diff --git a/lib/shared/addon/components/node-driver/driver-vmwarevsphere/template.hbs b/lib/shared/addon/components/node-driver/driver-vmwarevsphere/template.hbs
index da9ed5140..297f3d06e 100644
--- a/lib/shared/addon/components/node-driver/driver-vmwarevsphere/template.hbs
+++ b/lib/shared/addon/components/node-driver/driver-vmwarevsphere/template.hbs
@@ -3,16 +3,16 @@
     <div class="over-hr mb-20"><span>{{driverOptionsTitle}}</span></div>
 
     <div class="row box mt-20">
-      <h4>{{t 'nodeDriver.vmwarevspheree.accountSection'}}</h4>
+      <h4>{{t 'nodeDriver.vmwarevsphere.accountSection'}}</h4>
       <div class="row">
         <div class="col span-2 col-inline">
-          <label>{{t 'nodeDriver.vmwarevspheree.vcenter.label'}}{{field-required}}</label>
+          <label>{{t 'nodeDriver.vmwarevsphere.vcenter.label'}}{{field-required}}</label>
         </div>
         <div class="col span-4">
-          {{input type="text" class="form-control" value=config.vcenter placeholder=(t 'nodeDriver.vmwarevspheree.vcenter.placeholder')}}
+          {{input type="text" class="form-control" value=config.vcenter placeholder=(t 'nodeDriver.vmwarevsphere.vcenter.placeholder')}}
         </div>
         <div class="col span-2 col-inline">
-          <label>{{t 'nodeDriver.vmwarevspheree.vcenterPort.label'}}{{field-required}}</label>
+          <label>{{t 'nodeDriver.vmwarevsphere.vcenterPort.label'}}{{field-required}}</label>
         </div>
         <div class="col span-4">
           {{input-integer min=1 max=65535 class="form-control" value=config.vcenterPort}}
@@ -21,26 +21,26 @@
 
       <div class="row">
         <div class="col span-2 col-inline">
-          <label>{{t 'nodeDriver.vmwarevspheree.username.label'}}{{field-required}}</label>
+          <label>{{t 'nodeDriver.vmwarevsphere.username.label'}}{{field-required}}</label>
         </div>
         <div class="col span-4">
           {{input type="text" value=config.username classNames="form-control"}}
         </div>
 
         <div class="col span-2 col-inline">
-          <label>{{t 'nodeDriver.vmwarevspheree.password.label'}}{{field-required}}</label>
+          <label>{{t 'nodeDriver.vmwarevsphere.password.label'}}{{field-required}}</label>
         </div>
         <div class="col span-4">
-          {{input type="password" value=vmwarevsphereConfig.password classNames="form-control"}}
+          {{input type="password" value=config.password classNames="form-control"}}
         </div>
       </div>
     </div>
 
     <div class="row box mt-20">
-      <h4>{{t 'nodeDriver.vmwarevspheree.instanceOptionsSection'}}</h4>
+      <h4>{{t 'nodeDriver.vmwarevsphere.instanceOptionsSection'}}</h4>
       <div class="row">
         <div class="col span-2 col-inline">
-          <label>{{t 'nodeDriver.vmwarevspheree.cpuCount.label'}}</label>
+          <label>{{t 'nodeDriver.vmwarevsphere.cpuCount.label'}}</label>
         </div>
 
         <div class="col span-1">
@@ -51,71 +51,71 @@
         </div>
 
         <div class="col span-2 col-inline">
-          <label>{{t 'nodeDriver.vmwarevspheree.memorySize.label'}}</label>
+          <label>{{t 'nodeDriver.vmwarevsphere.memorySize.label'}}</label>
         </div>
         <div class="col span-4">
           <div class="input-group">
             {{input-integer min=1 value=config.memorySize classNames="form-control"}}
