diff --git a/.env b/.env
index 844e885c5a..f166c374dc 100644
--- a/.env
+++ b/.env
@@ -49,9 +49,9 @@ OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE=cumulative
 ACCOUNTING_DOCKERFILE=./src/accounting/Dockerfile
 
 # Ad Service
-AD_SERVICE_PORT=9555
-AD_SERVICE_ADDR=adservice:${AD_SERVICE_PORT}
-AD_SERVICE_DOCKERFILE=./src/adservice/Dockerfile
+AD_PORT=9555
+AD_ADDR=ad:${AD_PORT}
+AD_DOCKERFILE=./src/ad/Dockerfile
 
 # Cart Service
 CART_SERVICE_PORT=7070
diff --git a/.github/component_owners.yml b/.github/component_owners.yml
index 615e801fa8..b96dd2f31a 100644
--- a/.github/component_owners.yml
+++ b/.github/component_owners.yml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # this file is used by .github/workflows/assign-reviewers.yml
 components:
-  src/adservice:
+  src/ad:
     - jack-berg
     - mateuszrzeszutek
     - trask
diff --git a/.github/workflows/component-build-images.yml b/.github/workflows/component-build-images.yml
index 7514267b83..54afc160a6 100644
--- a/.github/workflows/component-build-images.yml
+++ b/.github/workflows/component-build-images.yml
@@ -55,8 +55,8 @@ jobs:
             tag_suffix: accounting
             context: ./
             setup-qemu: true
-          - file: ./src/adservice/Dockerfile
-            tag_suffix: adservice
+          - file: ./src/ad/Dockerfile
+            tag_suffix: ad
             context: ./
             setup-qemu: true
           - file: ./src/cartservice/src/Dockerfile
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c9a41b936..543798b3a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,8 @@ the release.
   ([#1797](https://github.com/open-telemetry/opentelemetry-demo/pull/1797))
 * [accounting] rename accountingservice to accounting
   ([#1827](https://github.com/open-telemetry/opentelemetry-demo/pull/1827))
+* [ad] rename adservice to ad
+  ([#1827](https://github.com/open-telemetry/opentelemetry-demo/pull/1832))
 
 ## 1.12.0
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 96b8433949..31db3038e9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -73,7 +73,7 @@ cd opentelemetry-demo/
 - Navigate to the Java Ad Service folder to install and update Gradle:
 
 ```shell
-cd .\src\adservice\
+cd .\src\ad\
 .\gradlew installDist
 .\gradlew wrapper --gradle-version 7.4.2
 ```
diff --git a/docker-compose-tests.yml b/docker-compose-tests.yml
index 40cbbccc28..df4c9cc5ba 100644
--- a/docker-compose-tests.yml
+++ b/docker-compose-tests.yml
@@ -37,7 +37,7 @@ services:
       args:
         TRACETEST_IMAGE_VERSION: ${TRACETEST_IMAGE_VERSION}
     environment:
-      - AD_SERVICE_ADDR
+      - AD_ADDR
       - CART_SERVICE_ADDR
       - CHECKOUT_SERVICE_ADDR
       - CURRENCY_SERVICE_ADDR
@@ -59,7 +59,7 @@ services:
       # adding demo services as dependencies
       accounting:
         condition: service_started
-      adservice:
+      ad:
         condition: service_started
       cartservice:
         condition: service_started
diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
index 1acbf44471..080f02e3c8 100644
--- a/docker-compose.minimal.yml
+++ b/docker-compose.minimal.yml
@@ -19,14 +19,14 @@ services:
   # ******************
 
   # AdService
-  adservice:
-    image: ${IMAGE_NAME}:${DEMO_VERSION}-adservice
-    container_name: ad-service
+  ad:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-ad
+    container_name: ad
     build:
       context: ./
-      dockerfile: ${AD_SERVICE_DOCKERFILE}
+      dockerfile: ${AD_DOCKERFILE}
       cache_from:
-        - ${IMAGE_NAME}:${IMAGE_VERSION}-adservice
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-ad
       args:
         OTEL_JAVA_AGENT_VERSION: ${OTEL_JAVA_AGENT_VERSION}
     deploy:
@@ -35,15 +35,15 @@ services:
           memory: 300M
     restart: unless-stopped
     ports:
-      - "${AD_SERVICE_PORT}"
+      - "${AD_PORT}"
     environment:
-      - AD_SERVICE_PORT
+      - AD_PORT
       - FLAGD_HOST
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_LOGS_EXPORTER=otlp
-      - OTEL_SERVICE_NAME=adservice
+      - OTEL_SERVICE_NAME=ad
     depends_on:
       otelcol:
         condition: service_started
@@ -199,7 +199,7 @@ services:
     environment:
       - PORT=${FRONTEND_PORT}
       - FRONTEND_ADDR
-      - AD_SERVICE_ADDR
+      - AD_ADDR
       - CART_SERVICE_ADDR
       - CHECKOUT_SERVICE_ADDR
       - CURRENCY_SERVICE_ADDR
@@ -217,7 +217,7 @@ services:
       - FLAGD_HOST
       - FLAGD_PORT
     depends_on:
-      adservice:
+      ad:
         condition: service_started
       cartservice:
         condition: service_started
diff --git a/docker-compose.yml b/docker-compose.yml
index 984d4c8858..893df4e440 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -45,14 +45,14 @@ services:
     logging: *logging
 
   # AdService
-  adservice:
-    image: ${IMAGE_NAME}:${DEMO_VERSION}-adservice
-    container_name: ad-service
+  ad:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-ad
+    container_name: ad
     build:
       context: ./
-      dockerfile: ${AD_SERVICE_DOCKERFILE}
+      dockerfile: ${AD_DOCKERFILE}
       cache_from:
-        - ${IMAGE_NAME}:${IMAGE_VERSION}-adservice
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-ad
       args:
         OTEL_JAVA_AGENT_VERSION: ${OTEL_JAVA_AGENT_VERSION}
     deploy:
@@ -61,16 +61,16 @@ services:
           memory: 300M
     restart: unless-stopped
     ports:
-      - "${AD_SERVICE_PORT}"
+      - "${AD_PORT}"
     environment:
-      - AD_SERVICE_PORT
+      - AD_PORT
       - FLAGD_HOST
       - FLAGD_PORT
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_LOGS_EXPORTER=otlp
-      - OTEL_SERVICE_NAME=adservice
+      - OTEL_SERVICE_NAME=ad
     depends_on:
       otelcol:
         condition: service_started
@@ -271,7 +271,7 @@ services:
     environment:
       - PORT=${FRONTEND_PORT}
       - FRONTEND_ADDR
-      - AD_SERVICE_ADDR
+      - AD_ADDR
       - CART_SERVICE_ADDR
       - CHECKOUT_SERVICE_ADDR
       - CURRENCY_SERVICE_ADDR
@@ -289,7 +289,7 @@ services:
       - FLAGD_HOST
       - FLAGD_PORT
     depends_on:
-      adservice:
+      ad:
         condition: service_started
       cartservice:
         condition: service_started
diff --git a/docker-gen-proto.sh b/docker-gen-proto.sh
index b90cab8413..c556469697 100755
--- a/docker-gen-proto.sh
+++ b/docker-gen-proto.sh
@@ -22,7 +22,7 @@ gen_proto_python() {
 }
 
 #gen_proto_dotnet accounting
-#gen_proto_java adservice
+#gen_proto_java ad
 #gen_proto_dotnet cartservice
 gen_proto_go checkoutservice
 #gen_proto_cpp currencyservice
diff --git a/ide-gen-proto.sh b/ide-gen-proto.sh
index a6e71ebb60..8469f6016e 100755
--- a/ide-gen-proto.sh
+++ b/ide-gen-proto.sh
@@ -66,7 +66,7 @@ gen_proto_ts() {
 }
 
 gen_proto_dotnet accounting
-# gen_proto_java adservice
+# gen_proto_java ad
 gen_proto_dotnet cartservice
 gen_proto_go checkoutservice
 # gen_proto_cpp currencyservice
diff --git a/kubernetes/opentelemetry-demo.yaml b/kubernetes/opentelemetry-demo.yaml
index 782b916a5c..1b9b57c500 100644
--- a/kubernetes/opentelemetry-demo.yaml
+++ b/kubernetes/opentelemetry-demo.yaml
@@ -11023,4 +11023,4 @@ spec:
         volumeMounts:
         - name: config-emptydir
           mountPath: /usr/share/opensearch/config/opensearch.yml
-          subPath: opensearch.yml
+          subPath: opensearch.yml
\ No newline at end of file
diff --git a/renovate.json5 b/renovate.json5
index f871b2b08a..86cb08c437 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -19,8 +19,8 @@
       "groupName": "accounting",
     },
     {
-      "matchFileNames": ["src/adservice/**"],
-      "groupName": "adservice",
+      "matchFileNames": ["src/ad/**"],
+      "groupName": "ad",
     },
     {
       "matchFileNames": ["src/cartservice/**"],
diff --git a/src/adservice/.java-version b/src/ad/.java-version
similarity index 100%
rename from src/adservice/.java-version
rename to src/ad/.java-version
diff --git a/src/adservice/Dockerfile b/src/ad/Dockerfile
similarity index 80%
rename from src/adservice/Dockerfile
rename to src/ad/Dockerfile
index 36c6b207fb..805025a24c 100644
--- a/src/adservice/Dockerfile
+++ b/src/ad/Dockerfile
@@ -6,13 +6,13 @@ FROM --platform=${BUILDPLATFORM} eclipse-temurin:21-jdk AS builder
 
 WORKDIR /usr/src/app/
 
-COPY ./src/adservice/gradlew* ./src/adservice/settings.gradle* ./src/adservice/build.gradle ./
-COPY ./src/adservice/gradle ./gradle
+COPY ./src/ad/gradlew* ./src/ad/settings.gradle* ./src/ad/build.gradle ./
+COPY ./src/ad/gradle ./gradle
 
 RUN ./gradlew
 RUN ./gradlew downloadRepos
 
-COPY ./src/adservice/ ./
+COPY ./src/ad/ ./
 COPY ./pb/ ./proto
 RUN ./gradlew installDist -PprotoSourceDir=./proto
 
@@ -27,5 +27,5 @@ COPY --from=builder /usr/src/app/ ./
 ADD --chmod=644 https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$OTEL_JAVA_AGENT_VERSION/opentelemetry-javaagent.jar /usr/src/app/opentelemetry-javaagent.jar
 ENV JAVA_TOOL_OPTIONS=-javaagent:/usr/src/app/opentelemetry-javaagent.jar
 
-EXPOSE ${AD_SERVICE_PORT}
-ENTRYPOINT [ "./build/install/opentelemetry-demo-ad-service/bin/AdService" ]
+EXPOSE ${AD_PORT}
+ENTRYPOINT [ "./build/install/opentelemetry-demo-ad-service/bin/Ad" ]
diff --git a/src/adservice/README.md b/src/ad/README.md
similarity index 78%
rename from src/adservice/README.md
rename to src/ad/README.md
index 6e94149f6d..e3865d16b9 100644
--- a/src/adservice/README.md
+++ b/src/ad/README.md
@@ -14,14 +14,14 @@ To build Ad Service, run:
 ```
 
 It will create an executable script
-`src/adservice/build/install/oteldemo/bin/AdService`.
+`src/ad/build/install/oteldemo/bin/Ad`.
 
 To run the Ad Service:
 
 ```sh
-export AD_SERVICE_PORT=8080
+export AD_PORT=8080
 export FEATURE_FLAG_GRPC_SERVICE_ADDR=featureflagservice:50053
-./build/install/opentelemetry-demo-ad-service/bin/AdService
+./build/install/opentelemetry-demo-ad-service/bin/Ad
 ```
 
 ### Upgrading Gradle
@@ -37,5 +37,5 @@ If you need to upgrade the version of gradle then run
 From the root of `opentelemetry-demo`, run:
 
 ```sh
-docker build --file ./src/adservice/Dockerfile ./
+docker build --file ./src/ad/Dockerfile ./
 ```
diff --git a/src/adservice/build.gradle b/src/ad/build.gradle
similarity index 97%
rename from src/adservice/build.gradle
rename to src/ad/build.gradle
index 3fe9cb7681..0af438a3d4 100644
--- a/src/adservice/build.gradle
+++ b/src/ad/build.gradle
@@ -13,7 +13,7 @@ repositories {
 }
 
 description = 'Ad Service'
-group = "adservice"
+group = "ad"
 version = "0.1.0-SNAPSHOT"
 
 def opentelemetryVersion = "1.40.0"
@@ -129,14 +129,14 @@ task downloadRepos(type: Copy) {
     into offlineCompile
 }
 
-task adService(type: CreateStartScripts) {
+task ad(type: CreateStartScripts) {
     mainClass.set('oteldemo.AdService')
-    applicationName = 'AdService'
+    applicationName = 'Ad'
     outputDir = new File(project.buildDir, 'tmp')
     classpath = startScripts.classpath
 }
 
 applicationDistribution.into('bin') {
-    from(adService)
+    from(ad)
     fileMode = 0755
 }
diff --git a/src/adservice/gradle/wrapper/gradle-wrapper.jar b/src/ad/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from src/adservice/gradle/wrapper/gradle-wrapper.jar
rename to src/ad/gradle/wrapper/gradle-wrapper.jar
diff --git a/src/adservice/gradle/wrapper/gradle-wrapper.properties b/src/ad/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from src/adservice/gradle/wrapper/gradle-wrapper.properties
rename to src/ad/gradle/wrapper/gradle-wrapper.properties
diff --git a/src/adservice/gradlew b/src/ad/gradlew
old mode 100755
new mode 100644
similarity index 100%
rename from src/adservice/gradlew
rename to src/ad/gradlew
diff --git a/src/adservice/gradlew.bat b/src/ad/gradlew.bat
similarity index 96%
rename from src/adservice/gradlew.bat
rename to src/ad/gradlew.bat
index 6689b85bee..93e3f59f13 100644
--- a/src/adservice/gradlew.bat
+++ b/src/ad/gradlew.bat
@@ -1,92 +1,92 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/src/adservice/settings.gradle b/src/ad/settings.gradle
similarity index 100%
rename from src/adservice/settings.gradle
rename to src/ad/settings.gradle
diff --git a/src/adservice/src/main/java/oteldemo/AdService.java b/src/ad/src/main/java/oteldemo/AdService.java
similarity index 99%
rename from src/adservice/src/main/java/oteldemo/AdService.java
rename to src/ad/src/main/java/oteldemo/AdService.java
index c55b663bf1..a64fdd6148 100644
--- a/src/adservice/src/main/java/oteldemo/AdService.java
+++ b/src/ad/src/main/java/oteldemo/AdService.java
@@ -76,7 +76,7 @@ public final class AdService {
   private void start() throws IOException {
     int port =
         Integer.parseInt(
-            Optional.ofNullable(System.getenv("AD_SERVICE_PORT"))
+            Optional.ofNullable(System.getenv("AD_PORT"))
                 .orElseThrow(
                     () ->
                         new IllegalStateException(
@@ -325,4 +325,4 @@ public static void main(String[] args) throws IOException, InterruptedException
     service.start();
     service.blockUntilShutdown();
   }
-}
+}
\ No newline at end of file
diff --git a/src/adservice/src/main/java/oteldemo/problempattern/CPULoad.java b/src/ad/src/main/java/oteldemo/problempattern/CPULoad.java
similarity index 100%
rename from src/adservice/src/main/java/oteldemo/problempattern/CPULoad.java
rename to src/ad/src/main/java/oteldemo/problempattern/CPULoad.java
diff --git a/src/adservice/src/main/java/oteldemo/problempattern/GarbageCollectionTrigger.java b/src/ad/src/main/java/oteldemo/problempattern/GarbageCollectionTrigger.java
similarity index 100%
rename from src/adservice/src/main/java/oteldemo/problempattern/GarbageCollectionTrigger.java
rename to src/ad/src/main/java/oteldemo/problempattern/GarbageCollectionTrigger.java
diff --git a/src/adservice/src/main/java/oteldemo/problempattern/MemoryUtils.java b/src/ad/src/main/java/oteldemo/problempattern/MemoryUtils.java
similarity index 100%
rename from src/adservice/src/main/java/oteldemo/problempattern/MemoryUtils.java
rename to src/ad/src/main/java/oteldemo/problempattern/MemoryUtils.java
diff --git a/src/adservice/src/main/resources/log4j2.xml b/src/ad/src/main/resources/log4j2.xml
similarity index 100%
rename from src/adservice/src/main/resources/log4j2.xml
rename to src/ad/src/main/resources/log4j2.xml
diff --git a/src/frontend/next.config.js b/src/frontend/next.config.js
index 047a9497a5..e7ee99bd0c 100755
--- a/src/frontend/next.config.js
+++ b/src/frontend/next.config.js
@@ -13,7 +13,7 @@ const myEnv = dotEnv.config({
 dotenvExpand.expand(myEnv);
 
 const {
-  AD_SERVICE_ADDR = '',
+  AD_ADDR = '',
   CART_SERVICE_ADDR = '',
   CHECKOUT_SERVICE_ADDR = '',
   CURRENCY_SERVICE_ADDR = '',
@@ -45,7 +45,7 @@ const nextConfig = {
     return config;
   },
   env: {
-    AD_SERVICE_ADDR,
+    AD_ADDR,
     CART_SERVICE_ADDR,
     CHECKOUT_SERVICE_ADDR,
     CURRENCY_SERVICE_ADDR,
diff --git a/test/tracetesting/adservice/get.yaml b/test/tracetesting/adservice/get.yaml
index a5b710f457..65b0f07f30 100644
--- a/test/tracetesting/adservice/get.yaml
+++ b/test/tracetesting/adservice/get.yaml
@@ -10,7 +10,7 @@ spec:
     type: grpc
     grpc:
       protobufFile: ../../../pb/demo.proto
-      address: ${var:AD_SERVICE_ADDR}
+      address: ${var:AD_ADDR}
       method: oteldemo.AdService.GetAds
       request: |-
         {
diff --git a/test/tracetesting/run.bash b/test/tracetesting/run.bash
index 966a04572b..dbcd65421f 100755
--- a/test/tracetesting/run.bash
+++ b/test/tracetesting/run.bash
@@ -8,7 +8,7 @@
 set -e
 
 # Availalble services to test
-ALL_SERVICES=("adservice" "cartservice" "currencyservice" "checkoutservice" "frontend" "emailservice" "paymentservice" "productcatalogservice" "recommendationservice" "shippingservice")
+ALL_SERVICES=("ad" "cartservice" "currencyservice" "checkoutservice" "frontend" "emailservice" "paymentservice" "productcatalogservice" "recommendationservice" "shippingservice")
 
 ## Script variables
 # Will contain the list of services to test
@@ -34,8 +34,8 @@ spec:
   id: tracetesting-vars
   name: tracetesting-vars
   values:
-    - key: AD_SERVICE_ADDR
-      value: $AD_SERVICE_ADDR
+    - key: AD_ADDR
+      value: $AD_ADDR
     - key: CART_SERVICE_ADDR
       value: $CART_SERVICE_ADDR
     - key: CHECKOUT_SERVICE_ADDR