diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedDexFile.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedDexFile.java
index 6ac074b8..88285b81 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedDexFile.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedDexFile.java
@@ -257,13 +257,13 @@ public abstract class DexBackedDexFile extends BaseDexBuffer implements DexFile
 
         public void dumpTo(Writer out, int width) throws IOException {
             AnnotatedBytes annotatedBytes = new AnnotatedBytes(width);
-            HeaderItem.getSection().annotateSection(annotatedBytes, this, 1);
+            HeaderItem.getAnnotator().annotateSection(annotatedBytes, this, 1);
 
             annotatedBytes.annotate(0, " ");
-            StringIdItem.getSection().annotateSection(annotatedBytes, this, stringCount);
+            StringIdItem.getAnnotator().annotateSection(annotatedBytes, this, stringCount);
 
             annotatedBytes.annotate(0, " ");
-            TypeIdItem.getSection().annotateSection(annotatedBytes, this, typeCount);
+            TypeIdItem.getAnnotator().annotateSection(annotatedBytes, this, typeCount);
 
             annotatedBytes.writeAnnotations(out, buf);
         }
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/HeaderItem.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/HeaderItem.java
index a176fb39..a7e46729 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/HeaderItem.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/HeaderItem.java
@@ -50,6 +50,8 @@ public class HeaderItem {
     public static final int CHECKSUM_OFFSET = 8;
 
     public static final int SIGNATURE_OFFSET = 12;
+    public static final int SIGNATURE_SIZE = 20;
+
     public static final int ENDIAN_TAG_OFFSET = 40;
 
     public static final int MAP_OFFSET = 52;
@@ -72,10 +74,8 @@ public class HeaderItem {
     public static final int CLASS_COUNT_OFFSET = 96;
     public static final int CLASS_START_OFFSET = 100;
 
-    public static final int SIGNATURE_SIZE = 20;
-
-    public static Section getSection() {
-        return new Section() {
+    public static SectionAnnotator getAnnotator() {
+        return new SectionAnnotator() {
             @Override
             public void annotateSection(@Nonnull AnnotatedBytes out, @Nonnull DexBackedDexFile dexFile, int length) {
                 int startOffset = out.getCursor();
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/Section.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/SectionAnnotator.java
similarity index 98%
rename from dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/Section.java
rename to dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/SectionAnnotator.java
index 09047389..8c0e290c 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/Section.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/SectionAnnotator.java
@@ -36,7 +36,7 @@ import org.jf.dexlib2.util.AnnotatedBytes;
 
 import javax.annotation.Nonnull;
 
-public interface Section {
+public interface SectionAnnotator {
 
     /**
      * Write out annotations for this section
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/StringIdItem.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/StringIdItem.java
index 90eaf246..fed045da 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/StringIdItem.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/StringIdItem.java
@@ -40,8 +40,8 @@ import javax.annotation.Nonnull;
 public class StringIdItem {
     public static final int ITEM_SIZE = 4;
 
-    public static Section getSection() {
-        return new Section() {
+    public static SectionAnnotator getAnnotator() {
+        return new SectionAnnotator() {
             @Override
             public void annotateSection(@Nonnull AnnotatedBytes out, @Nonnull DexBackedDexFile dexFile, int length) {
                 int startOffset = out.getCursor();
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/TypeIdItem.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/TypeIdItem.java
index 324d01e8..ee91fa19 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/TypeIdItem.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/TypeIdItem.java
@@ -40,8 +40,8 @@ import javax.annotation.Nonnull;
 public class TypeIdItem {
     public static final int ITEM_SIZE = 4;
 
-    public static Section getSection() {
-        return new Section() {
+    public static SectionAnnotator getAnnotator() {
+        return new SectionAnnotator() {
             @Override
             public void annotateSection(@Nonnull AnnotatedBytes out, @Nonnull DexBackedDexFile dexFile, int length) {
                 int startOffset = out.getCursor();