diff --git a/common/base.mk b/common/base.mk
index 896b3a4..c1762ac 100644
--- a/common/base.mk
+++ b/common/base.mk
@@ -477,7 +477,7 @@
 LIBQDMETADATA := libqdMetaData
 
 #LIBPOWER
-LIBPOWER := power.$(patsubst %f,%,$(subst _eas,,$(subst aosp_,,$(TARGET_PRODUCT))))
+LIBPOWER := power.marlin
 LIBPOWER += android.hardware.power@1.0-impl
 
 #LLVM for RenderScript
diff --git a/device-common.mk b/device-common.mk
index f881fd8..670b680 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -126,6 +126,8 @@
     android.hardware.vibrator@1.0-service \
     android.hardware.vr@1.0-service \
 
+PRODUCT_PROPERTY_OVERRIDES += ro.hardware.power=marlin
+
 # Light HAL
 PRODUCT_PACKAGES += \
     android.hardware.light@2.0-impl
diff --git a/power/Android.mk b/power/Android.mk
index 7e96cfe..889bc9a 100644
--- a/power/Android.mk
+++ b/power/Android.mk
@@ -25,7 +25,7 @@
 
 LOCAL_CFLAGS += -Wno-unused-parameter
 
-LOCAL_MODULE := power.$(patsubst %f,%,$(subst _eas,,$(subst aosp_,,$(TARGET_PRODUCT))))
+LOCAL_MODULE := power.marlin
 LOCAL_MODULE_TAGS := optional
 include $(BUILD_SHARED_LIBRARY)