diff --git a/_modules/virt_ng.py b/_modules/virtng.py
similarity index 100%
rename from _modules/virt_ng.py
rename to _modules/virtng.py
diff --git a/salt/control/virt.sls b/salt/control/virt.sls
index 378b2b8..b6015a0 100644
--- a/salt/control/virt.sls
+++ b/salt/control/virt.sls
@@ -42,7 +42,7 @@
 
 salt_control_virt_{{ cluster_name }}_{{ node_name }}:
   module.run:
-  - name: virt.init
+  - name: virtng.init
   - m_name: {{ node_name }}.{{ cluster.domain }}
   - cpu: {{ size.cpu }}
   - mem: {{ size.ram }}
diff --git a/salt/files/_virt.conf b/salt/files/_virt.conf
index 9434a66..fc6032c 100644
--- a/salt/files/_virt.conf
+++ b/salt/files/_virt.conf
@@ -1,8 +1,10 @@
 {% from "salt/map.jinja" import control with context %}
 
+{%- if control.net_profile is defined or control.disk_profile is defined %}
 virt:
+  {%- if control.net_profile is defined %}
   nic:
-    {%- for item_name, item in control.get('net_profile', {}).iteritems() %}
+    {%- for item_name, item in control.net_profile.iteritems() %}
     {{ item_name }}:
       {%- for iface_name, iface in item.iteritems() %}
       {{ iface_name }}:
@@ -17,8 +19,10 @@
         {%- endif %}
       {%- endfor %}
     {%- endfor %}
+  {%- endif %}
+  {%- if control.disk_profile is defined %}
   disk:
-    {%- for item_name, item in control.get('disk_profile', {}).iteritems() %}
+    {%- for item_name, item in control.disk_profile.iteritems() %}
     {{ item_name }}:
       {%- for disk_name, disk in item.iteritems() %}
       - {{ disk }}:
@@ -27,5 +31,7 @@
           {%- endif %}
       {%- endfor %} 
     {%- endfor %} 
+  {%- endif %}
+{%- endif %}
 
-virt.images: /var/lib/libvirt/images
\ No newline at end of file
+virt.images: /var/lib/libvirt/images