diff --git a/src/cloud/occi/etc/templates/large.erb b/src/cloud/occi/etc/templates/large.erb
index e6d1a94155..7147cb1ffa 100644
--- a/src/cloud/occi/etc/templates/large.erb
+++ b/src/cloud/occi/etc/templates/large.erb
@@ -8,7 +8,7 @@
 CPU    = 8
 MEMORY = 8192
 
-NAME   = <%= @vm_info['NAME'] %>
+NAME   = "<%= @vm_info['NAME'] %>"
 
 <% if @vm_info['DISK'] %>
     <% @vm_info.each('DISK') do |disk| %>
diff --git a/src/cloud/occi/etc/templates/medium.erb b/src/cloud/occi/etc/templates/medium.erb
index ab6bda21c7..e573ac5890 100644
--- a/src/cloud/occi/etc/templates/medium.erb
+++ b/src/cloud/occi/etc/templates/medium.erb
@@ -8,7 +8,7 @@
 CPU    = 4
 MEMORY = 4096
 
-NAME   = <%= @vm_info['NAME'] %>
+NAME   = "<%= @vm_info['NAME'] %>"
 
 <% if @vm_info['DISK'] %>
     <% @vm_info.each('DISK') do |disk| %>
diff --git a/src/cloud/occi/etc/templates/small.erb b/src/cloud/occi/etc/templates/small.erb
index 9c448bb7fd..a43c25851e 100644
--- a/src/cloud/occi/etc/templates/small.erb
+++ b/src/cloud/occi/etc/templates/small.erb
@@ -8,7 +8,7 @@
 CPU    = 1
 MEMORY = 1024
 
-NAME   = <%= @vm_info['NAME'] %>
+NAME   = "<%= @vm_info['NAME'] %>"
 
 <% if @vm_info['DISK'] %>
     <% @vm_info.each('DISK') do |disk| %>
diff --git a/src/cloud/occi/lib/VirtualNetworkOCCI.rb b/src/cloud/occi/lib/VirtualNetworkOCCI.rb
index 541899349b..9b0be1fb42 100755
--- a/src/cloud/occi/lib/VirtualNetworkOCCI.rb
+++ b/src/cloud/occi/lib/VirtualNetworkOCCI.rb
@@ -31,7 +31,7 @@ class VirtualNetworkOCCI < VirtualNetwork
     }
 
     ONE_NETWORK = %q{
-        NAME            = <%= @vnet_info['NAME'] %>
+        NAME            = "<%= @vnet_info['NAME'] %>"
         TYPE            = RANGED
         <% if @bridge %>
         BRIDGE          = <%= @bridge %>