diff --git a/cluster/addons/cluster-monitoring/heapster-controller.yaml b/cluster/addons/cluster-monitoring/heapster-controller.yaml
index d3d311edf97..7f8c9bb506f 100644
--- a/cluster/addons/cluster-monitoring/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/heapster-controller.yaml
@@ -1,5 +1,5 @@
 apiVersion: "v1beta1"
-id: "monitoring-heapsterController"
+id: "monitoring-heapster-controller"
 kind: "ReplicationController"
 desiredState: 
   replicas: 1
@@ -9,7 +9,7 @@ desiredState:
     desiredState:
       manifest:
         version: "v1beta1"
-        id: "monitoring-heapsterController"
+        id: "monitoring-heapster-controller"
         containers:
           - name: "heapster"
             image: "kubernetes/heapster:v0.6"
diff --git a/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
index 1babc4239e2..b262da15dbb 100644
--- a/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
@@ -1,6 +1,6 @@
 apiVersion: "v1beta1"
 kind: "ReplicationController"
-id: "monitoring-influxGrafanaController"
+id: "monitoring-influx-grafana-controller"
 desiredState: 
   replicas: 1
   replicaSelector:
@@ -11,7 +11,7 @@ desiredState:
     desiredState:
       manifest:
         version: "v1beta1"
-        id: "monitoring-influxGrafanaController"
+        id: "monitoring-influx-grafana-controller"
         containers: 
           - name: "influxdb"
             image: "kubernetes/heapster_influxdb:v0.3"
diff --git a/hack/e2e-suite/monitoring.sh b/hack/e2e-suite/monitoring.sh
index 33d1de435bb..73206842ee7 100755
--- a/hack/e2e-suite/monitoring.sh
+++ b/hack/e2e-suite/monitoring.sh
@@ -49,8 +49,8 @@ function setup {
 }
 
 function cleanup {
-  "${KUBECFG}" resize monitoring-influxGrafanaController 0 &> /dev/null || true
-  "${KUBECFG}" resize monitoring-heapsterController 0 &> /dev/null || true
+  "${KUBECFG}" resize monitoring-influx-grafana-controller 0 &> /dev/null || true
+  "${KUBECFG}" resize monitoring-heapster-controller 0 &> /dev/null || true
   while "${KUBECTL}" get pods -l "name=influxGrafana" -o template -t {{range.items}}{{.id}}:{{end}} | grep -c . &> /dev/null \
     || "${KUBECTL}" get pods -l "name=heapster" -o template -t {{range.items}}{{.id}}:{{end}} | grep -c . &> /dev/null; do
     sleep 2