diff --git a/testdata/goldens/java/com.google.cloud.speech.v1.SpeechClient.html b/testdata/goldens/java/com.google.cloud.speech.v1.SpeechClient.html
index c38eedb9..77d046c9 100644
--- a/testdata/goldens/java/com.google.cloud.speech.v1.SpeechClient.html
+++ b/testdata/goldens/java/com.google.cloud.speech.v1.SpeechClient.html
@@ -527,11 +527,11 @@ <h3 id="com_google_cloud_speech_v1_SpeechClient_longRunningRecognizeCallable__"
            .setConfig(RecognitionConfig.newBuilder().build())
            .setAudio(RecognitionAudio.newBuilder().build())
            .build();
-   ApiFuture<operation> future = speechClient.longRunningRecognizeCallable().futureCall(request);
+   ApiFuture&lt;Operation&gt; future = speechClient.longRunningRecognizeCallable().futureCall(request);
    // Do something.
    Operation response = future.get();
  }
- </operation></code></pre></div>
+ </code></pre></div>
   <strong>Returns</strong>
   <table class="responsive">
     <tbody>
diff --git a/testdata/goldens/java/com.google.cloud.speech.v1p1beta1.AdaptationClient.html b/testdata/goldens/java/com.google.cloud.speech.v1p1beta1.AdaptationClient.html
index bae8d1f5..2de97161 100644
--- a/testdata/goldens/java/com.google.cloud.speech.v1p1beta1.AdaptationClient.html
+++ b/testdata/goldens/java/com.google.cloud.speech.v1p1beta1.AdaptationClient.html
@@ -805,11 +805,11 @@ <h3 id="com_google_cloud_speech_v1p1beta1_AdaptationClient_deleteCustomClassCall
        DeleteCustomClassRequest.newBuilder()
            .setName(CustomClassName.of("[PROJECT]", "[LOCATION]", "[CUSTOM_CLASS]").toString())
            .build();
-   ApiFuture<empty> future = adaptationClient.deleteCustomClassCallable().futureCall(request);
+   ApiFuture&lt;Empty&gt; future = adaptationClient.deleteCustomClassCallable().futureCall(request);
    // Do something.
    future.get();
  }
- </empty></code></pre></div>
+ </code></pre></div>
   <strong>Returns</strong>
   <table class="responsive">
     <tbody>
@@ -922,11 +922,11 @@ <h3 id="com_google_cloud_speech_v1p1beta1_AdaptationClient_deletePhraseSetCallab
        DeletePhraseSetRequest.newBuilder()
            .setName(PhraseSetName.of("[PROJECT]", "[LOCATION]", "[PHRASE_SET]").toString())
            .build();
-   ApiFuture<empty> future = adaptationClient.deletePhraseSetCallable().futureCall(request);
+   ApiFuture&lt;Empty&gt; future = adaptationClient.deletePhraseSetCallable().futureCall(request);
    // Do something.
    future.get();
  }
- </empty></code></pre></div>
+ </code></pre></div>
   <strong>Returns</strong>
   <table class="responsive">
     <tbody>
diff --git a/testdata/goldens/java/com.google.cloud.speech.v1p1beta1.SpeechClient.html b/testdata/goldens/java/com.google.cloud.speech.v1p1beta1.SpeechClient.html
index 040a9d09..3012edcf 100644
--- a/testdata/goldens/java/com.google.cloud.speech.v1p1beta1.SpeechClient.html
+++ b/testdata/goldens/java/com.google.cloud.speech.v1p1beta1.SpeechClient.html
@@ -529,11 +529,11 @@ <h3 id="com_google_cloud_speech_v1p1beta1_SpeechClient_longRunningRecognizeCalla
            .setAudio(RecognitionAudio.newBuilder().build())
            .setOutputConfig(TranscriptOutputConfig.newBuilder().build())
            .build();
-   ApiFuture<operation> future = speechClient.longRunningRecognizeCallable().futureCall(request);
+   ApiFuture&lt;Operation&gt; future = speechClient.longRunningRecognizeCallable().futureCall(request);
    // Do something.
    Operation response = future.get();
  }
- </operation></code></pre></div>
+ </code></pre></div>
   <strong>Returns</strong>
   <table class="responsive">
     <tbody>
diff --git a/testdata/java/obj/api/com.google.cloud.speech.v1.SpeechClient.yml b/testdata/java/obj/api/com.google.cloud.speech.v1.SpeechClient.yml
index 7a9e4625..ab4551bd 100644
--- a/testdata/java/obj/api/com.google.cloud.speech.v1.SpeechClient.yml
+++ b/testdata/java/obj/api/com.google.cloud.speech.v1.SpeechClient.yml
@@ -308,7 +308,7 @@ items:
   overload: "com.google.cloud.speech.v1.SpeechClient.longRunningRecognizeCallable*"
   type: "Method"
   package: "com.google.cloud.speech.v1"
