diff --git a/Android.mk b/Android.mk
index 53da29e886..4f86e48296 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,12 +21,15 @@ KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM)
 DLKM_DIR   := $(TOP)/device/qcom/common/dlkm
 
 LOCAL_PATH := $(call my-dir)
+LOCAL_MODULE_DDK_BUILD := true
+LOCAL_MODULE_KO_DIRS := msm/synx/synx-driver.ko msm/synx/ipclite.ko
 
 include $(CLEAR_VARS)
 # For incremental compilation
 LOCAL_SRC_FILES           := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
 LOCAL_MODULE              := synx-driver-symvers
 LOCAL_MODULE_KBUILD_NAME  := Module.symvers
+#LOCAL_MODULE_STEM         := Module.symvers
 LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
 # Include kp_module.ko in the /vendor/lib/modules (vendor.img)
 # BOARD_VENDOR_KERNEL_MODULES += $(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)
@@ -37,7 +40,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES   := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
 $(info LOCAL_SRC_FILES = $(LOCAL_SRC_FILES))
 LOCAL_MODULE      := synx-driver.ko
-LOCAL_MODULE_KBUILD_NAME := msm/synx-driver.ko
+LOCAL_MODULE_KBUILD_NAME := msm/synx/synx-driver.ko
 LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
 include $(DLKM_DIR)/Build_external_kernelmodule.mk
 
@@ -57,7 +60,6 @@ $(info LOCAL_ADDITIONAL_DEPENDENCY = $(LOCAL_ADDITIONAL_DEPENDENCY))
 $(info LOCAL_ADDITIONAL_DEPENDENCIES = $(LOCAL_ADDITIONAL_DEPENDENCIES))
 $(info LOCAL_REQUIRED_MODULES = $(LOCAL_REQUIRED_MODULES))
 $(info DLKM_DIR = $(DLKM_DIR))
-
 include $(DLKM_DIR)/Build_external_kernelmodule.mk
 
 
diff --git a/pineapple.bzl b/pineapple.bzl
index 301fa5bd4d..5baba7f38e 100644
--- a/pineapple.bzl
+++ b/pineapple.bzl
@@ -6,7 +6,7 @@ def define_pineapple():
         target = "pineapple",
         registry = synx_modules,
         modules = [
-            "synx",
+            "synx-driver",
             "ipclite",
         ],
         config_options = [
diff --git a/synx_modules.bzl b/synx_modules.bzl
index e7865ace75..7cbee89a75 100644
--- a/synx_modules.bzl
+++ b/synx_modules.bzl
@@ -6,7 +6,7 @@ synx_modules = create_module_registry([":synx_headers"])
 register_synx_module = synx_modules.register
 
 register_synx_module(
-    name = "synx",
+    name = "synx-driver",
     path = "msm",
     srcs = [
         "synx/synx.c",