Index: /tools/gformat.py
===================================================================
--- /tools/gformat.py	(revision 10364)
+++ /tools/gformat.py	(revision 10365)
@@ -739,7 +739,8 @@
 
 def get_fqdn(datadump):
-  # Proxy naming convention is special
+  # Proxy naming convention is special, as the proxy name is also included in
+  # the nodename, when it comes to the numbered proxies.
   if datadump['nodetype'] == 'Proxy':
-    fqdn = datadump['nodename']
+    fqdn = datadump['nodetype'] + datadump['nodename'].replace('proxy','')
   else:
     # By default the full name is listed and also a shortname CNAME for easy use.