diff --git a/.gitignore b/.gitignore
index 9aea2dc..abcb354 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ tmp
 *.sw?
 *~
 .env.sh
+.idea
diff --git a/README.md b/README.md
index d4c0867..158e10c 100644
--- a/README.md
+++ b/README.md
@@ -67,10 +67,14 @@ platforms:
   - name: centos
     driver:
       catalog_name: Public Catalog
+      node_name: Linux-hostname
+      vmapp_name: VMapp-Linux
       image_name: CentOS64-64BIT
   - name: windows
     driver:
       catalog_name: Public Catalog
+      node_name: Windows-hostname
+      vmapp_name: VMapp-Windows
       image_name: W2K12-STD-R2-64BIT
       cpus: 2
       memory: 4096
diff --git a/lib/kitchen/driver/vcair.rb b/lib/kitchen/driver/vcair.rb
index e419e38..d61e4a8 100644
--- a/lib/kitchen/driver/vcair.rb
+++ b/lib/kitchen/driver/vcair.rb
@@ -242,6 +242,10 @@ def node_name
         config[:node_name] || generate_node_name
       end
 
+      def vmapp_name
+        config[:vmapp_name] || generate_node_name
+      end
+
       def generate_node_name
         # SecureRandom.hex generates a string 2x the argument.
         # We need the name to be 15 chars or less to play nicely
@@ -305,7 +309,7 @@ def validate_customization_script!
       end
 
       def instantiate
-        image.instantiate(node_name, instantiate_config)
+        image.instantiate(vmapp_name, instantiate_config)
       end
 
       def vapp
diff --git a/spec/vcair_spec.rb b/spec/vcair_spec.rb
index c6aba73..0a95449 100644
--- a/spec/vcair_spec.rb
+++ b/spec/vcair_spec.rb
@@ -51,8 +51,7 @@
                     logger:    logger,
                     transport: transport,
                     platform:  platform,
-                    to_str:    'instance_str'
-                   )
+                    to_str:    'instance_str')
   end
 
   before do
@@ -699,7 +698,7 @@
 
     it 'calls instantiate on the image' do
       allow(driver).to receive(:image).and_return(image)
-      allow(driver).to receive(:node_name).and_return('node')
+      allow(driver).to receive(:vmapp_name).and_return('node')
       allow(driver).to receive(:instantiate_config).and_return('config')
       expect(image).to receive(:instantiate).with('node', 'config')