diff --git a/pkg/custom-provider/provider_test.go b/pkg/custom-provider/provider_test.go
index 13a7e5ab..09a390a5 100644
--- a/pkg/custom-provider/provider_test.go
+++ b/pkg/custom-provider/provider_test.go
@@ -45,13 +45,13 @@ func setupPrometheusProvider() (provider.CustomMetricsProvider, *fakeprom.FakePr
 
 	prov, _ := NewPrometheusProvider(restMapper(), fakeKubeClient, fakeProm, namers, fakeProviderUpdateInterval, fakeProviderStartDuration)
 
-	containerSel := prom.MatchSeries("", prom.NameMatches("^container_.*"), prom.LabelNeq("container_name", "POD"), prom.LabelNeq("namespace", ""), prom.LabelNeq("pod_name", ""))
+	containerSel := prom.MatchSeries("", prom.NameMatches("^container_.*"), prom.LabelNeq("container", "POD"), prom.LabelNeq("namespace", ""), prom.LabelNeq("pod", ""))
 	namespacedSel := prom.MatchSeries("", prom.LabelNeq("namespace", ""), prom.NameNotMatches("^container_.*"))
 	fakeProm.SeriesResults = map[prom.Selector][]prom.Series{
 		containerSel: {
 			{
 				Name:   "container_some_usage",
-				Labels: pmodel.LabelSet{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"},
+				Labels: pmodel.LabelSet{"pod": "somepod", "namespace": "somens", "container": "somecont"},
 			},
 		},
 		namespacedSel: {
diff --git a/pkg/custom-provider/series_registry_test.go b/pkg/custom-provider/series_registry_test.go
index 6e55f8b9..b517a724 100644
--- a/pkg/custom-provider/series_registry_test.go
+++ b/pkg/custom-provider/series_registry_test.go
@@ -65,19 +65,19 @@ var seriesRegistryTestSeries = [][]prom.Series{
 	{
 		{
 			Name:   "container_some_time_seconds_total",
-			Labels: pmodel.LabelSet{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"},
+			Labels: pmodel.LabelSet{"pod": "somepod", "namespace": "somens", "container": "somecont"},
 		},
 	},
 	{
 		{
 			Name:   "container_some_count_total",
-			Labels: pmodel.LabelSet{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"},
+			Labels: pmodel.LabelSet{"pod": "somepod", "namespace": "somens", "container": "somecont"},
 		},
 	},
 	{
 		{
 			Name:   "container_some_usage",
-			Labels: pmodel.LabelSet{"pod_name": "somepod", "namespace": "somens", "container_name": "somecont"},
+			Labels: pmodel.LabelSet{"pod": "somepod", "namespace": "somens", "container": "somecont"},
 		},
 	},
 	{
@@ -161,7 +161,7 @@ var _ = Describe("Series Registry", func() {
 				resourceNames:  []string{"somepod1", "somepod2"},
 				metricSelector: labels.Everything(),
 
-				expectedQuery: "sum(container_some_usage{namespace=\"somens\",pod_name=~\"somepod1|somepod2\",container_name!=\"POD\"}) by (pod_name)",
+				expectedQuery: "sum(container_some_usage{namespace=\"somens\",pod=~\"somepod1|somepod2\",container!=\"POD\"}) by (pod)",
 			},
 			{
 				title:          "container metrics counter",
@@ -170,7 +170,7 @@ var _ = Describe("Series Registry", func() {
 				resourceNames:  []string{"somepod1", "somepod2"},
 				metricSelector: labels.Everything(),
 
-				expectedQuery: "sum(rate(container_some_count_total{namespace=\"somens\",pod_name=~\"somepod1|somepod2\",container_name!=\"POD\"}[1m])) by (pod_name)",
+				expectedQuery: "sum(rate(container_some_count_total{namespace=\"somens\",pod=~\"somepod1|somepod2\",container!=\"POD\"}[1m])) by (pod)",
 			},
 			{
 				title:          "container metrics seconds counter",
@@ -179,7 +179,7 @@ var _ = Describe("Series Registry", func() {
 				resourceNames:  []string{"somepod1", "somepod2"},
 				metricSelector: labels.Everything(),
 
-				expectedQuery: "sum(rate(container_some_time_seconds_total{namespace=\"somens\",pod_name=~\"somepod1|somepod2\",container_name!=\"POD\"}[1m])) by (pod_name)",
+				expectedQuery: "sum(rate(container_some_time_seconds_total{namespace=\"somens\",pod=~\"somepod1|somepod2\",container!=\"POD\"}[1m])) by (pod)",
 			},
 			// namespaced metrics
 			{
diff --git a/pkg/resourceprovider/provider_test.go b/pkg/resourceprovider/provider_test.go
index 919c0d58..f465daf6 100644
--- a/pkg/resourceprovider/provider_test.go
+++ b/pkg/resourceprovider/provider_test.go
@@ -49,9 +49,9 @@ func restMapper() apimeta.RESTMapper {
 func buildPodSample(namespace, pod, container string, val float64, ts int64) *pmodel.Sample {
 	return &pmodel.Sample{
 		Metric: pmodel.Metric{
-			"namespace":      pmodel.LabelValue(namespace),
-			"pod_name":       pmodel.LabelValue(pod),
-			"container_name": pmodel.LabelValue(container),
+			"namespace": pmodel.LabelValue(namespace),
+			"pod":       pmodel.LabelValue(pod),
+			"container": pmodel.LabelValue(container),
 		},
 		Value:     pmodel.SampleValue(val),
 		Timestamp: pmodel.Time(ts),