diff --git a/docker/blocks/graphite/fig b/docker/blocks/graphite/fig
index 4268641d32f..60acb8c1131 100644
--- a/docker/blocks/graphite/fig
+++ b/docker/blocks/graphite/fig
@@ -8,7 +8,7 @@ graphite:
     - /etc/localtime:/etc/localtime:ro
     - /etc/timezone:/etc/timezone:ro
 
-fake-data-gen:
+fake-graphite-data:
   image: grafana/fake-data-gen
   net: bridge
   environment:
diff --git a/docker/blocks/influxdb/fig b/docker/blocks/influxdb/fig
index 0dc69cb6b72..bdb4a274634 100644
--- a/docker/blocks/influxdb/fig
+++ b/docker/blocks/influxdb/fig
@@ -5,7 +5,7 @@ influxdb:
     - "8083:8083"
     - "8086:8086"
 
-fake-data-gen:
+fake-influxdb-data:
   image: grafana/fake-data-gen
   net: bridge
   environment:
diff --git a/docker/blocks/opentsdb/fig b/docker/blocks/opentsdb/fig
index 705d746a864..c346475e9a3 100644
--- a/docker/blocks/opentsdb/fig
+++ b/docker/blocks/opentsdb/fig
@@ -3,7 +3,7 @@ opentsdb:
   ports:
     - "4242:4242"
 
-fake-data-gen:
+fake-opentsdb-data:
   image: grafana/fake-data-gen
   net: bridge
   environment:
diff --git a/docker/blocks/prometheus/fig b/docker/blocks/prometheus/fig
index aa00e1b6272..ecfcf395d26 100644
--- a/docker/blocks/prometheus/fig
+++ b/docker/blocks/prometheus/fig
@@ -6,7 +6,7 @@ prometheus:
   volumes:
     - /var/docker/prometheus:/prometheus-data
 
-fake-data-gen:
+fake-prometheus-data:
   image: grafana/fake-data-gen
   net: bridge
   ports: