diff --git a/mkp/cisco_meraki-1.3.3-20240716.mkp b/mkp/cisco_meraki-1.3.3-20240716.mkp
index 3b335fa1898615782a86812aa8c1d5c2d1a6fd85..6ad31733cc657ad6060f3517adf21ba49ce31d96 100644
Binary files a/mkp/cisco_meraki-1.3.3-20240716.mkp and b/mkp/cisco_meraki-1.3.3-20240716.mkp differ
diff --git a/source/cmk_addons_plugins/meraki/agent_based/appliance_performance.py b/source/cmk_addons_plugins/meraki/agent_based/appliance_performance.py
index fce7cf5e09bd0acc4acffd603e958bf9f22c5c82..5652ef1100af0b31c9cae760b483ac77e91d4ea0 100644
--- a/source/cmk_addons_plugins/meraki/agent_based/appliance_performance.py
+++ b/source/cmk_addons_plugins/meraki/agent_based/appliance_performance.py
@@ -6,7 +6,7 @@
 # Author: thl-cmk[at]outlook[dot]com
 # URL   : https://thl-cmk.hopto.org
 # Date  : 2024-06-20
-# File  : cisco_meraki_appliance_performance.py (check plugin)
+# File  : appliance_performance.py (check plugin)
 
 # 2024-06-29: refactored for CMK 2.3
 # 2024-06-30: renamed from cisco_meraki_org_appliance_performance.py in to appliance_performance.py
diff --git a/source/cmk_addons_plugins/meraki/agent_based/appliance_uplinks.py b/source/cmk_addons_plugins/meraki/agent_based/appliance_uplinks.py
index 6879d6c272ba4371dbc038ea208aa6620be00813..7a093bf6ffadf5e3bc95ff813d5fe1c005eb2343 100644
--- a/source/cmk_addons_plugins/meraki/agent_based/appliance_uplinks.py
+++ b/source/cmk_addons_plugins/meraki/agent_based/appliance_uplinks.py
@@ -6,7 +6,7 @@
 # Author: thl-cmk[at]outlook[dot]com
 # URL   : https://thl-cmk.hopto.org
 # Date  : 2023-11-04
-# File  : cisco_meraki_appliance_uplinks.py (check plugin)
+# File  : appliance_uplinks.py (check plugin)
 
 # 2023-11-12: re-added appliance uplinks usage
 # 2024-04-27: fixed crash on missing last reported time (THX to Norman Kühnberger)
diff --git a/source/cmk_addons_plugins/meraki/agent_based/appliance_vpns.py b/source/cmk_addons_plugins/meraki/agent_based/appliance_vpns.py
index e0856fee41dbc023ad918fa851292fc64dfe3f0a..b163e2e8973d3df7a15e16bae1747ca9f8031855 100644
--- a/source/cmk_addons_plugins/meraki/agent_based/appliance_vpns.py
+++ b/source/cmk_addons_plugins/meraki/agent_based/appliance_vpns.py
@@ -6,7 +6,7 @@
 # Author: thl-cmk[at]outlook[dot]com
 # URL   : https://thl-cmk.hopto.org
 # Date  : 2023-11-04
-# File  : cisco_meraki_appliance_vpns.py (check plugin)
+# File  : appliance_vpns.py (check plugin)
 
 # 2024-04-27: made data parsing more robust
 # 2024-05-15: moved parse function to data classes
diff --git a/source/cmk_addons_plugins/meraki/agent_based/cellular_uplinks.py b/source/cmk_addons_plugins/meraki/agent_based/cellular_uplinks.py
index 06c149e54fad1d1dd7dbcca76e1dd90ceb8e4996..2c9df386bac7c2b34713248dab4c659d6841fe95 100644
--- a/source/cmk_addons_plugins/meraki/agent_based/cellular_uplinks.py
+++ b/source/cmk_addons_plugins/meraki/agent_based/cellular_uplinks.py
@@ -6,7 +6,7 @@
 # Author: thl-cmk[at]outlook[dot]com
 # URL   : https://thl-cmk.hopto.org
 # Date  : 2023-11-13
-# File  : cisco_meraki_org_cellular_uplinks.py (check plugin)
+# File  : cellular_uplinks.py (check plugin)
 
 # 2024-04-27: made data parsing more robust
 # 2024-06-29: refactored for CMK 2.3
diff --git a/source/cmk_addons_plugins/meraki/agent_based/device_uplinks.py b/source/cmk_addons_plugins/meraki/agent_based/device_uplinks.py
index 26ccfc8e565bfee098c0d1545ed38dc60f620d25..fdca89f1b1d2a1fe74d40ac7edfd654ec4653ddc 100644
--- a/source/cmk_addons_plugins/meraki/agent_based/device_uplinks.py
+++ b/source/cmk_addons_plugins/meraki/agent_based/device_uplinks.py
@@ -6,7 +6,7 @@
 # Author: thl-cmk[at]outlook[dot]com
 # URL   : https://thl-cmk.hopto.org
 # Date  : 2023-10-31
