diff --git a/mkp/vsphere_topo-0.0.7-20240801.mkp b/mkp/vsphere_topo-0.0.7-20240801.mkp
index 2a04c4271efac8b4db182e35c7504ee1a1c70cf1..0ade974d7355bd1b9caeefc14a1334df3b50bf97 100644
Binary files a/mkp/vsphere_topo-0.0.7-20240801.mkp and b/mkp/vsphere_topo-0.0.7-20240801.mkp differ
diff --git a/source/cmk_addons_plugins/vsphere_topo/agent_based/vsphere_topo.py b/source/cmk_addons_plugins/vsphere_topo/agent_based/vsphere_topo.py
index ea6baf7e012bfda77b001629c30ae9a126d121f4..6510d67230139225c940e3211d0d1dc734e87d47 100644
--- a/source/cmk_addons_plugins/vsphere_topo/agent_based/vsphere_topo.py
+++ b/source/cmk_addons_plugins/vsphere_topo/agent_based/vsphere_topo.py
@@ -244,6 +244,7 @@ def check_vsphere_topo(
     if (vm_to_data_stores := ls_connection.query(query=query)) is not None:
         for vm, data_stores in vm_to_data_stores:
             vm_name: str = adjust_name(vm, params.get(PARAM_VM_NAMES, {}))
+            vm_name = name_map(vm_name, vm_name)
             if vm_name in objects.topo_objects:
                 data_stores = data_stores.split(',')
                 for data_store in data_stores:
diff --git a/source/cmk_addons_plugins/vsphere_topo/rulesets/vsphere_topo.py b/source/cmk_addons_plugins/vsphere_topo/rulesets/vsphere_topo.py
index 989923a6937b71e796682eba1a67fde0b6cec27d..95ff9b2ef000e4b2c706644275b05c7f36fcc853 100644
--- a/source/cmk_addons_plugins/vsphere_topo/rulesets/vsphere_topo.py
+++ b/source/cmk_addons_plugins/vsphere_topo/rulesets/vsphere_topo.py
@@ -217,13 +217,14 @@ def _parameter_form() -> Dictionary:
                             PARAM_MAP_NAME_CMK: DictElement(
                                 parameter_form=String(
                                     title=Title('Checkmk name'),
-                                    custom_validate=(MatchRegex(
-                                        regex=r'^[0-9a-zA-Z\.\-\_]+$',
-                                        error_msg=Message(
-                                            'Your input does not match the required format. '
-                                            'Only "0-9a-zA-Z_-." are allowed.'
-                                        )
-                                    ),)
+                                    custom_validate=(
+                                        MatchRegex(
+                                            regex=r'^[0-9a-zA-Z\.\-\_]+$',
+                                            error_msg=Message(
+                                                'Your input does not match the required format. '
+                                                'Only "0-9a-zA-Z_-." are allowed.'
+                                            )
+                                        ),)
                                 ),
                                 required=True,
                             )