diff --git a/device-oriole.mk b/device-oriole.mk
index ee728c3..5a5ab27 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -117,7 +117,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	NfcNci \
 	Tag \
-	android.hardware.nfc@1.2-service.st
+	android.hardware.nfc-service.st
 
 # SecureElement
 PRODUCT_PACKAGES += \
@@ -131,7 +131,6 @@ PRODUCT_COPY_FILES += \
 	device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
 
 DEVICE_MANIFEST_FILE += \
-	device/google/raviole/nfc/manifest_nfc.xml \
 	device/google/raviole/nfc/manifest_se.xml
 
 # Vibrator HAL
diff --git a/device-raven.mk b/device-raven.mk
index b0300b3..bb42519 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -132,7 +132,7 @@ endif
 PRODUCT_PACKAGES += \
 	NfcNci \
 	Tag \
-	android.hardware.nfc@1.2-service.st
+	android.hardware.nfc-service.st
 
 # SecureElement
 PRODUCT_PACKAGES += \
@@ -146,7 +146,6 @@ PRODUCT_COPY_FILES += \
 	device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
 
 DEVICE_MANIFEST_FILE += \
-	device/google/raviole/nfc/manifest_nfc.xml \
 	device/google/raviole/nfc/manifest_se.xml
 
 
diff --git a/device-slider.mk b/device-slider.mk
index 647ee73..631ee09 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -84,7 +84,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	NfcNci \
 	Tag \
-	android.hardware.nfc@1.2-service.st
+	android.hardware.nfc-service.st
 
 # SecureElement
 PRODUCT_PACKAGES += \
@@ -97,7 +97,6 @@ PRODUCT_COPY_FILES += \
 	device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
 
 DEVICE_MANIFEST_FILE += \
-	device/google/raviole/nfc/manifest_nfc.xml \
 	device/google/raviole/nfc/manifest_se.xml
 
 # PowerStats HAL
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 577092e..e55b62a 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -76,10 +76,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	NfcNci \
 	Tag \
-	android.hardware.nfc@1.2-service.st
-
-DEVICE_MANIFEST_FILE += \
-	device/google/raviole/nfc/manifest_nfc.xml
+	android.hardware.nfc-service.st
 
 # PowerStats HAL
 PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin
diff --git a/nfc/libnfc-hal-st-debug.conf b/nfc/libnfc-hal-st-debug.conf
index 5fdaf5e..3b3e1ee 100644
--- a/nfc/libnfc-hal-st-debug.conf
+++ b/nfc/libnfc-hal-st-debug.conf
@@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
 NCI_HAL_MODULE="nfc_nci.st21nfc"
 
 ###############################################################################
-# White list to be set at startup.
-DEVICE_HOST_WHITE_LIST={02:C0}
+# Allow list to be set at startup.
+DEVICE_HOST_ALLOW_LIST={02:C0}
 
 ###############################################################################
 # BAIL OUT value for P2P
diff --git a/nfc/libnfc-hal-st-disable.conf b/nfc/libnfc-hal-st-disable.conf
index 2b455df..165665e 100644
--- a/nfc/libnfc-hal-st-disable.conf
+++ b/nfc/libnfc-hal-st-disable.conf
@@ -64,8 +64,8 @@ PRESENCE_CHECK_ALGORITHM=5
 NCI_HAL_MODULE="nfc_nci.st21nfc"
 
 ###############################################################################
-# White list to be set at startup.
-DEVICE_HOST_WHITE_LIST={02:C0}
+# Allow list to be set at startup.
+DEVICE_HOST_ALLOW_LIST={02:C0}
 
 ###############################################################################
 # BAIL OUT value for P2P
diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf
index 0035a70..b7599c7 100644
--- a/nfc/libnfc-hal-st.conf
+++ b/nfc/libnfc-hal-st.conf
@@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
 NCI_HAL_MODULE="nfc_nci.st21nfc"
 
 ###############################################################################
-# White list to be set at startup.
-DEVICE_HOST_WHITE_LIST={02:C0}
+# Allow list to be set at startup.
+DEVICE_HOST_ALLOW_LIST={02:C0}
 
 ###############################################################################
 # BAIL OUT value for P2P