diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
index 44cc686da4..6d85afd3d2 100644
--- a/docker-compose.minimal.yml
+++ b/docker-compose.minimal.yml
@@ -54,7 +54,7 @@ services:
   # Cart service
   cart:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-cart
-    container_name: cart-service
+    container_name: cart
     build:
       context: ./
       dockerfile: ${CART_DOCKERFILE}
@@ -131,7 +131,7 @@ services:
   # Currency service
   currency:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-currency
-    container_name: currency-service
+    container_name: currency
     build:
       context: ./
       dockerfile: ${CURRENCY_DOCKERFILE}
@@ -159,7 +159,7 @@ services:
   # Email service
   email:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-email
-    container_name: email-service
+    container_name: email
     build:
       context: ./src/email
       cache_from:
@@ -355,7 +355,7 @@ services:
   # Payment service
   payment:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-payment
-    container_name: payment-service
+    container_name: payment
     build:
       context: ./
       dockerfile: ${PAYMENT_DOCKERFILE}
@@ -411,7 +411,7 @@ services:
   # Quote service
   quote:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-quote
-    container_name: quote-service
+    container_name: quote
     build:
       context: ./
       dockerfile: ${QUOTE_DOCKERFILE}
@@ -439,7 +439,7 @@ services:
   # Recommendation service
   recommendation:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-recommendation
-    container_name: recommendation-service
+    container_name: recommendation
     build:
       context: ./
       dockerfile: ${RECOMMENDATION_DOCKERFILE}
diff --git a/docker-compose.yml b/docker-compose.yml
index 4eac5cc061..436a70d45b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -83,7 +83,7 @@ services:
   # Cart service
   cart:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-cart
-    container_name: cart-service
+    container_name: cart
     build:
       context: ./
       dockerfile: ${CART_DOCKERFILE}
@@ -169,7 +169,7 @@ services:
   # Currency service
   currency:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-currency
-    container_name: currency-service
+    container_name: currency
     build:
       context: ./
       dockerfile: ${CURRENCY_DOCKERFILE}
@@ -197,7 +197,7 @@ services:
   # Email service
   email:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-email
-    container_name: email-service
+    container_name: email
     build:
       context: ./
       dockerfile: ${EMAIL_DOCKERFILE}
@@ -431,7 +431,7 @@ services:
   # Payment service
   payment:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-payment
-    container_name: payment-service
+    container_name: payment
     build:
       context: ./
       dockerfile: ${PAYMENT_DOCKERFILE}
@@ -493,7 +493,7 @@ services:
   # Quote service
   quote:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-quote
-    container_name: quote-service
+    container_name: quote
     build:
       context: ./
       dockerfile: ${QUOTE_DOCKERFILE}
@@ -521,7 +521,7 @@ services:
   # Recommendation service
   recommendation:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-recommendation
-    container_name: recommendation-service
+    container_name: recommendation
     build:
       context: ./
       dockerfile: ${RECOMMENDATION_DOCKERFILE}
diff --git a/src/ad/Dockerfile b/src/ad/Dockerfile
index 1b59165945..92f69c049e 100644
--- a/src/ad/Dockerfile
+++ b/src/ad/Dockerfile
@@ -32,4 +32,4 @@ ADD --chmod=644 https://github.com/open-telemetry/opentelemetry-java-instrumenta
 ENV JAVA_TOOL_OPTIONS=-javaagent:/usr/src/app/opentelemetry-javaagent.jar
 
 EXPOSE ${AD_PORT}
-ENTRYPOINT [ "./build/install/opentelemetry-demo-ad-service/bin/Ad" ]
+ENTRYPOINT [ "./build/install/opentelemetry-demo-ad/bin/Ad" ]
diff --git a/src/ad/README.md b/src/ad/README.md
index e3865d16b9..f19b735c9a 100644
--- a/src/ad/README.md
+++ b/src/ad/README.md
@@ -21,7 +21,7 @@ To run the Ad Service:
 ```sh
 export AD_PORT=8080
 export FEATURE_FLAG_GRPC_SERVICE_ADDR=featureflagservice:50053
-./build/install/opentelemetry-demo-ad-service/bin/Ad
+./build/install/opentelemetry-demo-ad/bin/Ad
 ```
 
 ### Upgrading Gradle
