diff --git a/src/tm_mad/vcenter/delete b/src/tm_mad/vcenter/delete
index 22dd487352..0eecd647f2 100755
--- a/src/tm_mad/vcenter/delete
+++ b/src/tm_mad/vcenter/delete
@@ -40,8 +40,6 @@ $LOAD_PATH << File.dirname(__FILE__)
 
 require 'vcenter_driver'
 
-VM_PREFIX_DEFAULT = 'one-$i-'
-
 path = ARGV[0]
 vmid = ARGV[1]
 dsid = ARGV[2]
diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
index 94a3d54b44..f3343d47da 100644
--- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
+++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
@@ -352,9 +352,19 @@ module VCenterDriver
         def get_vcenter_name
             vm_prefix = host['TEMPLATE/VM_PREFIX']
             vm_prefix = VM_PREFIX_DEFAULT if vm_prefix.nil? || vm_prefix.empty?
+
+            if !one_item['USER_TEMPLATE/VM_PREFIX'].nil?
+                vm_prefix = one_item['USER_TEMPLATE/VM_PREFIX']
+            end
             vm_prefix.gsub!("$i", one_item['ID'])
 
-            vm_prefix + one_item['NAME']
+            vm_suffix = ""
+            if !one_item['USER_TEMPLATE/VM_SUFFIX'].nil?
+                vm_suffix = one_item['USER_TEMPLATE/VM_SUFFIX']
+            end
+            vm_suffix.gsub!("$i", one_item['ID'])
+
+            vm_prefix + one_item['NAME'] + vm_suffix
         end
 
         ############################################################################