diff --git a/retrieval/resource_map.go b/retrieval/resource_map.go
index a62970f3..853934ae 100644
--- a/retrieval/resource_map.go
+++ b/retrieval/resource_map.go
@@ -140,8 +140,8 @@ var TargetV2ResourceMap = ResourceMap{
 		"org":                   constValue("org"),
 		"env":                   constValue("env"),
 		"proxy_name":            constValue("proxy_name"),
-		"target_type":           constValue("target_type"),
-		"target_endpoint":       constValue("target_endpoint"),
+		"type":                  constValue("type"),
+		"endpoint":              constValue("endpoint"),
 		"runtime_version":       constValue("runtime_version"),
 		"instance_id":           constValue("instance_id"),
 	},
diff --git a/retrieval/resource_map_test.go b/retrieval/resource_map_test.go
index 93649694..a52a0583 100644
--- a/retrieval/resource_map_test.go
+++ b/retrieval/resource_map_test.go
@@ -213,8 +213,8 @@ func TestTranslateTargetV2(t *testing.T) {
 	}
 	metricLabels := labels.Labels{
 		{"proxy_name", "my-name"},
-		{"target_type", "my-target"},
-		{"target_endpoint", "my-endpoint"},
+		{"type", "my-type"},
+		{"endpoint", "my-endpoint"},
 		{"org", "my-org"},
 		{"env", "my-env"},
 		{"runtime_version", "my-revision"},
@@ -227,8 +227,8 @@ func TestTranslateTargetV2(t *testing.T) {
 		"org":                "my-org",
 		"env":                "my-env",
 		"proxy_name":         "my-name",
-		"target_type":        "my-target",
-		"target_endpoint":    "my-endpoint",
+		"type":               "my-type",
+		"endpoint":           "my-endpoint",
 		"runtime_version":    "my-revision",
 		"instance_id":        "my-instance",
 	}