diff --git a/lib/motion/project/template/ios.rb b/lib/motion/project/template/ios.rb
index dd94bc47..df78543a 100644
--- a/lib/motion/project/template/ios.rb
+++ b/lib/motion/project/template/ios.rb
@@ -149,7 +149,8 @@ END
     end
   end
 
-  simulate_device = App.config.device_family_string(family_int, target, retina)
+  device_name = ENV["device_name"]
+  simulate_device = App.config.device_family_string(device_name, family_int, target, retina)
 
   # Launch the simulator.
   xcode = App.config.xcode_dir
diff --git a/lib/motion/project/template/ios/config.rb b/lib/motion/project/template/ios/config.rb
index 858f8f44..6e6a8fe1 100644
--- a/lib/motion/project/template/ios/config.rb
+++ b/lib/motion/project/template/ios/config.rb
@@ -200,7 +200,7 @@ module Motion; module Project;
       end
     end
 
-    def device_family_string(family, target, retina)
+    def device_family_string(device_name, family, target, retina)
       device = case family
         when :iphone, 1
           "iPhone"
@@ -211,7 +211,7 @@ module Motion; module Project;
       ver = xcode_version[0].match(/(\d+)/)
       case ver[0].to_i
       when 6
-        device + device_retina_xcode6_string(family, target, retina)
+        (device_name.nil?) ? device + device_retina_xcode6_string(family, target, retina) : device_name
       when 5
         device + device_retina_xcode5_string(family, target, retina)
       else