diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index c2c8efe..ce06e54 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -39,7 +39,7 @@
     $(LOCAL_DIR)/factory_whitefin.mk
 
 COMMON_LUNCH_CHOICES := \
-    aosp_slider-userdebug \
-    aosp_whitefin-userdebug \
-    aosp_oriole-userdebug \
-    aosp_raven-userdebug
+    aosp_slider-trunk_staging-userdebug \
+    aosp_whitefin-trunk_staging-userdebug \
+    aosp_oriole-trunk_staging-userdebug \
+    aosp_raven-trunk_staging-userdebug
diff --git a/device-oriole.mk b/device-oriole.mk
index e9c757e..2184715 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -133,7 +133,7 @@
 	device/google/raviole/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	com.android.nfcservices \
+	NfcNci \
 	Tag \
 	android.hardware.nfc-service.st
 
diff --git a/device-raven.mk b/device-raven.mk
index f0db991..8ebde0c 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -148,7 +148,7 @@
 endif
 
 PRODUCT_PACKAGES += \
-	com.android.nfcservices \
+	NfcNci \
 	Tag \
 	android.hardware.nfc-service.st
 
diff --git a/device-slider.mk b/device-slider.mk
index 5f2a741..5cbab35 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -83,7 +83,7 @@
 	device/google/raviole/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	com.android.nfcservices \
+	NfcNci \
 	Tag \
 	android.hardware.nfc-service.st
 
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 090b93e..0c366c8 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -79,7 +79,7 @@
 	device/google/raviole/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	com.android.nfcservices \
+	NfcNci \
 	Tag \
 	android.hardware.nfc-service.st