diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 2dd5ec3..e741375 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -31,6 +31,5 @@
 # tree.
 # TODO(b/174997203): Clean this up when there is a better way to switch between
 # prebuilts and sources.
-SOONG_CONFIG_NAMESPACES += art_module
-SOONG_CONFIG_art_module += source_build
-SOONG_CONFIG_art_module_source_build := true
+$(call add_soong_config_namespace,art_module)
+$(call add_soong_config_var_value,art_module,source_build,true)
diff --git a/art_module/art_module.mk b/art_module/art_module.mk
index 4366345..d8074ed 100644
--- a/art_module/art_module.mk
+++ b/art_module/art_module.mk
@@ -20,6 +20,5 @@
 # tree.
 # TODO(b/174997203): Clean up the art_module_* products when there is a better
 # way to switch between prebuilts and sources.
-SOONG_CONFIG_NAMESPACES += art_module
-SOONG_CONFIG_art_module += source_build
-SOONG_CONFIG_art_module_source_build := true
+$(call add_soong_config_namespace,art_module)
+$(call add_soong_config_var_value,art_module,source_build,true)
diff --git a/art_module/art_module_arm.mk b/art_module/art_module_arm.mk
index 9d3929a..2811bf1 100644
--- a/art_module/art_module_arm.mk
+++ b/art_module/art_module_arm.mk
@@ -14,8 +14,7 @@
 # limitations under the License.
 #
 
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/module_arm.mk)
 $(call inherit-product, device/generic/art/art_module/art_module.mk)
 
 PRODUCT_NAME := art_module_arm
-PRODUCT_DEVICE := generic
diff --git a/art_module/art_module_arm64.mk b/art_module/art_module_arm64.mk
index b775600..933d5a6 100644
--- a/art_module/art_module_arm64.mk
+++ b/art_module/art_module_arm64.mk
@@ -14,8 +14,7 @@
 # limitations under the License.
 #
 
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/module_arm64.mk)
 $(call inherit-product, device/generic/art/art_module/art_module.mk)
 
 PRODUCT_NAME := art_module_arm64
-PRODUCT_DEVICE := generic_arm64
diff --git a/art_module/art_module_x86.mk b/art_module/art_module_x86.mk
index 7272ad4..3b4da4c 100644
--- a/art_module/art_module_x86.mk
+++ b/art_module/art_module_x86.mk
@@ -14,8 +14,7 @@
 # limitations under the License.
 #
 
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/module_x86.mk)
 $(call inherit-product, device/generic/art/art_module/art_module.mk)
 
 PRODUCT_NAME := art_module_x86
-PRODUCT_DEVICE := generic_x86
diff --git a/art_module/art_module_x86_64.mk b/art_module/art_module_x86_64.mk
index 7a16ff2..d55be8a 100644
--- a/art_module/art_module_x86_64.mk
+++ b/art_module/art_module_x86_64.mk
@@ -14,8 +14,7 @@
 # limitations under the License.
 #
 
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/module_x86_64.mk)
 $(call inherit-product, device/generic/art/art_module/art_module.mk)
 
 PRODUCT_NAME := art_module_x86_64
-PRODUCT_DEVICE := generic_x86_64