diff --git a/device-oriole.mk b/device-oriole.mk
index 168f6be..e0315be 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -114,7 +114,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	NfcNci \
 	Tag \
-	android.hardware.nfc-service.st
+	android.hardware.nfc@1.2-service.st
 
 # SecureElement
 PRODUCT_PACKAGES += \
@@ -126,6 +126,7 @@ PRODUCT_COPY_FILES += \
         device/google/raviole/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.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 f239d4e..c7c5943 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -129,7 +129,7 @@ endif
 PRODUCT_PACKAGES += \
 	NfcNci \
 	Tag \
-	android.hardware.nfc-service.st
+	android.hardware.nfc@1.2-service.st
 
 # SecureElement
 PRODUCT_PACKAGES += \
@@ -141,6 +141,7 @@ PRODUCT_COPY_FILES += \
         device/google/raviole/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf
 
 DEVICE_MANIFEST_FILE += \
+	device/google/raviole/nfc/manifest_nfc.xml \
 	device/google/raviole/nfc/manifest_se.xml
 
 # Vibrator HAL
diff --git a/device-slider.mk b/device-slider.mk
index f824591..08396e1 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	NfcNci \
 	Tag \
-	android.hardware.nfc-service.st
+	android.hardware.nfc@1.2-service.st
 
 # SecureElement
 PRODUCT_PACKAGES += \
@@ -96,6 +96,7 @@ 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 641e050..5f80809 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -75,7 +75,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	NfcNci \
 	Tag \
-	android.hardware.nfc-service.st
+	android.hardware.nfc@1.2-service.st
+
+DEVICE_MANIFEST_FILE += \
+	device/google/raviole/nfc/manifest_nfc.xml
 
 # 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 3b3e1ee..5fdaf5e 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"
 
 ###############################################################################
-# Allow list to be set at startup.
-DEVICE_HOST_ALLOW_LIST={02:C0}
+# White list to be set at startup.
+DEVICE_HOST_WHITE_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 165665e..2b455df 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"
 
 ###############################################################################
-# Allow list to be set at startup.
-DEVICE_HOST_ALLOW_LIST={02:C0}
+# White list to be set at startup.
+DEVICE_HOST_WHITE_LIST={02:C0}
 
 ###############################################################################
 # BAIL OUT value for P2P
diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf
index b7599c7..0035a70 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"
 
 ###############################################################################
-# Allow list to be set at startup.
-DEVICE_HOST_ALLOW_LIST={02:C0}
+# White list to be set at startup.
+DEVICE_HOST_WHITE_LIST={02:C0}
 
 ###############################################################################
 # BAIL OUT value for P2P