diff --git a/vimhandler/template/config/vmware.html b/vimhandler/template/config/vmware.html
index 9f01387..48a246b 100644
--- a/vimhandler/template/config/vmware.html
+++ b/vimhandler/template/config/vmware.html
@@ -21,13 +21,15 @@
         </div>
         <div class="row">
             <div class="form-group">
-                <label for="orgname" class="col-sm-4 control-label">Org. name</label>
+                <label for="vmware_vim_network_name" class="col-sm-4 control-label">VIM network name</label>
                 <div class="col-sm-6 input-group input-group-sm">
-                    <input disabled class="form-control config-input" id="orgname" name="config_orgname"
-                           placeholder="orgname">
+                    <input disabled class="form-control config-input" id="vmware_vim_network_name"
+                           name="config_vim_network_name"
+                           placeholder="vim_network_name">
                 </div>
             </div>
         </div>
+
         <div class="row">
             <div class="form-group">
                 <label for="admin_username" class="col-sm-4 control-label">Admin username</label>
@@ -79,6 +81,15 @@
     <div class="col-lg-6">
         <div class="row">
             <div class="form-group">
+                <label for="orgname" class="col-sm-4 control-label">Org. name</label>
+                <div class="col-sm-6 input-group input-group-sm">
+                    <input disabled class="form-control config-input" id="orgname" name="config_orgname"
+                           placeholder="orgname">
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="form-group">
                 <label for="vcenter_ip" class="col-sm-4 control-label">Vcenter ip</label>
                 <div class="col-sm-6 input-group input-group-sm">
                     <input disabled class="form-control config-input" id="vcenter_ip" name="config_vcenter_ip"