diff --git a/compiled/kapicorp-project-123/terraform/gcp_project_id_service.tf.json b/compiled/kapicorp-project-123/terraform/gcp_project_id_service.tf.json
deleted file mode 100644
index 275e5962..00000000
--- a/compiled/kapicorp-project-123/terraform/gcp_project_id_service.tf.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "resource": {
-    "gcp_project_id_service": {
-      "cloudbilling": {
-        "service": "cloudbilling.googleapis.com"
-      },
-      "iam": {
-        "service": "iam.googleapis.com"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/compiled/kapicorp-project-123/terraform/gcp_project_id.tf.json b/compiled/kapicorp-project-123/terraform/google_project.tf.json
similarity index 92%
rename from compiled/kapicorp-project-123/terraform/gcp_project_id.tf.json
rename to compiled/kapicorp-project-123/terraform/google_project.tf.json
index cbe43781..7d34f654 100644
--- a/compiled/kapicorp-project-123/terraform/gcp_project_id.tf.json
+++ b/compiled/kapicorp-project-123/terraform/google_project.tf.json
@@ -1,6 +1,6 @@
 {
   "resource": {
-    "gcp_project_id": {
+    "google_project": {
       "main": {
         "name": "kapicorp-project-123",
         "org_id": "az1oDhA50eU5d2ToHhNFrSaWNqAa1iaosXyZfd6SZQ2",
diff --git a/compiled/kapicorp-project-123/terraform/google_project_service.tf.json b/compiled/kapicorp-project-123/terraform/google_project_service.tf.json
new file mode 100644
index 00000000..a1bb686f
--- /dev/null
+++ b/compiled/kapicorp-project-123/terraform/google_project_service.tf.json
@@ -0,0 +1,14 @@
+{
+  "resource": {
+    "google_project_service": {
+      "cloudbilling": {
+        "service": "cloudbilling.googleapis.com",
+        "project": "kapicorp-project-123"
+      },
+      "iam": {
+        "service": "iam.googleapis.com",
+        "project": "kapicorp-project-123"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiled/kapicorp-terraform-admin/terraform/gcp_project_id_service.tf.json b/compiled/kapicorp-terraform-admin/terraform/gcp_project_id_service.tf.json
deleted file mode 100644
index 275e5962..00000000
--- a/compiled/kapicorp-terraform-admin/terraform/gcp_project_id_service.tf.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "resource": {
-    "gcp_project_id_service": {
-      "cloudbilling": {
-        "service": "cloudbilling.googleapis.com"
-      },
-      "iam": {
-        "service": "iam.googleapis.com"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/compiled/kapicorp-terraform-admin/terraform/gcp_project_id.tf.json b/compiled/kapicorp-terraform-admin/terraform/google_project.tf.json
similarity index 93%
rename from compiled/kapicorp-terraform-admin/terraform/gcp_project_id.tf.json
rename to compiled/kapicorp-terraform-admin/terraform/google_project.tf.json
index 75c6e863..98257579 100644
--- a/compiled/kapicorp-terraform-admin/terraform/gcp_project_id.tf.json
+++ b/compiled/kapicorp-terraform-admin/terraform/google_project.tf.json
@@ -1,6 +1,6 @@
 {
   "resource": {
-    "gcp_project_id": {
+    "google_project": {
       "main": {
         "name": "kapicorp-terraform-admin",
         "org_id": "az1oDhA50eU5d2ToHhNFrSaWNqAa1iaosXyZfd6SZQ2",
diff --git a/compiled/kapicorp-terraform-admin/terraform/google_project_service.tf.json b/compiled/kapicorp-terraform-admin/terraform/google_project_service.tf.json
new file mode 100644
index 00000000..6525c128
--- /dev/null
+++ b/compiled/kapicorp-terraform-admin/terraform/google_project_service.tf.json
@@ -0,0 +1,14 @@
+{
+  "resource": {
+    "google_project_service": {
+      "cloudbilling": {
+        "service": "cloudbilling.googleapis.com",
+        "project": "kapicorp-terraform-admin"
+      },
+      "iam": {
+        "service": "iam.googleapis.com",
+        "project": "kapicorp-terraform-admin"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/inventory/classes/terraform/gcp/organization/kapicorp.yml b/inventory/classes/terraform/gcp/organization/kapicorp.yml
index bc926445..961c9807 100644
--- a/inventory/classes/terraform/gcp/organization/kapicorp.yml
+++ b/inventory/classes/terraform/gcp/organization/kapicorp.yml
@@ -13,7 +13,7 @@ parameters:
   generators:
     terraform:
       defaults:
-        gcp_project_id:
+        google_project:
           org_id: ${gcp_organization_id}
           auto_create_network: false
           project_id: ${gcp_project_id}
@@ -22,7 +22,7 @@ parameters:
   terraform:
     resources:
       generic:
-        gcp_project_id:
+        google_project:
           main:
             project:
             name: ${gcp_display_name}
diff --git a/inventory/classes/terraform/gcp/resources/network.yml b/inventory/classes/terraform/gcp/resources/network.yml
index 19aeb286..a2679585 100644
--- a/inventory/classes/terraform/gcp/resources/network.yml
+++ b/inventory/classes/terraform/gcp/resources/network.yml
@@ -10,5 +10,5 @@ parameters:
             description: Default network for the project maintained by terraform
             auto_create_subnetworks: true
             depends_on:
-              - gcp_project_id.main
-              - gcp_project_id_service.compute
+              - google_project.main
+              - google_project_service.compute
diff --git a/inventory/classes/terraform/gcp/services/common.yml b/inventory/classes/terraform/gcp/services/common.yml
index 822ccd4d..d464e0d3 100644
--- a/inventory/classes/terraform/gcp/services/common.yml
+++ b/inventory/classes/terraform/gcp/services/common.yml
@@ -3,7 +3,7 @@ parameters:
   terraform:
     resources:
       generic:
-        gcp_project_id_service:
+        google_project_service:
           cloudbilling:
             service: cloudbilling.googleapis.com
           iam:
diff --git a/inventory/classes/terraform/gcp/services/compute.yml b/inventory/classes/terraform/gcp/services/compute.yml
index 79eaf346..b36f5297 100644
--- a/inventory/classes/terraform/gcp/services/compute.yml
+++ b/inventory/classes/terraform/gcp/services/compute.yml
@@ -6,7 +6,7 @@ parameters:
   terraform:
     resources:
       generic:
-        gcp_project_id_service:
+        google_project_service:
           compute:
             service: compute.googleapis.com
           storage-component:
@@ -14,4 +14,4 @@ parameters:
           container:
             service: container.googleapis.com
             depends_on:
-              - gcp_project_id_service.compute
+              - google_project_service.compute