diff --git a/mmv1/products/apigateway/terraform.yaml b/mmv1/products/apigateway/terraform.yaml
index 73434ae491cb..7009ffb77dbe 100644
--- a/mmv1/products/apigateway/terraform.yaml
+++ b/mmv1/products/apigateway/terraform.yaml
@@ -16,7 +16,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
   Api: !ruby/object:Overrides::Terraform::ResourceOverride
     autogen_async: true
     iam_policy: !ruby/object:Api::Resource::IamPolicy
-      skip_import_test: true
       allowed_iam_role: 'roles/apigateway.viewer'
       method_name_separator: ':'
       parent_resource_attribute: 'api'
@@ -27,15 +26,17 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         min_version: beta
         name: "apigateway_api_basic"
         primary_resource_id: "api"
+        primary_resource_name: "fmt.Sprintf(\"tf-test-my-api%s\", context[\"random_suffix\"])"
         vars:
-          name: "api"
+          api_id: "my-api"
       - !ruby/object:Provider::Terraform::Examples
         skip_docs: true
         min_version: beta
         name: "apigateway_api_full"
         primary_resource_id: "api"
+        primary_resource_name: "fmt.Sprintf(\"tf-test-my-api%s\", context[\"random_suffix\"])"
         vars:
-          name: "api"
+          api_id: "my-api"
     properties:
       displayName: !ruby/object:Overrides::Terraform::PropertyOverride
         default_from_api: true
@@ -60,23 +61,27 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         min_version: beta
         name: "apigateway_api_config_basic"
         primary_resource_id: "api_cfg"
+        primary_resource_name: "fmt.Sprintf(\"tf-test-my-api%s\", context[\"random_suffix\"]), fmt.Sprintf(\"tf-test-my-config%s\", context[\"random_suffix\"])" # Need to pass 2 ids into a Sprintf - parent resource id also needed to identify primary resource
         vars:
-          name: "api-cfg"
-          config: "cfg"
+          api_id: "my-api"
+          config_id: "my-config"
       - !ruby/object:Provider::Terraform::Examples
         skip_docs: true
         min_version: beta
         name: "apigateway_api_config_full"
         primary_resource_id: "api_cfg"
+        primary_resource_name: "fmt.Sprintf(\"tf-test-my-api%s\", context[\"random_suffix\"])"
         vars:
-          name: "api-cfg"
+          api_id: "my-api"
+          config_id: "my-config"
       - !ruby/object:Provider::Terraform::Examples
         min_version: beta
         name: "apigateway_api_config_grpc"
         primary_resource_id: "api_cfg"
+        primary_resource_name: "fmt.Sprintf(\"tf-test-my-api%s\", context[\"random_suffix\"])"
         vars:
-          name: "api-cfg"
-          config: "cfg"
+          api_id: "my-api"
+          config_id: "my-config"
         ignore_read_extra:
           - "grpc_services.0.file_descriptor_set"
       - !ruby/object:Provider::Terraform::Examples
@@ -84,9 +89,10 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         min_version: beta
         name: "apigateway_api_config_grpc_full"
         primary_resource_id: "api_cfg"
+        primary_resource_name: "fmt.Sprintf(\"tf-test-my-config%s\", context[\"random_suffix\"])"
         vars:
-          name: "api-cfg"
-          config: "cfg"
+          api_id: "my-api"
+          config_id: "my-config"
     properties:
       openapiDocuments.document.contents: !ruby/object:Overrides::Terraform::PropertyOverride
         validation: !ruby/object:Provider::Terraform::Validation
@@ -124,16 +130,21 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         min_version: beta
         name: "apigateway_gateway_basic"
         primary_resource_id: "api_gw"
+        primary_resource_name: "fmt.Sprintf(\"tf-test-my-gateway%s\", context[\"random_suffix\"])"
         vars:
-          name: "api-gw"
-          config: "config"
+          api_id: "my-api"
+          config_id: "my-config"
+          gateway_id: "my-gateway"
       - !ruby/object:Provider::Terraform::Examples
         skip_docs: true
         min_version: beta
         name: "apigateway_gateway_full"
         primary_resource_id: "api_gw"