-  summary: "Performs asynchronous speech recognition: receive results via the google.longrunning.Operations\n interface. Returns either an <code>Operation.error</code> or an <code>Operation.response</code> which contains a\n <code>LongRunningRecognizeResponse</code> message. For more information on asynchronous speech\n recognition, see the <a href=\"https://cloud.google.com/speech-to-text/docs/async-recognize\">how-to</a>.\n\n <p>Sample code:\n\n <pre class=\"prettyprint lang-java\"><code>\n try (SpeechClient speechClient = SpeechClient.create()) {\n   LongRunningRecognizeRequest request =\n       LongRunningRecognizeRequest.newBuilder()\n           .setConfig(RecognitionConfig.newBuilder().build())\n           .setAudio(RecognitionAudio.newBuilder().build())\n           .build();\n   ApiFuture<Operation> future = speechClient.longRunningRecognizeCallable().futureCall(request);\n   // Do something.\n   Operation response = future.get();\n }\n </code></pre>"
+  summary: "Performs asynchronous speech recognition: receive results via the google.longrunning.Operations\n interface. Returns either an <code>Operation.error</code> or an <code>Operation.response</code> which contains a\n <code>LongRunningRecognizeResponse</code> message. For more information on asynchronous speech\n recognition, see the <a href=\"https://cloud.google.com/speech-to-text/docs/async-recognize\">how-to</a>.\n\n <p>Sample code:\n\n <pre class=\"prettyprint lang-java\"><code>\n try (SpeechClient speechClient = SpeechClient.create()) {\n   LongRunningRecognizeRequest request =\n       LongRunningRecognizeRequest.newBuilder()\n           .setConfig(RecognitionConfig.newBuilder().build())\n           .setAudio(RecognitionAudio.newBuilder().build())\n           .build();\n   ApiFuture&lt;Operation&gt; future = speechClient.longRunningRecognizeCallable().futureCall(request);\n   // Do something.\n   Operation response = future.get();\n }\n </code></pre>"
   syntax:
     content: "public final UnaryCallable<LongRunningRecognizeRequest,Operation> longRunningRecognizeCallable()"
     return:
diff --git a/testdata/java/obj/api/com.google.cloud.speech.v1p1beta1.AdaptationClient.yml b/testdata/java/obj/api/com.google.cloud.speech.v1p1beta1.AdaptationClient.yml
index 656686b1..3ae1cf48 100644
--- a/testdata/java/obj/api/com.google.cloud.speech.v1p1beta1.AdaptationClient.yml
+++ b/testdata/java/obj/api/com.google.cloud.speech.v1p1beta1.AdaptationClient.yml
@@ -456,7 +456,7 @@ items:
   overload: "com.google.cloud.speech.v1p1beta1.AdaptationClient.deleteCustomClassCallable*"
   type: "Method"
   package: "com.google.cloud.speech.v1p1beta1"
-  summary: "Delete a custom class.\n\n <p>Sample code:\n\n <pre class=\"prettyprint lang-java\"><code>\n try (AdaptationClient adaptationClient = AdaptationClient.create()) {\n   DeleteCustomClassRequest request =\n       DeleteCustomClassRequest.newBuilder()\n           .setName(CustomClassName.of(\"[PROJECT]\", \"[LOCATION]\", \"[CUSTOM_CLASS]\").toString())\n           .build();\n   ApiFuture<Empty> future = adaptationClient.deleteCustomClassCallable().futureCall(request);\n   // Do something.\n   future.get();\n }\n </code></pre>"
+  summary: "Delete a custom class.\n\n <p>Sample code:\n\n <pre class=\"prettyprint lang-java\"><code>\n try (AdaptationClient adaptationClient = AdaptationClient.create()) {\n   DeleteCustomClassRequest request =\n       DeleteCustomClassRequest.newBuilder()\n           .setName(CustomClassName.of(\"[PROJECT]\", \"[LOCATION]\", \"[CUSTOM_CLASS]\").toString())\n           .build();\n   ApiFuture&lt;Empty&gt; future = adaptationClient.deleteCustomClassCallable().futureCall(request);\n   // Do something.\n   future.get();\n }\n </code></pre>"
   syntax:
     content: "public final UnaryCallable<DeleteCustomClassRequest,Empty> deleteCustomClassCallable()"
     return:
@@ -526,7 +526,7 @@ items:
   overload: "com.google.cloud.speech.v1p1beta1.AdaptationClient.deletePhraseSetCallable*"
   type: "Method"
   package: "com.google.cloud.speech.v1p1beta1"
-  summary: "Delete a phrase set.\n\n <p>Sample code:\n\n <pre class=\"prettyprint lang-java\"><code>\n try (AdaptationClient adaptationClient = AdaptationClient.create()) {\n   DeletePhraseSetRequest request =\n       DeletePhraseSetRequest.newBuilder()\n           .setName(PhraseSetName.of(\"[PROJECT]\", \"[LOCATION]\", \"[PHRASE_SET]\").toString())\n           .build();\n   ApiFuture<Empty> future = adaptationClient.deletePhraseSetCallable().futureCall(request);\n   // Do something.\n   future.get();\n }\n </code></pre>"
+  summary: "Delete a phrase set.\n\n <p>Sample code:\n\n <pre class=\"prettyprint lang-java\"><code>\n try (AdaptationClient adaptationClient = AdaptationClient.create()) {\n   DeletePhraseSetRequest request =\n       DeletePhraseSetRequest.newBuilder()\n           .setName(PhraseSetName.of(\"[PROJECT]\", \"[LOCATION]\", \"[PHRASE_SET]\").toString())\n           .build();\n   ApiFuture&lt;Empty&gt; future = adaptationClient.deletePhraseSetCallable().futureCall(request);\n   // Do something.\n   future.get();\n }\n </code></pre>"
   syntax:
     content: "public final UnaryCallable<DeletePhraseSetRequest,Empty> deletePhraseSetCallable()"
     return:
diff --git a/testdata/java/obj/api/com.google.cloud.speech.v1p1beta1.SpeechClient.yml b/testdata/java/obj/api/com.google.cloud.speech.v1p1beta1.SpeechClient.yml
index 4f06de32..7d4eeb49 100644
--- a/testdata/java/obj/api/com.google.cloud.speech.v1p1beta1.SpeechClient.yml
+++ b/testdata/java/obj/api/com.google.cloud.speech.v1p1beta1.SpeechClient.yml
@@ -308,7 +308,7 @@ items:
   overload: "com.google.cloud.speech.v1p1beta1.SpeechClient.longRunningRecognizeCallable*"
   type: "Method"
   package: "com.google.cloud.speech.v1p1beta1"
-  summary: "Performs asynchronous speech recognition: receive results via the google.longrunning.Operations\n interface. Returns either an <code>Operation.error</code> or an <code>Operation.response</code> which contains a\n <code>LongRunningRecognizeResponse</code> message. For more information on asynchronous speech\n recognition, see the <a href=\"https://cloud.google.com/speech-to-text/docs/async-recognize\">how-to</a>.\n\n <p>Sample code:\n\n <pre class=\"prettyprint lang-java\"><code>\n try (SpeechClient speechClient = SpeechClient.create()) {\n   LongRunningRecognizeRequest request =\n       LongRunningRecognizeRequest.newBuilder()\n           .setConfig(RecognitionConfig.newBuilder().build())\n           .setAudio(RecognitionAudio.newBuilder().build())\n           .setOutputConfig(TranscriptOutputConfig.newBuilder().build())\n           .build();\n   ApiFuture<Operation> future = speechClient.longRunningRecognizeCallable().futureCall(request);\n   // Do something.\n   Operation response = future.get();\n }\n </code></pre>"
+  summary: "Performs asynchronous speech recognition: receive results via the google.longrunning.Operations\n interface. Returns either an <code>Operation.error</code> or an <code>Operation.response</code> which contains a\n <code>LongRunningRecognizeResponse</code> message. For more information on asynchronous speech\n recognition, see the <a href=\"https://cloud.google.com/speech-to-text/docs/async-recognize\">how-to</a>.\n\n <p>Sample code:\n\n <pre class=\"prettyprint lang-java\"><code>\n try (SpeechClient speechClient = SpeechClient.create()) {\n   LongRunningRecognizeRequest request =\n       LongRunningRecognizeRequest.newBuilder()\n           .setConfig(RecognitionConfig.newBuilder().build())\n           .setAudio(RecognitionAudio.newBuilder().build())\n           .setOutputConfig(TranscriptOutputConfig.newBuilder().build())\n           .build();\n   ApiFuture&lt;Operation&gt; future = speechClient.longRunningRecognizeCallable().futureCall(request);\n   // Do something.\n   Operation response = future.get();\n }\n </code></pre>"
   syntax:
     content: "public final UnaryCallable<LongRunningRecognizeRequest,Operation> longRunningRecognizeCallable()"
     return: