diff --git a/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/ClassPool.java b/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/ClassPool.java
index 714dc474..a5801ed1 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/ClassPool.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/ClassPool.java
@@ -229,11 +229,11 @@ public class ClassPool implements ClassSection<CharSequence, CharSequence,
             }
 
             @Override public Integer getValue() {
-                return classDef.classDefOffset;
+                return classDef.classDefIndex;
             }
 
             @Override public Integer setValue(Integer value) {
-                return classDef.classDefOffset = value;
+                return classDef.classDefIndex = value;
             }
         };
     }
@@ -519,7 +519,7 @@ public class ClassPool implements ClassSection<CharSequence, CharSequence,
     }
 
     @Override public int getItemIndex(@Nonnull PoolClassDef classDef) {
-        return classDef.classDefOffset;
+        return classDef.classDefIndex;
     }
 
     @Nonnull @Override public Collection<? extends Map.Entry<PoolClassDef, Integer>> getItems() {
@@ -531,12 +531,12 @@ public class ClassPool implements ClassSection<CharSequence, CharSequence,
             }
 
             @Override public Integer getValue() {
-                return classDef.classDefOffset;
+                return classDef.classDefIndex;
             }
 
             @Override public Integer setValue(Integer value) {
-                int prev = classDef.classDefOffset;
-                classDef.classDefOffset = value;
+                int prev = classDef.classDefIndex;
+                classDef.classDefIndex = value;
                 return prev;
             }
         }
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/PoolClassDef.java b/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/PoolClassDef.java
index 8aa65a94..fe897d26 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/PoolClassDef.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/PoolClassDef.java
@@ -49,7 +49,7 @@ class PoolClassDef extends BaseTypeReference implements ClassDef {
     @Nonnull final ImmutableSortedSet<PoolMethod> directMethods;
     @Nonnull final ImmutableSortedSet<PoolMethod> virtualMethods;
 
-    int classDefOffset = DexPool.NO_OFFSET;
+    int classDefIndex = DexPool.NO_INDEX;
     int encodedArrayOffset = DexPool.NO_OFFSET;
     int annotationDirectoryOffset = DexPool.NO_OFFSET;