diff --git a/device.mk b/device.mk
index 4ddc38c1..a41010e4 100755
--- a/device.mk
+++ b/device.mk
@@ -335,10 +335,13 @@ PRODUCT_PACKAGES += \
 
 # Light HAL
 PRODUCT_PACKAGES += \
-    lights.$(PRODUCT_HARDWARE) \
+    lights.wahoo \
     android.hardware.light@2.0-impl:64 \
     android.hardware.light@2.0-service
 
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.hardware.lights=wahoo
+
 # eSE applet HALs
 PRODUCT_PACKAGES += \
     esed
diff --git a/liblight/Android.mk b/liblight/Android.mk
index 2ffa693c..bf309b16 100644
--- a/liblight/Android.mk
+++ b/liblight/Android.mk
@@ -25,7 +25,7 @@ LOCAL_CFLAGS := $(common_flags) \
     -DLOG_TAG=\"qdlights\" \
     -DDEFAULT_LOW_PERSISTENCE_MODE_BRIGHTNESS=$(DEFAULT_LOW_PERSISTENCE_MODE_BRIGHTNESS)
 LOCAL_CFLAGS += -Wall -Werror
-LOCAL_MODULE := lights.$(TARGET_DEVICE)
+LOCAL_MODULE := lights.wahoo
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)