diff --git a/google/devtools/containeranalysis/v1/containeranalysis_gapic.yaml b/google/devtools/containeranalysis/v1/containeranalysis_gapic.yaml
index 803bc5548..ebb7e283c 100644
--- a/google/devtools/containeranalysis/v1/containeranalysis_gapic.yaml
+++ b/google/devtools/containeranalysis/v1/containeranalysis_gapic.yaml
@@ -33,11 +33,17 @@ collections:
   entity_name: project
   language_overrides:
   - language: csharp
-    common_resource_name: Google.Api.Gax.ResourceNames.ProjectName
+    common_resource_name: Grafeas.V1.ProjectName
 - name_pattern: projects/{project}/notes/{note}
   entity_name: note
+  language_overrides:
+  - language: csharp
+    common_resource_name: Grafeas.V1.NoteName
 - name_pattern: projects/{project}/occurrences/{occurrence}
   entity_name: occurrence
+  language_overrides:
+  - language: csharp
+    common_resource_name: Grafeas.V1.OccurrenceName
 collection_oneofs:
 - oneof_name: iam_resource_oneof
   collection_names:
diff --git a/grafeas/v1/grafeas_gapic.yaml b/grafeas/v1/grafeas_gapic.yaml
index 2ad65620d..e62524137 100644
--- a/grafeas/v1/grafeas_gapic.yaml
+++ b/grafeas/v1/grafeas_gapic.yaml
@@ -3,17 +3,17 @@ config_schema_version: 1.0.0
 # The settings of generated code in a specific language.
 language_settings:
   java:
-    package_name: com.google.cloud.grafeas.v1
+    package_name: io.grafeas.v1
   python:
-    package_name: google.cloud.grafeas_v1.gapic
+    package_name: grafeas_v1.gapic
   go:
     package_name: cloud.google.com/go/grafeas/apiv1
   csharp:
-    package_name: Google.Cloud.Grafeas.V1
+    package_name: Grafeas.V1
   ruby:
-    package_name: Google::Cloud::Grafeas::V1
+    package_name: Grafeas::V1
   php:
-    package_name: Google\Cloud\Grafeas\V1
+    package_name: Grafeas\V1
   nodejs:
     package_name: grafeas.v1
     domain_layer_location: google-cloud
@@ -30,24 +30,10 @@ language_settings:
 collections:
 - name_pattern: projects/{project}
   entity_name: project
-  language_overrides:
-  - language: csharp
-    common_resource_name: Google.Api.Gax.ResourceNames.ProjectName
 - name_pattern: projects/{project}/notes/{note}
   entity_name: note
-  language_overrides:
-  - language: csharp
-    common_resource_name: Grafeas.V1.NoteName
 - name_pattern: projects/{project}/occurrences/{occurrence}
   entity_name: occurrence
-  language_overrides:
-  - language: csharp
-    common_resource_name: Grafeas.V1.OccurrenceName
-collection_oneofs:
-- oneof_name: iam_resource_oneof
-  collection_names:
-  - note
-  - occurrence
 # A list of API interface configurations.
 interfaces:
 # The fully qualified name of the API interface.