-            <div class="input-group-addon bg-default">{{t 'nodeDriver.vmwarevspheree.memorySize.unit'}}</div>
+            <div class="input-group-addon bg-default">{{t 'nodeDriver.vmwarevsphere.memorySize.unit'}}</div>
           </div>
         </div>
       </div>
 
       <div class="row">
         <div class="col span-2 col-inline">
-          <label>{{t 'nodeDriver.vmwarevspheree.diskSize.label'}}</label>
+          <label>{{t 'nodeDriver.vmwarevsphere.diskSize.label'}}</label>
         </div>
         <div class="col span-4">
           <div class="input-group">
             {{input-integer min=1 value=config.diskSize classNames="form-control"}}
-            <div class="input-group-addon bg-default">{{t 'nodeDriver.vmwarevspheree.diskSize.unit'}}</div>
+            <div class="input-group-addon bg-default">{{t 'nodeDriver.vmwarevsphere.diskSize.unit'}}</div>
           </div>
         </div>
 
         <div class="col span-2 col-inline">
-          <label>{{t 'nodeDriver.vmwarevspheree.boot2dockerUrl.label'}}</label>
+          <label>{{t 'nodeDriver.vmwarevsphere.boot2dockerUrl.label'}}</label>
         </div>
         <div class="col span-4">
-          {{input type="text" value=config.boot2dockerUrl classNames="form-control" placeholder=(t 'nodeDriver.vmwarevspheree.boot2dockerUrl.placeholder')}}
+          {{input type="text" value=config.boot2dockerUrl classNames="form-control" placeholder=(t 'nodeDriver.vmwarevsphere.boot2dockerUrl.placeholder')}}
         </div>
       </div>
     </div>
 
     <div class="row box mt-20">
-      <h4>{{t 'nodeDriver.vmwarevspheree.schedulingSection'}}</h4>
+      <h4>{{t 'nodeDriver.vmwarevsphere.schedulingSection'}}</h4>
       <div class="row">
         <div class="col span-2 col-inline">
-          <label>{{t 'nodeDriver.vmwarevspheree.dataCenter.label'}}</label>
+          <label>{{t 'nodeDriver.vmwarevsphere.dataCenter.label'}}</label>
         </div>
         <div class="col span-2">
           {{input type="text" value=config.datacenter classNames="form-control"}}
         </div>
 
         <div class="col span-2 col-inline">
-          <label>{{t 'nodeDriver.vmwarevspheree.pool.label'}}</label>
+          <label>{{t 'nodeDriver.vmwarevsphere.pool.label'}}</label>
         </div>
         <div class="col span-2">
           {{input type="text" value=config.pool classNames="form-control"}}
         </div>
 
         <div class="col span-2 col-inline">
-          <label>{{t 'nodeDriver.vmwarevspheree.host.label'}}</label>
+          <label>{{t 'nodeDriver.vmwarevsphere.host.label'}}</label>
         </div>
         <div class="col span-2">
-          {{input type="text" value=config.hostsystem classNames="form-control" placeholder=(t 'nodeDriver.vmwarevspheree.host.placeholder')}}
+          {{input type="text" value=config.hostsystem classNames="form-control" placeholder=(t 'nodeDriver.vmwarevsphere.host.placeholder')}}
         </div>
       </div>
 
       <div class="row">
         <div class="col span-2 col-inline">
-          <label>{{t 'nodeDriver.vmwarevspheree.network.label'}}</label>
+          <label>{{t 'nodeDriver.vmwarevsphere.network.label'}}</label>
         </div>
         <div class="col span-4">
           {{input type="text" value=config.network classNames="form-control"}}
         </div>
 
         <div class="col span-2 col-inline">
-          <label>{{t 'nodeDriver.vmwarevspheree.dataStore.label'}}</label>
+          <label>{{t 'nodeDriver.vmwarevsphere.dataStore.label'}}</label>
         </div>
         <div class="col span-4">
           {{input type="text" value=config.datastore classNames="form-control"}}