Index: /tools/gformat.py
===================================================================
--- /tools/gformat.py	(revision 14054)
+++ /tools/gformat.py	(revision 14055)
@@ -237,9 +237,7 @@
             datadump[key]['autogen_vlan_alias'] = '_alias' in key
             datadump[key]['autogen_iface'] = '.'.join(key.split('_')[1:])
-            datadump[key]['autogen_if_dhcp'] = datadump[key]['autogen_ifname']
           else:
             datadump[key]['autogen_if_dhcp'] = datadump[key]['autogen_ifbase']
             datadump[key]['autogen_iface'] = '_'.join(key.split('_')[1:])
-            datadump[key]['autogen_if_dhcp'] = datadump[key]['autogen_ifbase']
 
     except Exception as exc:
@@ -615,5 +613,5 @@
   # Output the blocks in groups
   for ifname,value in sorted(dhcp_out.iteritems()):
-      output += ("shared-network %s {\n" % ifname) + indent(''.join(value), 2).rstrip()  + '\n}\n\n'
+      output += ("shared-network \"%s\" {\n" % ifname) + indent(''.join(value), 2).rstrip()  + '\n}\n\n'
   return output