diff --git a/charms/openstack-exporter-k8s/src/grafana_dashboards/overview-openstack-exporter-dashboard.json b/charms/openstack-exporter-k8s/src/grafana_dashboards/cloud.json
similarity index 98%
rename from charms/openstack-exporter-k8s/src/grafana_dashboards/overview-openstack-exporter-dashboard.json
rename to charms/openstack-exporter-k8s/src/grafana_dashboards/cloud.json
index d54892b6..1ba537ab 100644
--- a/charms/openstack-exporter-k8s/src/grafana_dashboards/overview-openstack-exporter-dashboard.json
+++ b/charms/openstack-exporter-k8s/src/grafana_dashboards/cloud.json
@@ -76,7 +76,7 @@
           "showLineNumbers": false,
           "showMiniMap": false
         },
-        "content": "# Openstack dashboard\n\n* filter by juju_model (for openstack models) if connected to multiple clouds\n* openstack data is cached, currently refreshed every 5 minutes\n* The VM creation / teardown graph doesn't show the values for the builders in scalingstacks because they happen a lot faster than our scrape interval\n* \"Free IPs\" are not owned by any tenant and available for allocation\n* \"Unused IPs\" are owned by a tenant but not currently associated with an instance",
+        "content": "# OpenStack Cloud Usage\n\n* filter by juju_model (for openstack models) if connected to multiple clouds",
         "mode": "markdown"
       },
       "pluginVersion": "9.2.1",
@@ -1700,7 +1700,7 @@
     ]
   },
   "timezone": "utc",
-  "title": "OpenStack Overview",
+  "title": "OpenStack Cloud Usage",
   "uid": "7d177394-f0b4-11ee-9495-9b832692810a",
   "version": 1,
   "weekStart": ""
diff --git a/charms/openstack-exporter-k8s/src/grafana_dashboards/hypervisor-openstack-exporter-dashboard.json b/charms/openstack-exporter-k8s/src/grafana_dashboards/compute.json
similarity index 99%
rename from charms/openstack-exporter-k8s/src/grafana_dashboards/hypervisor-openstack-exporter-dashboard.json
rename to charms/openstack-exporter-k8s/src/grafana_dashboards/compute.json
index 7b57feab..4c0d1e8c 100644
--- a/charms/openstack-exporter-k8s/src/grafana_dashboards/hypervisor-openstack-exporter-dashboard.json
+++ b/charms/openstack-exporter-k8s/src/grafana_dashboards/compute.json
@@ -2396,6 +2396,6 @@
     ]
   },
   "timezone": "utc",
-  "title": "OpenStack Hypervisor Overview",
+  "title": "OpenStack Compute Overview",
   "version": 1
 }
diff --git a/charms/openstack-exporter-k8s/src/grafana_dashboards/openstack-exporter.json b/charms/openstack-exporter-k8s/src/grafana_dashboards/service.json
similarity index 99%
rename from charms/openstack-exporter-k8s/src/grafana_dashboards/openstack-exporter.json
rename to charms/openstack-exporter-k8s/src/grafana_dashboards/service.json
index eeaad67c..ae32888c 100644
--- a/charms/openstack-exporter-k8s/src/grafana_dashboards/openstack-exporter.json
+++ b/charms/openstack-exporter-k8s/src/grafana_dashboards/service.json
@@ -12,7 +12,7 @@
       }
     ]
   },
-  "description": "Openstack dashboard using the Openstack Exporter (https://github.com/openstack-exporter/openstack-exporter)",
+  "description": "OpenStack Service overview using the Openstack Exporter (https://github.com/openstack-exporter/openstack-exporter)",
   "editable": true,
   "gnetId": 9701,
   "graphTooltip": 0,
@@ -1890,7 +1890,7 @@
     ]
   },
   "timezone": "",
-  "title": "OpenStack Dashboard",
+  "title": "OpenStack Service Overview",
   "uid": "YZCsB1Qmz",
   "version": 20
 }