diff --git a/core/pkg/resourcehandler/k8sresources.go b/core/pkg/resourcehandler/k8sresources.go
index aee42b9d..727592c3 100644
--- a/core/pkg/resourcehandler/k8sresources.go
+++ b/core/pkg/resourcehandler/k8sresources.go
@@ -61,7 +61,7 @@ func (k8sHandler *K8sResourceHandler) GetResources(sessionObj *cautils.OPASessio
 	_, namespace, labels := armotypes.DigestPortalDesignator(designator)
 
 	// pull k8s recourses
-	ksResourceMap := setArmoResourceMap(sessionObj.Policies, resourceToControl)
+	ksResourceMap := setKSResourceMap(sessionObj.Policies, resourceToControl)
 
 	// map of Kubescape resources to control_ids
 	sessionObj.ResourceToControlsMap = resourceToControl
diff --git a/core/pkg/resourcehandler/k8sresourcesutils.go b/core/pkg/resourcehandler/k8sresourcesutils.go
index 4ead168a..1aab3793 100644
--- a/core/pkg/resourcehandler/k8sresourcesutils.go
+++ b/core/pkg/resourcehandler/k8sresourcesutils.go
@@ -40,10 +40,10 @@ var (
 		ClusterDescribe: {"container.googleapis.com/v1", "eks.amazonaws.com/v1", "management.azure.com/v1"}}
 )
 
