diff --git a/src/onedb/local/4.90.0_to_5.3.80.rb b/src/onedb/local/4.90.0_to_5.3.80.rb
index 84b34843d8..f7e2af2b0f 100644
--- a/src/onedb/local/4.90.0_to_5.3.80.rb
+++ b/src/onedb/local/4.90.0_to_5.3.80.rb
@@ -126,7 +126,7 @@ module Migrator
 
                     capacity = doc.create_element("CAPACITY")
                     host_info["capacity"].each { |k, v|
-                        name = k[0..1] << k[3..k.length-1]
+                        name = k.gsub(".", "_")
                         capacity.add_child(doc.create_element(name.upcase, v))
                     }
 
diff --git a/src/vmm_mad/remotes/ec2/ec2_driver.rb b/src/vmm_mad/remotes/ec2/ec2_driver.rb
index 49139a4eff..e2062a3369 100755
--- a/src/vmm_mad/remotes/ec2/ec2_driver.rb
+++ b/src/vmm_mad/remotes/ec2/ec2_driver.rb
@@ -454,8 +454,7 @@ class EC2Driver
     # Parse template instance type into
     # Amazon ec2 format (M1SMALL => m1.small)
     def parse_inst_type(type)
-        fixed_type = type[0..1]<< '.' << type[2..type.length+1]
-        return fixed_type.downcase
+        return type.downcase.gsub("_", ".")
     end
 
     # Get the info of all the EC2 instances. An EC2 instance must include