diff --git a/v2.0.0/UniFi-Poller_ Client DPI - InfluxDB.json b/v2.0.0/UniFi-Poller_ Client DPI - InfluxDB.json
index 45a9a15..f24e059 100644
--- a/v2.0.0/UniFi-Poller_ Client DPI - InfluxDB.json	
+++ b/v2.0.0/UniFi-Poller_ Client DPI - InfluxDB.json	
@@ -18,7 +18,7 @@
     },
     {
       "type": "panel",
-      "id": "grafana-piechart-panel",
+      "id": "piechart",
       "name": "Pie Chart",
       "version": "1.3.9"
     },
@@ -660,7 +660,7 @@
       "timeFrom": null,
       "title": "Total Traffic by Application",
       "transparent": true,
-      "type": "grafana-piechart-panel",
+      "type": "piechart",
       "valueName": "current"
     },
     {
@@ -844,7 +844,7 @@
       "timeFrom": null,
       "title": "Total Traffic by Category",
       "transparent": true,
-      "type": "grafana-piechart-panel",
+      "type": "piechart",
       "valueName": "current"
     },
     {
diff --git a/v2.0.0/UniFi-Poller_ Client DPI - Prometheus.json b/v2.0.0/UniFi-Poller_ Client DPI - Prometheus.json
index e63ad69..6025f18 100644
--- a/v2.0.0/UniFi-Poller_ Client DPI - Prometheus.json	
+++ b/v2.0.0/UniFi-Poller_ Client DPI - Prometheus.json	
@@ -18,7 +18,7 @@
     },
     {
       "type": "panel",
-      "id": "grafana-piechart-panel",
+      "id": "piechart",
       "name": "Pie Chart",
       "version": "1.5.0"
     },
@@ -405,7 +405,7 @@
       "timeFrom": null,
       "title": "Total Traffic by Category",
       "transparent": true,
-      "type": "grafana-piechart-panel",
+      "type": "piechart",
       "valueName": "current"
     },
     {
@@ -463,7 +463,7 @@
       "timeFrom": null,
       "title": "Total Traffic by Application",
       "transparent": true,
-      "type": "grafana-piechart-panel",
+      "type": "piechart",
       "valueName": "current"
     },
     {
diff --git a/v2.0.0/UniFi-Poller_ Client Insights - InfluxDB.json b/v2.0.0/UniFi-Poller_ Client Insights - InfluxDB.json
index 6e09da7..9ae4b83 100644
--- a/v2.0.0/UniFi-Poller_ Client Insights - InfluxDB.json	
+++ b/v2.0.0/UniFi-Poller_ Client Insights - InfluxDB.json	
@@ -18,7 +18,7 @@
     },
     {
       "type": "panel",
-      "id": "grafana-piechart-panel",
+      "id": "piechart",
       "name": "Pie Chart",
       "version": "1.5.0"
     },
@@ -929,7 +929,7 @@
       "timeShift": null,
       "title": "Clients / Channel",
       "transparent": true,
-      "type": "grafana-piechart-panel",
+      "type": "piechart",
       "valueName": "current"
     },
     {
@@ -1016,7 +1016,7 @@
       "timeFrom": "5m",
       "title": "Clients / AP Radio",
       "transparent": true,
-      "type": "grafana-piechart-panel",
+      "type": "piechart",
       "valueName": "current"
     },
     {
@@ -1104,7 +1104,7 @@
       "timeFrom": "5m",
       "title": "Client MAC OUI Breakdown",
       "transparent": true,
-      "type": "grafana-piechart-panel",
+      "type": "piechart",
       "valueName": "current"
     },
     {
@@ -1190,7 +1190,7 @@
       "timeFrom": "5m",
       "title": "OS/Dev Class/ID Breakdown",
       "transparent": true,
-      "type": "grafana-piechart-panel",
+      "type": "piechart",
       "valueName": "current"
     },
     {
diff --git a/v2.0.0/UniFi-Poller_ Client Insights - Prometheus.json b/v2.0.0/UniFi-Poller_ Client Insights - Prometheus.json
index 4d41cdb..7a7428d 100644
--- a/v2.0.0/UniFi-Poller_ Client Insights - Prometheus.json	
+++ b/v2.0.0/UniFi-Poller_ Client Insights - Prometheus.json	
@@ -18,7 +18,7 @@
     },
     {
       "type": "panel",
-      "id": "grafana-piechart-panel",
+      "id": "piechart",
       "name": "Pie Chart",
       "version": "1.5.0"
     },