+        primary_resource_name: "fmt.Sprintf(\"tf-test-my-gateway%s\", context[\"random_suffix\"])"
         vars:
-          name: "api-gw"
+          api_id: "my-api"
+          config_id: "my-config"
+          gateway_id: "my-gateway"
     properties:
       apiConfig: !ruby/object:Overrides::Terraform::PropertyOverride
         diff_suppress_func: compareResourceNames
diff --git a/mmv1/products/compute/terraform.yaml b/mmv1/products/compute/terraform.yaml
index 6d97b266e7e0..d90b6e934d02 100644
--- a/mmv1/products/compute/terraform.yaml
+++ b/mmv1/products/compute/terraform.yaml
@@ -1499,7 +1499,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       machineImageEncryptionKey.kmsKeyName: !ruby/object:Overrides::Terraform::PropertyOverride
         diff_suppress_func: compareCryptoKeyVersions
     iam_policy: !ruby/object:Api::Resource::IamPolicy
-      skip_import_test: true
       allowed_iam_role: 'roles/compute.admin'
       parent_resource_attribute: 'machine_image'
       iam_conditions_request_type: :QUERY_PARAM
@@ -1507,15 +1506,17 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       - !ruby/object:Provider::Terraform::Examples
         name: "machine_image_basic"
         primary_resource_id: "image"
+        primary_resource_name: "fmt.Sprintf(\"tf-test-my-image%s\", context[\"random_suffix\"])"
         vars:
-          vm_name: "vm"
-          image_name: "image"
+          vm_name: "my-vm"
+          image_name: "my-image"
       - !ruby/object:Provider::Terraform::Examples
         name: "compute_machine_image_kms"
         primary_resource_id: "image"
+        primary_resource_name: "fmt.Sprintf(\"tf-test-my-image%s\", context[\"random_suffix\"])"
         vars:
-          vm_name: "vm"
-          image_name: "image"
+          vm_name: "my-vm"
+          image_name: "my-image"
           key_name: "key"
           keyring_name: "keyring"
 
diff --git a/mmv1/products/metastore/terraform.yaml b/mmv1/products/metastore/terraform.yaml
index 9ec384c68405..b745dac7064b 100644
--- a/mmv1/products/metastore/terraform.yaml
+++ b/mmv1/products/metastore/terraform.yaml
@@ -98,12 +98,14 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         min_version: beta
         primary_resource_name: 'fmt.Sprintf("tf-test-metastore-fed%s", context["random_suffix"])'
         vars:
-          metastore_federation_name: "fed-1"
+          federation_id: "metastore-fed"
+          service_id:    "metastore-service"
       - !ruby/object:Provider::Terraform::Examples
         name: "dataproc_metastore_federation_bigquery"
         skip_test: true  # https://github.com/hashicorp/terraform-provider-google/issues/13710
         primary_resource_id: "default"
         min_version: beta
-        primary_resource_name: 'fmt.Sprintf("tf-test-metastore-fed-bq%s", context["random_suffix"])'
+        primary_resource_name: 'fmt.Sprintf("tf-test-metastore-fed%s", context["random_suffix"])'
         vars:
-          metastore_federation_name: "fed-2"          
+          federation_id: "metastore-fed"
+          service_id:    "metastore-service"
diff --git a/mmv1/templates/terraform/examples/apigateway_api_basic.tf.erb b/mmv1/templates/terraform/examples/apigateway_api_basic.tf.erb
index 00360abb5a64..df68d8cf1c51 100644
--- a/mmv1/templates/terraform/examples/apigateway_api_basic.tf.erb
+++ b/mmv1/templates/terraform/examples/apigateway_api_basic.tf.erb
@@ -1,4 +1,4 @@
 resource "google_api_gateway_api" "<%= ctx[:primary_resource_id] %>" {
   provider = google-beta
-  api_id = "<%= ctx[:vars]["name"] %>"
+  api_id = "<%= ctx[:vars]['api_id'] %>"
 }
