diff --git a/core/Makefile b/core/Makefile
index ee8303e..52e93b2 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -3214,7 +3214,7 @@
 ifdef BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE
 	@# Contents of the product-services image
 	$(hide) $(call package_files-copy-root, \
-		$(TARGET_OUT_PRODUCT_SERVICES),$(zip_root)/PRODUCT_SERVICES)
+		$(TARGET_OUT_PRODUCT_SERVICES),$(zip_root)/PRODUCT-SERVICES)
 endif
 ifdef BOARD_ODMIMAGE_FILE_SYSTEM_TYPE
 	@# Contents of the odm image
diff --git a/core/envsetup.mk b/core/envsetup.mk
index 8750203..125dadf 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -218,7 +218,7 @@
 # A device can set up TARGET_COPY_OUT_PRODUCT_SERVICES to "product-services" in its
 # BoardConfig.mk.
 # We'll substitute with the real value after loading BoardConfig.mk.
-_product_services_path_placeholder := ||PRODUCT_SERVICES-PATH-PH||
+_product_services_path_placeholder := ||PRODUCT-SERVICES-PATH-PH||
 TARGET_COPY_OUT_PRODUCT_SERVICES := $(_product_services_path_placeholder)
 ###########################################