diff --git a/src/main/java/io/grafeas/v1/GrafeasClient.java b/src/main/java/io/grafeas/v1/GrafeasClient.java
index 1fd42d59..ae9cf683 100644
--- a/src/main/java/io/grafeas/v1/GrafeasClient.java
+++ b/src/main/java/io/grafeas/v1/GrafeasClient.java
@@ -58,7 +58,7 @@
  * <code>
  * try (GrafeasClient grafeasClient = GrafeasClient.create()) {
  *   OccurrenceName name = OccurrenceName.of("[PROJECT]", "[OCCURRENCE]");
- *   grafeasClient.deleteOccurrence(name);
+ *   Occurrence response = grafeasClient.getOccurrence(name);
  * }
  * </code>
  * </pre>
@@ -165,188 +165,6 @@ public GrafeasStub getStub() {
     return stub;
   }
 
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes the specified occurrence. For example, use this method to delete an occurrence when the
-   * occurrence is no longer applicable for the given resource.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (GrafeasClient grafeasClient = GrafeasClient.create()) {
-   *   OccurrenceName name = OccurrenceName.of("[PROJECT]", "[OCCURRENCE]");
-   *   grafeasClient.deleteOccurrence(name);
-   * }
-   * </code></pre>
-   *
-   * @param name The name of the occurrence in the form of
-   *     `projects/[PROJECT_ID]/occurrences/[OCCURRENCE_ID]`.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteOccurrence(OccurrenceName name) {
-    DeleteOccurrenceRequest request =
-        DeleteOccurrenceRequest.newBuilder().setName(name == null ? null : name.toString()).build();
-    deleteOccurrence(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes the specified occurrence. For example, use this method to delete an occurrence when the
-   * occurrence is no longer applicable for the given resource.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (GrafeasClient grafeasClient = GrafeasClient.create()) {
-   *   OccurrenceName name = OccurrenceName.of("[PROJECT]", "[OCCURRENCE]");
-   *   grafeasClient.deleteOccurrence(name.toString());
-   * }
-   * </code></pre>
-   *
-   * @param name The name of the occurrence in the form of
-   *     `projects/[PROJECT_ID]/occurrences/[OCCURRENCE_ID]`.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteOccurrence(String name) {
-    DeleteOccurrenceRequest request = DeleteOccurrenceRequest.newBuilder().setName(name).build();
-    deleteOccurrence(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes the specified occurrence. For example, use this method to delete an occurrence when the
-   * occurrence is no longer applicable for the given resource.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (GrafeasClient grafeasClient = GrafeasClient.create()) {
-   *   OccurrenceName name = OccurrenceName.of("[PROJECT]", "[OCCURRENCE]");
-   *   DeleteOccurrenceRequest request = DeleteOccurrenceRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .build();
-   *   grafeasClient.deleteOccurrence(request);
-   * }
-   * </code></pre>
-   *
-   * @param request The request object containing all of the parameters for the API call.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteOccurrence(DeleteOccurrenceRequest request) {
-    deleteOccurrenceCallable().call(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes the specified occurrence. For example, use this method to delete an occurrence when the
-   * occurrence is no longer applicable for the given resource.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (GrafeasClient grafeasClient = GrafeasClient.create()) {
-   *   OccurrenceName name = OccurrenceName.of("[PROJECT]", "[OCCURRENCE]");
-   *   DeleteOccurrenceRequest request = DeleteOccurrenceRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .build();
-   *   ApiFuture&lt;Void&gt; future = grafeasClient.deleteOccurrenceCallable().futureCall(request);
-   *   // Do something
-   *   future.get();
-   * }
-   * </code></pre>
-   */
-  public final UnaryCallable<DeleteOccurrenceRequest, Empty> deleteOccurrenceCallable() {
-    return stub.deleteOccurrenceCallable();
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes the specified note.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (GrafeasClient grafeasClient = GrafeasClient.create()) {
-   *   NoteName name = NoteName.of("[PROJECT]", "[NOTE]");
-   *   grafeasClient.deleteNote(name);
-   * }
-   * </code></pre>
-   *
-   * @param name The name of the note in the form of `projects/[PROVIDER_ID]/notes/[NOTE_ID]`.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteNote(NoteName name) {
-    DeleteNoteRequest request =
-        DeleteNoteRequest.newBuilder().setName(name == null ? null : name.toString()).build();
-    deleteNote(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes the specified note.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (GrafeasClient grafeasClient = GrafeasClient.create()) {
-   *   NoteName name = NoteName.of("[PROJECT]", "[NOTE]");
-   *   grafeasClient.deleteNote(name.toString());
-   * }
-   * </code></pre>
-   *
-   * @param name The name of the note in the form of `projects/[PROVIDER_ID]/notes/[NOTE_ID]`.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteNote(String name) {
-    DeleteNoteRequest request = DeleteNoteRequest.newBuilder().setName(name).build();
-    deleteNote(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes the specified note.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (GrafeasClient grafeasClient = GrafeasClient.create()) {
-   *   NoteName name = NoteName.of("[PROJECT]", "[NOTE]");
-   *   DeleteNoteRequest request = DeleteNoteRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .build();
-   *   grafeasClient.deleteNote(request);
-   * }
-   * </code></pre>
-   *
-   * @param request The request object containing all of the parameters for the API call.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteNote(DeleteNoteRequest request) {
-    deleteNoteCallable().call(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes the specified note.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (GrafeasClient grafeasClient = GrafeasClient.create()) {
-   *   NoteName name = NoteName.of("[PROJECT]", "[NOTE]");
-   *   DeleteNoteRequest request = DeleteNoteRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .build();
-   *   ApiFuture&lt;Void&gt; future = grafeasClient.deleteNoteCallable().futureCall(request);
-   *   // Do something
-   *   future.get();
-   * }
-   * </code></pre>
-   */
-  public final UnaryCallable<DeleteNoteRequest, Empty> deleteNoteCallable() {
-    return stub.deleteNoteCallable();
-  }
-
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Gets the specified occurrence.
@@ -576,6 +394,100 @@ public final ListOccurrencesPagedResponse listOccurrences(ListOccurrencesRequest
     return stub.listOccurrencesCallable();
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified occurrence. For example, use this method to delete an occurrence when the
+   * occurrence is no longer applicable for the given resource.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (GrafeasClient grafeasClient = GrafeasClient.create()) {
+   *   OccurrenceName name = OccurrenceName.of("[PROJECT]", "[OCCURRENCE]");
+   *   grafeasClient.deleteOccurrence(name);
+   * }
+   * </code></pre>
+   *
+   * @param name The name of the occurrence in the form of
+   *     `projects/[PROJECT_ID]/occurrences/[OCCURRENCE_ID]`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteOccurrence(OccurrenceName name) {
+    DeleteOccurrenceRequest request =
+        DeleteOccurrenceRequest.newBuilder().setName(name == null ? null : name.toString()).build();
+    deleteOccurrence(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified occurrence. For example, use this method to delete an occurrence when the
+   * occurrence is no longer applicable for the given resource.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (GrafeasClient grafeasClient = GrafeasClient.create()) {
+   *   OccurrenceName name = OccurrenceName.of("[PROJECT]", "[OCCURRENCE]");
+   *   grafeasClient.deleteOccurrence(name.toString());
+   * }
+   * </code></pre>
+   *
+   * @param name The name of the occurrence in the form of
+   *     `projects/[PROJECT_ID]/occurrences/[OCCURRENCE_ID]`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteOccurrence(String name) {
+    DeleteOccurrenceRequest request = DeleteOccurrenceRequest.newBuilder().setName(name).build();
+    deleteOccurrence(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified occurrence. For example, use this method to delete an occurrence when the
+   * occurrence is no longer applicable for the given resource.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (GrafeasClient grafeasClient = GrafeasClient.create()) {
+   *   OccurrenceName name = OccurrenceName.of("[PROJECT]", "[OCCURRENCE]");
+   *   DeleteOccurrenceRequest request = DeleteOccurrenceRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   grafeasClient.deleteOccurrence(request);
+   * }
+   * </code></pre>
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteOccurrence(DeleteOccurrenceRequest request) {
+    deleteOccurrenceCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified occurrence. For example, use this method to delete an occurrence when the
+   * occurrence is no longer applicable for the given resource.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (GrafeasClient grafeasClient = GrafeasClient.create()) {
+   *   OccurrenceName name = OccurrenceName.of("[PROJECT]", "[OCCURRENCE]");
+   *   DeleteOccurrenceRequest request = DeleteOccurrenceRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ApiFuture&lt;Void&gt; future = grafeasClient.deleteOccurrenceCallable().futureCall(request);
+   *   // Do something
+   *   future.get();
+   * }
+   * </code></pre>
+   */
+  public final UnaryCallable<DeleteOccurrenceRequest, Empty> deleteOccurrenceCallable() {
+    return stub.deleteOccurrenceCallable();
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Creates a new occurrence.
@@ -1219,6 +1131,94 @@ public final UnaryCallable<ListNotesRequest, ListNotesResponse> listNotesCallabl
     return stub.listNotesCallable();
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified note.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (GrafeasClient grafeasClient = GrafeasClient.create()) {
+   *   NoteName name = NoteName.of("[PROJECT]", "[NOTE]");
+   *   grafeasClient.deleteNote(name);
+   * }
+   * </code></pre>
+   *
+   * @param name The name of the note in the form of `projects/[PROVIDER_ID]/notes/[NOTE_ID]`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteNote(NoteName name) {
+    DeleteNoteRequest request =
+        DeleteNoteRequest.newBuilder().setName(name == null ? null : name.toString()).build();
+    deleteNote(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified note.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (GrafeasClient grafeasClient = GrafeasClient.create()) {
+   *   NoteName name = NoteName.of("[PROJECT]", "[NOTE]");
+   *   grafeasClient.deleteNote(name.toString());
+   * }
+   * </code></pre>
+   *
+   * @param name The name of the note in the form of `projects/[PROVIDER_ID]/notes/[NOTE_ID]`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteNote(String name) {
+    DeleteNoteRequest request = DeleteNoteRequest.newBuilder().setName(name).build();
+    deleteNote(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified note.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (GrafeasClient grafeasClient = GrafeasClient.create()) {
+   *   NoteName name = NoteName.of("[PROJECT]", "[NOTE]");
+   *   DeleteNoteRequest request = DeleteNoteRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   grafeasClient.deleteNote(request);
+   * }
+   * </code></pre>
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteNote(DeleteNoteRequest request) {
+    deleteNoteCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified note.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (GrafeasClient grafeasClient = GrafeasClient.create()) {
+   *   NoteName name = NoteName.of("[PROJECT]", "[NOTE]");
+   *   DeleteNoteRequest request = DeleteNoteRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ApiFuture&lt;Void&gt; future = grafeasClient.deleteNoteCallable().futureCall(request);
+   *   // Do something
+   *   future.get();
+   * }
+   * </code></pre>
+   */
+  public final UnaryCallable<DeleteNoteRequest, Empty> deleteNoteCallable() {
+    return stub.deleteNoteCallable();
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Creates a new note.
diff --git a/src/main/java/io/grafeas/v1/GrafeasSettings.java b/src/main/java/io/grafeas/v1/GrafeasSettings.java
index 61f75348..410766d0 100644
--- a/src/main/java/io/grafeas/v1/GrafeasSettings.java
+++ b/src/main/java/io/grafeas/v1/GrafeasSettings.java
@@ -52,16 +52,16 @@
  * <p>The builder of this class is recursive, so contained classes are themselves builders. When
  * build() is called, the tree of builders is called to create the complete settings object.
  *
- * <p>For example, to set the total timeout of deleteOccurrence to 30 seconds:
+ * <p>For example, to set the total timeout of getOccurrence to 30 seconds:
  *
  * <pre>
  * <code>
  * GrafeasSettings.Builder grafeasSettingsBuilder =
  *     GrafeasSettings.newBuilder();
  * grafeasSettingsBuilder
- *     .deleteOccurrenceSettings()
+ *     .getOccurrenceSettings()
  *     .setRetrySettings(
- *         grafeasSettingsBuilder.deleteOccurrenceSettings().getRetrySettings().toBuilder()
+ *         grafeasSettingsBuilder.getOccurrenceSettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * GrafeasSettings grafeasSettings = grafeasSettingsBuilder.build();
@@ -71,16 +71,6 @@
 @Generated("by gapic-generator")
 @BetaApi
 public class GrafeasSettings extends ClientSettings<GrafeasSettings> {
-  /** Returns the object with the settings used for calls to deleteOccurrence. */
-  public UnaryCallSettings<DeleteOccurrenceRequest, Empty> deleteOccurrenceSettings() {
-    return ((GrafeasStubSettings) getStubSettings()).deleteOccurrenceSettings();
-  }
-
-  /** Returns the object with the settings used for calls to deleteNote. */
-  public UnaryCallSettings<DeleteNoteRequest, Empty> deleteNoteSettings() {
-    return ((GrafeasStubSettings) getStubSettings()).deleteNoteSettings();
-  }
-
   /** Returns the object with the settings used for calls to getOccurrence. */
   public UnaryCallSettings<GetOccurrenceRequest, Occurrence> getOccurrenceSettings() {
     return ((GrafeasStubSettings) getStubSettings()).getOccurrenceSettings();
@@ -93,6 +83,11 @@ public UnaryCallSettings<GetOccurrenceRequest, Occurrence> getOccurrenceSettings
     return ((GrafeasStubSettings) getStubSettings()).listOccurrencesSettings();
   }
 
+  /** Returns the object with the settings used for calls to deleteOccurrence. */
+  public UnaryCallSettings<DeleteOccurrenceRequest, Empty> deleteOccurrenceSettings() {
+    return ((GrafeasStubSettings) getStubSettings()).deleteOccurrenceSettings();
+  }
+
   /** Returns the object with the settings used for calls to createOccurrence. */
   public UnaryCallSettings<CreateOccurrenceRequest, Occurrence> createOccurrenceSettings() {
     return ((GrafeasStubSettings) getStubSettings()).createOccurrenceSettings();
@@ -125,6 +120,11 @@ public UnaryCallSettings<GetNoteRequest, Note> getNoteSettings() {
     return ((GrafeasStubSettings) getStubSettings()).listNotesSettings();
   }
 
+  /** Returns the object with the settings used for calls to deleteNote. */
+  public UnaryCallSettings<DeleteNoteRequest, Empty> deleteNoteSettings() {
+    return ((GrafeasStubSettings) getStubSettings()).deleteNoteSettings();
+  }
+
   /** Returns the object with the settings used for calls to createNote. */
   public UnaryCallSettings<CreateNoteRequest, Note> createNoteSettings() {
     return ((GrafeasStubSettings) getStubSettings()).createNoteSettings();
@@ -244,16 +244,6 @@ public Builder applyToAllUnaryMethods(
       return this;
     }
 
-    /** Returns the builder for the settings used for calls to deleteOccurrence. */
-    public UnaryCallSettings.Builder<DeleteOccurrenceRequest, Empty> deleteOccurrenceSettings() {
-      return getStubSettingsBuilder().deleteOccurrenceSettings();
-    }
-
-    /** Returns the builder for the settings used for calls to deleteNote. */
-    public UnaryCallSettings.Builder<DeleteNoteRequest, Empty> deleteNoteSettings() {
-      return getStubSettingsBuilder().deleteNoteSettings();
-    }
-
     /** Returns the builder for the settings used for calls to getOccurrence. */
     public UnaryCallSettings.Builder<GetOccurrenceRequest, Occurrence> getOccurrenceSettings() {
       return getStubSettingsBuilder().getOccurrenceSettings();
@@ -266,6 +256,11 @@ public UnaryCallSettings.Builder<GetOccurrenceRequest, Occurrence> getOccurrence
       return getStubSettingsBuilder().listOccurrencesSettings();
     }
 
+    /** Returns the builder for the settings used for calls to deleteOccurrence. */
+    public UnaryCallSettings.Builder<DeleteOccurrenceRequest, Empty> deleteOccurrenceSettings() {
+      return getStubSettingsBuilder().deleteOccurrenceSettings();
+    }
+
     /** Returns the builder for the settings used for calls to createOccurrence. */
     public UnaryCallSettings.Builder<CreateOccurrenceRequest, Occurrence>
         createOccurrenceSettings() {
@@ -300,6 +295,11 @@ public UnaryCallSettings.Builder<GetNoteRequest, Note> getNoteSettings() {
       return getStubSettingsBuilder().listNotesSettings();
     }
 
+    /** Returns the builder for the settings used for calls to deleteNote. */
+    public UnaryCallSettings.Builder<DeleteNoteRequest, Empty> deleteNoteSettings() {
+      return getStubSettingsBuilder().deleteNoteSettings();
+    }
+
     /** Returns the builder for the settings used for calls to createNote. */
     public UnaryCallSettings.Builder<CreateNoteRequest, Note> createNoteSettings() {
       return getStubSettingsBuilder().createNoteSettings();
diff --git a/src/main/java/io/grafeas/v1/package-info.java b/src/main/java/io/grafeas/v1/package-info.java
index bd0959bb..a90e0e57 100644
--- a/src/main/java/io/grafeas/v1/package-info.java
+++ b/src/main/java/io/grafeas/v1/package-info.java
@@ -40,7 +40,7 @@
  * <code>
  * try (GrafeasClient grafeasClient = GrafeasClient.create()) {
  *   OccurrenceName name = OccurrenceName.of("[PROJECT]", "[OCCURRENCE]");
- *   grafeasClient.deleteOccurrence(name);
+ *   Occurrence response = grafeasClient.getOccurrence(name);
  * }
  * </code>
  * </pre>
diff --git a/src/main/java/io/grafeas/v1/stub/GrafeasStub.java b/src/main/java/io/grafeas/v1/stub/GrafeasStub.java
index 2eaf5962..4ff93941 100644
--- a/src/main/java/io/grafeas/v1/stub/GrafeasStub.java
+++ b/src/main/java/io/grafeas/v1/stub/GrafeasStub.java
@@ -56,14 +56,6 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class GrafeasStub implements BackgroundResource {
 
-  public UnaryCallable<DeleteOccurrenceRequest, Empty> deleteOccurrenceCallable() {
-    throw new UnsupportedOperationException("Not implemented: deleteOccurrenceCallable()");
-  }
-
-  public UnaryCallable<DeleteNoteRequest, Empty> deleteNoteCallable() {
-    throw new UnsupportedOperationException("Not implemented: deleteNoteCallable()");
-  }
-
   public UnaryCallable<GetOccurrenceRequest, Occurrence> getOccurrenceCallable() {
     throw new UnsupportedOperationException("Not implemented: getOccurrenceCallable()");
   }
@@ -77,6 +69,10 @@ public UnaryCallable<ListOccurrencesRequest, ListOccurrencesResponse> listOccurr
     throw new UnsupportedOperationException("Not implemented: listOccurrencesCallable()");
   }
 
+  public UnaryCallable<DeleteOccurrenceRequest, Empty> deleteOccurrenceCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteOccurrenceCallable()");
+  }
+
   public UnaryCallable<CreateOccurrenceRequest, Occurrence> createOccurrenceCallable() {
     throw new UnsupportedOperationException("Not implemented: createOccurrenceCallable()");
   }
@@ -106,6 +102,10 @@ public UnaryCallable<ListNotesRequest, ListNotesResponse> listNotesCallable() {
     throw new UnsupportedOperationException("Not implemented: listNotesCallable()");
   }
 
+  public UnaryCallable<DeleteNoteRequest, Empty> deleteNoteCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteNoteCallable()");
+  }
+
   public UnaryCallable<CreateNoteRequest, Note> createNoteCallable() {
     throw new UnsupportedOperationException("Not implemented: createNoteCallable()");
   }
diff --git a/src/main/java/io/grafeas/v1/stub/GrafeasStubSettings.java b/src/main/java/io/grafeas/v1/stub/GrafeasStubSettings.java
index 8daf1b01..0f8e1279 100644
--- a/src/main/java/io/grafeas/v1/stub/GrafeasStubSettings.java
+++ b/src/main/java/io/grafeas/v1/stub/GrafeasStubSettings.java
@@ -86,16 +86,16 @@
  * <p>The builder of this class is recursive, so contained classes are themselves builders. When
  * build() is called, the tree of builders is called to create the complete settings object.
  *
- * <p>For example, to set the total timeout of deleteOccurrence to 30 seconds:
+ * <p>For example, to set the total timeout of getOccurrence to 30 seconds:
  *
  * <pre>
  * <code>
  * GrafeasStubSettings.Builder grafeasSettingsBuilder =
  *     GrafeasStubSettings.newBuilder();
  * grafeasSettingsBuilder
- *     .deleteOccurrenceSettings()
+ *     .getOccurrenceSettings()
  *     .setRetrySettings(
- *         grafeasSettingsBuilder.deleteOccurrenceSettings().getRetrySettings().toBuilder()
+ *         grafeasSettingsBuilder.getOccurrenceSettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * GrafeasStubSettings grafeasSettings = grafeasSettingsBuilder.build();
@@ -108,12 +108,11 @@ public class GrafeasStubSettings extends StubSettings<GrafeasStubSettings> {
   /** The default scopes of the service. */
   private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES = ImmutableList.of();
 
-  private final UnaryCallSettings<DeleteOccurrenceRequest, Empty> deleteOccurrenceSettings;
-  private final UnaryCallSettings<DeleteNoteRequest, Empty> deleteNoteSettings;
   private final UnaryCallSettings<GetOccurrenceRequest, Occurrence> getOccurrenceSettings;
   private final PagedCallSettings<
           ListOccurrencesRequest, ListOccurrencesResponse, ListOccurrencesPagedResponse>
       listOccurrencesSettings;
+  private final UnaryCallSettings<DeleteOccurrenceRequest, Empty> deleteOccurrenceSettings;
   private final UnaryCallSettings<CreateOccurrenceRequest, Occurrence> createOccurrenceSettings;
   private final UnaryCallSettings<BatchCreateOccurrencesRequest, BatchCreateOccurrencesResponse>
       batchCreateOccurrencesSettings;
@@ -122,6 +121,7 @@ public class GrafeasStubSettings extends StubSettings<GrafeasStubSettings> {
   private final UnaryCallSettings<GetNoteRequest, Note> getNoteSettings;
   private final PagedCallSettings<ListNotesRequest, ListNotesResponse, ListNotesPagedResponse>
       listNotesSettings;
+  private final UnaryCallSettings<DeleteNoteRequest, Empty> deleteNoteSettings;
   private final UnaryCallSettings<CreateNoteRequest, Note> createNoteSettings;
   private final UnaryCallSettings<BatchCreateNotesRequest, BatchCreateNotesResponse>
       batchCreateNotesSettings;
@@ -130,16 +130,6 @@ public class GrafeasStubSettings extends StubSettings<GrafeasStubSettings> {
           ListNoteOccurrencesRequest, ListNoteOccurrencesResponse, ListNoteOccurrencesPagedResponse>
       listNoteOccurrencesSettings;
 
-  /** Returns the object with the settings used for calls to deleteOccurrence. */
-  public UnaryCallSettings<DeleteOccurrenceRequest, Empty> deleteOccurrenceSettings() {
-    return deleteOccurrenceSettings;
-  }
-
-  /** Returns the object with the settings used for calls to deleteNote. */
-  public UnaryCallSettings<DeleteNoteRequest, Empty> deleteNoteSettings() {
-    return deleteNoteSettings;
-  }
-
   /** Returns the object with the settings used for calls to getOccurrence. */
   public UnaryCallSettings<GetOccurrenceRequest, Occurrence> getOccurrenceSettings() {
     return getOccurrenceSettings;
@@ -152,6 +142,11 @@ public UnaryCallSettings<GetOccurrenceRequest, Occurrence> getOccurrenceSettings
     return listOccurrencesSettings;
   }
 
+  /** Returns the object with the settings used for calls to deleteOccurrence. */
+  public UnaryCallSettings<DeleteOccurrenceRequest, Empty> deleteOccurrenceSettings() {
+    return deleteOccurrenceSettings;
+  }
+
   /** Returns the object with the settings used for calls to createOccurrence. */
   public UnaryCallSettings<CreateOccurrenceRequest, Occurrence> createOccurrenceSettings() {
     return createOccurrenceSettings;
@@ -184,6 +179,11 @@ public UnaryCallSettings<GetNoteRequest, Note> getNoteSettings() {
     return listNotesSettings;
   }
 
+  /** Returns the object with the settings used for calls to deleteNote. */
+  public UnaryCallSettings<DeleteNoteRequest, Empty> deleteNoteSettings() {
+    return deleteNoteSettings;
+  }
+
   /** Returns the object with the settings used for calls to createNote. */
   public UnaryCallSettings<CreateNoteRequest, Note> createNoteSettings() {
     return createNoteSettings;
@@ -275,16 +275,16 @@ public Builder toBuilder() {
   protected GrafeasStubSettings(Builder settingsBuilder) throws IOException {
     super(settingsBuilder);
 
-    deleteOccurrenceSettings = settingsBuilder.deleteOccurrenceSettings().build();
-    deleteNoteSettings = settingsBuilder.deleteNoteSettings().build();
     getOccurrenceSettings = settingsBuilder.getOccurrenceSettings().build();
     listOccurrencesSettings = settingsBuilder.listOccurrencesSettings().build();
+    deleteOccurrenceSettings = settingsBuilder.deleteOccurrenceSettings().build();
     createOccurrenceSettings = settingsBuilder.createOccurrenceSettings().build();
     batchCreateOccurrencesSettings = settingsBuilder.batchCreateOccurrencesSettings().build();
     updateOccurrenceSettings = settingsBuilder.updateOccurrenceSettings().build();
     getOccurrenceNoteSettings = settingsBuilder.getOccurrenceNoteSettings().build();
     getNoteSettings = settingsBuilder.getNoteSettings().build();
     listNotesSettings = settingsBuilder.listNotesSettings().build();
+    deleteNoteSettings = settingsBuilder.deleteNoteSettings().build();
     createNoteSettings = settingsBuilder.createNoteSettings().build();
     batchCreateNotesSettings = settingsBuilder.batchCreateNotesSettings().build();
     updateNoteSettings = settingsBuilder.updateNoteSettings().build();
@@ -465,13 +465,12 @@ public ApiFuture<ListNoteOccurrencesPagedResponse> getFuturePagedResponse(
   public static class Builder extends StubSettings.Builder<GrafeasStubSettings, Builder> {
     private final ImmutableList<UnaryCallSettings.Builder<?, ?>> unaryMethodSettingsBuilders;
 
-    private final UnaryCallSettings.Builder<DeleteOccurrenceRequest, Empty>
-        deleteOccurrenceSettings;
-    private final UnaryCallSettings.Builder<DeleteNoteRequest, Empty> deleteNoteSettings;
     private final UnaryCallSettings.Builder<GetOccurrenceRequest, Occurrence> getOccurrenceSettings;
     private final PagedCallSettings.Builder<
             ListOccurrencesRequest, ListOccurrencesResponse, ListOccurrencesPagedResponse>
         listOccurrencesSettings;
+    private final UnaryCallSettings.Builder<DeleteOccurrenceRequest, Empty>
+        deleteOccurrenceSettings;
     private final UnaryCallSettings.Builder<CreateOccurrenceRequest, Occurrence>
         createOccurrenceSettings;
     private final UnaryCallSettings.Builder<
@@ -485,6 +484,7 @@ public static class Builder extends StubSettings.Builder<GrafeasStubSettings, Bu
     private final PagedCallSettings.Builder<
             ListNotesRequest, ListNotesResponse, ListNotesPagedResponse>
         listNotesSettings;
+    private final UnaryCallSettings.Builder<DeleteNoteRequest, Empty> deleteNoteSettings;
     private final UnaryCallSettings.Builder<CreateNoteRequest, Note> createNoteSettings;
     private final UnaryCallSettings.Builder<BatchCreateNotesRequest, BatchCreateNotesResponse>
         batchCreateNotesSettings;
@@ -502,11 +502,13 @@ public static class Builder extends StubSettings.Builder<GrafeasStubSettings, Bu
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
+          "retry_policy_1_codes",
           ImmutableSet.copyOf(
               Lists.<StatusCode.Code>newArrayList(
-                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+                  StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED)));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -520,12 +522,22 @@ public static class Builder extends StubSettings.Builder<GrafeasStubSettings, Bu
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("retry_policy_1_params", settings);
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("no_retry_1_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -536,14 +548,12 @@ protected Builder() {
     protected Builder(ClientContext clientContext) {
       super(clientContext);
 
-      deleteOccurrenceSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
-      deleteNoteSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
       getOccurrenceSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       listOccurrencesSettings = PagedCallSettings.newBuilder(LIST_OCCURRENCES_PAGE_STR_FACT);
 
+      deleteOccurrenceSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
       createOccurrenceSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       batchCreateOccurrencesSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
@@ -556,6 +566,8 @@ protected Builder(ClientContext clientContext) {
 
       listNotesSettings = PagedCallSettings.newBuilder(LIST_NOTES_PAGE_STR_FACT);
 
+      deleteNoteSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
       createNoteSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       batchCreateNotesSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
@@ -567,16 +579,16 @@ protected Builder(ClientContext clientContext) {
 
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
-              deleteOccurrenceSettings,
-              deleteNoteSettings,
               getOccurrenceSettings,
               listOccurrencesSettings,
+              deleteOccurrenceSettings,
               createOccurrenceSettings,
               batchCreateOccurrencesSettings,
               updateOccurrenceSettings,
               getOccurrenceNoteSettings,
               getNoteSettings,
               listNotesSettings,
+              deleteNoteSettings,
               createNoteSettings,
               batchCreateNotesSettings,
               updateNoteSettings,
@@ -596,75 +608,75 @@ private static Builder createDefault() {
 
     private static Builder initDefaults(Builder builder) {
 
-      builder
-          .deleteOccurrenceSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      builder
-          .deleteNoteSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
       builder
           .getOccurrenceSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .listOccurrencesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
+
+      builder
+          .deleteOccurrenceSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .createOccurrenceSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .batchCreateOccurrencesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .updateOccurrenceSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .getOccurrenceNoteSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .getNoteSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .listNotesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
+
+      builder
+          .deleteNoteSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .createNoteSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .batchCreateNotesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .updateNoteSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .listNoteOccurrencesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       return builder;
     }
@@ -672,16 +684,16 @@ private static Builder initDefaults(Builder builder) {
     protected Builder(GrafeasStubSettings settings) {
       super(settings);
 
-      deleteOccurrenceSettings = settings.deleteOccurrenceSettings.toBuilder();
-      deleteNoteSettings = settings.deleteNoteSettings.toBuilder();
       getOccurrenceSettings = settings.getOccurrenceSettings.toBuilder();
       listOccurrencesSettings = settings.listOccurrencesSettings.toBuilder();
+      deleteOccurrenceSettings = settings.deleteOccurrenceSettings.toBuilder();
       createOccurrenceSettings = settings.createOccurrenceSettings.toBuilder();
       batchCreateOccurrencesSettings = settings.batchCreateOccurrencesSettings.toBuilder();
       updateOccurrenceSettings = settings.updateOccurrenceSettings.toBuilder();
       getOccurrenceNoteSettings = settings.getOccurrenceNoteSettings.toBuilder();
       getNoteSettings = settings.getNoteSettings.toBuilder();
       listNotesSettings = settings.listNotesSettings.toBuilder();
+      deleteNoteSettings = settings.deleteNoteSettings.toBuilder();
       createNoteSettings = settings.createNoteSettings.toBuilder();
       batchCreateNotesSettings = settings.batchCreateNotesSettings.toBuilder();
       updateNoteSettings = settings.updateNoteSettings.toBuilder();
@@ -689,16 +701,16 @@ protected Builder(GrafeasStubSettings settings) {
 
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
-              deleteOccurrenceSettings,
-              deleteNoteSettings,
               getOccurrenceSettings,
               listOccurrencesSettings,
+              deleteOccurrenceSettings,
               createOccurrenceSettings,
               batchCreateOccurrencesSettings,
               updateOccurrenceSettings,
               getOccurrenceNoteSettings,
               getNoteSettings,
               listNotesSettings,
+              deleteNoteSettings,
               createNoteSettings,
               batchCreateNotesSettings,
               updateNoteSettings,
@@ -721,16 +733,6 @@ public Builder applyToAllUnaryMethods(
       return unaryMethodSettingsBuilders;
     }
 
-    /** Returns the builder for the settings used for calls to deleteOccurrence. */
-    public UnaryCallSettings.Builder<DeleteOccurrenceRequest, Empty> deleteOccurrenceSettings() {
-      return deleteOccurrenceSettings;
-    }
-
-    /** Returns the builder for the settings used for calls to deleteNote. */
-    public UnaryCallSettings.Builder<DeleteNoteRequest, Empty> deleteNoteSettings() {
-      return deleteNoteSettings;
-    }
-
     /** Returns the builder for the settings used for calls to getOccurrence. */
     public UnaryCallSettings.Builder<GetOccurrenceRequest, Occurrence> getOccurrenceSettings() {
       return getOccurrenceSettings;
@@ -743,6 +745,11 @@ public UnaryCallSettings.Builder<GetOccurrenceRequest, Occurrence> getOccurrence
       return listOccurrencesSettings;
     }
 
+    /** Returns the builder for the settings used for calls to deleteOccurrence. */
+    public UnaryCallSettings.Builder<DeleteOccurrenceRequest, Empty> deleteOccurrenceSettings() {
+      return deleteOccurrenceSettings;
+    }
+
     /** Returns the builder for the settings used for calls to createOccurrence. */
     public UnaryCallSettings.Builder<CreateOccurrenceRequest, Occurrence>
         createOccurrenceSettings() {
@@ -777,6 +784,11 @@ public UnaryCallSettings.Builder<GetNoteRequest, Note> getNoteSettings() {
       return listNotesSettings;
     }
 
+    /** Returns the builder for the settings used for calls to deleteNote. */
+    public UnaryCallSettings.Builder<DeleteNoteRequest, Empty> deleteNoteSettings() {
+      return deleteNoteSettings;
+    }
+
     /** Returns the builder for the settings used for calls to createNote. */
     public UnaryCallSettings.Builder<CreateNoteRequest, Note> createNoteSettings() {
       return createNoteSettings;
diff --git a/src/main/java/io/grafeas/v1/stub/GrpcGrafeasStub.java b/src/main/java/io/grafeas/v1/stub/GrpcGrafeasStub.java
index 5400820b..39a16dae 100644
--- a/src/main/java/io/grafeas/v1/stub/GrpcGrafeasStub.java
+++ b/src/main/java/io/grafeas/v1/stub/GrpcGrafeasStub.java
@@ -67,22 +67,6 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public class GrpcGrafeasStub extends GrafeasStub {
 
-  private static final MethodDescriptor<DeleteOccurrenceRequest, Empty>
-      deleteOccurrenceMethodDescriptor =
-          MethodDescriptor.<DeleteOccurrenceRequest, Empty>newBuilder()
-              .setType(MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName("grafeas.v1.Grafeas/DeleteOccurrence")
-              .setRequestMarshaller(
-                  ProtoUtils.marshaller(DeleteOccurrenceRequest.getDefaultInstance()))
-              .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
-              .build();
-  private static final MethodDescriptor<DeleteNoteRequest, Empty> deleteNoteMethodDescriptor =
-      MethodDescriptor.<DeleteNoteRequest, Empty>newBuilder()
-          .setType(MethodDescriptor.MethodType.UNARY)
-          .setFullMethodName("grafeas.v1.Grafeas/DeleteNote")
-          .setRequestMarshaller(ProtoUtils.marshaller(DeleteNoteRequest.getDefaultInstance()))
-          .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
-          .build();
   private static final MethodDescriptor<GetOccurrenceRequest, Occurrence>
       getOccurrenceMethodDescriptor =
           MethodDescriptor.<GetOccurrenceRequest, Occurrence>newBuilder()
@@ -102,6 +86,15 @@ public class GrpcGrafeasStub extends GrafeasStub {
               .setResponseMarshaller(
                   ProtoUtils.marshaller(ListOccurrencesResponse.getDefaultInstance()))
               .build();
+  private static final MethodDescriptor<DeleteOccurrenceRequest, Empty>
+      deleteOccurrenceMethodDescriptor =
+          MethodDescriptor.<DeleteOccurrenceRequest, Empty>newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("grafeas.v1.Grafeas/DeleteOccurrence")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(DeleteOccurrenceRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
+              .build();
   private static final MethodDescriptor<CreateOccurrenceRequest, Occurrence>
       createOccurrenceMethodDescriptor =
           MethodDescriptor.<CreateOccurrenceRequest, Occurrence>newBuilder()
@@ -156,6 +149,13 @@ public class GrpcGrafeasStub extends GrafeasStub {
               .setRequestMarshaller(ProtoUtils.marshaller(ListNotesRequest.getDefaultInstance()))
               .setResponseMarshaller(ProtoUtils.marshaller(ListNotesResponse.getDefaultInstance()))
               .build();
+  private static final MethodDescriptor<DeleteNoteRequest, Empty> deleteNoteMethodDescriptor =
+      MethodDescriptor.<DeleteNoteRequest, Empty>newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("grafeas.v1.Grafeas/DeleteNote")
+          .setRequestMarshaller(ProtoUtils.marshaller(DeleteNoteRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
+          .build();
   private static final MethodDescriptor<CreateNoteRequest, Note> createNoteMethodDescriptor =
       MethodDescriptor.<CreateNoteRequest, Note>newBuilder()
           .setType(MethodDescriptor.MethodType.UNARY)
@@ -193,13 +193,12 @@ public class GrpcGrafeasStub extends GrafeasStub {
 
   private final BackgroundResource backgroundResources;
 
-  private final UnaryCallable<DeleteOccurrenceRequest, Empty> deleteOccurrenceCallable;
-  private final UnaryCallable<DeleteNoteRequest, Empty> deleteNoteCallable;
   private final UnaryCallable<GetOccurrenceRequest, Occurrence> getOccurrenceCallable;
   private final UnaryCallable<ListOccurrencesRequest, ListOccurrencesResponse>
       listOccurrencesCallable;
   private final UnaryCallable<ListOccurrencesRequest, ListOccurrencesPagedResponse>
       listOccurrencesPagedCallable;
+  private final UnaryCallable<DeleteOccurrenceRequest, Empty> deleteOccurrenceCallable;
   private final UnaryCallable<CreateOccurrenceRequest, Occurrence> createOccurrenceCallable;
   private final UnaryCallable<BatchCreateOccurrencesRequest, BatchCreateOccurrencesResponse>
       batchCreateOccurrencesCallable;
@@ -208,6 +207,7 @@ public class GrpcGrafeasStub extends GrafeasStub {
   private final UnaryCallable<GetNoteRequest, Note> getNoteCallable;
   private final UnaryCallable<ListNotesRequest, ListNotesResponse> listNotesCallable;
   private final UnaryCallable<ListNotesRequest, ListNotesPagedResponse> listNotesPagedCallable;
+  private final UnaryCallable<DeleteNoteRequest, Empty> deleteNoteCallable;
   private final UnaryCallable<CreateNoteRequest, Note> createNoteCallable;
   private final UnaryCallable<BatchCreateNotesRequest, BatchCreateNotesResponse>
       batchCreateNotesCallable;
@@ -253,32 +253,6 @@ protected GrpcGrafeasStub(
       throws IOException {
     this.callableFactory = callableFactory;
 
-    GrpcCallSettings<DeleteOccurrenceRequest, Empty> deleteOccurrenceTransportSettings =
-        GrpcCallSettings.<DeleteOccurrenceRequest, Empty>newBuilder()
-            .setMethodDescriptor(deleteOccurrenceMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor<DeleteOccurrenceRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteOccurrenceRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
-                })
-            .build();
-    GrpcCallSettings<DeleteNoteRequest, Empty> deleteNoteTransportSettings =
-        GrpcCallSettings.<DeleteNoteRequest, Empty>newBuilder()
-            .setMethodDescriptor(deleteNoteMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor<DeleteNoteRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteNoteRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
-                })
-            .build();
     GrpcCallSettings<GetOccurrenceRequest, Occurrence> getOccurrenceTransportSettings =
         GrpcCallSettings.<GetOccurrenceRequest, Occurrence>newBuilder()
             .setMethodDescriptor(getOccurrenceMethodDescriptor)
@@ -306,6 +280,19 @@ public Map<String, String> extract(ListOccurrencesRequest request) {
                       }
                     })
                 .build();
+    GrpcCallSettings<DeleteOccurrenceRequest, Empty> deleteOccurrenceTransportSettings =
+        GrpcCallSettings.<DeleteOccurrenceRequest, Empty>newBuilder()
+            .setMethodDescriptor(deleteOccurrenceMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor<DeleteOccurrenceRequest>() {
+                  @Override
+                  public Map<String, String> extract(DeleteOccurrenceRequest request) {
+                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                    params.put("name", String.valueOf(request.getName()));
+                    return params.build();
+                  }
+                })
+            .build();
     GrpcCallSettings<CreateOccurrenceRequest, Occurrence> createOccurrenceTransportSettings =
         GrpcCallSettings.<CreateOccurrenceRequest, Occurrence>newBuilder()
             .setMethodDescriptor(createOccurrenceMethodDescriptor)
@@ -386,6 +373,19 @@ public Map<String, String> extract(ListNotesRequest request) {
                   }
                 })
             .build();
+    GrpcCallSettings<DeleteNoteRequest, Empty> deleteNoteTransportSettings =
+        GrpcCallSettings.<DeleteNoteRequest, Empty>newBuilder()
+            .setMethodDescriptor(deleteNoteMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor<DeleteNoteRequest>() {
+                  @Override
+                  public Map<String, String> extract(DeleteNoteRequest request) {
+                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                    params.put("name", String.valueOf(request.getName()));
+                    return params.build();
+                  }
+                })
+            .build();
     GrpcCallSettings<CreateNoteRequest, Note> createNoteTransportSettings =
         GrpcCallSettings.<CreateNoteRequest, Note>newBuilder()
             .setMethodDescriptor(createNoteMethodDescriptor)
@@ -441,12 +441,6 @@ public Map<String, String> extract(ListNoteOccurrencesRequest request) {
                     })
                 .build();
 
-    this.deleteOccurrenceCallable =
-        callableFactory.createUnaryCallable(
-            deleteOccurrenceTransportSettings, settings.deleteOccurrenceSettings(), clientContext);
-    this.deleteNoteCallable =
-        callableFactory.createUnaryCallable(
-            deleteNoteTransportSettings, settings.deleteNoteSettings(), clientContext);
     this.getOccurrenceCallable =
         callableFactory.createUnaryCallable(
             getOccurrenceTransportSettings, settings.getOccurrenceSettings(), clientContext);
@@ -456,6 +450,9 @@ public Map<String, String> extract(ListNoteOccurrencesRequest request) {
     this.listOccurrencesPagedCallable =
         callableFactory.createPagedCallable(
             listOccurrencesTransportSettings, settings.listOccurrencesSettings(), clientContext);
+    this.deleteOccurrenceCallable =
+        callableFactory.createUnaryCallable(
+            deleteOccurrenceTransportSettings, settings.deleteOccurrenceSettings(), clientContext);
     this.createOccurrenceCallable =
         callableFactory.createUnaryCallable(
             createOccurrenceTransportSettings, settings.createOccurrenceSettings(), clientContext);
@@ -481,6 +478,9 @@ public Map<String, String> extract(ListNoteOccurrencesRequest request) {
     this.listNotesPagedCallable =
         callableFactory.createPagedCallable(
             listNotesTransportSettings, settings.listNotesSettings(), clientContext);
+    this.deleteNoteCallable =
+        callableFactory.createUnaryCallable(
+            deleteNoteTransportSettings, settings.deleteNoteSettings(), clientContext);
     this.createNoteCallable =
         callableFactory.createUnaryCallable(
             createNoteTransportSettings, settings.createNoteSettings(), clientContext);
@@ -504,14 +504,6 @@ public Map<String, String> extract(ListNoteOccurrencesRequest request) {
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
-  public UnaryCallable<DeleteOccurrenceRequest, Empty> deleteOccurrenceCallable() {
-    return deleteOccurrenceCallable;
-  }
-
-  public UnaryCallable<DeleteNoteRequest, Empty> deleteNoteCallable() {
-    return deleteNoteCallable;
-  }
-
   public UnaryCallable<GetOccurrenceRequest, Occurrence> getOccurrenceCallable() {
     return getOccurrenceCallable;
   }
@@ -525,6 +517,10 @@ public UnaryCallable<ListOccurrencesRequest, ListOccurrencesResponse> listOccurr
     return listOccurrencesCallable;
   }
 
+  public UnaryCallable<DeleteOccurrenceRequest, Empty> deleteOccurrenceCallable() {
+    return deleteOccurrenceCallable;
+  }
+
   public UnaryCallable<CreateOccurrenceRequest, Occurrence> createOccurrenceCallable() {
     return createOccurrenceCallable;
   }
@@ -554,6 +550,10 @@ public UnaryCallable<ListNotesRequest, ListNotesResponse> listNotesCallable() {
     return listNotesCallable;
   }
 
+  public UnaryCallable<DeleteNoteRequest, Empty> deleteNoteCallable() {
+    return deleteNoteCallable;
+  }
+
   public UnaryCallable<CreateNoteRequest, Note> createNoteCallable() {
     return createNoteCallable;
   }
diff --git a/src/test/java/io/grafeas/v1/GrafeasClientTest.java b/src/test/java/io/grafeas/v1/GrafeasClientTest.java
index 55e46d0b..58fc35b4 100644
--- a/src/test/java/io/grafeas/v1/GrafeasClientTest.java
+++ b/src/test/java/io/grafeas/v1/GrafeasClientTest.java
@@ -84,80 +84,6 @@ public void tearDown() throws Exception {
     client.close();
   }
 
-  @Test
-  @SuppressWarnings("all")
-  public void deleteOccurrenceTest() {
-    Empty expectedResponse = Empty.newBuilder().build();
-    mockGrafeas.addResponse(expectedResponse);
-
-    OccurrenceName name = OccurrenceName.of("[PROJECT]", "[OCCURRENCE]");
-
-    client.deleteOccurrence(name);
-
-    List<AbstractMessage> actualRequests = mockGrafeas.getRequests();
-    Assert.assertEquals(1, actualRequests.size());
-    DeleteOccurrenceRequest actualRequest = (DeleteOccurrenceRequest) actualRequests.get(0);
-
-    Assert.assertEquals(name, OccurrenceName.parse(actualRequest.getName()));
-    Assert.assertTrue(
-        channelProvider.isHeaderSent(
-            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
-            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void deleteOccurrenceExceptionTest() throws Exception {
-    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
-    mockGrafeas.addException(exception);
-
-    try {
-      OccurrenceName name = OccurrenceName.of("[PROJECT]", "[OCCURRENCE]");
-
-      client.deleteOccurrence(name);
-      Assert.fail("No exception raised");
-    } catch (InvalidArgumentException e) {
-      // Expected exception
-    }
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void deleteNoteTest() {
-    Empty expectedResponse = Empty.newBuilder().build();
-    mockGrafeas.addResponse(expectedResponse);
-
-    NoteName name = NoteName.of("[PROJECT]", "[NOTE]");
-
-    client.deleteNote(name);
-
-    List<AbstractMessage> actualRequests = mockGrafeas.getRequests();
-    Assert.assertEquals(1, actualRequests.size());
-    DeleteNoteRequest actualRequest = (DeleteNoteRequest) actualRequests.get(0);
-
-    Assert.assertEquals(name, NoteName.parse(actualRequest.getName()));
-    Assert.assertTrue(
-        channelProvider.isHeaderSent(
-            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
-            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void deleteNoteExceptionTest() throws Exception {
-    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
-    mockGrafeas.addException(exception);
-
-    try {
-      NoteName name = NoteName.of("[PROJECT]", "[NOTE]");
-
-      client.deleteNote(name);
-      Assert.fail("No exception raised");
-    } catch (InvalidArgumentException e) {
-      // Expected exception
-    }
-  }
-
   @Test
   @SuppressWarnings("all")
   public void getOccurrenceTest() {
@@ -257,6 +183,43 @@ public void listOccurrencesExceptionTest() throws Exception {
     }
   }
 
+  @Test
+  @SuppressWarnings("all")
+  public void deleteOccurrenceTest() {
+    Empty expectedResponse = Empty.newBuilder().build();
+    mockGrafeas.addResponse(expectedResponse);
+
+    OccurrenceName name = OccurrenceName.of("[PROJECT]", "[OCCURRENCE]");
+
+    client.deleteOccurrence(name);
+
+    List<AbstractMessage> actualRequests = mockGrafeas.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteOccurrenceRequest actualRequest = (DeleteOccurrenceRequest) actualRequests.get(0);
+
+    Assert.assertEquals(name, OccurrenceName.parse(actualRequest.getName()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteOccurrenceExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockGrafeas.addException(exception);
+
+    try {
+      OccurrenceName name = OccurrenceName.of("[PROJECT]", "[OCCURRENCE]");
+
+      client.deleteOccurrence(name);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
   @Test
   @SuppressWarnings("all")
   public void createOccurrenceTest() {
@@ -546,6 +509,43 @@ public void listNotesExceptionTest() throws Exception {
     }
   }
 
+  @Test
+  @SuppressWarnings("all")
+  public void deleteNoteTest() {
+    Empty expectedResponse = Empty.newBuilder().build();
+    mockGrafeas.addResponse(expectedResponse);
+
+    NoteName name = NoteName.of("[PROJECT]", "[NOTE]");
+
+    client.deleteNote(name);
+
+    List<AbstractMessage> actualRequests = mockGrafeas.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteNoteRequest actualRequest = (DeleteNoteRequest) actualRequests.get(0);
+
+    Assert.assertEquals(name, NoteName.parse(actualRequest.getName()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteNoteExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockGrafeas.addException(exception);
+
+    try {
+      NoteName name = NoteName.of("[PROJECT]", "[NOTE]");
+
+      client.deleteNote(name);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
   @Test
   @SuppressWarnings("all")
   public void createNoteTest() {
diff --git a/synth.metadata b/synth.metadata
index beefab52..946a7ffa 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,15 +4,15 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-grafeas.git",
-        "sha": "ba40fe021fe8b613d9e462b1c2767762327f62a1"
+        "sha": "9ef32fed9d8ddf1d7e4ce2b5f025c2fecff41c87"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "c4e37010d74071851ff24121f522e802231ac86e",
-        "internalRef": "313460921"
+        "sha": "79a17b8c64efa7bafff0a16b467754c73d570b6e",
+        "internalRef": "317385359"
       }
     },
     {