diff --git a/pkg/ibmvpc/analysis_output_test.go b/pkg/ibmvpc/analysis_output_test.go
index b149df065..d7beef312 100644
--- a/pkg/ibmvpc/analysis_output_test.go
+++ b/pkg/ibmvpc/analysis_output_test.go
@@ -360,9 +360,9 @@ var tests = []*vpcGeneralTest{
 var formatsAvoidComparison = map[vpcmodel.OutFormat]bool{vpcmodel.ARCHDRAWIO: true, vpcmodel.DRAWIO: true}
 
 // uncomment the function below to run for updating the expected output
-//var formatsAvoidOutputGeneration = map[vpcmodel.OutFormat]bool{vpcmodel.ARCHDRAWIO: true, vpcmodel.DRAWIO: true}
+// var formatsAvoidOutputGeneration = map[vpcmodel.OutFormat]bool{vpcmodel.ARCHDRAWIO: true, vpcmodel.DRAWIO: true}
 //
-//func TestAllWithGeneration(t *testing.T) {
+// func TestAllWithGeneration(t *testing.T) {
 //	// tests is the list of tests to run
 //	for testIdx := range tests {
 //		tt := tests[testIdx]
diff --git a/pkg/vpcmodel/semanticDiff.go b/pkg/vpcmodel/semanticDiff.go
index 2ef1ad836..e715c2b2c 100644
--- a/pkg/vpcmodel/semanticDiff.go
+++ b/pkg/vpcmodel/semanticDiff.go
@@ -59,11 +59,11 @@ type diffBetweenCfgs struct {
 // computes and returns the semantic diff of endpoints or subnets connectivity, as per the required analysis
 func (configs configsForDiff) GetDiff() (*diffBetweenCfgs, error) {
 	// 1. compute connectivity for each of the configurations
-	generalConnectivityMap1, err := configs.config1.getAllowedConnectionCombined(configs.diffAnalysis)
+	generalConnectivityMap1, err := configs.config1.getAllowedConnectionsCombined(configs.diffAnalysis)
 	if err != nil {
 		return nil, err
 	}
-	generalConnectivityMap2, err := configs.config2.getAllowedConnectionCombined(configs.diffAnalysis)
+	generalConnectivityMap2, err := configs.config2.getAllowedConnectionsCombined(configs.diffAnalysis)
 	if err != nil {
 		return nil, err
 	}
@@ -96,7 +96,7 @@ func (configs configsForDiff) GetDiff() (*diffBetweenCfgs, error) {
 	return res, nil
 }
 
-func (c *VPCConfig) getAllowedConnectionCombined(
+func (c *VPCConfig) getAllowedConnectionsCombined(
 	diffAnalysis diffAnalysisType) (generalConnectivityMap GeneralConnectivityMap, err error) {
 	if diffAnalysis == Subnets {
 		subnetsConn, err := c.GetSubnetsConnectivity(true, false)