diff --git a/data/grafana/rows/routeros_errors.py b/data/grafana/rows/routeros_errors.py
index 79d90e5..d67cfa6 100644
--- a/data/grafana/rows/routeros_errors.py
+++ b/data/grafana/rows/routeros_errors.py
@@ -4,7 +4,7 @@
         'queries': {
             'generic': {
                 'filters': {
-                    '_measurement': 'interface',
+                    '_measurement': 'mikrotik_interface_generic',
                     '_field': [
                         'in_errors',
                         'out_errors',
@@ -16,7 +16,7 @@
             },
             'mikrotik': {
                 'filters': {
-                    '_measurement': 'interface_errors',
+                    '_measurement': 'mikrotik_interface_detailed',
                     '_field': [
                         'rx_fcs_errors',
                         'rx_align_errors',
@@ -52,7 +52,7 @@
         'queries': {
             'generic': {
                 'filters': {
-                    '_measurement': 'interface',
+                    '_measurement': 'mikrotik_interface_generic',
                     '_field': [
                         'in_discards',
                         'out_discards',
@@ -64,7 +64,7 @@
             },
             'mikrotik': {
                 'filters': {
-                    '_measurement': 'interface_errors',
+                    '_measurement': 'mikrotik_interface_detailed',
                     '_field': [
                         'rx_too_short',
                         'rx_too_long',
diff --git a/data/grafana/rows/routeros_health.py b/data/grafana/rows/routeros_health.py
index ca42a5d..5ae759c 100644
--- a/data/grafana/rows/routeros_health.py
+++ b/data/grafana/rows/routeros_health.py
@@ -4,7 +4,7 @@
         'queries': {
             'temp': {
                 'filters': {
-                    '_measurement': 'hw',
+                    '_measurement': 'mikrotik_health',
                     'sensor': [
                         'temperature',
                         'cpu-temperature',
@@ -32,7 +32,7 @@
         'queries': {
             'temp': {
                 'filters': {
-                    '_measurement': 'hw',
+                    '_measurement': 'mikrotik_health',
                     'sensor': [
                         'fan1-speed',
                         'fan2-speed',
@@ -57,7 +57,7 @@
         'queries': {
             'temp': {
                 'filters': {
-                    '_measurement': 'hw',
+                    '_measurement': 'mikrotik_health',
                     'sensor': [
                         'psu1-current',
                         'psu2-current',
diff --git a/data/grafana/rows/routeros_packets.py b/data/grafana/rows/routeros_packets.py
index 4c38b35..03b6749 100644
--- a/data/grafana/rows/routeros_packets.py
+++ b/data/grafana/rows/routeros_packets.py
@@ -4,7 +4,7 @@
         'queries': {
             'in': {
                 'filters': {
-                    '_measurement': 'interface',
+                    '_measurement': 'mikrotik_interface_generic',
                     '_field': [
                         'in_ucast_pkts',
                         'in_mcast_pkts',
@@ -30,7 +30,7 @@
         'queries': {
             'out': {
                 'filters': {
-                    '_measurement': 'interface',
+                    '_measurement': 'mikrotik_interface_generic',
                     '_field': [
                         'out_ucast_pkts',
                         'out_mcast_pkts',
diff --git a/data/grafana/rows/routeros_poe.py b/data/grafana/rows/routeros_poe.py
index 0954141..5699ea7 100644
--- a/data/grafana/rows/routeros_poe.py
+++ b/data/grafana/rows/routeros_poe.py
@@ -4,7 +4,7 @@
         'queries': {
             'power': {
                 'filters': {
-                    '_measurement': 'poe',
+                    '_measurement': 'mikrotik_poe',
                     '_field': ['power'],
                     'operating_system': 'routeros',
                 },
@@ -26,7 +26,7 @@
         'queries': {
             'voltage': {
                 'filters': {
-                    '_measurement': 'poe',
+                    '_measurement': 'mikrotik_poe',
                     '_field': ['current'],
                     'operating_system': 'routeros',
                 },
@@ -48,7 +48,7 @@
         'queries': {
             'voltage': {
                 'filters': {
-                    '_measurement': 'poe',
+                    '_measurement': 'mikrotik_poe',
                     '_field': ['voltage'],
                     'operating_system': 'routeros',
                 },
diff --git a/data/grafana/rows/routeros_throughput.py b/data/grafana/rows/routeros_throughput.py
index 4f12f3d..73679ce 100644
--- a/data/grafana/rows/routeros_throughput.py
+++ b/data/grafana/rows/routeros_throughput.py
@@ -4,7 +4,7 @@
         'queries': {
             'in': {
                 'filters': {
-                    '_measurement': 'interface',
+                    '_measurement': 'mikrotik_interface_generic',
                     '_field': ['in_octets'],
                     'ifType': [6],
                     'operating_system': 'routeros',
@@ -26,7 +26,7 @@
         'queries': {
             'out': {
                 'filters': {
-                    '_measurement': 'interface',
+                    '_measurement': 'mikrotik_interface_generic',
                     '_field': ['out_octets'],
                     'ifType': [6],
                     'operating_system': 'routeros',