diff --git a/src/main/java/com/google/api/generator/spring/utils/Utils.java b/src/main/java/com/google/api/generator/spring/utils/Utils.java
index dea2b743f3..ce02532b84 100644
--- a/src/main/java/com/google/api/generator/spring/utils/Utils.java
+++ b/src/main/java/com/google/api/generator/spring/utils/Utils.java
@@ -28,7 +28,6 @@
 import com.google.api.generator.gapic.model.Service;
 import com.google.common.base.CaseFormat;
 import com.google.common.base.Preconditions;
-import com.google.common.base.Splitter;
 import com.google.protobuf.Duration;
 import com.google.protobuf.util.Durations;
 import io.grpc.serviceconfig.MethodConfig.RetryPolicy;
@@ -60,12 +59,12 @@ public static String getLibName(GapicContext context) {
     // discrepancies
     // eg. for vision proto: "com.google.cloud.vision.v1"
     // https://github.com/googleapis/java-vision/blob/main/proto-google-cloud-vision-v1/src/main/proto/google/cloud/vision/v1/image_annotator.proto#L36
-    List<String> pakkagePhrases = Splitter.on(".").splitToList(getPackageName(context));
-    return pakkagePhrases.get(pakkagePhrases.size() - 2);
+    // List<String> pakkagePhrases = Splitter.on(".").splitToList(getPackageName(context));
+    // return pakkagePhrases.get(pakkagePhrases.size() - 2);
 
-    // Option 3: Parse ApiShortName from service proto's default host (e.g. vision.googleapis.com)
-    // TODO: Replace implementation above to reuse parsing logic from SampleGen:
-    //  https://github.com/googleapis/gapic-generator-java/pull/1040
+    // Option 3: Use parsed apiShortName from service proto's default host
+    // (e.g. vision.googleapis.com => vision)
+    return context.services().get(0).apiShortName();
   }
 
   public static String getPackageName(GapicContext context) {
diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfo.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfo.golden
index d7ed65e461..d88f6b6892 100644
--- a/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfo.golden
+++ b/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfo.golden
@@ -1,4 +1,4 @@
-/** Spring Boot auto-configurations for showcase. */
+/** Spring Boot auto-configurations for localhost:7469. */
 @Generated("by gapic-generator-java")
 package com.google.showcase.v1beta1.spring;
 
diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfoFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfoFull.golden
index 4be7458a76..a73703ef49 100644
--- a/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfoFull.golden
+++ b/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfoFull.golden
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/** Spring Boot auto-configurations for showcase. */
+/** Spring Boot auto-configurations for localhost:7469. */
 @Generated("by gapic-generator-java")
 package com.google.showcase.v1beta1.spring;
 
diff --git a/src/test/java/com/google/api/generator/spring/goldens/SpringAdditionalMetadataJson.golden b/src/test/java/com/google/api/generator/spring/goldens/SpringAdditionalMetadataJson.golden
index 5da3bd87f0..16963f0b1c 100644
--- a/src/test/java/com/google/api/generator/spring/goldens/SpringAdditionalMetadataJson.golden
+++ b/src/test/java/com/google/api/generator/spring/goldens/SpringAdditionalMetadataJson.golden
@@ -3,7 +3,7 @@
     {
       "name": "com.google.showcase.v1beta1.spring.auto.echo.enabled",
       "type": "java.lang.Boolean",
-      "description": "Auto-configure Google Cloud showcase/Echo components.",
+      "description": "Auto-configure Google Cloud localhost:7469/Echo components.",
       "defaultValue": true
     }
   ]
diff --git a/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden b/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden
index 4c6080fe0d..e772bef703 100644
--- a/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden
+++ b/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden
@@ -6,8 +6,8 @@
   <groupId>com.google.cloud</groupId>
   <artifactId>com-google-showcase-v1beta1-spring-starter</artifactId>
   <version>{{starter-version}}</version>
-  <name>Spring Boot Starter - showcase</name>
-  <description>Spring Boot Starter with AutoConfiguration for showcase</description>
+  <name>Spring Boot Starter - localhost:7469</name>
+  <description>Spring Boot Starter with AutoConfiguration for localhost:7469</description>
 
 
   <dependencies>