diff --git a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
index 55c24d9c3288e80..f5746839eca59f0 100644
--- a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
+++ b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
@@ -199,7 +199,7 @@ DecodeStatus SBFDisassembler::getInstruction(MCInst &Instr, uint64_t &Size,
            STI.hasFeature(SBF::FeatureNewMemEncoding) &&
            STI.hasFeature(SBF::ALU32))
     Result =
-        decodeInstruction(DecoderTableSBFALU32MEM64,
+        decodeInstruction(DecoderTableSBFALU32MEMv264,
                           Instr, Insn, Address, this, STI);
   else if (isNewMem(Insn) && STI.hasFeature(SBF::FeatureNewMemEncoding))
     Result =
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index b48b74df179489c..3d93c81ab29a472 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -1298,18 +1298,18 @@ class STORE32_V2<SBFSizeModifier SizeOp, string Mnemonic>
 
 multiclass STOREi32<SBFWidthModifer SizeV1, SBFSizeModifier SizeV2,
                                     string Mnemonic> {
-    def _V1 : STORE32_V1<SizeV1, Mnemonic>, Requires<[SBFOldMemEncoding]>;
+    let DecoderNamespace = "SBFALU32" in {
+      def _V1 : STORE32_V1<SizeV1, Mnemonic>, Requires<[SBFOldMemEncoding]>;
+    }
 
-    let DecoderNamespace = "SBFALU32v2" in {
+    let DecoderNamespace = "SBFALU32MEMv2" in {
       def _V2 : STORE32_V2<SizeV2, Mnemonic>, Requires<[SBFNewMemEncoding]>;
     }
 }
 
-let DecoderNamespace = "SBFALU32MEM" in {
-  defm STW32 : STOREi32<SBF_W, SBF_W_V2, "stxw">;
-  defm STH32 : STOREi32<SBF_H, SBF_H_V2, "stxh">;
-  defm STB32 : STOREi32<SBF_B, SBF_B_V2, "stxb">;
-}
+defm STW32 : STOREi32<SBF_W, SBF_W_V2, "stxw">;
+defm STH32 : STOREi32<SBF_H, SBF_H_V2, "stxh">;
+defm STB32 : STOREi32<SBF_B, SBF_B_V2, "stxb">;
 
 let Predicates = [SBFHasALU32, SBFOldMemEncoding] in {
     def : Pat<(store GPR32:$src, ADDRri:$addr),
@@ -1362,17 +1362,18 @@ class LOAD32_V2<SBFSizeModifier SizeOp, string Mnemonic>
 
 multiclass LOADi32<SBFWidthModifer SizeV1, SBFSizeModifier SizeV2,
                                     string Mnemonic> {
- def _V1 : LOAD32_V1<SizeV1, Mnemonic>, Requires<[SBFOldMemEncoding]>;
- let DecoderNamespace = "SBFALU32v2" in {
+ let DecoderNamespace = "SBFALU32" in {
+    def _V1 : LOAD32_V1<SizeV1, Mnemonic>, Requires<[SBFOldMemEncoding]>;
+ }
+ let DecoderNamespace = "SBFALU32MEMv2" in {
    def _V2 : LOAD32_V2<SizeV2, Mnemonic>, Requires<[SBFNewMemEncoding]>;
  }
 }
 
-let DecoderNamespace = "SBFALU32MEM" in {
-  defm LDW32 : LOADi32<SBF_W, SBF_W_V2, "ldxw">;
-  defm LDH32 : LOADi32<SBF_H, SBF_H_V2, "ldxh">;
-  defm LDB32 : LOADi32<SBF_B, SBF_B_V2, "ldxb">;
-}
+
+defm LDW32 : LOADi32<SBF_W, SBF_W_V2, "ldxw">;
+defm LDH32 : LOADi32<SBF_H, SBF_H_V2, "ldxh">;
+defm LDB32 : LOADi32<SBF_B, SBF_B_V2, "ldxb">;
 
 let Predicates = [SBFHasALU32, SBFOldMemEncoding] in {
     def : Pat<(load ADDRri:$addr),