diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 87cd566ef..8890a7529 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -91,15 +91,15 @@ fluentd_image_tag: "{{ fluentd_version }}"
 kibana_version: "v4.6.1"
 kibana_image_repo: "gcr.io/google_containers/kibana"
 kibana_image_tag: "{{ kibana_version }}"
-grafana_version: "v4.0.2"
-grafana_image_repo: "gcr.io/google_containers/heapster-grafana-amd64"
-grafana_image_tag: "{{ grafana_version }}"
+heapster_grafana_version: "v4.0.2"
+heapster_grafana_image_repo: "gcr.io/google_containers/heapster-grafana-amd64"
+heapster_grafana_image_tag: "{{ grafana_version }}"
 heapster_version: "v1.3.0-beta.1"
 heapster_image_repo: "gcr.io/google_containers/heapster-amd64"
 heapster_image_tag: "{{ heapster_version }}"
-influxdb_version: "v1.1.1"
-influxdb_image_repo: "gcr.io/google_containers/heapster-influxdb-amd64"
-influxdb_image_tag: "{{ influxdb_version }}"
+heapster_influxdb_version: "v1.1.1"
+heapster_influxdb_image_repo: "gcr.io/google_containers/heapster-influxdb-amd64"
+heapster_influxdb_image_tag: "{{ influxdb_version }}"
 
 
 helm_version: "v2.2.2"
@@ -238,6 +238,7 @@ downloads:
     repo: "{{ kibana_image_repo }}"
     tag: "{{ kibana_image_tag }}"
     sha256: "{{ kibana_digest_checksum|default(None) }}"
+<<<<<<< HEAD
   helm:
     container: true
     repo: "{{ helm_image_repo }}"
@@ -248,21 +249,21 @@ downloads:
     repo: "{{ tiller_image_repo }}"
     tag: "{{ tiller_image_tag }}"
     sha256: "{{ tiller_digest_checksum|default(None) }}"
-  grafana:
+  heapster_grafana:
      container: true
-     repo: "{{ grafana_image_repo }}"
-     tag: "{{ grafana_image_tag }}"
-     sha256: "{{ grafana_digest_checksum|default(None) }}"
+     repo: "{{ heapster_grafana_image_repo }}"
+     tag: "{{ heapster_grafana_image_tag }}"
+     sha256: "{{ heapster_grafana_digest_checksum|default(None) }}"
   heapster:
     container: true
     repo: "{{ heapster_image_repo }}"
     tag: "{{ heapster_image_tag }}"
     sha256: "{{ heapster_digest_checksum|default(None) }}"
-  influxdb:
+  heapster_influxdb:
     container: true
-    repo: "{{ influxdb_image_repo }}"
-    tag: "{{ influxdb_image_tag }}"
-    sha256: "{{ influxdb_digest_checksum|default(None) }}"
+    repo: "{{ heapster_influxdb_image_repo }}"
+    tag: "{{ heapster_influxdb_image_tag }}"
+    sha256: "{{ heapster_influxdb_digest_checksum|default(None) }}"
 
 download:
   container: "{{ file.container|default('false') }}"
diff --git a/roles/kubernetes-apps/heapster/meta/main.yml b/roles/kubernetes-apps/heapster/meta/main.yml
index a7e0e9137..039c348b1 100644
--- a/roles/kubernetes-apps/heapster/meta/main.yml
+++ b/roles/kubernetes-apps/heapster/meta/main.yml
@@ -1,8 +1,8 @@
 ---
 dependencies:
   - role: download
-    file: "{{ downloads.grafana }}"
+    file: "{{ downloads.heapster_grafana }}"
   - role: download
     file: "{{ downloads.heapster }}"
   - role: download
-    file: "{{ downloads.influxdb }}"
+    file: "{{ downloads.heapster_influxdb }}"