diff --git a/.env b/.env
index 1779f87def..a98f85dae5 100644
--- a/.env
+++ b/.env
@@ -107,9 +107,9 @@ PAYMENT_ADDR=payment:${PAYMENT_PORT}
 PAYMENT_DOCKERFILE=./src/payment/Dockerfile
 
 # Product Catalog Service
-PRODUCT_CATALOG_SERVICE_PORT=3550
-PRODUCT_CATALOG_SERVICE_ADDR=productcatalogservice:${PRODUCT_CATALOG_SERVICE_PORT}
-PRODUCT_CATALOG_DOCKERFILE=./src/productcatalogservice/Dockerfile
+PRODUCT_CATALOG_PORT=3550
+PRODUCT_CATALOG_ADDR=product-catalog:${PRODUCT_CATALOG_PORT}
+PRODUCT_CATALOG_DOCKERFILE=./src/product-catalog/Dockerfile
 
 # Quote Service
 QUOTE_PORT=8090
diff --git a/.github/workflows/component-build-images.yml b/.github/workflows/component-build-images.yml
index 13ce94297e..3e561c3c9f 100644
--- a/.github/workflows/component-build-images.yml
+++ b/.github/workflows/component-build-images.yml
@@ -107,8 +107,8 @@ jobs:
             tag_suffix: payment
             context: ./
             setup-qemu: true
-          - file: ./src/productcatalogservice/Dockerfile
-            tag_suffix: productcatalogservice
+          - file: ./src/product-catalog/Dockerfile
+            tag_suffix: product-catalog
             context: ./
             setup-qemu: true
           - file: ./src/quote/Dockerfile
diff --git a/.licenserc.json b/.licenserc.json
index ce5eb313ba..c802c933e6 100644
--- a/.licenserc.json
+++ b/.licenserc.json
@@ -45,7 +45,7 @@
         "src/checkoutservice/genproto/",
         "src/featureflagservice/assets/vendor/",
         "src/featureflagservice/priv/",
