diff --git a/BUILD.bazel b/BUILD.bazel
index 9ffa59e6cb..ca61266dfd 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,11 +1,11 @@
-package(default_visibility = ["//visibility:public"])
-
 load(
     "//:gapic_generator_java.bzl",
     "google_java_format",
     "google_java_format_verification",
 )
 
+package(default_visibility = ["//visibility:public"])
+
 JAVA_SRCS = [
     "//src/main/java/com/google/api/generator:generator_files",
     "//src/main/java/com/google/api/generator/engine:engine_files",
diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java
index 74eaa5c6bd..57ae62e3aa 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java
@@ -464,7 +464,10 @@ private static List<MethodDefinition> createMethodVariants(
     List<MethodDefinition> javaMethods = new ArrayList<>();
     String methodName = JavaStyle.toLowerCamelCase(method.name());
     TypeNode methodInputType = method.inputType();
-    TypeNode methodOutputType = method.outputType();
+    TypeNode methodOutputType =
+        method.isPaged()
+            ? types.get(String.format(PAGED_RESPONSE_TYPE_NAME_PATTERN, method.name()))
+            : method.outputType();
     String methodInputTypeName = methodInputType.reference().name();
 
     Message inputMessage = messageTypes.get(methodInputTypeName);
@@ -579,11 +582,12 @@ private static List<MethodDefinition> createMethodVariants(
             .setVariable(Variable.builder().setName("request").setType(methodInputType).build())
             .setIsDecl(true)
             .build();
-
+    String callableMethodName =
+        method.isPaged()
+            ? String.format(PAGED_CALLABLE_NAME_PATTERN, methodName)
+            : String.format(CALLABLE_NAME_PATTERN, methodName);
     MethodInvocationExpr methodReturnExpr =
-        MethodInvocationExpr.builder()
-            .setMethodName(String.format(CALLABLE_NAME_PATTERN, methodName))
-            .build();
+        MethodInvocationExpr.builder().setMethodName(callableMethodName).build();
     methodReturnExpr =
         MethodInvocationExpr.builder()
             .setMethodName("call")
diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceClientClassComposerTest.java
index b18cdbe0ea..f46191705a 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceClientClassComposerTest.java
@@ -223,8 +223,8 @@ public void generateServiceClasses() {
           + "    return stub.chatAgainCallable();\n"
           + "  }\n"
           + "\n"
-          + "  public final PagedExpandResponse pagedExpand(PagedExpandRequest request) {\n"
-          + "    return pagedExpandCallable().call(request);\n"
+          + "  public final PagedExpandPagedResponse pagedExpand(PagedExpandRequest request) {\n"
+          + "    return pagedExpandPagedCallable().call(request);\n"
           + "  }\n"
           + "\n"
           + "  public final UnaryCallable<PagedExpandRequest, PagedExpandPagedResponse>\n"
@@ -232,8 +232,7 @@ public void generateServiceClasses() {
           + "    return stub.pagedExpandPagedCallable();\n"
           + "  }\n"
           + "\n"
-          + "  public final UnaryCallable<PagedExpandRequest, PagedExpandResponse>"
-          + " pagedExpandCallable() {\n"
+          + "  public final UnaryCallable<PagedExpandRequest, PagedExpandResponse> pagedExpandCallable() {\n"
           + "    return stub.pagedExpandCallable();\n"
           + "  }\n"
           + "\n"