diff --git a/cdn/README.md b/cdn/README.md
index cd9fe6b..1a22dea 100644
--- a/cdn/README.md
+++ b/cdn/README.md
@@ -39,7 +39,7 @@ This plugin provisions a complete CDN solution using Google Cloud CDN with:
 ```yaml
 entrypoints:
   default:
-    plugin: "gcp-cdn"
+    plugin: "cdn"
     properties:
       project_id: "my-project-123"
       region: "us-central1"
diff --git a/cdn/manifest.yaml b/cdn/manifest.yaml
index 2f2e6ef..bb83886 100644
--- a/cdn/manifest.yaml
+++ b/cdn/manifest.yaml
@@ -1,4 +1,4 @@
-name: gcp-cdn
+name: cdn
 display_name: CDN
 type: entrypoint
 description: "Creates Cloud CDN with load balancing and SSL certificates"
@@ -16,10 +16,6 @@ inputs:
     type: string
     required: true
     description: "Google Cloud region (e.g. `us-central1`)"
-  cdn_domain:
-    type: object
-    required: true
-    description: 'CDN domain configuration (e.g. `{"name": "cdn.example.com", "ssl": true}`)'
   domain_name:
     type: string
     required: true
diff --git a/cloudrun/README.md b/cloudrun/README.md
index c3a5425..ce09700 100644
--- a/cloudrun/README.md
+++ b/cloudrun/README.md
@@ -38,7 +38,7 @@ This plugin provisions Cloud Run services with:
 ## Prerequisites
 
 - Container image pushed to Google Container Registry or Artifact Registry
-- Service account with appropriate IAM permissions (managed by `gcp-service-account` plugin)
+- Service account with appropriate IAM permissions (managed by `service-account` plugin)
 
 ## Usage Example
 
@@ -47,9 +47,9 @@ This plugin provisions Cloud Run services with:
 ```yaml
 services:
   api:
-    plugin: "gcp-cloudrun"
+    plugin: "cloudrun"
     identities:
-      - plugin: "gcp-service-account"
+      - plugin: "service-account"
     properties:
       project_id: "my-project-123"
       region: "us-central1"
diff --git a/cloudrun/manifest.yaml b/cloudrun/manifest.yaml
index 2e8a58e..b6466f5 100644
--- a/cloudrun/manifest.yaml
+++ b/cloudrun/manifest.yaml
@@ -1,4 +1,4 @@
-name: gcp-cloudrun
+name: cloudrun
 display_name: Cloud Run
 type: service
 description: "Deploys Cloud Run services with auto-scaling and service accounts"
@@ -9,7 +9,7 @@ deployment:
   # NOTE: // is required to reference a sub-path of repository for terraform modules
   terraform: ./module
 runtime:
-  go_module: github.com/nitrictech/plugins/gcp/cloudrun
+  go_module: github.com/nitrictech/plugins-gcp/cloudrun
 
 inputs:
   environment_variables:
diff --git a/cloudrun/module/main.tf b/cloudrun/module/main.tf
index ac55d5e..12f3f5d 100644
--- a/cloudrun/module/main.tf
+++ b/cloudrun/module/main.tf
@@ -127,7 +127,7 @@ resource "google_cloud_run_v2_service" "service" {
       }
       env {
         name  = "SERVICE_ACCOUNT_EMAIL"
-        value = var.suga.identities["gcp:iam:role"].exports["gcp_service_account:email"]
+        value = var.suga.identities["gcp:iam:service_account"].exports["gcp_service_account:email"]
       }
       env {
         name  = "GCP_REGION"
@@ -143,7 +143,7 @@ resource "google_cloud_run_v2_service" "service" {
       }
     }
 
-    service_account = var.suga.identities["gcp:iam:role"].exports["gcp_service_account:email"]
+    service_account = var.suga.identities["gcp:iam:service_account"].exports["gcp_service_account:email"]
     timeout         = "${var.timeout_seconds}s"
   }
 
