diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb b/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb
index 30daeecdd6..c639a03236 100644
--- a/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb
+++ b/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb
@@ -113,7 +113,7 @@ class DatacenterFolder
                 next if one_host #If the host has been already imported
 
                 host_info = {}
-                host_info[:cluster_name]     = host['name']
+                host_info[:cluster_name]     = host['name'].tr(" ", "_")
                 host_info[:cluster_ref]      = host['_ref']
                 host_info[:vcenter_uuid]     = vcenter_uuid
                 host_info[:vcenter_version]  = vcenter_version
diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/host.rb b/src/vmm_mad/remotes/lib/vcenter_driver/host.rb
index 154de8f9f5..1ee8b4179e 100644
--- a/src/vmm_mad/remotes/lib/vcenter_driver/host.rb
+++ b/src/vmm_mad/remotes/lib/vcenter_driver/host.rb
@@ -101,8 +101,8 @@ class ClusterComputeResource
 
         str_info = ""
 
-        # Get cluster name for informative purposes
-        str_info << "VCENTER_NAME=" << self['name'] << "\n"
+        # Get cluster name for informative purposes (replace space with _ if any)
+        str_info << "VCENTER_NAME=" << self['name'].tr(" ", "_") << "\n"
 
         # System
         str_info << "HYPERVISOR=vcenter\n"