diff --git a/.changelog/12556.txt b/.changelog/12556.txt
new file mode 100644
index 0000000000..42b910df15
--- /dev/null
+++ b/.changelog/12556.txt
@@ -0,0 +1,3 @@
+```release-note:none
+
+```
\ No newline at end of file
diff --git a/google-beta/services/apigee/resource_apigee_env_keystore_alias_pkcs12.go b/google-beta/services/apigee/resource_apigee_keystores_aliases_pkcs12.go
similarity index 100%
rename from google-beta/services/apigee/resource_apigee_env_keystore_alias_pkcs12.go
rename to google-beta/services/apigee/resource_apigee_keystores_aliases_pkcs12.go
diff --git a/google-beta/services/apigee/resource_apigee_env_keystore_alias_pkcs12_meta.yaml b/google-beta/services/apigee/resource_apigee_keystores_aliases_pkcs12_meta.yaml
similarity index 100%
rename from google-beta/services/apigee/resource_apigee_env_keystore_alias_pkcs12_meta.yaml
rename to google-beta/services/apigee/resource_apigee_keystores_aliases_pkcs12_meta.yaml
diff --git a/google-beta/services/apigee/resource_apigee_env_keystore_alias_pkcs12_test.go b/google-beta/services/apigee/resource_apigee_keystores_aliases_pkcs12_test.go
similarity index 100%
rename from google-beta/services/apigee/resource_apigee_env_keystore_alias_pkcs12_test.go
rename to google-beta/services/apigee/resource_apigee_keystores_aliases_pkcs12_test.go
diff --git a/google-beta/services/compute/resource_usage_export_bucket.go b/google-beta/services/compute/resource_project_usage_export_bucket.go
similarity index 100%
rename from google-beta/services/compute/resource_usage_export_bucket.go
rename to google-beta/services/compute/resource_project_usage_export_bucket.go
diff --git a/google-beta/services/compute/resource_usage_export_bucket_meta.yaml b/google-beta/services/compute/resource_project_usage_export_bucket_meta.yaml
similarity index 100%
rename from google-beta/services/compute/resource_usage_export_bucket_meta.yaml
rename to google-beta/services/compute/resource_project_usage_export_bucket_meta.yaml
diff --git a/google-beta/services/compute/resource_usage_export_bucket_test.go b/google-beta/services/compute/resource_project_usage_export_bucket_test.go
similarity index 100%
rename from google-beta/services/compute/resource_usage_export_bucket_test.go
rename to google-beta/services/compute/resource_project_usage_export_bucket_test.go
diff --git a/google-beta/services/tags/resource_tags_location_tag_bindings.go b/google-beta/services/tags/resource_tags_location_tag_binding.go
similarity index 100%
rename from google-beta/services/tags/resource_tags_location_tag_bindings.go
rename to google-beta/services/tags/resource_tags_location_tag_binding.go
diff --git a/google-beta/services/tags/resource_tags_location_tag_bindings_meta.yaml b/google-beta/services/tags/resource_tags_location_tag_binding_meta.yaml
similarity index 100%
rename from google-beta/services/tags/resource_tags_location_tag_bindings_meta.yaml
rename to google-beta/services/tags/resource_tags_location_tag_binding_meta.yaml
diff --git a/website/docs/r/usage_export_bucket.html.markdown b/website/docs/r/project_usage_export_bucket.html.markdown
similarity index 100%
rename from website/docs/r/usage_export_bucket.html.markdown
rename to website/docs/r/project_usage_export_bucket.html.markdown