diff --git a/devon-vendor.mk b/devon-vendor.mk
index 67c3d547..d5c45f5e 100644
--- a/devon-vendor.mk
+++ b/devon-vendor.mk
@@ -9,7 +9,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/devon/proprietary/vendor/bin/STFlashTool:$(TARGET_COPY_OUT_VENDOR)/bin/STFlashTool \
     vendor/motorola/devon/proprietary/vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-ets:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-ets \
     vendor/motorola/devon/proprietary/vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-fpc:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-fpc \
-    vendor/motorola/devon/proprietary/vendor/bin/hw/android.hardware.nfc@1.2-service.st:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.nfc@1.2-service.st \
     vendor/motorola/devon/proprietary/vendor/bin/thermal-engine:$(TARGET_COPY_OUT_VENDOR)/bin/thermal-engine \
     vendor/motorola/devon/proprietary/vendor/etc/acdbdata/Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Bluetooth_cal.acdb \
     vendor/motorola/devon/proprietary/vendor/etc/acdbdata/General_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/General_cal.acdb \
@@ -30,7 +29,7 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/devon/proprietary/vendor/etc/camera/vidhance_calibration:$(TARGET_COPY_OUT_VENDOR)/etc/camera/vidhance_calibration \
     vendor/motorola/devon/proprietary/vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service-ets2.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.biometrics.fingerprint@2.1-service-ets2.rc \
     vendor/motorola/devon/proprietary/vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service-fpc2.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.biometrics.fingerprint@2.1-service-fpc2.rc \
-    vendor/motorola/devon/proprietary/vendor/etc/init/android.hardware.nfc@1.2-service.st.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.nfc@1.2-service.st.rc \
+    vendor/motorola/devon/proprietary/vendor/etc/init/android.hardware.nfc@1.2-service.st-moto.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.nfc@1.2-service.st-moto.rc \
     vendor/motorola/devon/proprietary/vendor/etc/init/hw/init.vendor.st21nfc.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.vendor.st21nfc.rc \
     vendor/motorola/devon/proprietary/vendor/etc/init/init.ets.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.ets.rc \
     vendor/motorola/devon/proprietary/vendor/etc/init/init_thermal-engine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init_thermal-engine.rc \
@@ -250,7 +249,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/devon/proprietary/vendor/lib64/libvidhance_fbc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvidhance_fbc.so \
     vendor/motorola/devon/proprietary/vendor/lib64/libvidhance_horizon_correction.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvidhance_horizon_correction.so \
     vendor/motorola/devon/proprietary/vendor/lib64/libvidhance_stabilizer.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvidhance_stabilizer.so \
-    vendor/motorola/devon/proprietary/vendor/lib64/nfc_nci.st21nfc.st.so:$(TARGET_COPY_OUT_VENDOR)/lib64/nfc_nci.st21nfc.st.so \
     vendor/motorola/devon/proprietary/vendor/lib64/vendor.egistecbix.hardware.fingerprint@4.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.egistecbix.hardware.fingerprint@4.0.so
 
 PRODUCT_PACKAGES += \
diff --git a/proprietary/vendor/bin/hw/android.hardware.nfc@1.2-service.st b/proprietary/vendor/bin/hw/android.hardware.nfc@1.2-service.st
deleted file mode 100644
index 450d9319..00000000
Binary files a/proprietary/vendor/bin/hw/android.hardware.nfc@1.2-service.st and /dev/null differ
diff --git a/proprietary/vendor/etc/init/android.hardware.nfc@1.2-service.st.rc b/proprietary/vendor/etc/init/android.hardware.nfc@1.2-service.st-moto.rc
similarity index 97%
rename from proprietary/vendor/etc/init/android.hardware.nfc@1.2-service.st.rc
rename to proprietary/vendor/etc/init/android.hardware.nfc@1.2-service.st-moto.rc
index ef945408..2d6fac5e 100644
--- a/proprietary/vendor/etc/init/android.hardware.nfc@1.2-service.st.rc
+++ b/proprietary/vendor/etc/init/android.hardware.nfc@1.2-service.st-moto.rc
@@ -8,6 +8,7 @@ on property:init.svc.vendor.stflashtool=stopped && property:ro.vendor.hw.nfc=ese
     start vendor.st_nfc_hal_service
 
 service vendor.st_nfc_hal_service /vendor/bin/hw/android.hardware.nfc@1.2-service.st
+    override
     class hal
     user nfc
     group nfc
diff --git a/proprietary/vendor/lib64/nfc_nci.st21nfc.st.so b/proprietary/vendor/lib64/nfc_nci.st21nfc.st.so
deleted file mode 100644
index 8dc84782..00000000
Binary files a/proprietary/vendor/lib64/nfc_nci.st21nfc.st.so and /dev/null differ