diff --git a/proprietary/lib64/vendor.qti.esepowermanager@1.0.so b/proprietary/lib64/vendor.qti.esepowermanager@1.0.so
index ca2e4b3..8088f76 100644
Binary files a/proprietary/lib64/vendor.qti.esepowermanager@1.0.so and b/proprietary/lib64/vendor.qti.esepowermanager@1.0.so differ
diff --git a/proprietary/vendor/bin/esepmdaemon b/proprietary/vendor/bin/esepmdaemon
deleted file mode 100644
index 197bc2b..0000000
Binary files a/proprietary/vendor/bin/esepmdaemon and /dev/null differ
diff --git a/proprietary/vendor/bin/hw/vendor.qti.esepowermanager@1.0-service b/proprietary/vendor/bin/hw/vendor.qti.esepowermanager@1.0-service
index 27e7fab..2e1a2cb 100755
Binary files a/proprietary/vendor/bin/hw/vendor.qti.esepowermanager@1.0-service and b/proprietary/vendor/bin/hw/vendor.qti.esepowermanager@1.0-service differ
diff --git a/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.0-service.rc b/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.0-service.rc
index 1cc50f9..e76d4cf 100644
--- a/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.0-service.rc
+++ b/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.0-service.rc
@@ -1,4 +1,4 @@
-service vendor.qti_esepowermanager_service /vendor/bin/hw/vendor.qti.esepowermanager@1.0-service
+service qti_esepowermanager_service /vendor/bin/hw/vendor.qti.esepowermanager@1.0-service
     class hal
     user system
-    group nfc
+    group nfc system
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.esepowermanager@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.esepowermanager@1.0-impl.so
new file mode 100644
index 0000000..d22718f
Binary files /dev/null and b/proprietary/vendor/lib64/hw/vendor.qti.esepowermanager@1.0-impl.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.0.so b/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.0.so
new file mode 100644
index 0000000..eb7564a
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.0_vendor.so b/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.0_vendor.so
deleted file mode 100644
index 197b2f2..0000000
Binary files a/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.0_vendor.so and /dev/null differ
diff --git a/sanders-vendor.mk b/sanders-vendor.mk
index 7b11d86..751215c 100644
--- a/sanders-vendor.mk
+++ b/sanders-vendor.mk
@@ -169,7 +169,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sanders/proprietary/lib/lib_mot_app6_metadata.so:system/lib/lib_mot_app6_metadata.so \
     vendor/motorola/sanders/proprietary/lib/libmotaudioutils.so:system/lib/libmotaudioutils.so \
     vendor/motorola/sanders/proprietary/vendor/bin/audioflacapp:system/vendor/bin/audioflacapp \
-    vendor/motorola/sanders/proprietary/vendor/bin/esepmdaemon:system/vendor/bin/esepmdaemon \
     vendor/motorola/sanders/proprietary/vendor/bin/mm-pp-dpps:system/vendor/bin/mm-pp-dpps \
     vendor/motorola/sanders/proprietary/vendor/bin/qseeproxydaemon:system/vendor/bin/qseeproxydaemon \
     vendor/motorola/sanders/proprietary/vendor/bin/qseeproxysampledaemon:system/vendor/bin/qseeproxysampledaemon \
@@ -1247,7 +1246,10 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sanders/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.0_vendor.so:system/vendor/lib64/vendor.qti.hardware.radio.uim@1.0_vendor.so \
     vendor/motorola/sanders/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0_vendor.so:system/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0_vendor.so \
     vendor/motorola/sanders/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0_vendor.so:system/vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0_vendor.so \
-    vendor/motorola/sanders/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.0_vendor.so:system/vendor/lib64/vendor.qti.esepowermanager@1.0_vendor.so \
+    vendor/motorola/sanders/proprietary/vendor/bin/hw/vendor.qti.esepowermanager@1.0-service:system/vendor/bin/hw/vendor.qti.esepowermanager@1.0-service \
+    vendor/motorola/sanders/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.0-service.rc:system/vendor/etc/init/vendor.qti.esepowermanager@1.0-service.rc \
+    vendor/motorola/sanders/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.0.so:system/vendor/lib64/vendor.qti.esepowermanager@1.0.so \
+    vendor/motorola/sanders/proprietary/vendor/lib64/hw/vendor.qti.esepowermanager@1.0-impl.so:system/vendor/lib64/hw/vendor.qti.esepowermanager@1.0-impl.so \
     vendor/motorola/sanders/proprietary/lib64/vendor.qti.esepowermanager@1.0.so:system/lib64/vendor.qti.esepowermanager@1.0.so \
     vendor/motorola/sanders/proprietary/vendor/framework/vendor.qti.hardware.alarm-V1.0-java.jar:system/vendor/framework/vendor.qti.hardware.alarm-V1.0-java.jar \
     vendor/motorola/sanders/proprietary/vendor/lib64/libalarmservice_jni.so:system/vendor/lib64/libalarmservice_jni.so \