diff --git a/cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml b/cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml
index 8756b3f834e..03691121488 100644
--- a/cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml
@@ -4,6 +4,7 @@ metadata:
   labels: 
     name: influxGrafana
     kubernetes.io/cluster-service: "true"
+    kubernetes.io/name: "Grafana"
   name: monitoring-grafana
 spec: 
   ports: 
diff --git a/cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml b/cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml
index 94e730382b7..eb39a3a1902 100644
--- a/cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml
@@ -4,6 +4,7 @@ metadata:
   labels: 
     name: influxGrafana
     kubernetes.io/cluster-service: "true"
+    kubernetes.io/name: "InfluxDB"
   name: monitoring-influxdb
 spec: 
   ports: 
diff --git a/cluster/addons/dns/skydns-svc.yaml.in b/cluster/addons/dns/skydns-svc.yaml.in
index 1416a7489ed..15e85d6c16a 100644
--- a/cluster/addons/dns/skydns-svc.yaml.in
+++ b/cluster/addons/dns/skydns-svc.yaml.in
@@ -5,8 +5,8 @@ metadata:
   namespace: default
   labels:
     k8s-app: kube-dns
-    name: kube-dns
     kubernetes.io/cluster-service: "true"
+    kubernetes.io/name: "KubeDNS"
 spec:
   selector:
     k8s-app: kube-dns
diff --git a/cluster/addons/fluentd-elasticsearch/es-service.yaml b/cluster/addons/fluentd-elasticsearch/es-service.yaml
index 344fb76f27e..21f05b6b240 100644
--- a/cluster/addons/fluentd-elasticsearch/es-service.yaml
+++ b/cluster/addons/fluentd-elasticsearch/es-service.yaml
@@ -4,6 +4,7 @@ metadata:
   labels:
     name: elasticsearch-logging
     kubernetes.io/cluster-service: "true"
+    kubernetes.io/name: "Elasticsearch"
   name: elasticsearch-logging
 spec:
   ports:
diff --git a/cluster/addons/fluentd-elasticsearch/kibana-service.yaml b/cluster/addons/fluentd-elasticsearch/kibana-service.yaml
index f7ccc35292d..1eeec2ffbd1 100644
--- a/cluster/addons/fluentd-elasticsearch/kibana-service.yaml
+++ b/cluster/addons/fluentd-elasticsearch/kibana-service.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
     name: kibana-logging
     kubernetes.io/cluster-service: "true"
+    kubernetes.io/name: "Kibana"
   name: kibana-logging
 spec:
   ports:
diff --git a/pkg/kubectl/cmd/clusterinfo.go b/pkg/kubectl/cmd/clusterinfo.go
index 38a5f0ad732..4b419e435f7 100644
--- a/pkg/kubectl/cmd/clusterinfo.go
+++ b/pkg/kubectl/cmd/clusterinfo.go
@@ -79,7 +79,7 @@ func RunClusterInfo(factory *cmdutil.Factory, out io.Writer, cmd *cobra.Command)
 			} else {
 				link = client.Host + "/api/v1beta3/proxy/namespaces/" + service.ObjectMeta.Namespace + "/services/" + service.ObjectMeta.Name
 			}
-			printService(out, service.ObjectMeta.Labels["name"], link)
+			printService(out, service.ObjectMeta.Labels["kubernetes.io/name"], link)
 		}
 		return nil
 	})