diff --git a/src/ad/settings.gradle b/src/ad/settings.gradle
index 963f698863..b85c24c7d1 100644
--- a/src/ad/settings.gradle
+++ b/src/ad/settings.gradle
@@ -1,2 +1,2 @@
 
-rootProject.name = 'opentelemetry-demo-ad-service'
+rootProject.name = 'opentelemetry-demo-ad'
diff --git a/src/currency/CMakeLists.txt b/src/currency/CMakeLists.txt
index 3bf13c25bc..d642155dca 100644
--- a/src/currency/CMakeLists.txt
+++ b/src/currency/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.1)
-project(currency-service)
+project(currency)
 
 find_package(Protobuf REQUIRED)
 find_package(gRPC CONFIG REQUIRED)
diff --git a/test/README.md b/test/README.md
index 2d79d0ce61..3d17b9f1e7 100644
--- a/test/README.md
+++ b/test/README.md
@@ -25,9 +25,9 @@ make run-tracetesting SERVICES_TO_TEST="service-1 service-2 ..."
 docker compose run traceBasedTests "service-1 service-2 ..."
 ```
 
-For instance, if you need to run the tests for `ad-service` and
-`payment-service`, you can run them with:
+For instance, if you need to run the tests for `ad` and `payment`, you can run
+them with:
 
 ```sh
-make run-tracetesting SERVICES_TO_TEST="ad-service payment-service"
+make run-tracetesting SERVICES_TO_TEST="ad payment"
 ```
diff --git a/test/tracetesting/ad/all.yaml b/test/tracetesting/ad/all.yaml
index a114984752..e57c232224 100644
--- a/test/tracetesting/ad/all.yaml
+++ b/test/tracetesting/ad/all.yaml
@@ -3,7 +3,7 @@
 
 type: TestSuite
 spec:
-  id: ad-service-all
+  id: ad-all
   name: 'Ad Service'
   description: Run all Ad Service tests enabled in sequence
   steps:
diff --git a/test/tracetesting/currency/all.yaml b/test/tracetesting/currency/all.yaml
index 843df84c9e..2f30f4f526 100644
--- a/test/tracetesting/currency/all.yaml
+++ b/test/tracetesting/currency/all.yaml
@@ -3,7 +3,7 @@
 
 type: TestSuite
 spec:
-  id: currency-service-all
+  id: currency-all
   name: 'Currency Service'
   description: Run all Currency Service tests enabled in sequence
   steps:
diff --git a/test/tracetesting/recommendation/all.yaml b/test/tracetesting/recommendation/all.yaml
index d1effe4317..bfc43119d3 100644
--- a/test/tracetesting/recommendation/all.yaml
+++ b/test/tracetesting/recommendation/all.yaml
@@ -3,7 +3,7 @@
 
 type: TestSuite
 spec:
-  id: recommendation-service-all
+  id: recommendation-all
   name: 'Recommendation Service'
   description: Run all Recommendation Service tests enabled in sequence
   steps:
diff --git a/test/tracetesting/run.bash b/test/tracetesting/run.bash
index 13b827e754..3842c0858c 100755
--- a/test/tracetesting/run.bash
+++ b/test/tracetesting/run.bash
@@ -54,8 +54,8 @@ spec:
       value: $RECOMMENDATION_ADDR
     - key: SHIPPING_ADDR
       value: $SHIPPING_ADDR
-    - key: KAFKA_SERVICE_ADDR
-      value: $KAFKA_SERVICE_ADDR
+    - key: KAFKA_ADDR
+      value: $KAFKA_ADDR
 EOF
 }
 
diff --git a/test/tracetesting/shipping/all.yaml b/test/tracetesting/shipping/all.yaml
index e25a2fca0b..b41610d52a 100644
--- a/test/tracetesting/shipping/all.yaml
+++ b/test/tracetesting/shipping/all.yaml
@@ -3,7 +3,7 @@
 
 type: TestSuite
 spec:
-  id: shipping-service-all
+  id: shipping-all
   name: 'Shipping Service'
   description: Run all Shipping Service tests enabled in sequence
   steps: