diff --git a/generation/new_client/new-client.py b/generation/new_client/new-client.py
index 4fd7cc0abcd4..7f739c29e8a6 100644
--- a/generation/new_client/new-client.py
+++ b/generation/new_client/new-client.py
@@ -236,7 +236,8 @@ def generate(
         output_name=str(workdir / owlbot_yaml_location_from_module),
         artifact_name=distribution_name_short,
         proto_path=proto_path,
-        module_name=f"java-{output_name}"
+        module_name=f"java-{output_name}",
+        api_shortname=api_shortname
     )
 
     # get the sha256 digets for the owlbot image
diff --git a/generation/new_client/templates/owlbot.yaml.monorepo.j2 b/generation/new_client/templates/owlbot.yaml.monorepo.j2
index aa755cf998ec..ad9aa5e416e3 100644
--- a/generation/new_client/templates/owlbot.yaml.monorepo.j2
+++ b/generation/new_client/templates/owlbot.yaml.monorepo.j2
@@ -33,4 +33,4 @@ deep-copy-regex:
   dest: "/owl-bot-staging/{{ module_name }}/$1/samples/snippets/generated"
 {% endif %}
 
-api-name: {{ module_name }}
+api-name: {{ api_shortname }}
diff --git a/java-discoveryengine/.OwlBot.yaml b/java-discoveryengine/.OwlBot.yaml
index 348252f826c6..699c60b17a4d 100644
--- a/java-discoveryengine/.OwlBot.yaml
+++ b/java-discoveryengine/.OwlBot.yaml
@@ -32,4 +32,4 @@ deep-copy-regex:
 - source: "/google/cloud/discoveryengine/(v.*)/.*-java/samples/snippets/generated"
   dest: "/owl-bot-staging/java-discoveryengine/$1/samples/snippets/generated"
 
-api-name: java-discoveryengine
\ No newline at end of file
+api-name: discoveryengine
diff --git a/java-enterpriseknowledgegraph/.OwlBot.yaml b/java-enterpriseknowledgegraph/.OwlBot.yaml
index 9c36fa10de0c..7ed057bb97a1 100644
--- a/java-enterpriseknowledgegraph/.OwlBot.yaml
+++ b/java-enterpriseknowledgegraph/.OwlBot.yaml
@@ -32,4 +32,4 @@ deep-copy-regex:
 - source: "/google/cloud/enterpriseknowledgegraph/(v.*)/.*-java/samples/snippets/generated"
   dest: "/owl-bot-staging/java-enterpriseknowledgegraph/$1/samples/snippets/generated"
 
-api-name: java-enterpriseknowledgegraph
\ No newline at end of file
+api-name: enterpriseknowledgegraph
diff --git a/java-maps-addressvalidation/.OwlBot.yaml b/java-maps-addressvalidation/.OwlBot.yaml
index ec7c525ef45a..6a923403e131 100644
--- a/java-maps-addressvalidation/.OwlBot.yaml
+++ b/java-maps-addressvalidation/.OwlBot.yaml
@@ -32,4 +32,4 @@ deep-copy-regex:
 - source: "/google/maps/addressvalidation/(v.*)/.*-java/samples/snippets/generated"
   dest: "/owl-bot-staging/java-maps-addressvalidation/$1/samples/snippets/generated"
 
-api-name: java-maps-addressvalidation
\ No newline at end of file
+api-name: maps-addressvalidation
diff --git a/java-maps-routing/.OwlBot.yaml b/java-maps-routing/.OwlBot.yaml
index ab983c6a0ec3..fa373f0b66eb 100644
--- a/java-maps-routing/.OwlBot.yaml
+++ b/java-maps-routing/.OwlBot.yaml
@@ -32,4 +32,4 @@ deep-copy-regex:
 - source: "/google/maps/routing/(v.*)/.*-java/samples/snippets/generated"
   dest: "/owl-bot-staging/java-maps-routing/$1/samples/snippets/generated"
 
-api-name: java-maps-routing
\ No newline at end of file
+api-name: maps-routing
diff --git a/java-monitoring-metricsscope/.OwlBot.yaml b/java-monitoring-metricsscope/.OwlBot.yaml
index c5df2df978e6..e4f089b55c70 100644
--- a/java-monitoring-metricsscope/.OwlBot.yaml
+++ b/java-monitoring-metricsscope/.OwlBot.yaml
@@ -32,4 +32,4 @@ deep-copy-regex:
 - source: "/google/monitoring/metricsscope/(v.*)/.*-java/samples/snippets/generated"
   dest: "/owl-bot-staging/java-monitoring-metricsscope/$1/samples/snippets/generated"
 
-api-name: java-monitoring-metricsscope
\ No newline at end of file
+api-name: monitoring-metricsscope
diff --git a/java-vmwareengine/.OwlBot.yaml b/java-vmwareengine/.OwlBot.yaml
index 7e146d5a8ffe..af0b8fd8bdd0 100644
--- a/java-vmwareengine/.OwlBot.yaml
+++ b/java-vmwareengine/.OwlBot.yaml
@@ -32,4 +32,4 @@ deep-copy-regex:
 - source: "/google/cloud/vmwareengine/(v.*)/.*-java/samples/snippets/generated"
   dest: "/owl-bot-staging/java-vmwareengine/$1/samples/snippets/generated"
 
-api-name: java-vmwareengine
\ No newline at end of file
+api-name: vmwareengine