-        "src/productcatalogservice/genproto/",
+        "src/product-catalog/genproto/",
         "src/react-native-app/ios/Pods/",
         "src/react-native-app/ios/build/",
         "src/react-native-app/android/app/build/",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2861f1bcc3..9cedc9a7c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,8 @@ the release.
   ([#1863](https://github.com/open-telemetry/opentelemetry-demo/pull/1863))
 * [recommendation] rename recommendationservice to recommendation
   ([#1865](https://github.com/open-telemetry/opentelemetry-demo/pull/1865))
+* [product-catalog] rename productcatalogservice to product-catalog
+  ([#1864](https://github.com/open-telemetry/opentelemetry-demo/pull/1864))
 
 ## 1.12.0
 
diff --git a/Makefile b/Makefile
index 7bb2f27153..c3e77ca408 100644
--- a/Makefile
+++ b/Makefile
@@ -139,7 +139,7 @@ docker-generate-protobuf:
 
 .PHONY: clean
 clean:
-	rm -rf ./src/{checkoutservice,productcatalogservice}/genproto/oteldemo/
+	rm -rf ./src/{checkoutservice,product-catalog}/genproto/oteldemo/
 	rm -rf ./src/recommendation/{demo_pb2,demo_pb2_grpc}.py
 
 .PHONY: check-clean-work-tree
diff --git a/docker-compose-tests.yml b/docker-compose-tests.yml
index dc2714c84a..f9e55f2863 100644
--- a/docker-compose-tests.yml
+++ b/docker-compose-tests.yml
@@ -44,7 +44,7 @@ services:
       - EMAIL_ADDR
       - FRONTEND_ADDR
       - PAYMENT_ADDR
-      - PRODUCT_CATALOG_SERVICE_ADDR
+      - PRODUCT_CATALOG_ADDR
       - RECOMMENDATION_ADDR
       - SHIPPING_ADDR
       - KAFKA_SERVICE_ADDR
@@ -75,7 +75,7 @@ services:
         condition: service_started
       payment:
         condition: service_started
-      productcatalogservice:
+      product-catalog:
         condition: service_started
       quote:
         condition: service_started
diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
index 2066c6b2ac..b0d3474ecb 100644
--- a/docker-compose.minimal.yml
+++ b/docker-compose.minimal.yml
@@ -103,7 +103,7 @@ services:
       - EMAIL_ADDR
       - FLAGD_HOST
       - PAYMENT_ADDR
-      - PRODUCT_CATALOG_SERVICE_ADDR
+      - PRODUCT_CATALOG_ADDR
       - SHIPPING_ADDR
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
@@ -118,7 +118,7 @@ services:
         condition: service_started
       payment:
         condition: service_started
-      productcatalogservice:
+      product-catalog:
         condition: service_started
       shipping:
         condition: service_started
@@ -203,7 +203,7 @@ services:
       - CART_ADDR
       - CHECKOUT_SERVICE_ADDR
       - CURRENCY_ADDR
-      - PRODUCT_CATALOG_SERVICE_ADDR
+      - PRODUCT_CATALOG_ADDR
       - RECOMMENDATION_ADDR
       - SHIPPING_ADDR
       - OTEL_EXPORTER_OTLP_ENDPOINT
@@ -225,7 +225,7 @@ services:
         condition: service_started
       currency:
         condition: service_started
-      productcatalogservice:
+      product-catalog:
         condition: service_started
       quote:
         condition: service_started
@@ -379,28 +379,28 @@ services:
     logging: *logging
 
   # Product Catalog service
-  productcatalogservice:
-    image: ${IMAGE_NAME}:${DEMO_VERSION}-productcatalogservice
-    container_name: product-catalog-service
+  product-catalog:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-product-catalog
+    container_name: product-catalog
     build:
       context: ./
       dockerfile: ${PRODUCT_CATALOG_DOCKERFILE}
       cache_from:
-        - ${IMAGE_NAME}:${IMAGE_VERSION}-productcatalogservice
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-product-catalog
     deploy:
       resources:
         limits:
           memory: 20M
     restart: unless-stopped
     ports:
-      - "${PRODUCT_CATALOG_SERVICE_PORT}"
+      - "${PRODUCT_CATALOG_PORT}"
     environment:
       - FLAGD_HOST
-      - PRODUCT_CATALOG_SERVICE_PORT
+      - PRODUCT_CATALOG_PORT
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
-      - OTEL_SERVICE_NAME=productcatalogservice
+      - OTEL_SERVICE_NAME=product-catalog
     depends_on:
       otel-collector:
         condition: service_started
@@ -453,7 +453,7 @@ services:
     environment:
       - FLAGD_HOST
       - RECOMMENDATION_PORT
-      - PRODUCT_CATALOG_SERVICE_ADDR
+      - PRODUCT_CATALOG_ADDR
       - OTEL_PYTHON_LOG_CORRELATION=true
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
@@ -461,7 +461,7 @@ services:
       - OTEL_SERVICE_NAME=recommendation
       - PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
     depends_on:
-      productcatalogservice:
+      product-catalog:
         condition: service_started
       otel-collector:
         condition: service_started
diff --git a/docker-compose.yml b/docker-compose.yml
index 22ee8e86ac..9bbe68949d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -136,7 +136,7 @@ services:
       - CURRENCY_ADDR
       - EMAIL_ADDR
       - PAYMENT_ADDR
-      - PRODUCT_CATALOG_SERVICE_ADDR
+      - PRODUCT_CATALOG_ADDR
       - SHIPPING_ADDR
       - KAFKA_SERVICE_ADDR
       - OTEL_EXPORTER_OTLP_ENDPOINT
@@ -152,7 +152,7 @@ services:
         condition: service_started
       payment:
         condition: service_started
-      productcatalogservice:
+      product-catalog:
         condition: service_started
       shipping:
         condition: service_started
@@ -275,7 +275,7 @@ services:
       - CART_ADDR
       - CHECKOUT_SERVICE_ADDR
       - CURRENCY_ADDR
-      - PRODUCT_CATALOG_SERVICE_ADDR
+      - PRODUCT_CATALOG_ADDR
       - RECOMMENDATION_ADDR
       - SHIPPING_ADDR
       - OTEL_EXPORTER_OTLP_ENDPOINT
@@ -297,7 +297,7 @@ services:
         condition: service_started
       currency:
         condition: service_started
-      productcatalogservice:
+      product-catalog:
         condition: service_started
       quote:
         condition: service_started
@@ -458,29 +458,29 @@ services:
     logging: *logging
 
   # Product Catalog service
-  productcatalogservice:
-    image: ${IMAGE_NAME}:${DEMO_VERSION}-productcatalogservice
-    container_name: product-catalog-service
+  product-catalog:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-product-catalog
+    container_name: product-catalog
     build:
       context: ./
       dockerfile: ${PRODUCT_CATALOG_DOCKERFILE}
       cache_from:
-        - ${IMAGE_NAME}:${IMAGE_VERSION}-productcatalogservice
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-product-catalog
     deploy:
       resources:
         limits:
           memory: 20M
     restart: unless-stopped
     ports:
-      - "${PRODUCT_CATALOG_SERVICE_PORT}"
+      - "${PRODUCT_CATALOG_PORT}"
     environment:
-      - PRODUCT_CATALOG_SERVICE_PORT
+      - PRODUCT_CATALOG_PORT
       - FLAGD_HOST
       - FLAGD_PORT
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
-      - OTEL_SERVICE_NAME=productcatalogservice
+      - OTEL_SERVICE_NAME=product-catalog
     depends_on:
       otel-collector:
         condition: service_started
@@ -534,7 +534,7 @@ services:
       - "${RECOMMENDATION_PORT}"
     environment:
       - RECOMMENDATION_PORT
-      - PRODUCT_CATALOG_SERVICE_ADDR
+      - PRODUCT_CATALOG_ADDR
       - FLAGD_HOST
       - FLAGD_PORT
       - OTEL_PYTHON_LOG_CORRELATION=true
@@ -544,7 +544,7 @@ services:
       - OTEL_SERVICE_NAME=recommendation
       - PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
     depends_on:
-      productcatalogservice:
+      product-catalog:
         condition: service_started
       otel-collector:
         condition: service_started
diff --git a/docker-gen-proto.sh b/docker-gen-proto.sh
index 8a9a7364b7..656755b3c1 100755
--- a/docker-gen-proto.sh
+++ b/docker-gen-proto.sh
@@ -39,7 +39,7 @@ if [ -z "$1" ]; then
   #gen_proto_ruby email
   #gen_proto_ts frontend
   #gen_proto_js payment
-  gen_proto_go productcatalogservice
+  gen_proto_go product-catalog
   #gen_proto_php quote
   gen_proto_python recommendation
   #gen_proto_rust shipping
diff --git a/ide-gen-proto.sh b/ide-gen-proto.sh
index aabbdf5f38..7487ce1ab3 100755
--- a/ide-gen-proto.sh
+++ b/ide-gen-proto.sh
@@ -74,7 +74,7 @@ gen_proto_go checkoutservice
 gen_proto_ts frontend
 gen_proto_ts react-native-app
 gen_proto_js payment
-gen_proto_go productcatalogservice
+gen_proto_go product-catalog
 # gen_proto_php quote
 gen_proto_python recommendation
 gen_proto_rust shipping
diff --git a/renovate.json5 b/renovate.json5
index 7155995f2a..88d31088db 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -75,8 +75,8 @@
       "groupName": "payment",
     },
     {
-      "matchFileNames": ["src/productcatalogservice/**"],
-      "groupName": "productcatalogservice",
+      "matchFileNames": ["src/product-catalog/**"],
+      "groupName": "product-catalog",
     },
     {
       "matchFileNames": ["src/prometheus/**"],
diff --git a/src/checkoutservice/main.go b/src/checkoutservice/main.go
index 3f9c169199..46bf9d59f7 100644
--- a/src/checkoutservice/main.go
+++ b/src/checkoutservice/main.go
@@ -172,7 +172,7 @@ func main() {
 	svc.shippingSvcClient = pb.NewShippingServiceClient(c)
 	defer c.Close()
 
-	mustMapEnv(&svc.productCatalogSvcAddr, "PRODUCT_CATALOG_SERVICE_ADDR")
+	mustMapEnv(&svc.productCatalogSvcAddr, "PRODUCT_CATALOG_ADDR")
 	c = mustCreateClient(svc.productCatalogSvcAddr)
 	svc.productCatalogSvcClient = pb.NewProductCatalogServiceClient(c)
 	defer c.Close()
diff --git a/src/frontend/gateways/rpc/ProductCatalog.gateway.ts b/src/frontend/gateways/rpc/ProductCatalog.gateway.ts
index 8b0783ec5f..18d83053ed 100644
--- a/src/frontend/gateways/rpc/ProductCatalog.gateway.ts
+++ b/src/frontend/gateways/rpc/ProductCatalog.gateway.ts
@@ -4,9 +4,9 @@
 import { ChannelCredentials } from '@grpc/grpc-js';
 import { ListProductsResponse, Product, ProductCatalogServiceClient } from '../../protos/demo';
 
-const { PRODUCT_CATALOG_SERVICE_ADDR = '' } = process.env;
+const { PRODUCT_CATALOG_ADDR = '' } = process.env;
 
-const client = new ProductCatalogServiceClient(PRODUCT_CATALOG_SERVICE_ADDR, ChannelCredentials.createInsecure());
+const client = new ProductCatalogServiceClient(PRODUCT_CATALOG_ADDR, ChannelCredentials.createInsecure());
 
 const ProductCatalogGateway = () => ({
   listProducts() {
diff --git a/src/frontend/next.config.js b/src/frontend/next.config.js
index 98e3e53f48..753e112a0e 100755
--- a/src/frontend/next.config.js
+++ b/src/frontend/next.config.js
@@ -17,7 +17,7 @@ const {
   CART_ADDR = '',
   CHECKOUT_SERVICE_ADDR = '',
   CURRENCY_ADDR = '',
-  PRODUCT_CATALOG_SERVICE_ADDR = '',
+  PRODUCT_CATALOG_ADDR = '',
   RECOMMENDATION_ADDR = '',
   SHIPPING_ADDR = '',
   ENV_PLATFORM = '',
@@ -49,7 +49,7 @@ const nextConfig = {
     CART_ADDR,
     CHECKOUT_SERVICE_ADDR,
     CURRENCY_ADDR,
-    PRODUCT_CATALOG_SERVICE_ADDR,
+    PRODUCT_CATALOG_ADDR,
     RECOMMENDATION_ADDR,
     SHIPPING_ADDR,
     OTEL_EXPORTER_OTLP_TRACES_ENDPOINT,
diff --git a/src/product-catalog/Dockerfile b/src/product-catalog/Dockerfile
new file mode 100644
index 0000000000..66fb63f0da
--- /dev/null
+++ b/src/product-catalog/Dockerfile
@@ -0,0 +1,27 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+
+FROM golang:1.22-alpine AS builder
+
+WORKDIR /usr/src/app/
+
+RUN --mount=type=cache,target=/go/pkg/mod/ \
+    --mount=type=bind,source=./src/product-catalog/go.sum,target=go.sum \
+    --mount=type=bind,source=./src/product-catalog/go.mod,target=go.mod \
+    go mod download
+
+RUN --mount=type=cache,target=/go/pkg/mod/ \
+    --mount=type=cache,target=/root/.cache/go-build \
+    --mount=type=bind,rw,source=./src/product-catalog,target=. \
+    go build -ldflags "-s -w" -o /go/bin/product-catalog/ ./
+
+FROM alpine AS release
+
+WORKDIR /usr/src/app/
+
+COPY ./src/product-catalog/products/ ./products/
+COPY --from=builder /go/bin/product-catalog/ ./
+
+EXPOSE ${PRODUCT_CATALOG_PORT}
+ENTRYPOINT [ "./product-catalog" ]
diff --git a/src/productcatalogservice/README.md b/src/product-catalog/README.md
similarity index 88%
rename from src/productcatalogservice/README.md
rename to src/product-catalog/README.md
index 99b3d7c1bf..ca4970d623 100644
--- a/src/productcatalogservice/README.md
+++ b/src/product-catalog/README.md
@@ -12,7 +12,7 @@ When this service is run the output should be similar to the following
 To build the service binary, run:
 
 ```sh
-go build -o /go/bin/productcatalogservice/
+go build -o /go/bin/product-catalog/
 ```
 
 ## Docker Build
@@ -20,7 +20,7 @@ go build -o /go/bin/productcatalogservice/
 From the root directory, run:
 
 ```sh
-docker compose build productcatalogservice
+docker compose build product-catalog
 ```
 
 ## Regenerate protos
diff --git a/src/productcatalogservice/genproto/Dockerfile b/src/product-catalog/genproto/Dockerfile
similarity index 73%
rename from src/productcatalogservice/genproto/Dockerfile
rename to src/product-catalog/genproto/Dockerfile
index d313bb0cc4..3c5f118ef1 100644
--- a/src/productcatalogservice/genproto/Dockerfile
+++ b/src/product-catalog/genproto/Dockerfile
@@ -7,9 +7,9 @@ WORKDIR /build
 
 RUN apk add --no-cache protobuf-dev
 
-COPY ./src/productcatalogservice/go.mod ./
-COPY ./src/productcatalogservice/go.sum ./
-COPY ./src/productcatalogservice/tools.go ./
+COPY ./src/product-catalog/go.mod ./
+COPY ./src/product-catalog/go.sum ./
+COPY ./src/product-catalog/tools.go ./
 
 RUN go env -w GOMODCACHE=/root/.cache/go-build
 RUN --mount=type=cache,target=/root/.cache/go-build \
diff --git a/src/productcatalogservice/genproto/oteldemo/demo.pb.go b/src/product-catalog/genproto/oteldemo/demo.pb.go
similarity index 100%
rename from src/productcatalogservice/genproto/oteldemo/demo.pb.go
rename to src/product-catalog/genproto/oteldemo/demo.pb.go
diff --git a/src/productcatalogservice/genproto/oteldemo/demo_grpc.pb.go b/src/product-catalog/genproto/oteldemo/demo_grpc.pb.go
similarity index 100%
rename from src/productcatalogservice/genproto/oteldemo/demo_grpc.pb.go
rename to src/product-catalog/genproto/oteldemo/demo_grpc.pb.go
diff --git a/src/productcatalogservice/go.mod b/src/product-catalog/go.mod
similarity index 97%
rename from src/productcatalogservice/go.mod
rename to src/product-catalog/go.mod
index 93478a1c55..745ca6d017 100644
--- a/src/productcatalogservice/go.mod
+++ b/src/product-catalog/go.mod
@@ -1,4 +1,4 @@
-module github.com/opentelemetry/opentelemetry-demo/src/productcatalogservice
+module github.com/opentelemetry/opentelemetry-demo/src/product-catalog
 
 go 1.22.7
 
diff --git a/src/productcatalogservice/go.sum b/src/product-catalog/go.sum
similarity index 100%
rename from src/productcatalogservice/go.sum
rename to src/product-catalog/go.sum
diff --git a/src/productcatalogservice/main.go b/src/product-catalog/main.go
similarity index 95%
rename from src/productcatalogservice/main.go
rename to src/product-catalog/main.go
index 12cfd4b53f..ae6393d994 100644
--- a/src/productcatalogservice/main.go
+++ b/src/product-catalog/main.go
@@ -36,7 +36,7 @@ import (
 	otelhooks "github.com/open-feature/go-sdk-contrib/hooks/open-telemetry/pkg"
 	flagd "github.com/open-feature/go-sdk-contrib/providers/flagd/pkg"
 	"github.com/open-feature/go-sdk/openfeature"
-	pb "github.com/opentelemetry/opentelemetry-demo/src/productcatalogservice/genproto/oteldemo"
+	pb "github.com/opentelemetry/opentelemetry-demo/src/product-catalog/genproto/oteldemo"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials/insecure"
@@ -141,9 +141,9 @@ func main() {
 
 	svc := &productCatalog{}
 	var port string
-	mustMapEnv(&port, "PRODUCT_CATALOG_SERVICE_PORT")
+	mustMapEnv(&port, "PRODUCT_CATALOG_PORT")
 
-	log.Infof("ProductCatalogService gRPC server started on port: %s", port)
+	log.Infof("Product Catalog gRPC server started on port: %s", port)
 
 	ln, err := net.Listen("tcp", fmt.Sprintf(":%s", port))
 	if err != nil {
@@ -171,7 +171,7 @@ func main() {
 	<-ctx.Done()
 
 	srv.GracefulStop()
-	log.Println("ProductCatalogService gRPC server stopped")
+	log.Println("Product Catalog gRPC server stopped")
 }
 
 type productCatalog struct {
@@ -252,7 +252,7 @@ func (p *productCatalog) GetProduct(ctx context.Context, req *pb.GetProductReque
 
 	// GetProduct will fail on a specific product when feature flag is enabled
 	if p.checkProductFailure(ctx, req.Id) {
-		msg := fmt.Sprintf("Error: ProductCatalogService Fail Feature Flag Enabled")
+		msg := fmt.Sprintf("Error: Product Catalog Fail Feature Flag Enabled")
 		span.SetStatus(otelcodes.Error, msg)
 		span.AddEvent(msg)
 		return nil, status.Errorf(codes.Internal, msg)
diff --git a/src/productcatalogservice/products/products.json b/src/product-catalog/products/products.json
similarity index 100%
rename from src/productcatalogservice/products/products.json
rename to src/product-catalog/products/products.json
diff --git a/src/productcatalogservice/tools.go b/src/product-catalog/tools.go
similarity index 100%
rename from src/productcatalogservice/tools.go
rename to src/product-catalog/tools.go
diff --git a/src/productcatalogservice/Dockerfile b/src/productcatalogservice/Dockerfile
deleted file mode 100644
index f954743401..0000000000
--- a/src/productcatalogservice/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-
-FROM golang:1.22-alpine AS builder
-
-WORKDIR /usr/src/app/
-
-RUN --mount=type=cache,target=/go/pkg/mod/ \
-    --mount=type=bind,source=./src/productcatalogservice/go.sum,target=go.sum \
-    --mount=type=bind,source=./src/productcatalogservice/go.mod,target=go.mod \
-    go mod download
-
-RUN --mount=type=cache,target=/go/pkg/mod/ \
-    --mount=type=cache,target=/root/.cache/go-build \
-    --mount=type=bind,rw,source=./src/productcatalogservice,target=. \
-    go build -ldflags "-s -w" -o /go/bin/productcatalogservice/ ./
-
-FROM alpine AS release
-
-WORKDIR /usr/src/app/
-
-COPY ./src/productcatalogservice/products/ ./products/
-COPY --from=builder /go/bin/productcatalogservice/ ./
-
-EXPOSE ${PRODUCT_SERVICE_PORT}
-ENTRYPOINT [ "./productcatalogservice" ]
diff --git a/src/recommendation/recommendation_server.py b/src/recommendation/recommendation_server.py
index fd25359ea9..df681bfccc 100644
--- a/src/recommendation/recommendation_server.py
+++ b/src/recommendation/recommendation_server.py
@@ -153,7 +153,7 @@ def check_feature_flag(flag_name: str):
     logger = logging.getLogger('main')
     logger.addHandler(handler)
 
-    catalog_addr = must_map_env('PRODUCT_CATALOG_SERVICE_ADDR')
+    catalog_addr = must_map_env('PRODUCT_CATALOG_ADDR')
     pc_channel = grpc.insecure_channel(catalog_addr)
     product_catalog_stub = demo_pb2_grpc.ProductCatalogServiceStub(pc_channel)
 
diff --git a/test/tracetesting/productcatalogservice/all.yaml b/test/tracetesting/product-catalog/all.yaml
similarity index 52%
rename from test/tracetesting/productcatalogservice/all.yaml
rename to test/tracetesting/product-catalog/all.yaml
index d52c24142a..21f7a12b7a 100644
--- a/test/tracetesting/productcatalogservice/all.yaml
+++ b/test/tracetesting/product-catalog/all.yaml
@@ -3,9 +3,9 @@
 
 type: TestSuite
 spec:
-  id: product-catalog-service-all
-  name: 'Product Catalog Service'
-  description: Run all Product Catalog Service tests enabled in sequence
+  id: product-catalog-all
+  name: 'Product Catalog'
+  description: Run all Product Catalog tests enabled in sequence
   steps:
   - ./list.yaml
   - ./get.yaml
diff --git a/test/tracetesting/productcatalogservice/get.yaml b/test/tracetesting/product-catalog/get.yaml
similarity index 96%
rename from test/tracetesting/productcatalogservice/get.yaml
rename to test/tracetesting/product-catalog/get.yaml
index 297f1a51b4..a1e26c4c3a 100644
--- a/test/tracetesting/productcatalogservice/get.yaml
+++ b/test/tracetesting/product-catalog/get.yaml
@@ -10,7 +10,7 @@ spec:
     type: grpc
     grpc:
       protobufFile: ../../../pb/demo.proto
-      address: ${var:PRODUCT_CATALOG_SERVICE_ADDR}
+      address: ${var:PRODUCT_CATALOG_ADDR}
       method: oteldemo.ProductCatalogService.GetProduct
       request: |-
         {
diff --git a/test/tracetesting/productcatalogservice/list.yaml b/test/tracetesting/product-catalog/list.yaml
similarity index 94%
rename from test/tracetesting/productcatalogservice/list.yaml
rename to test/tracetesting/product-catalog/list.yaml
index 1b124d2dfc..92adadb78e 100644
--- a/test/tracetesting/productcatalogservice/list.yaml
+++ b/test/tracetesting/product-catalog/list.yaml
@@ -10,7 +10,7 @@ spec:
     type: grpc
     grpc:
       protobufFile: ../../../pb/demo.proto
-      address: ${var:PRODUCT_CATALOG_SERVICE_ADDR}
+      address: ${var:PRODUCT_CATALOG_ADDR}
       method: oteldemo.ProductCatalogService.ListProducts
       request: ""
   specs:
diff --git a/test/tracetesting/productcatalogservice/search.yaml b/test/tracetesting/product-catalog/search.yaml
similarity index 95%
rename from test/tracetesting/productcatalogservice/search.yaml
rename to test/tracetesting/product-catalog/search.yaml
index 50d925375c..fe211b8e7c 100644
--- a/test/tracetesting/productcatalogservice/search.yaml
+++ b/test/tracetesting/product-catalog/search.yaml
@@ -10,7 +10,7 @@ spec:
     type: grpc
     grpc:
       protobufFile: ../../../pb/demo.proto
-      address: ${var:PRODUCT_CATALOG_SERVICE_ADDR}
+      address: ${var:PRODUCT_CATALOG_ADDR}
       method: oteldemo.ProductCatalogService.SearchProducts
       request: |-
         {
diff --git a/test/tracetesting/run.bash b/test/tracetesting/run.bash
index 15c15263c2..96efd03630 100755
--- a/test/tracetesting/run.bash
+++ b/test/tracetesting/run.bash
@@ -8,7 +8,7 @@
 set -e
 
 # Availalble services to test
-ALL_SERVICES=("ad" "cart" "currency" "checkoutservice" "frontend" "email" "payment" "productcatalogservice" "recommendation" "shipping")
+ALL_SERVICES=("ad" "cart" "currency" "checkoutservice" "frontend" "email" "payment" "product-catalog" "recommendation" "shipping")
 
 ## Script variables
 # Will contain the list of services to test
@@ -48,8 +48,8 @@ spec:
       value: $FRONTEND_ADDR
     - key: PAYMENT_ADDR
       value: $PAYMENT_ADDR
-    - key: PRODUCT_CATALOG_SERVICE_ADDR
-      value: $PRODUCT_CATALOG_SERVICE_ADDR
+    - key: PRODUCT_CATALOG_ADDR
+      value: $PRODUCT_CATALOG_ADDR
     - key: RECOMMENDATION_ADDR
       value: $RECOMMENDATION_ADDR
     - key: SHIPPING_ADDR