diff --git a/Android.mk b/Android.mk
index 52a941dec1..47a6a69acb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,6 +20,8 @@ KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM)
 DLKM_DIR   := device/qcom/common/dlkm
 
 LOCAL_PATH := $(call my-dir)
+LOCAL_MODULE_DDK_BUILD    := true
+LOCAL_MODULE_KO_DIRS      := driver/msm-mmrm.ko test/mmrm_test_module.ko
 
 include $(CLEAR_VARS)
 # For incremental compilation
@@ -28,7 +30,6 @@ LOCAL_MODULE              := mmrm-module-symvers
 LOCAL_MODULE_STEM         := Module.symvers
 LOCAL_MODULE_KBUILD_NAME  := Module.symvers
 LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
-ENABLE_DDK_BUILD          := false
 # Include kp_module.ko in the /vendor/lib/modules (vendor.img)
 # BOARD_VENDOR_KERNEL_MODULES += $(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)
 include $(DLKM_DIR)/Build_external_kernelmodule.mk
@@ -41,7 +42,6 @@ LOCAL_MODULE_KBUILD_NAME  := driver/msm-mmrm.ko
 LOCAL_MODULE_TAGS         := optional
 LOCAL_MODULE_DEBUG_ENABLE := true
 LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
-ENABLE_DDK_BUILD          := false
 # Include kp_module.ko in the /vendor/lib/modules (vendor.img)
 # BOARD_VENDOR_KERNEL_MODULES += $(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)
 include $(DLKM_DIR)/Build_external_kernelmodule.mk
@@ -54,7 +54,6 @@ LOCAL_MODULE_KBUILD_NAME  := test/mmrm_test_module.ko
 LOCAL_MODULE_TAGS         := optional
 LOCAL_MODULE_DEBUG_ENABLE := true
 LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
-ENABLE_DDK_BUILD          := false
 # Include kp_module.ko in the /vendor/lib/modules (vendor.img)
 # BOARD_VENDOR_KERNEL_MODULES += $(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)
 include $(DLKM_DIR)/Build_external_kernelmodule.mk
diff --git a/mmrm_modules.bzl b/mmrm_modules.bzl
index 6f2e535dff..78c2ab5a16 100644
--- a/mmrm_modules.bzl
+++ b/mmrm_modules.bzl
@@ -9,7 +9,7 @@ module_entry = mmrm_driver_modules.register
 #--------------- MM-DRIVERS MODULES ------------------
 
 module_entry(
-    name = "msm_mmrm",
+    name = "msm-mmrm",
     path = MMRM_DRV_PATH + "/src",
     config_option = "CONFIG_MSM_MMRM",
     srcs = [
@@ -19,15 +19,15 @@ module_entry(
         "mmrm_internal.c",
         "mmrm_res_parse.c",
         "msm_mmrm.c"
-        ],
+    ],
 )
 
 module_entry(
-    name = "msm_test",
+    name = "mmrm_test_module",
     path =  MMRM_TEST_PATH,
     config_option = "CONFIG_MSM_MMRM",
     srcs = [
         "mmrm_test_internal.c",
         "mmrm_test.c"
-        ],
+    ],
 )
\ No newline at end of file
diff --git a/target.bzl b/target.bzl
index 09fc871d1d..055d0253eb 100644
--- a/target.bzl
+++ b/target.bzl
@@ -6,7 +6,7 @@ def define_pineapple():
         target = "pineapple",
         registry = mmrm_driver_modules,
         modules = [
-            "msm_mmrm",
-            "msm_test",
+            "msm-mmrm",
+            "mmrm_test_module",
         ],
 )
\ No newline at end of file