diff --git a/disasm.c b/disasm.c
index 4ce6efd8..a53fe0a7 100644
--- a/disasm.c
+++ b/disasm.c
@@ -1066,7 +1066,7 @@ int32_t disasm(uint8_t *data, char *output, int outbufsize, int segsize,
 		    prefix.vex_lp = prefix.vex[1] & 7;
 		}
 
-		ix = itable_VEX[0][prefix.vex_m][prefix.vex_lp];
+		ix = itable_vex[0][prefix.vex_m][prefix.vex_lp];
 	    }
 	    end_prefix = true;
 	    break;
@@ -1087,7 +1087,7 @@ int32_t disasm(uint8_t *data, char *output, int outbufsize, int segsize,
 		prefix.vex_v = (~prefix.vex[2] >> 3) & 15;
 		prefix.vex_lp = prefix.vex[2] & 7;
 
-		ix = itable_VEX[1][prefix.vex_m][prefix.vex_lp];
+		ix = itable_vex[1][prefix.vex_m][prefix.vex_lp];
 	    }
 	    end_prefix = true;
 	    break;
diff --git a/insns.h b/insns.h
index 38b5f100..e8096a73 100644
--- a/insns.h
+++ b/insns.h
@@ -32,7 +32,7 @@ struct disasm_index {
 /* Tables for the assembler and disassembler, respectively */
 extern const struct itemplate * const nasm_instructions[];
 extern const struct disasm_index itable[256];
-extern const struct disasm_index * const itable_VEX[2][32][8];
+extern const struct disasm_index * const itable_vex[2][32][8];
 
 /* Common table for the byte codes */
 extern const uint8_t nasm_bytecodes[];
diff --git a/insns.pl b/insns.pl
index 66238644..7c5767e3 100755
--- a/insns.pl
+++ b/insns.pl
@@ -15,12 +15,12 @@
 $MAX_OPERANDS = 5;
 
 # Add VEX/XOP prefixes
-@vex_class = ( 'VEX', 'XOP' );
+@vex_class = ( 'vex', 'xop' );
 $vex_classes = scalar(@vex_class);
 @vexlist = ();
 %vexmap = ();
 for ($c = 0; $c < $vex_classes; $c++) {
-    $vexmap{"\L$vex_class[$c]"} = $c;
+    $vexmap{$vex_class[$c]} = $c;
     for ($m = 0; $m < 32; $m++) {
 	for ($lp = 0; $lp < 8; $lp++) {
 	    push(@vexlist, sprintf("%s%02X%01X", $vex_class[$c], $m, $lp));
@@ -249,7 +249,7 @@ if ( !defined($output) || $output eq 'd' ) {
 	print D "};\n";
     }
 
-    printf D "\nconst struct disasm_index * const itable_VEX[%d][32][8] =\n",
+    printf D "\nconst struct disasm_index * const itable_vex[%d][32][8] =\n",
         $vex_classes;
     print D "{\n";
     for ($c = 0; $c < $vex_classes; $c++) {