diff --git a/src/main/java/com/google/api/generator/gapic/composer/Composer.java b/src/main/java/com/google/api/generator/gapic/composer/Composer.java
index 7b53da261c..55f2ca51d7 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/Composer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/Composer.java
@@ -48,7 +48,7 @@ public static List<GapicClass> generateServiceClasses(
   public static List<GapicClass> generateStubClasses(
       Service service, Map<String, Message> messageTypes) {
     List<GapicClass> clazzes = new ArrayList<>();
-    clazzes.add(generateStubServiceStub(service, messageTypes));
+    clazzes.add(ServiceStubClassComposer.instance().generate(service, messageTypes));
     clazzes.add(generateStubServiceSettings(service));
     clazzes.add(GrpcServiceCallableFactoryClassComposer.instance().generate(service, messageTypes));
     clazzes.add(GrpcServiceStubClassComposer.instance().generate(service, messageTypes));
@@ -58,7 +58,7 @@ public static List<GapicClass> generateStubClasses(
   public static List<GapicClass> generateClientSettingsClasses(
       Service service, Map<String, Message> messageTypes) {
     List<GapicClass> clazzes = new ArrayList<>();
-    clazzes.add(generateServiceClient(service, messageTypes));
+    clazzes.add(ServiceClientClassComposer.instance().generate(service, messageTypes));
     clazzes.add(generateServiceSettings(service));
     return clazzes;
   }
@@ -72,22 +72,12 @@ public static List<GapicClass> generateMocksAndTestClasses(
   }
 
   /** ====================== STUB CLASSES ==================== */
-  private static GapicClass generateStubServiceStub(
-      Service service, Map<String, Message> messageTypes) {
-    return ServiceStubClassComposer.instance().generate(service, messageTypes);
-  }
-
   private static GapicClass generateStubServiceSettings(Service service) {
     return generateGenericClass(
         Kind.STUB, String.format("%sStubSettings", service.name()), service);
   }
 
   /** ====================== MAIN CLASSES ==================== */
-  private static GapicClass generateServiceClient(
-      Service service, Map<String, Message> messageTypes) {
-    return ServiceClientClassComposer.instance().generate(service, messageTypes);
-  }
-
   private static GapicClass generateServiceSettings(Service service) {
     return generateGenericClass(Kind.MAIN, String.format("%sSettings", service.name()), service);
   }