diff --git a/mmv1/templates/terraform/examples/apigateway_api_config_basic.tf.erb b/mmv1/templates/terraform/examples/apigateway_api_config_basic.tf.erb
index f7ecbec7c34e..ef131d8f77da 100644
--- a/mmv1/templates/terraform/examples/apigateway_api_config_basic.tf.erb
+++ b/mmv1/templates/terraform/examples/apigateway_api_config_basic.tf.erb
@@ -1,12 +1,12 @@
 resource "google_api_gateway_api" "<%= ctx[:primary_resource_id] %>" {
   provider = google-beta
-  api_id = "<%= ctx[:vars]["name"] %>"
+  api_id = "<%= ctx[:vars]['api_id'] %>"
 }
 
 resource "google_api_gateway_api_config" "<%= ctx[:primary_resource_id] %>" {
   provider = google-beta
   api = google_api_gateway_api.<%= ctx[:primary_resource_id] %>.api_id
-  api_config_id = "<%= ctx[:vars]["config"] %>"
+  api_config_id = "<%= ctx[:vars]['config_id'] %>"
 
   openapi_documents {
     document {
diff --git a/mmv1/templates/terraform/examples/apigateway_api_config_full.tf.erb b/mmv1/templates/terraform/examples/apigateway_api_config_full.tf.erb
index 5499c24f2277..52cf63ea4050 100644
--- a/mmv1/templates/terraform/examples/apigateway_api_config_full.tf.erb
+++ b/mmv1/templates/terraform/examples/apigateway_api_config_full.tf.erb
@@ -1,12 +1,12 @@
 resource "google_api_gateway_api" "<%= ctx[:primary_resource_id] %>" {
   provider = google-beta
-  api_id = "<%= ctx[:vars]["name"] %>"
+  api_id = "<%= ctx[:vars]['api_id'] %>"
 }
 
 resource "google_api_gateway_api_config" "<%= ctx[:primary_resource_id] %>" {
   provider = google-beta
   api = google_api_gateway_api.<%= ctx[:primary_resource_id] %>.api_id
-  api_config_id = "<%= ctx[:vars]["name"] %>"
+  api_config_id = "<%= ctx[:vars]['config_id'] %>"
   display_name = "MM Dev API Config"
   labels = {
     environment = "dev"
diff --git a/mmv1/templates/terraform/examples/apigateway_api_config_grpc.tf.erb b/mmv1/templates/terraform/examples/apigateway_api_config_grpc.tf.erb
index 416172c68119..4ef1ed24fe10 100644
--- a/mmv1/templates/terraform/examples/apigateway_api_config_grpc.tf.erb
+++ b/mmv1/templates/terraform/examples/apigateway_api_config_grpc.tf.erb
@@ -1,12 +1,12 @@
 resource "google_api_gateway_api" "<%= ctx[:primary_resource_id] %>" {
   provider = google-beta
-  api_id = "<%= ctx[:vars]["name"] %>"
+  api_id = "<%= ctx[:vars]['api_id'] %>"
 }
 
 resource "google_api_gateway_api_config" "<%= ctx[:primary_resource_id] %>" {
   provider = google-beta
   api = google_api_gateway_api.<%= ctx[:primary_resource_id] %>.api_id
-  api_config_id = "<%= ctx[:vars]["config"] %>"
+  api_config_id = "<%= ctx[:vars]['config_id'] %>"
 
   grpc_services {
     file_descriptor_set {
diff --git a/mmv1/templates/terraform/examples/apigateway_api_config_grpc_full.tf.erb b/mmv1/templates/terraform/examples/apigateway_api_config_grpc_full.tf.erb
index e60483249aa5..38c3d28da1e0 100644
--- a/mmv1/templates/terraform/examples/apigateway_api_config_grpc_full.tf.erb
+++ b/mmv1/templates/terraform/examples/apigateway_api_config_grpc_full.tf.erb
@@ -1,12 +1,12 @@
 resource "google_api_gateway_api" "<%= ctx[:primary_resource_id] %>" {
   provider = google-beta
-  api_id = "<%= ctx[:vars]["name"] %>"
+  api_id = "<%= ctx[:vars]['api_id'] %>"
 }
 
 resource "google_api_gateway_api_config" "<%= ctx[:primary_resource_id] %>" {
   provider = google-beta
   api = google_api_gateway_api.<%= ctx[:primary_resource_id] %>.api_id
-  api_config_id = "<%= ctx[:vars]["config"] %>"
+  api_config_id = "<%= ctx[:vars]['config_id'] %>"
 
   grpc_services {
     file_descriptor_set {
diff --git a/mmv1/templates/terraform/examples/apigateway_api_full.tf.erb b/mmv1/templates/terraform/examples/apigateway_api_full.tf.erb
index 47697fcfd0d0..adb5985e34e8 100644
--- a/mmv1/templates/terraform/examples/apigateway_api_full.tf.erb
+++ b/mmv1/templates/terraform/examples/apigateway_api_full.tf.erb
@@ -1,6 +1,6 @@
 resource "google_api_gateway_api" "<%= ctx[:primary_resource_id] %>" {
   provider = google-beta
-  api_id = "<%= ctx[:vars]["name"] %>"
+  api_id = "<%= ctx[:vars]['api_id'] %>"
   display_name = "MM Dev API"
   labels = {
     environment = "dev"
diff --git a/mmv1/templates/terraform/examples/apigateway_gateway_basic.tf.erb b/mmv1/templates/terraform/examples/apigateway_gateway_basic.tf.erb
index 311d011a0a5f..06c342d6baa5 100644
--- a/mmv1/templates/terraform/examples/apigateway_gateway_basic.tf.erb
+++ b/mmv1/templates/terraform/examples/apigateway_gateway_basic.tf.erb
@@ -1,12 +1,12 @@
 resource "google_api_gateway_api" "<%= ctx[:primary_resource_id] %>" {
   provider = google-beta
-  api_id = "<%= ctx[:vars]["name"] %>"
+  api_id = "<%= ctx[:vars]['api_id'] %>"
 }
 
 resource "google_api_gateway_api_config" "<%= ctx[:primary_resource_id] %>" {
   provider = google-beta
   api = google_api_gateway_api.<%= ctx[:primary_resource_id] %>.api_id
-  api_config_id = "<%= ctx[:vars]["config"] %>"
+  api_config_id = "<%= ctx[:vars]['config_id'] %>"
 
   openapi_documents {
     document {
@@ -22,5 +22,5 @@ resource "google_api_gateway_api_config" "<%= ctx[:primary_resource_id] %>" {
 resource "google_api_gateway_gateway" "<%= ctx[:primary_resource_id] %>" {
   provider = google-beta
   api_config = google_api_gateway_api_config.<%= ctx[:primary_resource_id] %>.id
-  gateway_id = "<%= ctx[:vars]["name"] %>"
+  gateway_id = "<%= ctx[:vars]['gateway_id'] %>"
 }
diff --git a/mmv1/templates/terraform/examples/apigateway_gateway_full.tf.erb b/mmv1/templates/terraform/examples/apigateway_gateway_full.tf.erb
index e0fae29c7d45..b0338bb70b8f 100644
--- a/mmv1/templates/terraform/examples/apigateway_gateway_full.tf.erb
+++ b/mmv1/templates/terraform/examples/apigateway_gateway_full.tf.erb
@@ -1,12 +1,12 @@
 resource "google_api_gateway_api" "<%= ctx[:primary_resource_id] %>" {
   provider = google-beta
-  api_id = "<%= ctx[:vars]["name"] %>"
+  api_id = "<%= ctx[:vars]['api_id'] %>"
 }
 
 resource "google_api_gateway_api_config" "<%= ctx[:primary_resource_id] %>" {
   provider = google-beta
   api = google_api_gateway_api.<%= ctx[:primary_resource_id] %>.api_id
-  api_config_id = "<%= ctx[:vars]["name"] %>"
+  api_config_id = "<%= ctx[:vars]['config_id'] %>"
 
   openapi_documents {
     document {
@@ -20,7 +20,7 @@ resource "google_api_gateway_gateway" "<%= ctx[:primary_resource_id] %>" {
   provider = google-beta
   region     = "us-central1"
   api_config = google_api_gateway_api_config.<%= ctx[:primary_resource_id] %>.id
-  gateway_id = "<%= ctx[:vars]["name"] %>"
+  gateway_id = "<%= ctx[:vars]['gateway_id'] %>"
   display_name = "MM Dev API Gateway"
   labels = {
     environment = "dev"