diff --git a/A-Team.mk b/A-Team.mk
index d2040e3..9f29963 100644
--- a/A-Team.mk
+++ b/A-Team.mk
@@ -39,7 +39,7 @@ PRODUCT_SOONG_NAMESPACES += \
 endif
 
 # A-Team Custom APN
-ifeq ($(CUSTOM_APN), True)
+ifeq ($(APN_VARIANT), 1)
 PRODUCT_SOONG_NAMESPACES += \
     [A-Team_Custom_APN] 
 else
@@ -49,31 +49,31 @@ endif
 
 # A-Team Rom Apps
 ifneq ($(GSI), true)
-    PRODUCT_SOONG_NAMESPACES += \
+PRODUCT_SOONG_NAMESPACES += \
     [A-Team_Apps]
 endif
 
-TARGET_KERNEL_SOURCE := kernel/motorola/$(DEVICE_KERNEL)
+TARGET_KERNEL_SOURCE := kernel/motorola/$(DEVICE_SOC)
 PRODUCT_SOONG_NAMESPACES += \
-  [$(DEVICE_NAME)_$(TARGET_KERNEL)_Kernel]
+  [$(DEVICE_DISPLAY_CODENAME)-$(DEVICE_KERNEL)_Kernel]
 ##################################################################
 ###########################
 ## A-Team Gapps ##
 ##################################################################
 
 # A-Team Gapps
-ifeq ($(GAPPS_VARIANT), Gapps)
+ifeq ($(GAPPS_VARIANT), gapps)
 PRODUCT_SOONG_NAMESPACES += \
-     [A-Team_G-Apps]
+    [A-Team_G-Apps]
 # MindTheGapps
 $(call inherit-product, vendor/gapps/arm64/arm64-vendor.mk)
 #$(call inherit-product, vendor/gms/products/gms.mk)
 endif
 
 # A-Team Micro-G
-ifeq ($(GAPPS_VARIANT), Micro-G)
+ifeq ($(GAPPS_VARIANT), micro-g)
 PRODUCT_SOONG_NAMESPACES += \
-     [A-Team_Micro-G]
+    [A-Team_Micro-G]
 #$(call inherit-product, vendor/microg/products/gms.mk)
 endif
 ##################################################################
@@ -98,10 +98,13 @@ PRODUCT_PRODUCT_PROPERTIES += \
 ## A-Team Moto System Add-Ons ##
 ##################################################################
 
+#PRODUCT_SOONG_NAMESPACES += \
+#    [A-Team_Busybox]
+
 # Copy Busybox - /system/bin
-PRODUCT_COPY_FILES += \
-    $(A_TEAM_PATH)/Busybox/arm64/busybox:$(TARGET_COPY_OUT_SYSTEM)/bin/busybox \
-    $(A_TEAM_PATH)/Busybox/arm64/ssl_helper:$(TARGET_COPY_OUT_SYSTEM)/bin/ssl_helper
+#PRODUCT_COPY_FILES += \
+#    $(A_TEAM_PATH)/Busybox/arm64/busybox:$(TARGET_COPY_OUT_SYSTEM)/bin/busybox \
+#    $(A_TEAM_PATH)/Busybox/arm64/ssl_helper:$(TARGET_COPY_OUT_SYSTEM)/bin/ssl_helper
 
 # Clock 
 PRODUCT_COPY_FILES += \