diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index fbccbaa..696f2ce 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @PaloAltoNetworks/azure-vmseries-modules-codeowners @PaloAltoNetworks/aws-vmseries-modules-codeowners @PaloAltoNetworks/gcp-vmseries-modules-codeowners
\ No newline at end of file
+* @PaloAltoNetworks/azure-swfw-modules-codeowners @PaloAltoNetworks/aws-swfw-modules-codeowners @PaloAltoNetworks/gcp-swfw-modules-codeowners
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 5344834..6eef26d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,7 +1,7 @@
 name: Bug Report
 description: Create an issue to help us improve
-title: '[Bug Report] <Short title of the bug>'
-assignees: aws-vmseries-modules-codeowners
+title: "[Bug Report] <Short title of the bug>"
+assignees: aws-swfw-modules-codeowners
 body:
   - type: textarea
     attributes:
@@ -12,7 +12,7 @@ body:
   - type: input
     attributes:
       label: Test skeleton version
-      description: What is the test skeleton version in use (https://github.com/PaloAltoNetworks/terraform-modules-vmseries-tests-skeleton/releases)? Please include the commit hash if you're using an unreleased version.
+      description: What is the test skeleton version in use (https://github.com/PaloAltoNetworks/terraform-modules-swfw-tests-skeleton/releases)? Please include the commit hash if you're using an unreleased version.
       placeholder: eg. v0.1.2
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index c8bf17a..5339db9 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -2,7 +2,7 @@ name: Feature request
 description: Suggest an idea for this project
 # title: '[Enhancement] <Title>'
 labels: enhancement
-assignees: aws-vmseries-modules-codeowners
+assignees: aws-swfw-modules-codeowners
 body:
   - type: textarea
     attributes:
diff --git a/.github/workflows/lint_pr_title.yml b/.github/workflows/lint_pr_title.yml
index 2758c11..7ba8b27 100644
--- a/.github/workflows/lint_pr_title.yml
+++ b/.github/workflows/lint_pr_title.yml
@@ -20,5 +20,5 @@ on:
 jobs:
   lint_pr_title:
     name: Lint PR
-    uses: PaloAltoNetworks/terraform-modules-vmseries-ci-workflows/.github/workflows/lint_pr_title.yml@v2.2
+    uses: PaloAltoNetworks/terraform-modules-swfw-ci-workflows/.github/workflows/lint_pr_title.yml@v2.2
     if: github.actor != 'dependabot[bot]'
diff --git a/.releaserc.json b/.releaserc.json
index b6a09a2..c1f439c 100644
--- a/.releaserc.json
+++ b/.releaserc.json
@@ -36,7 +36,7 @@
         [
             "@semantic-release/github",
             {
-                "successComment": ":tada: This ${issue.pull_request ? 'PR is included' : 'issue has been resolved'} in version ${nextRelease.version} :tada:\n\nThe release is available on [Terraform Registry](https://registry.terraform.io/modules/PaloAltoNetworks/vmseries-modules/aws/latest) and [GitHub release](../releases/tag/v${nextRelease.version})\n\n> Posted by [semantic-release](https://github.com/semantic-release/semantic-release) bot"
+                "successComment": ":tada: This ${issue.pull_request ? 'PR is included' : 'issue has been resolved'} in version ${nextRelease.version} :tada:\n\nThe release is available on [GitHub release](../releases/tag/v${nextRelease.version})\n\n> Posted by [semantic-release](https://github.com/semantic-release/semantic-release) bot"
             }
         ]
     ],
diff --git a/README.md b/README.md
index 7cef506..1def210 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,13 @@
 
 ## Description
 
-Test skeleton with Terratest in Go used to execute integration and e2e tests for VM-Series modules:
+Test skeleton with Terratest in Go used to execute integration and e2e tests for Software Firewall modules:
 - [terraform-aws-vmseries-modules](https://github.com/PaloAltoNetworks/terraform-aws-vmseries-modules)
 - [terraform-azurerm-vmseries-modules](https://github.com/PaloAltoNetworks/terraform-azurerm-vmseries-modules)
 - [terraform-google-vmseries-modules](https://github.com/PaloAltoNetworks/terraform-google-vmseries-modules)
+- [terraform-aws-swfw-modules](https://github.com/PaloAltoNetworks/terraform-aws-swfw-modules)
+- [terraform-azurerm-swfw-modules](https://github.com/PaloAltoNetworks/terraform-azurerm-swfw-modules)
+- [terraform-google-swfw-modules](https://github.com/PaloAltoNetworks/terraform-google-swfw-modules)
 
 ## Usage
 
diff --git a/go.mod b/go.mod
index c319655..199f905 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/PaloAltoNetworks/terraform-modules-vmseries-tests-skeleton
+module github.com/PaloAltoNetworks/terraform-modules-swfw-tests-skeleton
 
 go 1.20
 
diff --git a/samples/vmseries_example_plan_and_deploy/main.tf b/samples/vmseries_example_plan_and_deploy/main.tf
index 9a8a0cc..1da65a6 100644
--- a/samples/vmseries_example_plan_and_deploy/main.tf
+++ b/samples/vmseries_example_plan_and_deploy/main.tf
@@ -1,7 +1,7 @@
 ### VPCS ###
 
 module "vpc" {
-  source = "github.com/PaloAltoNetworks/terraform-aws-vmseries-modules//modules/vpc"
+  source = "github.com/PaloAltoNetworks/terraform-aws-swfw-modules//modules/vpc"
 
   for_each = var.vpcs
 
@@ -19,7 +19,7 @@ module "vpc" {
 
 module "subnet_sets" {
   for_each = toset(flatten([for _, v in { for vk, vv in var.vpcs : vk => distinct([for sk, sv in vv.subnets : "${vk}-${sv.set}"]) } : v]))
-  source   = "github.com/PaloAltoNetworks/terraform-aws-vmseries-modules//modules/subnet_set"
+  source   = "github.com/PaloAltoNetworks/terraform-aws-swfw-modules//modules/subnet_set"
 
   name                = split("-", each.key)[1]
   vpc_id              = module.vpc[split("-", each.key)[0]].id
@@ -64,7 +64,7 @@ locals {
 
 module "vpc_routes" {
   for_each = { for route in local.vpc_routes : "${route.subnet_key}_${route.to_cidr}" => route }
-  source   = "github.com/PaloAltoNetworks/terraform-aws-vmseries-modules//modules/vpc_route"
+  source   = "github.com/PaloAltoNetworks/terraform-aws-swfw-modules//modules/vpc_route"
 
   route_table_ids = module.subnet_sets[each.value.subnet_key].unique_route_table_ids
   to_cidr         = each.value.to_cidr
@@ -132,7 +132,7 @@ locals {
 
 module "vmseries" {
   for_each = { for vmseries in local.vmseries_instances : "${vmseries.group}-${vmseries.instance}" => vmseries }
-  source   = "github.com/PaloAltoNetworks/terraform-aws-vmseries-modules//modules/vmseries"
+  source   = "github.com/PaloAltoNetworks/terraform-aws-swfw-modules//modules/vmseries"
 
   name             = "${var.name_prefix}${each.key}"
   vmseries_version = each.value.common.panos_version
diff --git a/samples/vmseries_example_plan_and_deploy/main_test.go b/samples/vmseries_example_plan_and_deploy/main_test.go
index eae8125..d077633 100644
--- a/samples/vmseries_example_plan_and_deploy/main_test.go
+++ b/samples/vmseries_example_plan_and_deploy/main_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/PaloAltoNetworks/terraform-modules-vmseries-tests-skeleton/pkg/testskeleton"
+	"github.com/PaloAltoNetworks/terraform-modules-swfw-tests-skeleton/pkg/testskeleton"
 	"github.com/gruntwork-io/terratest/modules/logger"
 	"github.com/gruntwork-io/terratest/modules/terraform"
 )
diff --git a/samples/vmseries_module_check_additional_changes_after_deployment/main.tf b/samples/vmseries_module_check_additional_changes_after_deployment/main.tf
index 49df514..392e011 100644
--- a/samples/vmseries_module_check_additional_changes_after_deployment/main.tf
+++ b/samples/vmseries_module_check_additional_changes_after_deployment/main.tf
@@ -6,7 +6,7 @@ resource "random_string" "random_sufix" {
 
 # Test security VPC
 module "security_vpc" {
-  source = "github.com/PaloAltoNetworks/terraform-aws-vmseries-modules//modules/vpc"
+  source = "github.com/PaloAltoNetworks/terraform-aws-swfw-modules//modules/vpc"
 
   name                    = "${var.name_prefix}${random_string.random_sufix.id}"
   cidr_block              = var.security_vpc_cidr
@@ -19,7 +19,7 @@ module "security_vpc" {
 
 # Subnets configured in test security VPC
 module "security_subnet_sets" {
-  source = "github.com/PaloAltoNetworks/terraform-aws-vmseries-modules//modules/subnet_set"
+  source = "github.com/PaloAltoNetworks/terraform-aws-swfw-modules//modules/subnet_set"
 
   for_each = toset(distinct([for _, v in var.security_vpc_subnets : v.set]))
 
@@ -33,7 +33,7 @@ module "security_subnet_sets" {
 # Routes configured in test security VPC
 module "security_vpc_routes" {
   for_each = { for route in local.security_vpc_routes : "${route.subnet_key}_${route.to_cidr}" => route }
-  source   = "github.com/PaloAltoNetworks/terraform-aws-vmseries-modules//modules/vpc_route"
+  source   = "github.com/PaloAltoNetworks/terraform-aws-swfw-modules//modules/vpc_route"
 
   route_table_ids = module.security_subnet_sets[each.value.subnet_key].unique_route_table_ids
   to_cidr         = each.value.to_cidr
@@ -43,7 +43,7 @@ module "security_vpc_routes" {
 # Optinal S3 bucket for bootstrapping
 module "bootstrap" {
   count              = var.use_s3_bucket_to_bootstrap ? 1 : 0
-  source             = "github.com/PaloAltoNetworks/terraform-aws-vmseries-modules//modules/bootstrap"
+  source             = "github.com/PaloAltoNetworks/terraform-aws-swfw-modules//modules/bootstrap"
   prefix             = local.bucket_name_prefix
   global_tags        = var.global_tags
   plugin-op-commands = var.plugin_op_commands
@@ -52,7 +52,7 @@ module "bootstrap" {
 # VM-Series deployed for tests
 module "vmseries" {
   for_each = var.vmseries
-  source   = "github.com/PaloAltoNetworks/terraform-aws-vmseries-modules//modules/vmseries"
+  source   = "github.com/PaloAltoNetworks/terraform-aws-swfw-modules//modules/vmseries"
 
   name              = "${var.name_prefix}${random_string.random_sufix.id}${var.name_sufix}"
   ssh_key_name      = aws_key_pair.generated_key.key_name
diff --git a/samples/vmseries_module_check_additional_changes_after_deployment/main_test.go b/samples/vmseries_module_check_additional_changes_after_deployment/main_test.go
index 2bf05c3..ac2fa7e 100644
--- a/samples/vmseries_module_check_additional_changes_after_deployment/main_test.go
+++ b/samples/vmseries_module_check_additional_changes_after_deployment/main_test.go
@@ -3,7 +3,7 @@ package vmseries_module_check_additional_changes_after_deployment
 import (
 	"testing"
 
-	"github.com/PaloAltoNetworks/terraform-modules-vmseries-tests-skeleton/pkg/testskeleton"
+	"github.com/PaloAltoNetworks/terraform-modules-swfw-tests-skeleton/pkg/testskeleton"
 	"github.com/gruntwork-io/terratest/modules/logger"
 	"github.com/gruntwork-io/terratest/modules/terraform"
 	tfjson "github.com/hashicorp/terraform-json"
diff --git a/samples/vmseries_module_check_additional_changes_after_deployment/panorama_routes.tf.temp b/samples/vmseries_module_check_additional_changes_after_deployment/panorama_routes.tf.temp
index ef31586..1d61aee 100644
--- a/samples/vmseries_module_check_additional_changes_after_deployment/panorama_routes.tf.temp
+++ b/samples/vmseries_module_check_additional_changes_after_deployment/panorama_routes.tf.temp
@@ -12,7 +12,7 @@ locals {
 
 module "panorama_vpc_routes" {
   for_each = { for route in local.panorama_vpc_routes : "${route.subnet_key}_${route.to_cidr}" => route }
-  source  = "github.com/PaloAltoNetworks/terraform-aws-vmseries-modules//modules/vpc_route"
+  source  = "github.com/PaloAltoNetworks/terraform-aws-swfw-modules//modules/vpc_route"
 
   next_hop_set    = each.value.next_hop_set
   route_table_ids = module.security_subnet_sets[each.value.subnet_key].unique_route_table_ids
diff --git a/samples/vmseries_module_check_terraform_output_and_vmseries_url/main.tf b/samples/vmseries_module_check_terraform_output_and_vmseries_url/main.tf
index 49df514..392e011 100644
--- a/samples/vmseries_module_check_terraform_output_and_vmseries_url/main.tf
+++ b/samples/vmseries_module_check_terraform_output_and_vmseries_url/main.tf
@@ -6,7 +6,7 @@ resource "random_string" "random_sufix" {
 
 # Test security VPC
 module "security_vpc" {
-  source = "github.com/PaloAltoNetworks/terraform-aws-vmseries-modules//modules/vpc"
+  source = "github.com/PaloAltoNetworks/terraform-aws-swfw-modules//modules/vpc"
 
   name                    = "${var.name_prefix}${random_string.random_sufix.id}"
   cidr_block              = var.security_vpc_cidr
@@ -19,7 +19,7 @@ module "security_vpc" {
 
 # Subnets configured in test security VPC
 module "security_subnet_sets" {
-  source = "github.com/PaloAltoNetworks/terraform-aws-vmseries-modules//modules/subnet_set"
+  source = "github.com/PaloAltoNetworks/terraform-aws-swfw-modules//modules/subnet_set"
 
   for_each = toset(distinct([for _, v in var.security_vpc_subnets : v.set]))
 
@@ -33,7 +33,7 @@ module "security_subnet_sets" {
 # Routes configured in test security VPC
 module "security_vpc_routes" {
   for_each = { for route in local.security_vpc_routes : "${route.subnet_key}_${route.to_cidr}" => route }
-  source   = "github.com/PaloAltoNetworks/terraform-aws-vmseries-modules//modules/vpc_route"
+  source   = "github.com/PaloAltoNetworks/terraform-aws-swfw-modules//modules/vpc_route"
 
   route_table_ids = module.security_subnet_sets[each.value.subnet_key].unique_route_table_ids
   to_cidr         = each.value.to_cidr
@@ -43,7 +43,7 @@ module "security_vpc_routes" {
 # Optinal S3 bucket for bootstrapping
 module "bootstrap" {
   count              = var.use_s3_bucket_to_bootstrap ? 1 : 0
-  source             = "github.com/PaloAltoNetworks/terraform-aws-vmseries-modules//modules/bootstrap"
+  source             = "github.com/PaloAltoNetworks/terraform-aws-swfw-modules//modules/bootstrap"
   prefix             = local.bucket_name_prefix
   global_tags        = var.global_tags
   plugin-op-commands = var.plugin_op_commands
@@ -52,7 +52,7 @@ module "bootstrap" {
 # VM-Series deployed for tests
 module "vmseries" {
   for_each = var.vmseries
-  source   = "github.com/PaloAltoNetworks/terraform-aws-vmseries-modules//modules/vmseries"
+  source   = "github.com/PaloAltoNetworks/terraform-aws-swfw-modules//modules/vmseries"
 
   name              = "${var.name_prefix}${random_string.random_sufix.id}${var.name_sufix}"
   ssh_key_name      = aws_key_pair.generated_key.key_name
diff --git a/samples/vmseries_module_check_terraform_output_and_vmseries_url/main_test.go b/samples/vmseries_module_check_terraform_output_and_vmseries_url/main_test.go
index e6c3747..ecf5043 100644
--- a/samples/vmseries_module_check_terraform_output_and_vmseries_url/main_test.go
+++ b/samples/vmseries_module_check_terraform_output_and_vmseries_url/main_test.go
@@ -3,8 +3,8 @@ package vmseries_module_check_terraform_output_and_vmseries_url
 import (
 	"testing"
 
-	"github.com/PaloAltoNetworks/terraform-modules-vmseries-tests-skeleton/pkg/helpers"
-	"github.com/PaloAltoNetworks/terraform-modules-vmseries-tests-skeleton/pkg/testskeleton"
+	"github.com/PaloAltoNetworks/terraform-modules-swfw-tests-skeleton/pkg/helpers"
+	"github.com/PaloAltoNetworks/terraform-modules-swfw-tests-skeleton/pkg/testskeleton"
 	"github.com/gruntwork-io/terratest/modules/logger"
 	"github.com/gruntwork-io/terratest/modules/terraform"
 )
diff --git a/samples/vmseries_module_check_terraform_plan_errors/main.tf b/samples/vmseries_module_check_terraform_plan_errors/main.tf
index 49df514..392e011 100644
--- a/samples/vmseries_module_check_terraform_plan_errors/main.tf
+++ b/samples/vmseries_module_check_terraform_plan_errors/main.tf
@@ -6,7 +6,7 @@ resource "random_string" "random_sufix" {
 
 # Test security VPC
 module "security_vpc" {
-  source = "github.com/PaloAltoNetworks/terraform-aws-vmseries-modules//modules/vpc"
+  source = "github.com/PaloAltoNetworks/terraform-aws-swfw-modules//modules/vpc"
 
   name                    = "${var.name_prefix}${random_string.random_sufix.id}"
   cidr_block              = var.security_vpc_cidr
@@ -19,7 +19,7 @@ module "security_vpc" {
 
 # Subnets configured in test security VPC
 module "security_subnet_sets" {
-  source = "github.com/PaloAltoNetworks/terraform-aws-vmseries-modules//modules/subnet_set"
+  source = "github.com/PaloAltoNetworks/terraform-aws-swfw-modules//modules/subnet_set"
 
   for_each = toset(distinct([for _, v in var.security_vpc_subnets : v.set]))
 
@@ -33,7 +33,7 @@ module "security_subnet_sets" {
 # Routes configured in test security VPC
 module "security_vpc_routes" {
   for_each = { for route in local.security_vpc_routes : "${route.subnet_key}_${route.to_cidr}" => route }
-  source   = "github.com/PaloAltoNetworks/terraform-aws-vmseries-modules//modules/vpc_route"
+  source   = "github.com/PaloAltoNetworks/terraform-aws-swfw-modules//modules/vpc_route"
 
   route_table_ids = module.security_subnet_sets[each.value.subnet_key].unique_route_table_ids
   to_cidr         = each.value.to_cidr
@@ -43,7 +43,7 @@ module "security_vpc_routes" {
 # Optinal S3 bucket for bootstrapping
 module "bootstrap" {
   count              = var.use_s3_bucket_to_bootstrap ? 1 : 0
-  source             = "github.com/PaloAltoNetworks/terraform-aws-vmseries-modules//modules/bootstrap"
+  source             = "github.com/PaloAltoNetworks/terraform-aws-swfw-modules//modules/bootstrap"
   prefix             = local.bucket_name_prefix
   global_tags        = var.global_tags
   plugin-op-commands = var.plugin_op_commands
@@ -52,7 +52,7 @@ module "bootstrap" {
 # VM-Series deployed for tests
 module "vmseries" {
   for_each = var.vmseries
-  source   = "github.com/PaloAltoNetworks/terraform-aws-vmseries-modules//modules/vmseries"
+  source   = "github.com/PaloAltoNetworks/terraform-aws-swfw-modules//modules/vmseries"
 
   name              = "${var.name_prefix}${random_string.random_sufix.id}${var.name_sufix}"
   ssh_key_name      = aws_key_pair.generated_key.key_name
diff --git a/samples/vmseries_module_check_terraform_plan_errors/main_test.go b/samples/vmseries_module_check_terraform_plan_errors/main_test.go
index 380c61d..32c978c 100644
--- a/samples/vmseries_module_check_terraform_plan_errors/main_test.go
+++ b/samples/vmseries_module_check_terraform_plan_errors/main_test.go
@@ -3,7 +3,7 @@ package vmseries_module_check_terraform_plan_errors
 import (
 	"testing"
 
-	"github.com/PaloAltoNetworks/terraform-modules-vmseries-tests-skeleton/pkg/testskeleton"
+	"github.com/PaloAltoNetworks/terraform-modules-swfw-tests-skeleton/pkg/testskeleton"
 	"github.com/gruntwork-io/terratest/modules/logger"
 	"github.com/gruntwork-io/terratest/modules/terraform"
 )