diff --git a/dexpreopt/config.go b/dexpreopt/config.go
index 319e36e..064992f 100644
--- a/dexpreopt/config.go
+++ b/dexpreopt/config.go
@@ -66,9 +66,9 @@
 
 	EmptyDirectory string // path to an empty directory
 
-	DefaultDexPreoptImageLocation map[string]string // default boot image location for each architecture
-	CpuVariant                    map[string]string // cpu variant for each architecture
-	InstructionSetFeatures        map[string]string // instruction set for each architecture
+	DefaultDexPreoptImage  map[string]string // default boot image location for each architecture
+	CpuVariant             map[string]string // cpu variant for each architecture
+	InstructionSetFeatures map[string]string // instruction set for each architecture
 
 	Tools Tools // paths to tools possibly used by the generated commands
 }
@@ -103,8 +103,8 @@
 	UsesLibraries         []string
 	LibraryPaths          map[string]string
 
-	Archs                  []string
-	DexPreoptImageLocation string
+	Archs           []string
+	DexPreoptImages []string
 
 	PreoptExtractedApk bool // Overrides OnlyPreoptModules