diff --git a/cluster/addons/fluentd-elasticsearch/es-controller.yaml b/cluster/addons/fluentd-elasticsearch/es-controller.yaml
index 9ef3adc93c8..2643fc7a0e6 100644
--- a/cluster/addons/fluentd-elasticsearch/es-controller.yaml
+++ b/cluster/addons/fluentd-elasticsearch/es-controller.yaml
@@ -24,10 +24,10 @@ spec:
         name: elasticsearch-logging         
         ports:
         - containerPort: 9200
-          name: es-port
+          name: db
           protocol: TCP
         - containerPort: 9300
-          name: es-transport-port
+          name: transport
           protocol: TCP
         volumeMounts:
         - name: es-persistent-storage
diff --git a/cluster/addons/fluentd-elasticsearch/es-service.yaml b/cluster/addons/fluentd-elasticsearch/es-service.yaml
index 4551b5d6ab6..1e1388cc4f2 100644
--- a/cluster/addons/fluentd-elasticsearch/es-service.yaml
+++ b/cluster/addons/fluentd-elasticsearch/es-service.yaml
@@ -11,6 +11,6 @@ spec:
   ports:
   - port: 9200
     protocol: TCP
-    targetPort: es-port
+    targetPort: db
   selector:
     k8s-app: elasticsearch-logging
diff --git a/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml b/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
index 677bc5f664a..9d8d5475158 100644
--- a/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
+++ b/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
@@ -27,5 +27,5 @@ spec:
             value: "http://elasticsearch-logging:9200"
         ports:
         - containerPort: 5601
-          name: kibana-port
+          name: ui
           protocol: TCP
diff --git a/cluster/addons/fluentd-elasticsearch/kibana-service.yaml b/cluster/addons/fluentd-elasticsearch/kibana-service.yaml
index 3ae4df0d410..af4d3d88304 100644
--- a/cluster/addons/fluentd-elasticsearch/kibana-service.yaml
+++ b/cluster/addons/fluentd-elasticsearch/kibana-service.yaml
@@ -12,6 +12,6 @@ spec:
   ports:
   - port: 5601
     protocol: TCP
-    targetPort: kibana-port
+    targetPort: ui
   selector:
     k8s-app: kibana-logging
diff --git a/docs/getting-started-guides/coreos/azure/addons/fluentd-elasticsearch/es-controller.yaml b/docs/getting-started-guides/coreos/azure/addons/fluentd-elasticsearch/es-controller.yaml
index f4cda7b032a..9ef2085d953 100644
--- a/docs/getting-started-guides/coreos/azure/addons/fluentd-elasticsearch/es-controller.yaml
+++ b/docs/getting-started-guides/coreos/azure/addons/fluentd-elasticsearch/es-controller.yaml
@@ -24,10 +24,10 @@ spec:
         name: elasticsearch-logging
         ports:
         - containerPort: 9200
-          name: es-port
+          name: db
           protocol: TCP
         - containerPort: 9300
-          name: es-transport-port
+          name: transport
           protocol: TCP
         volumeMounts:
         - name: es-persistent-storage
diff --git a/pkg/api/replication_controller_example.json b/pkg/api/replication_controller_example.json
index 9ddc8f21e3b..62a4f3473e3 100644
--- a/pkg/api/replication_controller_example.json
+++ b/pkg/api/replication_controller_example.json
@@ -49,12 +49,12 @@
                         "image": "gcr.io/google_containers/elasticsearch:1.0",
                         "ports": [
                             {
-                                "name": "es-port",
+                                "name": "db",
                                 "containerPort": 9200,
                                 "protocol": "TCP"
                             },
                             {
-                                "name": "es-transport-port",
+                                "name": "transport",
                                 "containerPort": 9300,
                                 "protocol": "TCP"
                             }