diff --git a/Android.mk b/Android.mk
index f2b4114..ba8dafa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,3 @@
-ifeq ($(filter-out smdkc210,$(TARGET_BOARD_PLATFORM)),)
+ifeq ($(filter-out smdkv310,$(TARGET_BOARD_PLATFORM)),)
     include $(all-subdir-makefiles)
 endif
diff --git a/common.mk b/common.mk
index f628d74..ec33442 100644
--- a/common.mk
+++ b/common.mk
@@ -39,6 +39,11 @@
 # application settings that are stored in resourced.
 DEVICE_PACKAGE_OVERLAYS := device/samsung/c1-common/overlay
 
+# Libs
+PRODUCT_PACKAGES := \
+    gps.smdkv310 \
+    lights.smdkv310
+
 # These are the hardware-specific configuration files
 PRODUCT_COPY_FILES := \
 	device/samsung/c1-common/etc/asound.conf:system/etc/asound.conf \
@@ -51,8 +56,8 @@ PRODUCT_COPY_FILES := \
 # Init files
 PRODUCT_COPY_FILES += \
 	device/samsung/c1-common/init.rc:root/init.rc \
-	device/samsung/c1-common/init.smdkc210.rc:root/init.smdkc210.rc \
-	device/samsung/c1-common/ueventd.smdkc210.rc:root/ueventd.smdkc210.rc
+	device/samsung/c1-common/init.smdkv310.rc:root/init.smdkv310.rc \
+	device/samsung/c1-common/ueventd.smdkv310.rc:root/ueventd.smdkv310.rc
 
 # Configuration files for audio
 PRODUCT_COPY_FILES += \
diff --git a/init.smdkc210.rc b/init.smdkv310.rc
similarity index 100%
rename from init.smdkc210.rc
rename to init.smdkv310.rc
diff --git a/liblight/Android.mk b/liblight/Android.mk
index 87d67f8..d8eecab 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.GT-I9100
+LOCAL_MODULE := lights.$(TARGET_BOOTLOADER_BOARD_NAME)
 
 LOCAL_MODULE_TAGS := optional
 
diff --git a/ueventd.smdkc210.rc b/ueventd.smdkv310.rc
similarity index 100%
rename from ueventd.smdkc210.rc
rename to ueventd.smdkv310.rc