diff --git a/fast/stages/3-gcve-dev/README.md b/fast/stages/3-gcve-dev/README.md
index 8f2aebf57..568a0f892 100644
--- a/fast/stages/3-gcve-dev/README.md
+++ b/fast/stages/3-gcve-dev/README.md
@@ -179,9 +179,9 @@ terraform apply
 | [folder_ids](variables-fast.tf#L46) | Folders used by FAST stages in folders/nnnnnnnnnnn format. | <code>map&#40;string&#41;</code> |  | <code>&#123;&#125;</code> | <code>0-org-setup</code> |
 | [iam](variables.tf#L17) | Project-level authoritative IAM bindings for users and service accounts in  {ROLE => [MEMBERS]} format. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |  |
 | [iam_by_principals](variables.tf#L24) | Authoritative IAM binding in {PRINCIPAL => [ROLES]} format. Principals need to be statically defined to avoid cycle errors. Merged internally with the `iam` variable. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |  |
-| [network_peerings](variables.tf#L31) | The network peerings between users' VPCs and the VMware Engine networks. Key is used for the peering name suffix. Network is expanded for FAST defined networks. | <code title="map&#40;object&#40;&#123;&#10;  peer_network                  &#61; string&#10;  configure_peer_network        &#61; optional&#40;bool, false&#41;&#10;  description                   &#61; optional&#40;string, &#34;Managed by Terraform.&#34;&#41;&#10;  peer_to_vmware_engine_network &#61; optional&#40;bool, false&#41;&#10;  routes_config &#61; optional&#40;object&#40;&#123;&#10;    export        &#61; optional&#40;bool, false&#41;&#10;    import        &#61; optional&#40;bool, false&#41;&#10;    public_export &#61; optional&#40;bool, false&#41;&#10;    public_import &#61; optional&#40;bool, false&#41;&#10;  &#125;&#41;, &#123;&#125;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code title="&#123;&#10;  dev-spoke-0 &#61; &#123;&#10;    peer_network           &#61; &#34;dev-spoke-0&#34;&#10;    configure_peer_network &#61; true&#10;  &#125;&#10;&#125;">&#123;&#8230;&#125;</code> |  |
+| [network_peerings](variables.tf#L31) | The network peerings between users' VPCs and the VMware Engine networks. Key is used for the peering name suffix. Network is expanded for FAST defined networks. | <code title="map&#40;object&#40;&#123;&#10;  peer_network                  &#61; string&#10;  configure_peer_network        &#61; optional&#40;bool, false&#41;&#10;  description                   &#61; optional&#40;string, &#34;Managed by Terraform.&#34;&#41;&#10;  peer_to_vmware_engine_network &#61; optional&#40;bool, false&#41;&#10;  routes_config &#61; optional&#40;object&#40;&#123;&#10;    export        &#61; optional&#40;bool, false&#41;&#10;    import        &#61; optional&#40;bool, false&#41;&#10;    public_export &#61; optional&#40;bool, false&#41;&#10;    public_import &#61; optional&#40;bool, false&#41;&#10;  &#125;&#41;, &#123;&#125;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code title="&#123;&#10;  dev-spoke-0 &#61; &#123;&#10;    peer_network           &#61; &#34;dev&#34;&#10;    configure_peer_network &#61; true&#10;  &#125;&#10;&#125;">&#123;&#8230;&#125;</code> |  |
 | [private_cloud_configs](variables.tf#L54) | The VMware private cloud configurations. Key is used for the private cloud name suffix. | <code title="map&#40;object&#40;&#123;&#10;  cidr &#61; string&#10;  zone &#61; string&#10;  additional_cluster_configs &#61; optional&#40;map&#40;object&#40;&#123;&#10;    custom_core_count &#61; optional&#40;number&#41;&#10;    node_count        &#61; optional&#40;number, 3&#41;&#10;    node_type_id      &#61; optional&#40;string, &#34;standard-72&#34;&#41;&#10;  &#125;&#41;&#41;, &#123;&#125;&#41;&#10;  management_cluster_config &#61; optional&#40;object&#40;&#123;&#10;    custom_core_count &#61; optional&#40;number&#41;&#10;    name              &#61; optional&#40;string, &#34;mgmt-cluster&#34;&#41;&#10;    node_count        &#61; optional&#40;number, 3&#41;&#10;    node_type_id      &#61; optional&#40;string, &#34;standard-72&#34;&#41;&#10;  &#125;&#41;, &#123;&#125;&#41;&#10;  description &#61; optional&#40;string, &#34;Managed by Terraform.&#34;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |  |
-| [stage_config](variables.tf#L76) | FAST stage configuration used to find resource ids. Must match name defined for the stage in resource management. | <code title="object&#40;&#123;&#10;  environment &#61; string&#10;  name        &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code title="&#123;&#10;  environment &#61; &#34;dev&#34;&#10;  name        &#61; &#34;gcve-dev&#34;&#10;&#125;">&#123;&#8230;&#125;</code> |  |
+| [stage_config](variables.tf#L76) | FAST stage configuration used to find resource ids. Must match name defined for the stage in resource management. | <code title="object&#40;&#123;&#10;  environment &#61; string&#10;  name        &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code title="&#123;&#10;  environment &#61; &#34;dev&#34;&#10;  name        &#61; &#34;gcve&#47;dev&#34;&#10;&#125;">&#123;&#8230;&#125;</code> |  |
 | [vpc_self_links](variables-fast.tf#L63) | FAST host VPC self links. | <code>map&#40;string&#41;</code> |  | <code>&#123;&#125;</code> | <code>2-networking</code> |
 
 ## Outputs
diff --git a/fast/stages/3-gcve-dev/variables.tf b/fast/stages/3-gcve-dev/variables.tf
index 00ac24753..75b489e99 100644
--- a/fast/stages/3-gcve-dev/variables.tf
+++ b/fast/stages/3-gcve-dev/variables.tf
@@ -45,7 +45,7 @@ variable "network_peerings" {
   nullable = false
   default = {
     dev-spoke-0 = {
-      peer_network           = "dev-spoke-0"
+      peer_network           = "dev"
       configure_peer_network = true
     }
   }
@@ -81,6 +81,6 @@ variable "stage_config" {
   })
   default = {
     environment = "dev"
-    name        = "gcve-dev"
+    name        = "gcve/dev"
   }
 }
diff --git a/tests/fast/stages/s3_gcve_dev/simple.tfvars b/tests/fast/stages/s3_gcve_dev/simple.tfvars
index 045598c5a..f647ff4c3 100644
--- a/tests/fast/stages/s3_gcve_dev/simple.tfvars
+++ b/tests/fast/stages/s3_gcve_dev/simple.tfvars
@@ -11,7 +11,7 @@ environments = {
 }
 
 folder_ids = {
-  gcve-dev = "folders/00000000000000"
+  "gcve/dev" = "folders/00000000000000"
 }
 
 organization = {
@@ -35,7 +35,7 @@ private_cloud_configs = {
 }
 
 vpc_self_links = {
-  "dev-spoke-0" = "projects/em-prod-net-spoke-0/global/networks/prod-spoke-0",
+  "dev" = "projects/em-dev-net-spoke-0/global/networks/dev-spoke-0",
 }