diff --git a/google/firestore/admin/v1/firestore_gapic.yaml b/google/firestore/admin/v1/firestore_gapic.yaml
index 90f2189c..1ae2e5f1 100644
--- a/google/firestore/admin/v1/firestore_gapic.yaml
+++ b/google/firestore/admin/v1/firestore_gapic.yaml
@@ -9,11 +9,11 @@ language_settings:
     package_name: cloud.google.com/go/firestore/apiv1
     domain_layer_location: cloud.google.com/go/firestore
   csharp:
-    package_name: Google.Cloud.Firestore.V1
+    package_name: Google.Cloud.Firestore.Admin.V1
   ruby:
     package_name: Google::Cloud::Firestore::V1
   php:
-    package_name: Google\Cloud\Firestore\V1
+    package_name: Google\Cloud\Firestore\Admin\V1
   nodejs:
     package_name: firestore.v1
     domain_layer_location: google-cloud
@@ -173,6 +173,9 @@ interfaces:
     retry_params_name: default
     timeout_millis: 60000
 resource_name_generation:
+- message_name: CreateIndexRequest
+  field_entity_map:
+    parent: parent
 - message_name: GetIndexRequest
   field_entity_map:
     name: index
@@ -188,3 +191,9 @@ resource_name_generation:
 - message_name: GetFieldRequest
   field_entity_map:
     name: field
+- message_name: ListFieldsRequest
+  field_entity_map:
+    parent: parent
+- message_name: ListIndexesRequest
+  field_entity_map:
+    parent: parent