diff --git a/gpswrapper/Android.mk b/gpswrapper/Android.mk
index b38b9f9..f831c4f 100755
--- a/gpswrapper/Android.mk
+++ b/gpswrapper/Android.mk
@@ -1,11 +1,9 @@
-ifeq ($(BOARD_USES_GPSWRAPPER),true)
-
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_MODULE := gps.$(TARGET_BOOTLOADER_BOARD_NAME)
+LOCAL_MODULE := gps.smdkv310
 
 LOCAL_SHARED_LIBRARIES:= \
 	liblog \
@@ -21,5 +19,3 @@ LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
 
 include $(BUILD_SHARED_LIBRARY)
-
-endif
diff --git a/liblight/Android.mk b/liblight/Android.mk
index d8eecab..bdac140 100644
--- a/liblight/Android.mk
+++ b/liblight/Android.mk
@@ -24,7 +24,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
 
 LOCAL_SHARED_LIBRARIES := liblog
 
-LOCAL_MODULE := lights.$(TARGET_BOOTLOADER_BOARD_NAME)
+LOCAL_MODULE := lights.smdkv310
 
 LOCAL_MODULE_TAGS := optional