diff --git a/pkg/networkservice/chains/nsmgr/single_test.go b/pkg/networkservice/chains/nsmgr/single_test.go
index cee152c25..f81a4c0f8 100644
--- a/pkg/networkservice/chains/nsmgr/single_test.go
+++ b/pkg/networkservice/chains/nsmgr/single_test.go
@@ -264,8 +264,8 @@ func Test_ShouldParseNetworkServiceLabelsTemplate(t *testing.T) {
 	const (
 		testEnvName             = "NODE_NAME"
 		testEnvValue            = "testValue"
-		destinationTestKey      = `NodeNameKey`
-		destinationTestTemplate = `{{.NodeNameKey}}`
+		destinationTestKey      = `NodeName`
+		destinationTestTemplate = `{{.NodeName}}`
 	)
 
 	err := os.Setenv(testEnvName, testEnvValue)
diff --git a/pkg/networkservice/common/clientinfo/client_test.go b/pkg/networkservice/common/clientinfo/client_test.go
index 89788ea72..023d0d857 100644
--- a/pkg/networkservice/common/clientinfo/client_test.go
+++ b/pkg/networkservice/common/clientinfo/client_test.go
@@ -71,9 +71,9 @@ func TestClientInfo(t *testing.T) {
 			},
 			oldLabels: nil,
 			want: map[string]string{
-				"NodeNameKey":    "AAA",
-				"PodNameKey":     "BBB",
-				"ClusterNameKey": "CCC",
+				"NodeName":    "AAA",
+				"PodName":     "BBB",
+				"ClusterName": "CCC",
 			},
 		},
 		{
@@ -84,15 +84,15 @@ func TestClientInfo(t *testing.T) {
 				"CLUSTER_NAME": "CCC",
 			},
 			oldLabels: map[string]string{
-				"NodeNameKey":    "OLD_VAL1",
-				"PodNameKey":     "OLD_VAL2",
-				"ClusterNameKey": "OLD_VAL3",
+				"NodeName":       "OLD_VAL1",
+				"PodName":        "OLD_VAL2",
+				"ClusterName":    "OLD_VAL3",
 				"SomeOtherLabel": "DDD",
 			},
 			want: map[string]string{
-				"NodeNameKey":    "OLD_VAL1",
-				"PodNameKey":     "OLD_VAL2",
-				"ClusterNameKey": "OLD_VAL3",
+				"NodeName":       "OLD_VAL1",
+				"PodName":        "OLD_VAL2",
+				"ClusterName":    "OLD_VAL3",
 				"SomeOtherLabel": "DDD",
 			},
 		},
@@ -103,14 +103,14 @@ func TestClientInfo(t *testing.T) {
 				"CLUSTER_NAME": "CCC",
 			},
 			oldLabels: map[string]string{
-				"NodeNameKey":    "OLD_VAL1",
-				"ClusterNameKey": "OLD_VAL3",
+				"NodeName":       "OLD_VAL1",
+				"ClusterName":    "OLD_VAL3",
 				"SomeOtherLabel": "DDD",
 			},
 			want: map[string]string{
-				"NodeNameKey":    "OLD_VAL1",
-				"PodNameKey":     "BBB",
-				"ClusterNameKey": "OLD_VAL3",
+				"NodeName":       "OLD_VAL1",
+				"PodName":        "BBB",
+				"ClusterName":    "OLD_VAL3",
 				"SomeOtherLabel": "DDD",
 			},
 		},
@@ -121,12 +121,12 @@ func TestClientInfo(t *testing.T) {
 				"CLUSTER_NAME": "CCC",
 			},
 			oldLabels: map[string]string{
-				"ClusterNameKey": "OLD_VAL3",
+				"ClusterName":    "OLD_VAL3",
 				"SomeOtherLabel": "DDD",
 			},
 			want: map[string]string{
-				"PodNameKey":     "BBB",
-				"ClusterNameKey": "OLD_VAL3",
+				"PodName":        "BBB",
+				"ClusterName":    "OLD_VAL3",
 				"SomeOtherLabel": "DDD",
 			},
 		},
diff --git a/pkg/registry/common/clientinfo/server_test.go b/pkg/registry/common/clientinfo/server_test.go
index 20e81f00c..32febaa18 100644
--- a/pkg/registry/common/clientinfo/server_test.go
+++ b/pkg/registry/common/clientinfo/server_test.go
@@ -65,9 +65,9 @@ func TestLabelsServer(t *testing.T) {
 				"CLUSTER_NAME": "CCC",
 			},
 			expected: map[string]string{
-				"NodeNameKey":    "AAA",
-				"PodNameKey":     "BBB",
-				"ClusterNameKey": "CCC",
+				"NodeName":    "AAA",
+				"PodName":     "BBB",
+				"ClusterName": "CCC",
 			},
 		},
 		{
@@ -78,15 +78,15 @@ func TestLabelsServer(t *testing.T) {
 				"CLUSTER_NAME": "CCC",
 			},
 			expected: map[string]string{
-				"NodeNameKey":    "OLD_VAL1",
-				"PodNameKey":     "OLD_VAL2",
-				"ClusterNameKey": "OLD_VAL3",
+				"NodeName":       "OLD_VAL1",
+				"PodName":        "OLD_VAL2",
+				"ClusterName":    "OLD_VAL3",
 				"SomeOtherLabel": "DDD",
 			},
 			input: map[string]string{
-				"NodeNameKey":    "OLD_VAL1",
-				"PodNameKey":     "OLD_VAL2",
-				"ClusterNameKey": "OLD_VAL3",
+				"NodeName":       "OLD_VAL1",
+				"PodName":        "OLD_VAL2",
+				"ClusterName":    "OLD_VAL3",
 				"SomeOtherLabel": "DDD",
 			},
 		},
@@ -96,13 +96,13 @@ func TestLabelsServer(t *testing.T) {
 				"CLUSTER_NAME": "CCC",
 			},
 			expected: map[string]string{
-				"NodeNameKey":    "OLD_VAL1",
-				"ClusterNameKey": "OLD_VAL2",
+				"NodeName":       "OLD_VAL1",
+				"ClusterName":    "OLD_VAL2",
 				"SomeOtherLabel": "DDD",
 			},
 			input: map[string]string{
-				"NodeNameKey":    "OLD_VAL1",
-				"ClusterNameKey": "OLD_VAL2",
+				"NodeName":       "OLD_VAL1",
+				"ClusterName":    "OLD_VAL2",
 				"SomeOtherLabel": "DDD",
 			},
 		},
diff --git a/pkg/tools/clientinfo/clientinfo.go b/pkg/tools/clientinfo/clientinfo.go
index 8dbf2b4c8..b872fb32a 100644
--- a/pkg/tools/clientinfo/clientinfo.go
+++ b/pkg/tools/clientinfo/clientinfo.go
@@ -28,9 +28,9 @@ const (
 	nodeNameEnv      = "NODE_NAME"
 	podNameEnv       = "POD_NAME"
 	clusterNameEnv   = "CLUSTER_NAME"
-	nodeNameLabel    = "NodeNameKey"
-	podNameLabel     = "PodNameKey"
-	clusterNameLabel = "ClusterNameKey"
+	nodeNameLabel    = "NodeName"
+	podNameLabel     = "PodName"
+	clusterNameLabel = "ClusterName"
 )
 
 // AddClientInfo adds client info (node/pod/cluster names) to provided map, taking this info from corresponding