-# File  : cisco_meraki_org_device_uplinks.py (inventory plugin)
+# File  : cdevice_uplinks.py (inventory plugin)
 
 # inventory of cisco Meraki uplinks
 
diff --git a/source/cmk_addons_plugins/meraki/agent_based/networks.py b/source/cmk_addons_plugins/meraki/agent_based/networks.py
index cd98c3ca5154c629dbeb84676b135a24ac5b350d..056f958617b475978e48c711cd98993d79cdaa5d 100644
--- a/source/cmk_addons_plugins/meraki/agent_based/networks.py
+++ b/source/cmk_addons_plugins/meraki/agent_based/networks.py
@@ -6,7 +6,7 @@
 # Author: thl-cmk[at]outlook[dot]com
 # URL   : https://thl-cmk.hopto.org
 # Date  : 2023-11-04
-# File  : cisco_meraki_org_networks.py (check plugin)
+# File  : networks.py (check plugin)
 
 # 2024-06-29: refactored for CMK 2.3
 # 2024-06-30: renamed from cisco_meraki_org_networks.py in to networks.py
diff --git a/source/cmk_addons_plugins/meraki/agent_based/organisations_api.py b/source/cmk_addons_plugins/meraki/agent_based/organisations_api.py
index dd0660105cbfa798512a1ca45c581b33bf2f969c..991e9886986a08354dc1da6ab8749bb431ac458f 100644
--- a/source/cmk_addons_plugins/meraki/agent_based/organisations_api.py
+++ b/source/cmk_addons_plugins/meraki/agent_based/organisations_api.py
@@ -6,7 +6,7 @@
 # Author: thl-cmk[at]outlook[dot]com
 # URL   : https://thl-cmk.hopto.org
 # Date  : 2023-11-11
-# File  : cisco_meraki_organisations.py (check plugin)
+# File  : organisations.py (check plugin)
 
 # 2024-04-27: made data parsing more robust
 # 2024-05-12: added api request count
diff --git a/source/cmk_addons_plugins/meraki/agent_based/switch_ports_statuses.py b/source/cmk_addons_plugins/meraki/agent_based/switch_ports_statuses.py
index 8409609a69d4a0c05c47338b0a52cdc90bb2ab44..7ec77bfc4a5903b9ee28c1f46faa0319c2f5f9c0 100644
--- a/source/cmk_addons_plugins/meraki/agent_based/switch_ports_statuses.py
+++ b/source/cmk_addons_plugins/meraki/agent_based/switch_ports_statuses.py
@@ -6,7 +6,7 @@
 # Author: thl-cmk[at]outlook[dot]com
 # URL   : https://thl-cmk.hopto.org
 # Date  : 2023-11-11
-# File  : cisco_meraki_switch_ports_statuses.py (check plugin)
+# File  : switch_ports_statuses.py (check plugin)
 
 # 2024-04-08: moved neighbour_name and neighbour_port to key columns
 # 2024-04-27: made data parsing more robust
diff --git a/source/cmk_addons_plugins/meraki/agent_based/wireless_device_ssid_status.py b/source/cmk_addons_plugins/meraki/agent_based/wireless_device_ssid_status.py
index 429671a7bff852f6d322b25d7c5f527456dfacf7..0e4a30ca8765f263379c9990e1a2dd1c4a5976ef 100644
--- a/source/cmk_addons_plugins/meraki/agent_based/wireless_device_ssid_status.py
+++ b/source/cmk_addons_plugins/meraki/agent_based/wireless_device_ssid_status.py
@@ -6,7 +6,7 @@
 # Author: thl-cmk[at]outlook[dot]com
 # URL   : https://thl-cmk.hopto.org
 # Date  : 2023-11-11
-# File  : cisco_meraki_org_wireless_device_status.py (check plugin)
+# File  : wireless_device_status.py (check plugin)
 
 # 2024-04-27: made data parsing more robust
 # 2024-06-23: fixed crash on empty json_data
diff --git a/source/cmk_addons_plugins/meraki/agent_based/wireless_ethernet_statuses.py b/source/cmk_addons_plugins/meraki/agent_based/wireless_ethernet_statuses.py
index 9fc2fca6106790c47ce61a41cc03f5c988a2e5c0..8ad1aa7c6b3233bb87574750ba832da63618226c 100644
--- a/source/cmk_addons_plugins/meraki/agent_based/wireless_ethernet_statuses.py
+++ b/source/cmk_addons_plugins/meraki/agent_based/wireless_ethernet_statuses.py
@@ -6,7 +6,7 @@
 # Author: thl-cmk[at]outlook[dot]com
 # URL   : https://thl-cmk.hopto.org
 # Date  : 2023-11-11
-# File  : cisco_meraki_org_wireless_ethernet_statuses.py (check plugin)
+# File  : wireless_ethernet_statuses.py (check plugin)
 
 # 2024-04-27: made data parsing more robust
 # 2024-06-29: refactored for CMK 2.3