diff --git a/.circleci/config.yml b/.circleci/config.yml
index 11b8b3505..814cd224f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -46,7 +46,7 @@ jobs:
 
   run-integration-tests:
     machine:
-      image: ubuntu-2004:202010-01
+      image: ubuntu-2004:2024.04.4
     environment:
       K8S_VERSION: v1.25.2
       KUBECONFIG: /home/circleci/.kube/config
diff --git a/admiral/pkg/controller/common/common.go b/admiral/pkg/controller/common/common.go
index af875d63b..4382e64d5 100644
--- a/admiral/pkg/controller/common/common.go
+++ b/admiral/pkg/controller/common/common.go
@@ -703,22 +703,22 @@ func GetMeshPortsHelper(meshPorts string, destService *k8sV1.Service, clusterNam
 	return ports
 }
 
-func GenerateUniqueNameForVS(syncNamespace string, vsName string) string {
+func GenerateUniqueNameForVS(originNamespace string, vsName string) string {
 
-	if syncNamespace == "" && vsName == "" {
+	if originNamespace == "" && vsName == "" {
 		return ""
-	} else if syncNamespace == "" {
+	} else if originNamespace == "" {
 		return vsName
 	} else if vsName == "" {
-		return syncNamespace
+		return originNamespace
 	}
 
-	newVSName := syncNamespace + "-" + vsName
+	newVSName := originNamespace + "-" + vsName
 	if len(newVSName) > 250 {
 		newVSName = newVSName[:250]
 	}
 	//"op=%v type=%v name=%v namespace=%s cluster=%s message=%v"
-	logrus.Debugf(LogFormatAdv, "VirtualService", newVSName, syncNamespace, "", "New VS name generated")
+	logrus.Debugf(LogFormatAdv, "VirtualService", newVSName, originNamespace, "", "New VS name generated")
 
 	return newVSName