diff --git a/test/appframework_gcp/c3/appframework_gcs_suite_test.go b/test/appframework_gcp/c3/appframework_gcs_suite_test.go
index 0c3aa540f..67f59fd4a 100644
--- a/test/appframework_gcp/c3/appframework_gcs_suite_test.go
+++ b/test/appframework_gcp/c3/appframework_gcs_suite_test.go
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package gcpc3appfw
+package c3gcpappfw
 
 import (
 	"os"
diff --git a/test/appframework_gcp/c3/appframework_gcs_test.go b/test/appframework_gcp/c3/appframework_gcs_test.go
index 285fe3754..92b03deac 100644
--- a/test/appframework_gcp/c3/appframework_gcs_test.go
+++ b/test/appframework_gcp/c3/appframework_gcs_test.go
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.s
-package gcpc3appfw
+package c3gcpappfw
 
 import (
 	"context"
@@ -89,7 +89,7 @@ var _ = Describe("c3appfw test", func() {
 	})
 
 	Context("Single Site Indexer Cluster with Search Head Cluster (C3) and App Framework", func() {
-		It("smoke, gcpc3, gcpmasterappframeworkc3, gcpappframework, gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then upgrade them", func() {
+		It("smoke, c3gcp, masterappframeworkc3gcp, appframeworkgcp, gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then upgrade them", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -308,7 +308,7 @@ var _ = Describe("c3appfw test", func() {
 	})
 
 	Context("Single Site Indexer Cluster with Search Head Cluster (C3) with App Framework", func() {
-		It("smoke, c3, gcpmasterappframeworkc3, gcpappframework, gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then downgrade them", func() {
+		It("smoke, c3gcp, masterappframeworkc3gcp, appframeworkgcp, gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then downgrade them", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -793,7 +793,7 @@ var _ = Describe("c3appfw test", func() {
 	})
 
 	Context("Clustered deployment (C3 - clustered indexer, search head cluster)", func() {
-		It("smoke, gcpc3, gcpmasterappframeworkc3, gcpappframework, gcp_sanity: can deploy a C3 SVA and have apps installed locally on Cluster Manager and Deployer", func() {
+		It("smoke, c3gcp, masterappframeworkc3gcp, appframeworkgcp, gcp_sanity: can deploy a C3 SVA and have apps installed locally on Cluster Manager and Deployer", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -2966,7 +2966,7 @@ var _ = Describe("c3appfw test", func() {
 	})
 
 	Context("Single Site Indexer Cluster with Search Head Cluster (C3) and App Framework", func() {
-		It("smoke, gcpc3, gcpmasterappframeworkc3, gcpappframework, gcp_sanity: can deploy a C3 SVA with App Framework enabled and check isDeploymentInProgressFlag for CM and SHC CR's", func() {
+		It("smoke, c3gcp, masterappframeworkc3gcp, appframeworkgcp, gcp_sanity: can deploy a C3 SVA with App Framework enabled and check isDeploymentInProgressFlag for CM and SHC CR's", func() {
 
 			/*
 			   Test Steps
diff --git a/test/appframework_gcp/c3/manager_appframework_test.go b/test/appframework_gcp/c3/manager_appframework_test.go
index f18a702df..500edafea 100644
--- a/test/appframework_gcp/c3/manager_appframework_test.go
+++ b/test/appframework_gcp/c3/manager_appframework_test.go
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.s
-package gcpc3appfw
+package c3gcpappfw
 
 import (
 	"context"
@@ -86,7 +86,7 @@ var _ = Describe("c3appfw test", func() {
 	})
 
 	Context("Single Site Indexer Cluster with Search Head Cluster (C3) and App Framework", func() {
-		It("smoke, gcpc3, gcpmanagerappframeworkc3, gcpappframework, gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then upgrade them", func() {
+		It("smoke, c3gcp, managerappframeworkc3gcp, appframeworkgcp, gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then upgrade them", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -305,7 +305,7 @@ var _ = Describe("c3appfw test", func() {
 	})
 
 	Context("Single Site Indexer Cluster with Search Head Cluster (C3) and App Framework and Image Upgrade", func() {
-		It("smoke, gcpc3, gcpmanagerappframeworkc3t, gcpappframework, gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then upgrade the image and apps", func() {
+		It("smoke, c3gcp, managerappframeworkc3gcpt, appframeworkgcp, gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then upgrade the image and apps", func() {
 
 			//################## SETUP ####################
 
@@ -446,7 +446,7 @@ var _ = Describe("c3appfw test", func() {
 	})
 
 	Context("Single Site Indexer Cluster with Search Head Cluster (C3) with App Framework", func() {
-		It("smoke, gcpc3, gcpmanagerappframeworkc3, gcpappframework, gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then downgrade them", func() {
+		It("smoke, c3gcp, managerappframeworkc3gcp, appframeworkgcp, gcp_sanity: can deploy a C3 SVA with App Framework enabled, install apps then downgrade them", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -931,7 +931,7 @@ var _ = Describe("c3appfw test", func() {
 	})
 
 	Context("Clustered deployment (C3 - clustered indexer, search head cluster)", func() {
-		It("smoke, gcpc3, gcpmanagerappframeworkc3, gcpappframework, gcp_sanity: can deploy a C3 SVA and have apps installed locally on Cluster Manager and Deployer", func() {
+		It("smoke, c3gcp, managerappframeworkc3gcp, appframeworkgcp, gcp_sanity: can deploy a C3 SVA and have apps installed locally on Cluster Manager and Deployer", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -3104,7 +3104,7 @@ var _ = Describe("c3appfw test", func() {
 	})
 
 	Context("Single Site Indexer Cluster with Search Head Cluster (C3) and App Framework", func() {
-		It("smoke, gcpc3, gcpmanagerappframeworkc3, gcpappframework, gcp_sanity: can deploy a C3 SVA with App Framework enabled and check isDeploymentInProgressFlag for CM and SHC CR's", func() {
+		It("smoke, c3gcp, managerappframeworkc3gcp, appframeworkgcp, gcp_sanity: can deploy a C3 SVA with App Framework enabled and check isDeploymentInProgressFlag for CM and SHC CR's", func() {
 
 			/*
 			   Test Steps
diff --git a/test/appframework_gcp/m4/appframework_gcs_suite_test.go b/test/appframework_gcp/m4/appframework_gcs_suite_test.go
index ed2c246a4..15cc338e6 100644
--- a/test/appframework_gcp/m4/appframework_gcs_suite_test.go
+++ b/test/appframework_gcp/m4/appframework_gcs_suite_test.go
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package gcpm4appfw
+package m4gcpappfw
 
 import (
 	"os"
diff --git a/test/appframework_gcp/m4/appframework_gcs_test.go b/test/appframework_gcp/m4/appframework_gcs_test.go
index ce51a88ec..e27f45b2f 100644
--- a/test/appframework_gcp/m4/appframework_gcs_test.go
+++ b/test/appframework_gcp/m4/appframework_gcs_test.go
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.s
-package gcpm4appfw
+package m4gcpappfw
 
 import (
 	"context"
@@ -89,7 +89,7 @@ var _ = Describe("m4appfw test", func() {
 	})
 
 	Context("Multisite Indexer Cluster with Search Head Cluster (m4) with App Framework", func() {
-		It("smoke, gcpm4, gcpmasterappframeworkm4, gcpappframework, gcp_sanity: can deploy a M4 SVA with App Framework enabled, install apps and upgrade them", func() {
+		It("smoke, m4gcp, masterappframeworkm4gcp, appframeworkgcp, gcp_sanity: can deploy a M4 SVA with App Framework enabled, install apps and upgrade them", func() {
 
 			/* Test Steps
 			   ################## SETUP ##################
@@ -1717,7 +1717,7 @@ var _ = Describe("m4appfw test", func() {
 	})
 
 	Context("Single Site Indexer Cluster with Search Head Cluster (M4) and App Framework", func() {
-		It("smoke, gcpm4, gcpmasterappframeworkm4, gcpappframework, gcp_sanity: can deploy a M4, add new apps to app source while install is in progress and have all apps installed cluster-wide", func() {
+		It("smoke, m4gcp, masterappframeworkm4gcp, appframeworkgcp, gcp_sanity: can deploy a M4, add new apps to app source while install is in progress and have all apps installed cluster-wide", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -2636,7 +2636,7 @@ var _ = Describe("m4appfw test", func() {
 	})
 
 	Context("Multisite Indexer Cluster with Search Head Cluster (m4) with App Framework", func() {
-		It("smoke, gcpm4, gcpmasterappframeworkm4, gcpappframework, gcp_sanity: can deploy a M4 SVA with App Framework enabled, install apps and check IsDeploymentInProgress for CM and SHC CR's", func() {
+		It("smoke, m4gcp, masterappframeworkm4gcp, appframeworkgcp, gcp_sanity: can deploy a M4 SVA with App Framework enabled, install apps and check IsDeploymentInProgress for CM and SHC CR's", func() {
 
 			/* Test Steps
 			   ################## SETUP ##################
diff --git a/test/appframework_gcp/m4/manager_appframework_test.go b/test/appframework_gcp/m4/manager_appframework_test.go
index 397c952e5..04b1803f3 100644
--- a/test/appframework_gcp/m4/manager_appframework_test.go
+++ b/test/appframework_gcp/m4/manager_appframework_test.go
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.s
-package gcpm4appfw
+package m4gcpappfw
 
 import (
 	"context"
@@ -88,7 +88,7 @@ var _ = Describe("m4appfw test", func() {
 	})
 
 	Context("Multisite Indexer Cluster with Search Head Cluster (m4) with App Framework", func() {
-		It("smoke, gcpm4, gcpmanagerappframeworkm4, gcpappframework, gcp_sanity: can deploy a M4 SVA with App Framework enabled, install apps and upgrade them", func() {
+		It("smoke, m4gcp, managerappframeworkm4gcp, appframeworkgcp, gcp_sanity: can deploy a M4 SVA with App Framework enabled, install apps and upgrade them", func() {
 
 			/* Test Steps
 			   ################## SETUP ##################
@@ -1716,7 +1716,7 @@ var _ = Describe("m4appfw test", func() {
 	})
 
 	Context("Single Site Indexer Cluster with Search Head Cluster (M4) and App Framework", func() {
-		It("smoke, gcpm4, gcpmanagerappframeworkm4, gcpappframework, gcp_sanity: can deploy a M4, add new apps to app source while install is in progress and have all apps installed cluster-wide", func() {
+		It("smoke, m4gcp, managerappframeworkm4gcp, appframeworkgcp, gcp_sanity: can deploy a M4, add new apps to app source while install is in progress and have all apps installed cluster-wide", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -2635,7 +2635,7 @@ var _ = Describe("m4appfw test", func() {
 	})
 
 	Context("Multisite Indexer Cluster with Search Head Cluster (m4) with App Framework", func() {
-		It("smoke, gcpm4, gcpmanagerappframeworkm4, gcpappframework, gcp_sanity: can deploy a M4 SVA with App Framework enabled, install apps and check IsDeploymentInProgress for CM and SHC CR's", func() {
+		It("smoke, m4gcp, managerappframeworkm4gcp, appframeworkgcp, gcp_sanity: can deploy a M4 SVA with App Framework enabled, install apps and check IsDeploymentInProgress for CM and SHC CR's", func() {
 
 			/* Test Steps
 			   ################## SETUP ##################
diff --git a/test/appframework_gcp/s1/appframework_gcs_test.go b/test/appframework_gcp/s1/appframework_gcs_test.go
index 14c1823f2..a99f463c3 100644
--- a/test/appframework_gcp/s1/appframework_gcs_test.go
+++ b/test/appframework_gcp/s1/appframework_gcs_test.go
@@ -250,7 +250,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("smoke, gcps1, gcpappframeworks1, gcpappframework, gcp_sanity: can deploy a Standalone instance with App Framework enabled, install apps then downgrade them", func() {
+		It("smoke, gcps1, appframeworkgcps1, appframeworkgcp, gcp_sanity: can deploy a Standalone instance with App Framework enabled, install apps then downgrade them", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -1928,7 +1928,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("smoke, gcps1, gcpappframeworks1, gcpappframework, gcp_sanity: can deploy a Standalone instance with App Framework enabled, install apps and check isDeploymentInProgress is set for Standaloen and MC CR's", func() {
+		It("smoke, gcps1, appframeworkgcps1, appframeworkgcp, gcp_sanity: can deploy a Standalone instance with App Framework enabled, install apps and check isDeploymentInProgress is set for Standaloen and MC CR's", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################