diff --git a/device-caiman.mk b/device-caiman.mk
index b6ab794d..ff09f4d7 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -72,7 +72,7 @@ PRODUCT_COPY_FILES += \
 	device/google/caimito/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	NfcNci \
+	com.android.nfcservices \
 	Tag \
 	android.hardware.nfc-service.st
 
diff --git a/device-komodo.mk b/device-komodo.mk
index 22cbdaa8..a28b1cc2 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \
 	device/google/caimito/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	NfcNci \
+	com.android.nfcservices \
 	Tag \
 	android.hardware.nfc-service.st
 
diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk
index 968ca404..50f37880 100644
--- a/device-ripcurrent24.mk
+++ b/device-ripcurrent24.mk
@@ -65,7 +65,7 @@ PRODUCT_COPY_FILES += \
 	device/google/caimito/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	NfcNci \
+	com.android.nfcservices \
 	Tag \
 	android.hardware.nfc-service.st
 
diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk
index 9034573a..dffdbdda 100644
--- a/device-ripcurrentpro.mk
+++ b/device-ripcurrentpro.mk
@@ -67,7 +67,7 @@ PRODUCT_COPY_FILES += \
 	device/google/caimito/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	NfcNci \
+	com.android.nfcservices \
 	Tag \
 	android.hardware.nfc-service.st
 
diff --git a/device-tokay.mk b/device-tokay.mk
index 9e03dfa6..9af1a1f0 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -74,7 +74,7 @@ PRODUCT_COPY_FILES += \
 	device/google/caimito/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	NfcNci \
+	com.android.nfcservices \
 	Tag \
 	android.hardware.nfc-service.st