diff --git a/01-network.tf b/01-network.tf
index bc6f658..7bb7234 100644
--- a/01-network.tf
+++ b/01-network.tf
@@ -9,7 +9,7 @@ resource "stackit_network" "landingzone_wan" {
 
 resource "stackit_network" "landingzone_lan" {
   project_id         = module.project.project_info["landingzone"].project_id
-  name               = "lan_network1"
+  name               = "landingzone_lan"
   ipv4_prefix        = "10.220.1.0/24"
   routed              = true
 }
@@ -31,132 +31,132 @@ resource "stackit_network_interface" "landingzone_lan" {
 }
 
 /* ---------- project 2 core ------------------ */
-resource "stackit_network" "p2_lan_network1" {
+resource "stackit_network" "core_lan" {
   project_id         = module.project.project_info["core"].project_id
-  name               = "p2_lan_network"
+  name               = "core_lan"
   ipv4_prefix        = "10.220.5.0/24"
   routed              = true
 }
 
-resource "stackit_network_interface" "p2_lan1" {
+resource "stackit_network_interface" "core_lan" {
   project_id         = module.project.project_info["core"].project_id
-  network_id         = stackit_network.p2_lan_network1.network_id
+  network_id         = stackit_network.core_lan.network_id
   security           = false
-  name              = "P2LAN1"
+  name              = "CORELAN"
   security_group_ids = [ stackit_security_group.example.security_group_id ]
 }
 
 /* this is for adding a second network interface to the core project (for WAN access).*/
- resource "stackit_network" "p2_wan_network1" {
+ resource "stackit_network" "core_wan" {
   project_id         = module.project.project_info["core"].project_id
-  name               = "wan"
+  name               = "core_wan"
   ipv4_prefix        = "10.220.50.0/24"
   routed              = true
 }
 
-resource "stackit_network_interface" "p2_wan_interface1" {
+resource "stackit_network_interface" "core_wan" {
   project_id         = module.project.project_info["core"].project_id
-  network_id         = stackit_network.p2_wan_network1.network_id
+  network_id         = stackit_network.core_wan.network_id
   security           = false
-  name              = "wan_if"
+  name              = "core_wan_if"
 }
 /**/
 
 /* ---------- project 3 backup ------------------ */
-resource "stackit_network" "p3_lan_network1" {
+resource "stackit_network" "backup_lan" {
   project_id         = module.project.project_info["backup"].project_id
-  name               = "p3_lan_network"
+  name               = "backup_lan"
   ipv4_prefix        = "10.220.6.0/24"
   routed              = true
 }
 
-resource "stackit_network_interface" "p3_lan1" {
+resource "stackit_network_interface" "backup_lan" {
   project_id         = module.project.project_info["backup"].project_id
-  network_id         = stackit_network.p3_lan_network1.network_id
+  network_id         = stackit_network.backup_lan.network_id
   security           = false 
-  name              = "P3LAN1"
+  name              = "BACKUPLAN"
   //security_group_ids = [ stackit_security_group.example.security_group_id ]
 }
 
 /* project 4 for SKE, so no configuration necessary here */
 
 /* ------- project 5 - vpn ------------ */
-resource "stackit_network" "wan_network_beta" {
+resource "stackit_network" "vpn_wan" {
   project_id          = module.project.project_info["vpn"].project_id
-  name                = "wan_network_beta"
+  name                = "vpn_wan"
   ipv4_nameservers    = ["1.1.1.1", "8.8.8.8"]
   ipv4_prefix         = "10.230.0.0/24"
   routed              = true
 }
 
-resource "stackit_network" "lan_network_beta" {
+resource "stackit_network" "vpn_lan" {
   project_id         = module.project.project_info["vpn"].project_id
-  name               = "lan_network_beta"
+  name               = "vpn_lan"
   ipv4_prefix        = "10.230.1.0/24"
   routed              = true
 }
 
-resource "stackit_network_interface" "wan_beta" {
+resource "stackit_network_interface" "vpn_wan" {
   project_id        = module.project.project_info["vpn"].project_id
-  network_id        = stackit_network.wan_network_beta.network_id
+  network_id        = stackit_network.vpn_wan.network_id
   security          = false
   name              = "MGMT"
   ipv4              = "10.230.0.254"
 
 }
 
-resource "stackit_network_interface" "lan_beta" {
+resource "stackit_network_interface" "vpn_lan" {
   project_id         = module.project.project_info["vpn"].project_id
-  network_id         = stackit_network.lan_network_beta.network_id
+  network_id         = stackit_network.vpn_lan.network_id
   security           = false
-  name              = "LAN1"
+  name              = "VPNLAN"
 }
 
 /* ---------- project 6 infra ------------------ */
-resource "stackit_network" "p6_lan_network1" {
+resource "stackit_network" "infra_lan" {
   project_id         = module.project.project_info["infra"].project_id
-  name               = "p6_lan_network"
+  name               = "infra_lan"
   ipv4_prefix        = "10.230.5.0/24"
   routed              = true
 }
 
-resource "stackit_network_interface" "p6_lan1" {
+resource "stackit_network_interface" "infra_lan" {
   project_id         = module.project.project_info["infra"].project_id
-  network_id         = stackit_network.p6_lan_network1.network_id
+  network_id         = stackit_network.infra_lan.network_id
   security           = false
-  name              = "P6LAN1"
+  name              = "INFRALAN"
   security_group_ids = [ stackit_security_group.example_beta.security_group_id ]
 }
 
 /* ---------- public IP configuration------------- */
-resource "stackit_public_ip" "wan_ip" {
+resource "stackit_public_ip" "landingzone_wan" {
   project_id           = module.project.project_info["landingzone"].project_id
   network_interface_id = stackit_network_interface.landingzone_wan.network_interface_id
 }
-resource "stackit_public_ip" "wan_ip_beta" {
+resource "stackit_public_ip" "vpn_wan" {
   project_id           = module.project.project_info["vpn"].project_id
-  network_interface_id = stackit_network_interface.wan_beta.network_interface_id
+  network_interface_id = stackit_network_interface.vpn_wan.network_interface_id
 }
 
 /* this is for adding a public IP to the second project (core) for WAN access. */
-resource "stackit_public_ip" "wan_server" {
+resource "stackit_public_ip" "core_wan" {
   project_id           = module.project.project_info["core"].project_id
-  network_interface_id = stackit_network_interface.p2_wan_interface1.network_interface_id
+  network_interface_id = stackit_network_interface.core_wan.network_interface_id
 }
 
 /* Output the public IPs for both projects */
 output "public_ips" {
   value = {
-    "pfsense-alpha"   = stackit_public_ip.wan_ip.ip
-    "pfsense-beta" = stackit_public_ip.wan_ip_beta.ip
-    "wan_server"   = stackit_public_ip.wan_server.ip
+    "pfsense-alpha"   = stackit_public_ip.landingzone_wan.ip
+    "pfsense-beta" = stackit_public_ip.vpn_wan.ip
+    "wan_server"   = stackit_public_ip.core_wan.ip
   }
 }
 
 output "private_ips" {
   value = {
-    "linux-alpha"   = stackit_network_interface.p2_lan1.ipv4
-    "linux-beta"    = stackit_network_interface.p6_lan1.ipv4
+    "linux-alpha"   = stackit_network_interface.core_lan.ipv4
+    "linux-beta"    = stackit_network_interface.infra_lan.ipv4
   }
 }
 
diff --git a/03-pfSense-appliance.tf b/03-pfSense-appliance.tf
index d3e262d..67e4fa5 100644
--- a/03-pfSense-appliance.tf
+++ b/03-pfSense-appliance.tf
@@ -46,7 +46,7 @@ resource "stackit_server" "pfsense_appliance_beta" {
   }
   availability_zone = var.region_az1
   machine_type      = var.flavor
-  network_interfaces = [stackit_network_interface.wan_beta.network_interface_id, stackit_network_interface.lan_beta.network_interface_id ]
-  depends_on = [ stackit_network.wan_network_beta ]
+  network_interfaces = [stackit_network_interface.vpn_wan.network_interface_id, stackit_network_interface.vpn_lan.network_interface_id ]
+  depends_on = [ stackit_network.vpn_wan ]
 }
 
diff --git a/05-server.tf b/05-server.tf
index 19bce5e..5e3530f 100644
--- a/05-server.tf
+++ b/05-server.tf
@@ -20,9 +20,9 @@ resource "stackit_server" "dev_server" {
   }
   availability_zone = var.region_az1
   machine_type      = var.flavor
-  network_interfaces = [stackit_network_interface.p2_lan1.network_interface_id ]
+  network_interfaces = [stackit_network_interface.core_lan.network_interface_id ]
   keypair_name = stackit_key_pair.keypair.name
-  depends_on = [ stackit_network_interface.p2_lan1 ]
+  depends_on = [ stackit_network_interface.core_lan ]
 }
 
 data "stackit_image" "debian" {
@@ -52,9 +52,9 @@ resource "stackit_server" "dev_server_p3" {
   }
   availability_zone = var.region_az1
   machine_type      = var.flavor
-  network_interfaces = [stackit_network_interface.p3_lan1.network_interface_id ]
+  network_interfaces = [stackit_network_interface.backup_lan.network_interface_id ]
   keypair_name = stackit_key_pair.keypair.name
-  depends_on = [ stackit_network_interface.p3_lan1 ]
+  depends_on = [ stackit_network_interface.backup_lan ]
 }
 
 
@@ -80,9 +80,9 @@ resource "stackit_server" "dev_server_p6" {
   }
   availability_zone = var.region_az1
   machine_type      = var.flavor
-  network_interfaces = [stackit_network_interface.p6_lan1.network_interface_id ]
+  network_interfaces = [stackit_network_interface.infra_lan.network_interface_id ]
   keypair_name = stackit_key_pair.keypair.name
-  depends_on = [ stackit_network_interface.p6_lan1 ]
+  depends_on = [ stackit_network_interface.infra_lan ]
 }