diff --git a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction10t.java b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction10t.java
index 4209e473..19ef36ea 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction10t.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction10t.java
@@ -39,7 +39,7 @@ import org.jf.dexlib2.util.Preconditions;
 import javax.annotation.Nonnull;
 
 public class ImmutableInstruction10t extends ImmutableInstruction implements Instruction10t {
-    public static final Format FORMAT = Format.Format12x;
+    public static final Format FORMAT = Format.Format10t;
 
     public final int codeOffset;
 
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction20t.java b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction20t.java
index 19251d65..c3b6d3ee 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction20t.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction20t.java
@@ -39,7 +39,7 @@ import org.jf.dexlib2.util.Preconditions;
 import javax.annotation.Nonnull;
 
 public class ImmutableInstruction20t extends ImmutableInstruction implements Instruction20t {
-    public static final Format FORMAT = Format.Format12x;
+    public static final Format FORMAT = Format.Format20t;
 
     public final int codeOffset;
 
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction22b.java b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction22b.java
index 7400766c..7b076305 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction22b.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction22b.java
@@ -50,7 +50,7 @@ public class ImmutableInstruction22b extends ImmutableInstruction implements Ins
                                    int registerB,
                                    int literal) {
         super(opcode);
-        Preconditions.checkFormat(opcode, Format.Format35c);
+        Preconditions.checkFormat(opcode, FORMAT);
         this.registerA = Preconditions.checkByteRegister(registerA);
         this.registerB = Preconditions.checkByteRegister(registerB);
         this.literal = Preconditions.checkByteLiteral(literal);
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction22s.java b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction22s.java
index a8db56fb..6eb5b6c0 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction22s.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction22s.java
@@ -50,7 +50,7 @@ public class ImmutableInstruction22s extends ImmutableInstruction implements Ins
                                    int registerB,
                                    int literal) {
         super(opcode);
-        Preconditions.checkFormat(opcode, Format.Format35c);
+        Preconditions.checkFormat(opcode, FORMAT);
         this.registerA = Preconditions.checkNibbleRegister(registerA);
         this.registerB = Preconditions.checkNibbleRegister(registerB);
         this.literal = Preconditions.checkShortLiteral(literal);
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction22t.java b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction22t.java
index ed47768b..f4e5de67 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction22t.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction22t.java
@@ -50,7 +50,7 @@ public class ImmutableInstruction22t extends ImmutableInstruction implements Ins
                                    int registerB,
                                    int codeOffset) {
         super(opcode);
-        Preconditions.checkFormat(opcode, Format.Format35c);
+        Preconditions.checkFormat(opcode, FORMAT);
         this.registerA = Preconditions.checkNibbleRegister(registerA);
         this.registerB = Preconditions.checkNibbleRegister(registerB);
         this.codeOffset = Preconditions.checkShortCodeOffset(codeOffset);
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction22x.java b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction22x.java
index d8499d96..95e6bdaa 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction22x.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction22x.java
@@ -48,7 +48,7 @@ public class ImmutableInstruction22x extends ImmutableInstruction implements Ins
                                    int registerA,
                                    int registerB) {
         super(opcode);
-        Preconditions.checkFormat(opcode, Format.Format35c);
+        Preconditions.checkFormat(opcode, FORMAT);
         this.registerA = Preconditions.checkByteRegister(registerA);
         this.registerB = Preconditions.checkShortRegister(registerB);
     }
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction23x.java b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction23x.java
index 1d7af45b..60f12285 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction23x.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction23x.java
@@ -50,7 +50,7 @@ public class ImmutableInstruction23x extends ImmutableInstruction implements Ins
                                    int registerB,
                                    int registerC) {
         super(opcode);
-        Preconditions.checkFormat(opcode, Format.Format35c);
+        Preconditions.checkFormat(opcode, FORMAT);
         this.registerA = Preconditions.checkByteRegister(registerA);
         this.registerB = Preconditions.checkByteRegister(registerB);
         this.registerC = Preconditions.checkByteRegister(registerC);
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction30t.java b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction30t.java
index 50c51ac0..d1538813 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction30t.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction30t.java
@@ -39,7 +39,7 @@ import org.jf.dexlib2.util.Preconditions;
 import javax.annotation.Nonnull;
 
 public class ImmutableInstruction30t extends ImmutableInstruction implements Instruction30t {
-    public static final Format FORMAT = Format.Format12x;
+    public static final Format FORMAT = Format.Format30t;
 
     public final int codeOffset;
 
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction32x.java b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction32x.java
index 7fb69131..e2197a21 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction32x.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction32x.java
@@ -48,7 +48,7 @@ public class ImmutableInstruction32x extends ImmutableInstruction implements Ins
                                    int registerA,
                                    int registerB) {
         super(opcode);
-        Preconditions.checkFormat(opcode, Format.Format35c);
+        Preconditions.checkFormat(opcode, FORMAT);
         this.registerA = Preconditions.checkShortRegister(registerA);
         this.registerB = Preconditions.checkShortRegister(registerB);
     }
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction35c.java b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction35c.java
index 6d5b9a2e..662b5bab 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction35c.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction35c.java
@@ -58,7 +58,7 @@ public class ImmutableInstruction35c extends ImmutableInstruction implements Ins
                                    int registerG,
                                    @Nonnull String reference) {
         super(opcode);
-        Preconditions.checkFormat(opcode, Format.Format35c);
+        Preconditions.checkFormat(opcode, FORMAT);
         this.registerCount = Preconditions.check35cRegisterCount(registerCount);
         this.registerC = (registerCount>0) ? Preconditions.checkNibbleRegister(registerC) : 0;
         this.registerD = (registerCount>1) ? Preconditions.checkNibbleRegister(registerD) : 0;