diff --git a/arm/Android.bp b/arm/Android.bp
index c58d951..3ef0905 100644
--- a/arm/Android.bp
+++ b/arm/Android.bp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * This file is generated by device/gapps//setup-makefiles.sh
+ * This file is generated by device/gapps/arm/setup-makefiles.sh
  */
 
 soong_namespace {
diff --git a/arm/Android.mk b/arm/Android.mk
index 95d36bb..0680738 100644
--- a/arm/Android.mk
+++ b/arm/Android.mk
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/arm/setup-makefiles.sh
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter arm,$(TARGET_ARCH)),)
+ifeq ($(TARGET_ARCH),arm)
 
 endif
diff --git a/arm/BoardConfigVendor.mk b/arm/BoardConfigVendor.mk
index 37b5c98..1e83765 100644
--- a/arm/BoardConfigVendor.mk
+++ b/arm/BoardConfigVendor.mk
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/arm/setup-makefiles.sh
 
diff --git a/arm/arm-vendor.mk b/arm/arm-vendor.mk
index 8f15ffe..99cad82 100644
--- a/arm/arm-vendor.mk
+++ b/arm/arm-vendor.mk
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/arm/setup-makefiles.sh
 
 PRODUCT_SOONG_NAMESPACES += \
-    vendor/gapps/
+    vendor/gapps/arm
 
 PRODUCT_COPY_FILES += \
     vendor/gapps/arm/proprietary/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libjni_latinimegoogle.so
diff --git a/arm64/Android.bp b/arm64/Android.bp
index c58d951..306d332 100644
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * This file is generated by device/gapps//setup-makefiles.sh
+ * This file is generated by device/gapps/arm64/setup-makefiles.sh
  */
 
 soong_namespace {
diff --git a/arm64/Android.mk b/arm64/Android.mk
index 8778282..43cf256 100644
--- a/arm64/Android.mk
+++ b/arm64/Android.mk
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/arm64/setup-makefiles.sh
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter arm64,$(TARGET_ARCH)),)
+ifeq ($(TARGET_ARCH),arm64)
 
 endif
diff --git a/arm64/BoardConfigVendor.mk b/arm64/BoardConfigVendor.mk
index 37b5c98..0f25827 100644
--- a/arm64/BoardConfigVendor.mk
+++ b/arm64/BoardConfigVendor.mk
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/arm64/setup-makefiles.sh
 
diff --git a/arm64/arm64-vendor.mk b/arm64/arm64-vendor.mk
index 6ea6ef0..95aa703 100644
--- a/arm64/arm64-vendor.mk
+++ b/arm64/arm64-vendor.mk
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/arm64/setup-makefiles.sh
 
 PRODUCT_SOONG_NAMESPACES += \
-    vendor/gapps/
+    vendor/gapps/arm64
 
 PRODUCT_COPY_FILES += \
     vendor/gapps/arm64/proprietary/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libjni_latinimegoogle.so \
diff --git a/common/Android.bp b/common/Android.bp
index 136cc5f..b29417a 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * This file is generated by device/gapps//setup-makefiles.sh
+ * This file is generated by device/gapps/common/setup-makefiles.sh
  */
 
 soong_namespace {
diff --git a/common/Android.mk b/common/Android.mk
index 620b791..2a90cc2 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/common/setup-makefiles.sh
 
 LOCAL_PATH := $(call my-dir)
 
diff --git a/common/BoardConfigVendor.mk b/common/BoardConfigVendor.mk
index 37b5c98..ed16202 100644
--- a/common/BoardConfigVendor.mk
+++ b/common/BoardConfigVendor.mk
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/common/setup-makefiles.sh
 
diff --git a/common/common-vendor.mk b/common/common-vendor.mk
index b9c9d14..b1ce447 100644
--- a/common/common-vendor.mk
+++ b/common/common-vendor.mk
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/common/setup-makefiles.sh
 
 PRODUCT_SOONG_NAMESPACES += \
-    vendor/gapps/
+    vendor/gapps/common
 
 PRODUCT_COPY_FILES += \
     vendor/gapps/common/proprietary/etc/permissions/com.google.android.dialer.support.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/com.google.android.dialer.support.xml \
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index fba612b..73a0fbf 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -20,7 +20,7 @@ set -e
 
 export INITIAL_COPYRIGHT_YEAR=2017
 
-export GAPPS_COMMON=common
+export DEVICE_COMMON=common
 export VENDOR=gapps
 
 # Load extract_utils and do some sanity checks
@@ -37,7 +37,7 @@ fi
 . "$HELPER"
 
 # Initialize the helper for common gapps
-setup_vendor "$GAPPS_COMMON" "$VENDOR" "$LINEAGE_ROOT" true
+setup_vendor "$DEVICE_COMMON" "$VENDOR" "$LINEAGE_ROOT" true
 
 # Copyright headers
 write_headers "arm arm64 x86"
@@ -55,19 +55,19 @@ sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK"
 # We are done with common
 write_footers
 
-for TARGET in arm arm64 x86; do
+for DEVICE in arm arm64 x86; do
 
 # Reinitialize the helper for target gapps
-setup_vendor "$TARGET" "$VENDOR" "$LINEAGE_ROOT" true
+setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT"
 
 # Copyright headers and guards
-write_headers "$TARGET"
+write_headers "$DEVICE"
 
-write_makefiles "$MY_DIR"/proprietary-files-$TARGET.txt
+write_makefiles "$MY_DIR"/proprietary-files-$DEVICE.txt
 
 # Gapps that are too large for grouper
 echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$PRODUCTMK"
-write_makefiles "$MY_DIR"/proprietary-files-$TARGET-nongrouper.txt
+write_makefiles "$MY_DIR"/proprietary-files-$DEVICE-nongrouper.txt
 echo "endif" >> "$PRODUCTMK"
 
 printf '\n%s\n' "\$(call inherit-product, vendor/gapps/common/common-vendor.mk)" >> "$PRODUCTMK"
diff --git a/x86/Android.bp b/x86/Android.bp
index e82c803..387cc72 100644
--- a/x86/Android.bp
+++ b/x86/Android.bp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * This file is generated by device/gapps//setup-makefiles.sh
+ * This file is generated by device/gapps/x86/setup-makefiles.sh
  */
 
 soong_namespace {
diff --git a/x86/Android.mk b/x86/Android.mk
index 49c500c..f5ff15e 100644
--- a/x86/Android.mk
+++ b/x86/Android.mk
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/x86/setup-makefiles.sh
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter x86,$(TARGET_ARCH)),)
+ifeq ($(TARGET_ARCH),x86)
 
 endif
diff --git a/x86/BoardConfigVendor.mk b/x86/BoardConfigVendor.mk
index 37b5c98..51df80d 100644
--- a/x86/BoardConfigVendor.mk
+++ b/x86/BoardConfigVendor.mk
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/x86/setup-makefiles.sh
 
diff --git a/x86/x86-vendor.mk b/x86/x86-vendor.mk
index 18c1082..cff24d5 100644
--- a/x86/x86-vendor.mk
+++ b/x86/x86-vendor.mk
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/x86/setup-makefiles.sh
 
 PRODUCT_SOONG_NAMESPACES += \
-    vendor/gapps/
+    vendor/gapps/x86
 
 PRODUCT_COPY_FILES += \
     vendor/gapps/x86/proprietary/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libjni_latinimegoogle.so