@@ -1095,7 +1095,7 @@
       "timeFrom": null,
       "title": "Clients / Channel",
       "transparent": true,
-      "type": "grafana-piechart-panel",
+      "type": "piechart",
       "valueName": "current"
     },
     {
@@ -1150,7 +1150,7 @@
       "timeFrom": null,
       "title": "Clients / AP Radio",
       "transparent": true,
-      "type": "grafana-piechart-panel",
+      "type": "piechart",
       "valueName": "current"
     },
     {
@@ -1217,7 +1217,7 @@
       "timeFrom": null,
       "title": "Client MAC OUI Breakdown",
       "transparent": true,
-      "type": "grafana-piechart-panel",
+      "type": "piechart",
       "valueName": "current"
     },
     {
diff --git a/v2.0.0/UniFi-Poller_ UAP Insights - InfluxDB.json b/v2.0.0/UniFi-Poller_ UAP Insights - InfluxDB.json
index 5678dd0..9d119fe 100644
--- a/v2.0.0/UniFi-Poller_ UAP Insights - InfluxDB.json	
+++ b/v2.0.0/UniFi-Poller_ UAP Insights - InfluxDB.json	
@@ -24,7 +24,7 @@
     },
     {
       "type": "panel",
-      "id": "grafana-piechart-panel",
+      "id": "piechart",
       "name": "Pie Chart",
       "version": "1.3.9"
     },
@@ -210,7 +210,7 @@
       "timeFrom": "5m",
       "title": "Clients / Channel",
       "transparent": true,
-      "type": "grafana-piechart-panel",
+      "type": "piechart",
       "valueName": "current"
     },
     {
@@ -295,7 +295,7 @@
       "timeFrom": "5m",
       "title": "Clients / AP Band",
       "transparent": true,
-      "type": "grafana-piechart-panel",
+      "type": "piechart",
       "valueName": "current"
     },
     {
@@ -378,7 +378,7 @@
       "timeFrom": "5m",
       "title": "Client / MAC OUI",
       "transparent": true,
-      "type": "grafana-piechart-panel",
+      "type": "piechart",
       "valueName": "current"
     },
     {
diff --git a/v2.0.0/UniFi-Poller_ UAP Insights - Prometheus.json b/v2.0.0/UniFi-Poller_ UAP Insights - Prometheus.json
index 1902ef5..9e05727 100644
--- a/v2.0.0/UniFi-Poller_ UAP Insights - Prometheus.json	
+++ b/v2.0.0/UniFi-Poller_ UAP Insights - Prometheus.json	
@@ -24,7 +24,7 @@
     },
     {
       "type": "panel",
-      "id": "grafana-piechart-panel",
+      "id": "piechart",
       "name": "Pie Chart",
       "version": "1.5.0"
     },
@@ -194,7 +194,7 @@
       "timeFrom": null,
       "title": "Clients / Channel",
       "transparent": true,
-      "type": "grafana-piechart-panel",
+      "type": "piechart",
       "valueName": "current"
     },
     {
@@ -256,7 +256,7 @@
       "timeFrom": null,
       "title": "Clients / AP Radio",
       "transparent": true,
-      "type": "grafana-piechart-panel",
+      "type": "piechart",
       "valueName": "current"
     },
     {
@@ -313,7 +313,7 @@
       "timeFrom": null,
       "title": "Client / MAC OUI",
       "transparent": true,
-      "type": "grafana-piechart-panel",
+      "type": "piechart",
       "valueName": "current"
     },
     {