-func isEmptyImgVulns(armoResourcesMap cautils.KSResources) bool {
-	imgVulnResources := cautils.MapImageVulnResources(&armoResourcesMap)
+func isEmptyImgVulns(ksResourcesMap cautils.KSResources) bool {
+	imgVulnResources := cautils.MapImageVulnResources(&ksResourcesMap)
 	for _, resource := range imgVulnResources {
-		if val, ok := armoResourcesMap[resource]; ok {
+		if val, ok := ksResourcesMap[resource]; ok {
 			if len(val) > 0 {
 				return false
 			}
@@ -68,20 +68,20 @@ func setK8sResourceMap(frameworks []reporthandling.Framework) *cautils.K8SResour
 	return &k8sResources
 }
 
-func setArmoResourceMap(frameworks []reporthandling.Framework, resourceToControl map[string][]string) *cautils.KSResources {
-	armoResources := make(cautils.KSResources)
-	complexMap := setComplexArmoResourceMap(frameworks, resourceToControl)
+func setKSResourceMap(frameworks []reporthandling.Framework, resourceToControl map[string][]string) *cautils.KSResources {
+	ksResources := make(cautils.KSResources)
+	complexMap := setComplexKSResourceMap(frameworks, resourceToControl)
 	for group := range complexMap {
 		for version := range complexMap[group] {
 			for resource := range complexMap[group][version] {
 				groupResources := k8sinterface.ResourceGroupToString(group, version, resource)
 				for _, groupResource := range groupResources {
-					armoResources[groupResource] = nil
+					ksResources[groupResource] = nil
 				}
 			}
 		}
 	}
-	return &armoResources
+	return &ksResources
 }
 
 func setComplexK8sResourceMap(frameworks []reporthandling.Framework) map[string]map[string]map[string]interface{} {
@@ -99,13 +99,13 @@ func setComplexK8sResourceMap(frameworks []reporthandling.Framework) map[string]
 }
 
 // [group][versionn][resource]
-func setComplexArmoResourceMap(frameworks []reporthandling.Framework, resourceToControls map[string][]string) map[string]map[string]map[string]interface{} {
+func setComplexKSResourceMap(frameworks []reporthandling.Framework, resourceToControls map[string][]string) map[string]map[string]map[string]interface{} {
 	k8sResources := make(map[string]map[string]map[string]interface{})
 	for _, framework := range frameworks {
 		for _, control := range framework.Controls {
 			for _, rule := range control.Rules {
 				for _, match := range rule.DynamicMatch {
-					insertArmoResourcesAndControls(k8sResources, match, resourceToControls, control)
+					insertKSResourcesAndControls(k8sResources, match, resourceToControls, control)
 				}
 			}
 		}
@@ -113,7 +113,7 @@ func setComplexArmoResourceMap(frameworks []reporthandling.Framework, resourceTo
 	return k8sResources
 }
 
-func mapArmoResourceToApiGroup(resource string) []string {
+func mapKSResourceToApiGroup(resource string) []string {
 	if val, ok := MapResourceToApiGroup[resource]; ok {
 		return []string{val}
 	}
@@ -127,9 +127,9 @@ func mapArmoResourceToApiGroup(resource string) []string {
 }
 
 func insertControls(resource string, resourceToControl map[string][]string, control reporthandling.Control) {
-	armoResources := mapArmoResourceToApiGroup(resource)
-	for _, armoResource := range armoResources {
-		group, version := k8sinterface.SplitApiVersion(armoResource)
+	ksResources := mapKSResourceToApiGroup(resource)
+	for _, ksResource := range ksResources {
+		group, version := k8sinterface.SplitApiVersion(ksResource)
 		r := k8sinterface.JoinResourceTriplets(group, version, resource)
 		if _, ok := resourceToControl[r]; !ok {
 			resourceToControl[r] = append(resourceToControl[r], control.ControlID)
@@ -159,7 +159,7 @@ func insertResources(k8sResources map[string]map[string]map[string]interface{},
 	}
 }
 
-func insertArmoResourcesAndControls(k8sResources map[string]map[string]map[string]interface{}, match reporthandling.RuleMatchObjects, resourceToControl map[string][]string, control reporthandling.Control) {
+func insertKSResourcesAndControls(k8sResources map[string]map[string]map[string]interface{}, match reporthandling.RuleMatchObjects, resourceToControl map[string][]string, control reporthandling.Control) {
 	for _, apiGroup := range match.APIGroups {
 		if v, ok := k8sResources[apiGroup]; !ok || v == nil {
 			k8sResources[apiGroup] = make(map[string]map[string]interface{})
diff --git a/core/pkg/resourcehandler/k8sresourcesutils_test.go b/core/pkg/resourcehandler/k8sresourcesutils_test.go
index 1637afb1..0f917961 100644
--- a/core/pkg/resourcehandler/k8sresourcesutils_test.go
+++ b/core/pkg/resourcehandler/k8sresourcesutils_test.go
@@ -27,16 +27,16 @@ func TestSetResourceMap(t *testing.T) {
 
 }
 func TestSsEmptyImgVulns(t *testing.T) {
-	armoResourcesMap := make(cautils.KSResources, 0)
-	armoResourcesMap["container.googleapis.com/v1"] = []string{"fsdfds"}
-	assert.Equal(t, true, isEmptyImgVulns(armoResourcesMap))
+	ksResourcesMap := make(cautils.KSResources, 0)
+	ksResourcesMap["container.googleapis.com/v1"] = []string{"fsdfds"}
+	assert.Equal(t, true, isEmptyImgVulns(ksResourcesMap))
 
-	armoResourcesMap["armo.vuln.images/v1/ImageVulnerabilities"] = []string{"dada"}
-	assert.Equal(t, false, isEmptyImgVulns(armoResourcesMap))
+	ksResourcesMap["armo.vuln.images/v1/ImageVulnerabilities"] = []string{"dada"}
+	assert.Equal(t, false, isEmptyImgVulns(ksResourcesMap))
 
-	armoResourcesMap["armo.vuln.images/v1/ImageVulnerabilities"] = []string{}
-	armoResourcesMap["bla"] = []string{"blu"}
-	assert.Equal(t, true, isEmptyImgVulns(armoResourcesMap))
+	ksResourcesMap["armo.vuln.images/v1/ImageVulnerabilities"] = []string{}
+	ksResourcesMap["bla"] = []string{"blu"}
+	assert.Equal(t, true, isEmptyImgVulns(ksResourcesMap))
 }
 
 func TestInsertK8sResources(t *testing.T) {