diff --git a/manticore/native/cpu/arm.py b/manticore/native/cpu/arm.py
index 6d87aea84..dcda8b26a 100644
--- a/manticore/native/cpu/arm.py
+++ b/manticore/native/cpu/arm.py
@@ -754,14 +754,11 @@ def set_arm_tls(self, data):
     @staticmethod
     def canonicalize_instruction_name(instr):
         name = instr.insn_name().upper()
-        # XXX bypass a capstone bug that incorrectly labels some insns as mov
-        if name == "MOV":
-            if instr.mnemonic.startswith("lsr"):
-                return "LSR"
-            elif instr.mnemonic.startswith("lsl"):
-                return "LSL"
-            elif instr.mnemonic.startswith("asr"):
-                return "ASR"
+        # FIXME: Workaround https://github.com/aquynh/capstone/issues/1630
+        if instr.mnemonic == "addw":
+            return "ADDW"
+        elif instr.mnemonic == "subw":
+            return "SUBW"
         return OP_NAME_MAP.get(name, name)
 
     def _wrap_operands(self, operands):