diff --git a/bddisasm/bddisasm.c b/bddisasm/bddisasm.c
index ef99545..a0e6db0 100644
--- a/bddisasm/bddisasm.c
+++ b/bddisasm/bddisasm.c
@@ -3398,9 +3398,9 @@ NdFindInstruction(
 
         case ND_ILUT_AUXILIARY:
             // Auxiliary redirection. Default to table[0] if nothing matches.
-            if (Instrux->HasRex && (NULL != pTable->Table[ND_ILUT_INDEX_AUX_REX]))
+            if (Instrux->HasRex && Instrux->Rex.b && (NULL != pTable->Table[ND_ILUT_INDEX_AUX_REXB]))
             {
-                nextIndex = ND_ILUT_INDEX_AUX_REX;
+                nextIndex = ND_ILUT_INDEX_AUX_REXB;
             }
             else if (Instrux->HasRex && Instrux->Rex.w && (NULL != pTable->Table[ND_ILUT_INDEX_AUX_REXW]))
             {
diff --git a/bddisasm/include/instructions.h b/bddisasm/include/instructions.h
index b145b7a..40f6422 100644
--- a/bddisasm/include/instructions.h
+++ b/bddisasm/include/instructions.h
@@ -42820,7 +42820,7 @@ const ND_INSTRUCTION gInstructions[2586] =
         },
     }, 
 
-    // Pos:2539 Instruction:"XCHG rAX,Zv" Encoding:"rex 0x90"/"O"
+    // Pos:2539 Instruction:"XCHG rAX,Zv" Encoding:"rexb 0x90"/"O"
     {
         ND_INS_XCHG, ND_CAT_DATAXFER, ND_SET_I86, 1557, 
         0, 
diff --git a/bddisasm/include/table_root.h b/bddisasm/include/table_root.h
index 12c107f..533da0a 100644
--- a/bddisasm/include/table_root.h
+++ b/bddisasm/include/table_root.h
@@ -14536,7 +14536,7 @@ const ND_TABLE_INSTRUCTION gRootTable_root_90_aF3_leaf =
     (const void *)&gInstructions[848]
 };
 
-const ND_TABLE_INSTRUCTION gRootTable_root_90_rex_leaf = 
+const ND_TABLE_INSTRUCTION gRootTable_root_90_rexb_leaf = 
 {
     ND_ILUT_INSTRUCTION,
     (const void *)&gInstructions[2539]
@@ -14547,7 +14547,7 @@ const ND_TABLE_AUXILIARY gRootTable_root_90_auxiliary =
     ND_ILUT_AUXILIARY,
     { 
         /* 00 */ (const void *)&gRootTable_root_90_None_leaf,
-        /* 01 */ (const void *)&gRootTable_root_90_rex_leaf,
+        /* 01 */ (const void *)&gRootTable_root_90_rexb_leaf,
         /* 02 */ NULL,
         /* 03 */ NULL,
         /* 04 */ (const void *)&gRootTable_root_90_aF3_leaf,
diff --git a/bddisasm/include/tabledefs.h b/bddisasm/include/tabledefs.h
index c522b5b..df18324 100644
--- a/bddisasm/include/tabledefs.h
+++ b/bddisasm/include/tabledefs.h
@@ -62,7 +62,7 @@ typedef enum _ND_ILUT_TYPE
 #define ND_ILUT_INDEX_ASIZE_64          3
 
 #define ND_ILUT_INDEX_AUX_NONE          0
-#define ND_ILUT_INDEX_AUX_REX           1
+#define ND_ILUT_INDEX_AUX_REXB          1
 #define ND_ILUT_INDEX_AUX_REXW          2
 #define ND_ILUT_INDEX_AUX_O64           3
 #define ND_ILUT_INDEX_AUX_F3            4
diff --git a/isagenerator/disasmlib.py b/isagenerator/disasmlib.py
index 47ed671..8dcd736 100644
--- a/isagenerator/disasmlib.py
+++ b/isagenerator/disasmlib.py
@@ -663,7 +663,7 @@ class Instruction():
         # Sixth redirection class: default address size
         self.RedAs16 = self.RedAs32 = self.RedAs64 = False
         # Seventh redirecton class: rex, rex.w, rep, repz
-        self.RedRex = self.RedRexW = self.RedRep = self.Red64 = self.RedF3 = False
+        self.RedRexB = self.RedRexW = self.RedRep = self.Red64 = self.RedF3 = False
         # Misc - vendor
         self.Vendor = None
         # Misc - feature.
@@ -693,8 +693,8 @@ class Instruction():
                 self.Red64 = True
             elif 'rexw' == t: 
                 self.RedRexW = True
-            elif 'rex' == t: 
-                self.RedRex = True
+            elif 'rexb' == t: 
+                self.RedRexB = True
             elif 'rep' == t: 
                 self.RedRep = True
             elif 'ds16' == t: 
@@ -1003,8 +1003,8 @@ class Instruction():
         # the other classes, this is not exhaustive - if an instruction does not fit in any of the entries, it 
         # will default to index 0 (and it will not return invalid encoding, unless entry 0 is invalid).
         oprefixes = []
-        if self.RedRex: 
-            oprefixes.append('rex')
+        if self.RedRexB: 
+            oprefixes.append('rexb')
         if self.RedRexW: 
             oprefixes.append('rexw')
         if self.Red64: 
diff --git a/isagenerator/generate_tables.py b/isagenerator/generate_tables.py
index 63f416f..ac5ce5f 100644
--- a/isagenerator/generate_tables.py
+++ b/isagenerator/generate_tables.py
@@ -380,7 +380,7 @@ indexes = {
     "F2"    : 3,
 
     # other prefixes
-    "rex"   : 1,
+    "rexb"  : 1,
     "rexw"  : 2,
     "64"    : 3,
     "aF3"   : 4,
diff --git a/isagenerator/instructions/table_base.dat b/isagenerator/instructions/table_base.dat
index 433d519..dacc633 100644
--- a/isagenerator/instructions/table_base.dat
+++ b/isagenerator/instructions/table_base.dat
@@ -212,7 +212,7 @@ POP            Ev            Kv                [            0x8F /0]       s:I86
 # 0x90 - 0x9F
 NOP            nil           nil               [            0x90]          s:I86, t:NOP, 
 PAUSE          nil           nil               [      a0xF3 0x90]          s:PAUSE, t:MISC, m:NOTSX
-XCHG           rAX,Zv        nil               [        rex 0x90]          s:I86, t:DATAXFER, w:RW|RW
+XCHG           rAX,Zv        nil               [       rexb 0x90]          s:I86, t:DATAXFER, w:RW|RW
 XCHG           rAX,Zv        nil               [            0x91]          s:I86, t:DATAXFER, w:RW|RW
 XCHG           rAX,Zv        nil               [            0x92]          s:I86, t:DATAXFER, w:RW|RW
 XCHG           rAX,Zv        nil               [            0x93]          s:I86, t:DATAXFER, w:RW|RW