diff --git a/liblights/Android.mk b/liblights/Android.mk
index e2487ea..515d7c9 100644
--- a/liblights/Android.mk
+++ b/liblights/Android.mk
@@ -18,7 +18,7 @@ ifneq ($(TARGET_SIMULATOR),true)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := lights.htcleo
+LOCAL_MODULE := lights.$(TARGET_BOOTLOADER_BOARD_NAME)
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
 
diff --git a/libsensors/Android.mk b/libsensors/Android.mk
index e37a379..9fb3c97 100644
--- a/libsensors/Android.mk
+++ b/libsensors/Android.mk
@@ -21,7 +21,7 @@ ifneq ($(TARGET_SIMULATOR),true)
 # hw/<SENSORS_HARDWARE_MODULE_ID>.<ro.product.board>.so
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := sensors.htcleo
+LOCAL_MODULE := sensors.$(TARGET_BOOTLOADER_BOARD_NAME)
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw