diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreClient.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreClient.java
index cb3a43c77..705c9d537 100644
--- a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreClient.java
+++ b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreClient.java
@@ -30,7 +30,6 @@
 import com.google.cloud.firestore.v1.stub.FirestoreStub;
 import com.google.cloud.firestore.v1.stub.FirestoreStubSettings;
 import com.google.common.util.concurrent.MoreExecutors;
-import com.google.firestore.v1.AnyPathName;
 import com.google.firestore.v1.BatchGetDocumentsRequest;
 import com.google.firestore.v1.BatchGetDocumentsResponse;
 import com.google.firestore.v1.BeginTransactionRequest;
@@ -194,9 +193,9 @@ public FirestoreStub getStub() {
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   AnyPathName name = AnyPathName.of("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+   *   String name = "";
    *   GetDocumentRequest request = GetDocumentRequest.newBuilder()
-   *     .setName(name.toString())
+   *     .setName(name)
    *     .build();
    *   Document response = firestoreClient.getDocument(request);
    * }
@@ -217,9 +216,9 @@ public final Document getDocument(GetDocumentRequest request) {
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   AnyPathName name = AnyPathName.of("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+   *   String name = "";
    *   GetDocumentRequest request = GetDocumentRequest.newBuilder()
-   *     .setName(name.toString())
+   *     .setName(name)
    *     .build();
    *   ApiFuture&lt;Document&gt; future = firestoreClient.getDocumentCallable().futureCall(request);
    *   // Do something
@@ -239,10 +238,10 @@ public final UnaryCallable<GetDocumentRequest, Document> getDocumentCallable() {
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   String formattedParent = AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+   *   String parent = "";
    *   String collectionId = "";
    *   ListDocumentsRequest request = ListDocumentsRequest.newBuilder()
-   *     .setParent(formattedParent)
+   *     .setParent(parent)
    *     .setCollectionId(collectionId)
    *     .build();
    *   for (Document element : firestoreClient.listDocuments(request).iterateAll()) {
@@ -266,10 +265,10 @@ public final ListDocumentsPagedResponse listDocuments(ListDocumentsRequest reque
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   String formattedParent = AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+   *   String parent = "";
    *   String collectionId = "";
    *   ListDocumentsRequest request = ListDocumentsRequest.newBuilder()
-   *     .setParent(formattedParent)
+   *     .setParent(parent)
    *     .setCollectionId(collectionId)
    *     .build();
    *   ApiFuture&lt;ListDocumentsPagedResponse&gt; future = firestoreClient.listDocumentsPagedCallable().futureCall(request);
@@ -293,10 +292,10 @@ public final ListDocumentsPagedResponse listDocuments(ListDocumentsRequest reque
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   String formattedParent = AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+   *   String parent = "";
    *   String collectionId = "";
    *   ListDocumentsRequest request = ListDocumentsRequest.newBuilder()
-   *     .setParent(formattedParent)
+   *     .setParent(parent)
    *     .setCollectionId(collectionId)
    *     .build();
    *   while (true) {
@@ -326,14 +325,12 @@ public final UnaryCallable<ListDocumentsRequest, ListDocumentsResponse> listDocu
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   String formattedParent = AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+   *   String parent = "";
    *   String collectionId = "";
-   *   String documentId = "";
    *   Document document = Document.newBuilder().build();
    *   CreateDocumentRequest request = CreateDocumentRequest.newBuilder()
-   *     .setParent(formattedParent)
+   *     .setParent(parent)
    *     .setCollectionId(collectionId)
-   *     .setDocumentId(documentId)
    *     .setDocument(document)
    *     .build();
    *   Document response = firestoreClient.createDocument(request);
@@ -355,14 +352,12 @@ public final Document createDocument(CreateDocumentRequest request) {
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   String formattedParent = AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+   *   String parent = "";
    *   String collectionId = "";
-   *   String documentId = "";
    *   Document document = Document.newBuilder().build();
    *   CreateDocumentRequest request = CreateDocumentRequest.newBuilder()
-   *     .setParent(formattedParent)
+   *     .setParent(parent)
    *     .setCollectionId(collectionId)
-   *     .setDocumentId(documentId)
    *     .setDocument(document)
    *     .build();
    *   ApiFuture&lt;Document&gt; future = firestoreClient.createDocumentCallable().futureCall(request);
@@ -413,10 +408,8 @@ public final Document updateDocument(Document document, DocumentMask updateMask)
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
    *   Document document = Document.newBuilder().build();
-   *   DocumentMask updateMask = DocumentMask.newBuilder().build();
    *   UpdateDocumentRequest request = UpdateDocumentRequest.newBuilder()
    *     .setDocument(document)
-   *     .setUpdateMask(updateMask)
    *     .build();
    *   Document response = firestoreClient.updateDocument(request);
    * }
@@ -438,10 +431,8 @@ public final Document updateDocument(UpdateDocumentRequest request) {
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
    *   Document document = Document.newBuilder().build();
-   *   DocumentMask updateMask = DocumentMask.newBuilder().build();
    *   UpdateDocumentRequest request = UpdateDocumentRequest.newBuilder()
    *     .setDocument(document)
-   *     .setUpdateMask(updateMask)
    *     .build();
    *   ApiFuture&lt;Document&gt; future = firestoreClient.updateDocumentCallable().futureCall(request);
    *   // Do something
@@ -461,7 +452,7 @@ public final UnaryCallable<UpdateDocumentRequest, Document> updateDocumentCallab
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   AnyPathName name = AnyPathName.of("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+   *   String name = "";
    *   firestoreClient.deleteDocument(name);
    * }
    * </code></pre>
@@ -470,29 +461,6 @@ public final UnaryCallable<UpdateDocumentRequest, Document> updateDocumentCallab
    *     `projects/{project_id}/databases/{database_id}/documents/{document_path}`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final void deleteDocument(AnyPathName name) {
-    DeleteDocumentRequest request =
-        DeleteDocumentRequest.newBuilder().setName(name == null ? null : name.toString()).build();
-    deleteDocument(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes a document.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   AnyPathName name = AnyPathName.of("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
-   *   firestoreClient.deleteDocument(name.toString());
-   * }
-   * </code></pre>
-   *
-   * @param name Required. The resource name of the Document to delete. In the format:
-   *     `projects/{project_id}/databases/{database_id}/documents/{document_path}`.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
   public final void deleteDocument(String name) {
     DeleteDocumentRequest request = DeleteDocumentRequest.newBuilder().setName(name).build();
     deleteDocument(request);
@@ -506,9 +474,9 @@ public final void deleteDocument(String name) {
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   AnyPathName name = AnyPathName.of("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+   *   String name = "";
    *   DeleteDocumentRequest request = DeleteDocumentRequest.newBuilder()
-   *     .setName(name.toString())
+   *     .setName(name)
    *     .build();
    *   firestoreClient.deleteDocument(request);
    * }
@@ -529,9 +497,9 @@ public final void deleteDocument(DeleteDocumentRequest request) {
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   AnyPathName name = AnyPathName.of("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+   *   String name = "";
    *   DeleteDocumentRequest request = DeleteDocumentRequest.newBuilder()
-   *     .setName(name.toString())
+   *     .setName(name)
    *     .build();
    *   ApiFuture&lt;Void&gt; future = firestoreClient.deleteDocumentCallable().futureCall(request);
    *   // Do something
@@ -554,11 +522,9 @@ public final UnaryCallable<DeleteDocumentRequest, Empty> deleteDocumentCallable(
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
-   *   List&lt;String&gt; documents = new ArrayList&lt;&gt;();
+   *   String database = "";
    *   BatchGetDocumentsRequest request = BatchGetDocumentsRequest.newBuilder()
-   *     .setDatabase(formattedDatabase)
-   *     .addAllDocuments(documents)
+   *     .setDatabase(database)
    *     .build();
    *
    *   ServerStream&lt;BatchGetDocumentsResponse&gt; stream = firestoreClient.batchGetDocumentsCallable().call(request);
@@ -581,8 +547,8 @@ public final UnaryCallable<DeleteDocumentRequest, Empty> deleteDocumentCallable(
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
-   *   BeginTransactionResponse response = firestoreClient.beginTransaction(formattedDatabase);
+   *   String database = "";
+   *   BeginTransactionResponse response = firestoreClient.beginTransaction(database);
    * }
    * </code></pre>
    *
@@ -604,9 +570,9 @@ public final BeginTransactionResponse beginTransaction(String database) {
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
+   *   String database = "";
    *   BeginTransactionRequest request = BeginTransactionRequest.newBuilder()
-   *     .setDatabase(formattedDatabase)
+   *     .setDatabase(database)
    *     .build();
    *   BeginTransactionResponse response = firestoreClient.beginTransaction(request);
    * }
@@ -627,9 +593,9 @@ public final BeginTransactionResponse beginTransaction(BeginTransactionRequest r
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
+   *   String database = "";
    *   BeginTransactionRequest request = BeginTransactionRequest.newBuilder()
-   *     .setDatabase(formattedDatabase)
+   *     .setDatabase(database)
    *     .build();
    *   ApiFuture&lt;BeginTransactionResponse&gt; future = firestoreClient.beginTransactionCallable().futureCall(request);
    *   // Do something
@@ -650,9 +616,9 @@ public final BeginTransactionResponse beginTransaction(BeginTransactionRequest r
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
+   *   String database = "";
    *   List&lt;Write&gt; writes = new ArrayList&lt;&gt;();
-   *   CommitResponse response = firestoreClient.commit(formattedDatabase, writes);
+   *   CommitResponse response = firestoreClient.commit(database, writes);
    * }
    * </code></pre>
    *
@@ -676,11 +642,9 @@ public final CommitResponse commit(String database, List<Write> writes) {
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
-   *   List&lt;Write&gt; writes = new ArrayList&lt;&gt;();
+   *   String database = "";
    *   CommitRequest request = CommitRequest.newBuilder()
-   *     .setDatabase(formattedDatabase)
-   *     .addAllWrites(writes)
+   *     .setDatabase(database)
    *     .build();
    *   CommitResponse response = firestoreClient.commit(request);
    * }
@@ -701,11 +665,9 @@ public final CommitResponse commit(CommitRequest request) {
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
-   *   List&lt;Write&gt; writes = new ArrayList&lt;&gt;();
+   *   String database = "";
    *   CommitRequest request = CommitRequest.newBuilder()
-   *     .setDatabase(formattedDatabase)
-   *     .addAllWrites(writes)
+   *     .setDatabase(database)
    *     .build();
    *   ApiFuture&lt;CommitResponse&gt; future = firestoreClient.commitCallable().futureCall(request);
    *   // Do something
@@ -725,9 +687,9 @@ public final UnaryCallable<CommitRequest, CommitResponse> commitCallable() {
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
+   *   String database = "";
    *   ByteString transaction = ByteString.copyFromUtf8("");
-   *   firestoreClient.rollback(formattedDatabase, transaction);
+   *   firestoreClient.rollback(database, transaction);
    * }
    * </code></pre>
    *
@@ -750,10 +712,10 @@ public final void rollback(String database, ByteString transaction) {
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
+   *   String database = "";
    *   ByteString transaction = ByteString.copyFromUtf8("");
    *   RollbackRequest request = RollbackRequest.newBuilder()
-   *     .setDatabase(formattedDatabase)
+   *     .setDatabase(database)
    *     .setTransaction(transaction)
    *     .build();
    *   firestoreClient.rollback(request);
@@ -775,10 +737,10 @@ public final void rollback(RollbackRequest request) {
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
+   *   String database = "";
    *   ByteString transaction = ByteString.copyFromUtf8("");
    *   RollbackRequest request = RollbackRequest.newBuilder()
-   *     .setDatabase(formattedDatabase)
+   *     .setDatabase(database)
    *     .setTransaction(transaction)
    *     .build();
    *   ApiFuture&lt;Void&gt; future = firestoreClient.rollbackCallable().futureCall(request);
@@ -799,9 +761,9 @@ public final UnaryCallable<RollbackRequest, Empty> rollbackCallable() {
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   String formattedParent = AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+   *   String parent = "";
    *   RunQueryRequest request = RunQueryRequest.newBuilder()
-   *     .setParent(formattedParent)
+   *     .setParent(parent)
    *     .build();
    *
    *   ServerStream&lt;RunQueryResponse&gt; stream = firestoreClient.runQueryCallable().call(request);
@@ -826,9 +788,9 @@ public final ServerStreamingCallable<RunQueryRequest, RunQueryResponse> runQuery
    *   BidiStream&lt;WriteRequest, WriteResponse&gt; bidiStream =
    *       firestoreClient.writeCallable().call();
    *
-   *   String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
+   *   String database = "";
    *   WriteRequest request = WriteRequest.newBuilder()
-   *     .setDatabase(formattedDatabase)
+   *     .setDatabase(database)
    *     .build();
    *   bidiStream.send(request);
    *   for (WriteResponse response : bidiStream) {
@@ -852,9 +814,9 @@ public final BidiStreamingCallable<WriteRequest, WriteResponse> writeCallable()
    *   BidiStream&lt;ListenRequest, ListenResponse&gt; bidiStream =
    *       firestoreClient.listenCallable().call();
    *
-   *   String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
+   *   String database = "";
    *   ListenRequest request = ListenRequest.newBuilder()
-   *     .setDatabase(formattedDatabase)
+   *     .setDatabase(database)
    *     .build();
    *   bidiStream.send(request);
    *   for (ListenResponse response : bidiStream) {
@@ -875,8 +837,8 @@ public final BidiStreamingCallable<ListenRequest, ListenResponse> listenCallable
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   String formattedParent = AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
-   *   for (String element : firestoreClient.listCollectionIds(formattedParent).iterateAll()) {
+   *   String parent = "";
+   *   for (String element : firestoreClient.listCollectionIds(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -901,9 +863,9 @@ public final ListCollectionIdsPagedResponse listCollectionIds(String parent) {
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   String formattedParent = AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+   *   String parent = "";
    *   ListCollectionIdsRequest request = ListCollectionIdsRequest.newBuilder()
-   *     .setParent(formattedParent)
+   *     .setParent(parent)
    *     .build();
    *   for (String element : firestoreClient.listCollectionIds(request).iterateAll()) {
    *     // doThingsWith(element);
@@ -926,9 +888,9 @@ public final ListCollectionIdsPagedResponse listCollectionIds(ListCollectionIdsR
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   String formattedParent = AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+   *   String parent = "";
    *   ListCollectionIdsRequest request = ListCollectionIdsRequest.newBuilder()
-   *     .setParent(formattedParent)
+   *     .setParent(parent)
    *     .build();
    *   ApiFuture&lt;ListCollectionIdsPagedResponse&gt; future = firestoreClient.listCollectionIdsPagedCallable().futureCall(request);
    *   // Do something
@@ -951,9 +913,9 @@ public final ListCollectionIdsPagedResponse listCollectionIds(ListCollectionIdsR
    *
    * <pre><code>
    * try (FirestoreClient firestoreClient = FirestoreClient.create()) {
-   *   String formattedParent = AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+   *   String parent = "";
    *   ListCollectionIdsRequest request = ListCollectionIdsRequest.newBuilder()
-   *     .setParent(formattedParent)
+   *     .setParent(parent)
    *     .build();
    *   while (true) {
    *     ListCollectionIdsResponse response = firestoreClient.listCollectionIdsCallable().call(request);
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreStubSettings.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreStubSettings.java
index 6272c4e94..22f861ec8 100644
--- a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreStubSettings.java
+++ b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreStubSettings.java
@@ -434,9 +434,7 @@ public static class Builder extends StubSettings.Builder<FirestoreStubSettings,
           "idempotent",
           ImmutableSet.copyOf(
               Lists.<StatusCode.Code>newArrayList(
-                  StatusCode.Code.DEADLINE_EXCEEDED,
-                  StatusCode.Code.INTERNAL,
-                  StatusCode.Code.UNAVAILABLE)));
+                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
       definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
@@ -582,7 +580,7 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .listCollectionIdsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       return builder;
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/FirestoreClientTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/FirestoreClientTest.java
index 2b884be29..8600dd0ae 100644
--- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/FirestoreClientTest.java
+++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/FirestoreClientTest.java
@@ -31,7 +31,6 @@
 import com.google.api.gax.rpc.ServerStreamingCallable;
 import com.google.api.gax.rpc.StatusCode;
 import com.google.common.collect.Lists;
-import com.google.firestore.v1.AnyPathName;
 import com.google.firestore.v1.BatchGetDocumentsRequest;
 import com.google.firestore.v1.BatchGetDocumentsResponse;
 import com.google.firestore.v1.BeginTransactionRequest;
@@ -39,7 +38,6 @@
 import com.google.firestore.v1.CommitRequest;
 import com.google.firestore.v1.CommitResponse;
 import com.google.firestore.v1.CreateDocumentRequest;
-import com.google.firestore.v1.DatabaseRootName;
 import com.google.firestore.v1.DeleteDocumentRequest;
 import com.google.firestore.v1.Document;
 import com.google.firestore.v1.DocumentMask;
@@ -120,8 +118,8 @@ public void getDocumentTest() {
     Document expectedResponse = Document.newBuilder().setName(name2).build();
     mockFirestore.addResponse(expectedResponse);
 
-    AnyPathName name = AnyPathName.of("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
-    GetDocumentRequest request = GetDocumentRequest.newBuilder().setName(name.toString()).build();
+    String name = "name3373707";
+    GetDocumentRequest request = GetDocumentRequest.newBuilder().setName(name).build();
 
     Document actualResponse = client.getDocument(request);
     Assert.assertEquals(expectedResponse, actualResponse);
@@ -130,7 +128,7 @@ public void getDocumentTest() {
     Assert.assertEquals(1, actualRequests.size());
     GetDocumentRequest actualRequest = (GetDocumentRequest) actualRequests.get(0);
 
-    Assert.assertEquals(name, AnyPathName.parse(actualRequest.getName()));
+    Assert.assertEquals(name, actualRequest.getName());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -144,8 +142,8 @@ public void getDocumentExceptionTest() throws Exception {
     mockFirestore.addException(exception);
 
     try {
-      AnyPathName name = AnyPathName.of("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
-      GetDocumentRequest request = GetDocumentRequest.newBuilder().setName(name.toString()).build();
+      String name = "name3373707";
+      GetDocumentRequest request = GetDocumentRequest.newBuilder().setName(name).build();
 
       client.getDocument(request);
       Assert.fail("No exception raised");
@@ -167,14 +165,10 @@ public void listDocumentsTest() {
             .build();
     mockFirestore.addResponse(expectedResponse);
 
-    String formattedParent =
-        AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+    String parent = "parent-995424086";
     String collectionId = "collectionId-821242276";
     ListDocumentsRequest request =
-        ListDocumentsRequest.newBuilder()
-            .setParent(formattedParent)
-            .setCollectionId(collectionId)
-            .build();
+        ListDocumentsRequest.newBuilder().setParent(parent).setCollectionId(collectionId).build();
 
     ListDocumentsPagedResponse pagedListResponse = client.listDocuments(request);
 
@@ -186,7 +180,7 @@ public void listDocumentsTest() {
     Assert.assertEquals(1, actualRequests.size());
     ListDocumentsRequest actualRequest = (ListDocumentsRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedParent, actualRequest.getParent());
+    Assert.assertEquals(parent, actualRequest.getParent());
     Assert.assertEquals(collectionId, actualRequest.getCollectionId());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
@@ -201,14 +195,10 @@ public void listDocumentsExceptionTest() throws Exception {
     mockFirestore.addException(exception);
 
     try {
-      String formattedParent =
-          AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+      String parent = "parent-995424086";
       String collectionId = "collectionId-821242276";
       ListDocumentsRequest request =
-          ListDocumentsRequest.newBuilder()
-              .setParent(formattedParent)
-              .setCollectionId(collectionId)
-              .build();
+          ListDocumentsRequest.newBuilder().setParent(parent).setCollectionId(collectionId).build();
 
       client.listDocuments(request);
       Assert.fail("No exception raised");
@@ -224,16 +214,13 @@ public void createDocumentTest() {
     Document expectedResponse = Document.newBuilder().setName(name).build();
     mockFirestore.addResponse(expectedResponse);
 
-    String formattedParent =
-        AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+    String parent = "parent-995424086";
     String collectionId = "collectionId-821242276";
-    String documentId = "documentId506676927";
     Document document = Document.newBuilder().build();
     CreateDocumentRequest request =
         CreateDocumentRequest.newBuilder()
-            .setParent(formattedParent)
+            .setParent(parent)
             .setCollectionId(collectionId)
-            .setDocumentId(documentId)
             .setDocument(document)
             .build();
 
@@ -244,9 +231,8 @@ public void createDocumentTest() {
     Assert.assertEquals(1, actualRequests.size());
     CreateDocumentRequest actualRequest = (CreateDocumentRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedParent, actualRequest.getParent());
+    Assert.assertEquals(parent, actualRequest.getParent());
     Assert.assertEquals(collectionId, actualRequest.getCollectionId());
-    Assert.assertEquals(documentId, actualRequest.getDocumentId());
     Assert.assertEquals(document, actualRequest.getDocument());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
@@ -261,16 +247,13 @@ public void createDocumentExceptionTest() throws Exception {
     mockFirestore.addException(exception);
 
     try {
-      String formattedParent =
-          AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+      String parent = "parent-995424086";
       String collectionId = "collectionId-821242276";
-      String documentId = "documentId506676927";
       Document document = Document.newBuilder().build();
       CreateDocumentRequest request =
           CreateDocumentRequest.newBuilder()
-              .setParent(formattedParent)
+              .setParent(parent)
               .setCollectionId(collectionId)
-              .setDocumentId(documentId)
               .setDocument(document)
               .build();
 
@@ -329,7 +312,7 @@ public void deleteDocumentTest() {
     Empty expectedResponse = Empty.newBuilder().build();
     mockFirestore.addResponse(expectedResponse);
 
-    AnyPathName name = AnyPathName.of("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+    String name = "name3373707";
 
     client.deleteDocument(name);
 
@@ -337,7 +320,7 @@ public void deleteDocumentTest() {
     Assert.assertEquals(1, actualRequests.size());
     DeleteDocumentRequest actualRequest = (DeleteDocumentRequest) actualRequests.get(0);
 
-    Assert.assertEquals(name, AnyPathName.parse(actualRequest.getName()));
+    Assert.assertEquals(name, actualRequest.getName());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -351,7 +334,7 @@ public void deleteDocumentExceptionTest() throws Exception {
     mockFirestore.addException(exception);
 
     try {
-      AnyPathName name = AnyPathName.of("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+      String name = "name3373707";
 
       client.deleteDocument(name);
       Assert.fail("No exception raised");
@@ -371,13 +354,9 @@ public void batchGetDocumentsTest() throws Exception {
             .setTransaction(transaction)
             .build();
     mockFirestore.addResponse(expectedResponse);
-    String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
-    List<String> documents = new ArrayList<>();
+    String database = "database1789464955";
     BatchGetDocumentsRequest request =
-        BatchGetDocumentsRequest.newBuilder()
-            .setDatabase(formattedDatabase)
-            .addAllDocuments(documents)
-            .build();
+        BatchGetDocumentsRequest.newBuilder().setDatabase(database).build();
 
     MockStreamObserver<BatchGetDocumentsResponse> responseObserver = new MockStreamObserver<>();
 
@@ -395,13 +374,9 @@ public void batchGetDocumentsTest() throws Exception {
   public void batchGetDocumentsExceptionTest() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockFirestore.addException(exception);
-    String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
-    List<String> documents = new ArrayList<>();
+    String database = "database1789464955";
     BatchGetDocumentsRequest request =
-        BatchGetDocumentsRequest.newBuilder()
-            .setDatabase(formattedDatabase)
-            .addAllDocuments(documents)
-            .build();
+        BatchGetDocumentsRequest.newBuilder().setDatabase(database).build();
 
     MockStreamObserver<BatchGetDocumentsResponse> responseObserver = new MockStreamObserver<>();
 
@@ -427,16 +402,16 @@ public void beginTransactionTest() {
         BeginTransactionResponse.newBuilder().setTransaction(transaction).build();
     mockFirestore.addResponse(expectedResponse);
 
-    String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
+    String database = "database1789464955";
 
-    BeginTransactionResponse actualResponse = client.beginTransaction(formattedDatabase);
+    BeginTransactionResponse actualResponse = client.beginTransaction(database);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockFirestore.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     BeginTransactionRequest actualRequest = (BeginTransactionRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedDatabase, actualRequest.getDatabase());
+    Assert.assertEquals(database, actualRequest.getDatabase());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -450,9 +425,9 @@ public void beginTransactionExceptionTest() throws Exception {
     mockFirestore.addException(exception);
 
     try {
-      String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
+      String database = "database1789464955";
 
-      client.beginTransaction(formattedDatabase);
+      client.beginTransaction(database);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -465,17 +440,17 @@ public void commitTest() {
     CommitResponse expectedResponse = CommitResponse.newBuilder().build();
     mockFirestore.addResponse(expectedResponse);
 
-    String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
+    String database = "database1789464955";
     List<Write> writes = new ArrayList<>();
 
-    CommitResponse actualResponse = client.commit(formattedDatabase, writes);
+    CommitResponse actualResponse = client.commit(database, writes);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockFirestore.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     CommitRequest actualRequest = (CommitRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedDatabase, actualRequest.getDatabase());
+    Assert.assertEquals(database, actualRequest.getDatabase());
     Assert.assertEquals(writes, actualRequest.getWritesList());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
@@ -490,10 +465,10 @@ public void commitExceptionTest() throws Exception {
     mockFirestore.addException(exception);
 
     try {
-      String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
+      String database = "database1789464955";
       List<Write> writes = new ArrayList<>();
 
-      client.commit(formattedDatabase, writes);
+      client.commit(database, writes);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -506,16 +481,16 @@ public void rollbackTest() {
     Empty expectedResponse = Empty.newBuilder().build();
     mockFirestore.addResponse(expectedResponse);
 
-    String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
+    String database = "database1789464955";
     ByteString transaction = ByteString.copyFromUtf8("-34");
 
-    client.rollback(formattedDatabase, transaction);
+    client.rollback(database, transaction);
 
     List<AbstractMessage> actualRequests = mockFirestore.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     RollbackRequest actualRequest = (RollbackRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedDatabase, actualRequest.getDatabase());
+    Assert.assertEquals(database, actualRequest.getDatabase());
     Assert.assertEquals(transaction, actualRequest.getTransaction());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
@@ -530,10 +505,10 @@ public void rollbackExceptionTest() throws Exception {
     mockFirestore.addException(exception);
 
     try {
-      String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
+      String database = "database1789464955";
       ByteString transaction = ByteString.copyFromUtf8("-34");
 
-      client.rollback(formattedDatabase, transaction);
+      client.rollback(database, transaction);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -551,9 +526,8 @@ public void runQueryTest() throws Exception {
             .setSkippedResults(skippedResults)
             .build();
     mockFirestore.addResponse(expectedResponse);
-    String formattedParent =
-        AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
-    RunQueryRequest request = RunQueryRequest.newBuilder().setParent(formattedParent).build();
+    String parent = "parent-995424086";
+    RunQueryRequest request = RunQueryRequest.newBuilder().setParent(parent).build();
 
     MockStreamObserver<RunQueryResponse> responseObserver = new MockStreamObserver<>();
 
@@ -570,9 +544,8 @@ public void runQueryTest() throws Exception {
   public void runQueryExceptionTest() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockFirestore.addException(exception);
-    String formattedParent =
-        AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
-    RunQueryRequest request = RunQueryRequest.newBuilder().setParent(formattedParent).build();
+    String parent = "parent-995424086";
+    RunQueryRequest request = RunQueryRequest.newBuilder().setParent(parent).build();
 
     MockStreamObserver<RunQueryResponse> responseObserver = new MockStreamObserver<>();
 
@@ -597,8 +570,8 @@ public void writeTest() throws Exception {
     WriteResponse expectedResponse =
         WriteResponse.newBuilder().setStreamId(streamId).setStreamToken(streamToken).build();
     mockFirestore.addResponse(expectedResponse);
-    String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
-    WriteRequest request = WriteRequest.newBuilder().setDatabase(formattedDatabase).build();
+    String database = "database1789464955";
+    WriteRequest request = WriteRequest.newBuilder().setDatabase(database).build();
 
     MockStreamObserver<WriteResponse> responseObserver = new MockStreamObserver<>();
 
@@ -618,8 +591,8 @@ public void writeTest() throws Exception {
   public void writeExceptionTest() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockFirestore.addException(exception);
-    String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
-    WriteRequest request = WriteRequest.newBuilder().setDatabase(formattedDatabase).build();
+    String database = "database1789464955";
+    WriteRequest request = WriteRequest.newBuilder().setDatabase(database).build();
 
     MockStreamObserver<WriteResponse> responseObserver = new MockStreamObserver<>();
 
@@ -643,8 +616,8 @@ public void writeExceptionTest() throws Exception {
   public void listenTest() throws Exception {
     ListenResponse expectedResponse = ListenResponse.newBuilder().build();
     mockFirestore.addResponse(expectedResponse);
-    String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
-    ListenRequest request = ListenRequest.newBuilder().setDatabase(formattedDatabase).build();
+    String database = "database1789464955";
+    ListenRequest request = ListenRequest.newBuilder().setDatabase(database).build();
 
     MockStreamObserver<ListenResponse> responseObserver = new MockStreamObserver<>();
 
@@ -664,8 +637,8 @@ public void listenTest() throws Exception {
   public void listenExceptionTest() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockFirestore.addException(exception);
-    String formattedDatabase = DatabaseRootName.format("[PROJECT]", "[DATABASE]");
-    ListenRequest request = ListenRequest.newBuilder().setDatabase(formattedDatabase).build();
+    String database = "database1789464955";
+    ListenRequest request = ListenRequest.newBuilder().setDatabase(database).build();
 
     MockStreamObserver<ListenResponse> responseObserver = new MockStreamObserver<>();
 
@@ -697,10 +670,9 @@ public void listCollectionIdsTest() {
             .build();
     mockFirestore.addResponse(expectedResponse);
 
-    String formattedParent =
-        AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+    String parent = "parent-995424086";
 
-    ListCollectionIdsPagedResponse pagedListResponse = client.listCollectionIds(formattedParent);
+    ListCollectionIdsPagedResponse pagedListResponse = client.listCollectionIds(parent);
 
     List<String> resources = Lists.newArrayList(pagedListResponse.iterateAll());
     Assert.assertEquals(1, resources.size());
@@ -710,7 +682,7 @@ public void listCollectionIdsTest() {
     Assert.assertEquals(1, actualRequests.size());
     ListCollectionIdsRequest actualRequest = (ListCollectionIdsRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedParent, actualRequest.getParent());
+    Assert.assertEquals(parent, actualRequest.getParent());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -724,10 +696,9 @@ public void listCollectionIdsExceptionTest() throws Exception {
     mockFirestore.addException(exception);
 
     try {
-      String formattedParent =
-          AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]");
+      String parent = "parent-995424086";
 
-      client.listCollectionIds(formattedParent);
+      client.listCollectionIds(parent);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
diff --git a/synth.metadata b/synth.metadata
index 3d848d7e2..534f0f23a 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -11,8 +11,8 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "0d69cddaa23b556e7299f84ad55a02ec1cad55a9",
-        "internalRef": "305561114"
+        "sha": "d741cd976975c745d0199987aff0e908b8352992",
+        "internalRef": "305561906"
       }
     },
     {