diff --git a/cloudrun/module/providers.tf b/cloudrun/module/providers.tf
index 4be8f28..f577216 100644
--- a/cloudrun/module/providers.tf
+++ b/cloudrun/module/providers.tf
@@ -14,7 +14,7 @@ terraform {
 
     docker = {
       source  = "kreuzwerker/docker"
-      version = "3.6.2"
+      version = "3.6.0"
     }
   }
 }
\ No newline at end of file
diff --git a/serviceaccount/README.md b/serviceaccount/README.md
index 3cb4056..1c157cc 100644
--- a/serviceaccount/README.md
+++ b/serviceaccount/README.md
@@ -38,9 +38,9 @@ This plugin provisions IAM service accounts with:
 ```yaml
 services:
   storage-worker:
-    plugin: "gcp-cloudrun"
+    plugin: "cloudrun"
     identities:
-      - plugin: "gcp-service-account"
+      - plugin: "service-account"
         properties:
           project_id: "my-project-123"
           trusted_actions:
@@ -54,9 +54,9 @@ services:
 ```yaml
 services:
   backend:
-    plugin: "gcp-cloudrun"
+    plugin: "cloudrun"
     identities:
-      - plugin: "gcp-service-account"
+      - plugin: "service-account"
         properties:
           project_id: "my-project-123"
           trusted_actions:
@@ -70,9 +70,9 @@ services:
 ```yaml
 services:
   monitoring:
-    plugin: "gcp-cloudrun"
+    plugin: "cloudrun"
     identities:
-      - plugin: "gcp-service-account"
+      - plugin: "service-account"
         properties:
           project_id: "my-project-123"
           trusted_actions:
diff --git a/serviceaccount/manifest.yaml b/serviceaccount/manifest.yaml
index d499b6f..4256264 100644
--- a/serviceaccount/manifest.yaml
+++ b/serviceaccount/manifest.yaml
@@ -1,4 +1,4 @@
-name: gcp-service-account
+name: service-account
 display_name: Service Account
 type: identity
 description: "Creates service accounts for GCP resource authentication"
diff --git a/storage/README.md b/storage/README.md
index a908247..57251a3 100644
--- a/storage/README.md
+++ b/storage/README.md
@@ -49,7 +49,7 @@ This plugin creates Cloud Storage buckets with:
 ```yaml
 buckets:
   uploads:
-    plugin: "gcp-storage-bucket"
+    plugin: "storage-bucket"
     properties:
       project_id: "my-project-123"
       region: "us-central1"
@@ -61,7 +61,7 @@ buckets:
 ```yaml
 buckets:
   backups:
-    plugin: "gcp-storage-bucket"
+    plugin: "storage-bucket"
     properties:
       project_id: "my-project-123"
       region: "us-central1"
@@ -73,7 +73,7 @@ buckets:
 ```yaml
 buckets:
   reports:
-    plugin: "gcp-storage-bucket"
+    plugin: "storage-bucket"
     properties:
       project_id: "my-project-123"
       region: "us-central1"
diff --git a/storage/manifest.yaml b/storage/manifest.yaml
index 0bf9c0b..89cb6de 100644
--- a/storage/manifest.yaml
+++ b/storage/manifest.yaml
@@ -1,11 +1,12 @@
-name: gcp-storage-bucket
+name: storage-bucket
+display_name: Storage
 type: storage
 description: "Provisions GCS buckets with custom access controls and automatic file upload"
 icon: ./icon.svg
 deployment:
   terraform: ./module
 runtime:
-  go_module: github.com/nitrictech/plugins/gcp/storage
+  go_module: github.com/nitrictech/plugins-gcp/storage
 
 inputs:
   project_id:
diff --git a/storage/module/main.tf b/storage/module/main.tf
index 60909e4..6a87f60 100644
--- a/storage/module/main.tf
+++ b/storage/module/main.tf
@@ -63,7 +63,7 @@ resource "google_project_iam_member" "iam_access" {
 
   project = var.project_id
   role    = google_project_iam_custom_role.bucket_access_role[each.key].name
-  member  = "serviceAccount:${each.value.identities["gcp:iam:role"].exports["gcp_service_account:email"]}"
+  member  = "serviceAccount:${each.value.identities["gcp:iam:service_account"].exports["gcp_service_account:email"]}"
 }
 
 locals {