--- a/python/target/arminstructions.py	Sun Dec 01 18:37:23 2013 +0100
+++ b/python/target/arminstructions.py	Tue Dec 03 18:00:22 2013 +0100
@@ -418,14 +418,14 @@
         return '{} {}, {}, {}'.format(self.mnemonic, self.rd, self.rn, self.imm3.imm)
 
 @instruction
-class addregregimm3_ins(regregimm3_base):
+class Add2(regregimm3_base):
     """ add Rd, Rn, imm3 """
     mnemonic = 'add'
     opcode = 0b0001110
 
 
 @instruction
-class subregregimm3_ins(regregimm3_base):
+class Sub2(regregimm3_base):
     """ sub Rd, Rn, imm3 """
     mnemonic = 'sub'
     opcode = 0b0001111
@@ -491,7 +491,7 @@
         
 
 @instruction
-class mulregreg_ins(ArmInstruction):
+class Mul(ArmInstruction):
     """ mul Rn, Rdm """
     operands = (Reg8Op, Reg8Op)
     mnemonic = 'MUL'