diff --git a/NAME b/NAME
index 6d8c7ca2..f1b20bb5 100644
--- a/NAME
+++ b/NAME
@@ -1,79 +1,52 @@
+% IANA WHOIS server
+% for more information on IANA, visit http://www.iana.org
+% This query returned 1 object
 
-IANA Whois Service
-Domain: name
-ID: name
+domain:       NAME
 
-Sponsoring Organization:
-    Name: 
-    Organization: The Global Name Registry Ltd.
-    Address1: 2nd Floor Water Front
-    Address2: Chancellors Road
-    Address3: Hammersmith Embankment
-    City: London
-    State/Province: 
-    Country: United Kingdom
-    Postal Code: W6 9RU
-    Phone: 
-    Fax: 
-    Email: 
-    Registration Date: 01-January-1985
-    Last Updated Date: 13-November-2008
+organisation: The Global Name Registry Ltd.
+address:      2nd Floor Water Front
+address:      Chancellors Road
+address:      Hammersmith Embankment
+address:      London  W6 9RU
+address:      United Kingdom
 
-Administrative Contact:
-    Name: Registry Customer Service
-    Organization: The Global Name Registry Ltd.
-    Address1: 21345 Ridgetop Circle
-    Address2: 
-    Address3: 
-    City: Dulles
-    State/Province: Virginia
-    Country: United States
-    Postal Code: 20166
-    Phone: +1 703 925 6999
-    Fax: +1 703 421 5828
-    Email: info@verisign-grs.com
-    Registration Date: 28-April-2003
-    Last Updated Date: 13-November-2008
+contact:      administrative
+name:         Registry Customer Service
+organisation: The Global Name Registry Ltd.
+address:      21345 Ridgetop Circle
+address:      Dulles Virginia 20166
+address:      United States
+phone:        +1 703 925 6999
+fax-no:       +1 703 421 5828
+e-mail:       info@verisign-grs.com
 
-Technical Contact:
-    Name: Registry Customer Service
-    Organization: The Global Name Registry Ltd.
-    Address1: 21345 Ridgetop Circle
-    Address2: 
-    Address3: 
-    City: Dulles
-    State/Province: Virginia
-    Country: United States
-    Postal Code: 20166
-    Phone: +1 703 925 6999
-    Fax: +1 703 421 5828
-    Email: info@verisign-grs.com
-    Registration Date: 28-April-2003
-    Last Updated Date: 13-November-2008
-URL for registration services: http://www.name
-Whois Server (port 43): whois.nic.name
+contact:      technical
+name:         Registry Customer Service
+organisation: The Global Name Registry Ltd.
+address:      21345 Ridgetop Circle
+address:      Dulles Virginia 20166
+address:      United States
+phone:        +1 703 925 6999
+fax-no:       +1 703 421 5828
+e-mail:       info@verisign-grs.com
 
-Nameserver Information:
-    Nameserver: a6.nstld.com.
-    IP Address: 192.5.6.35
-    Nameserver: c6.nstld.com.
-    IP Address: 192.26.92.35
-    Nameserver: d6.nstld.com.
-    IP Address: 192.31.80.35
-    Nameserver: f6.nstld.com.
-    IP Address: 192.35.51.35
-    Nameserver: g6.nstld.com.
-    IP Address: 192.42.93.35
-    Nameserver: h6.nstld.com.
-    IP Address: 192.54.112.35
-    Nameserver: j6.nstld.com.
-    IP Address: 192.48.79.35
-    Nameserver: k6.nstld.com.
-    IP Address: 192.52.178.35
-    Nameserver: l6.nstld.com.
-    IP Address: 192.41.162.35
-    Nameserver: m6.nstld.com.
-    IP Address: 192.55.83.35
+nserver:      A6.NSTLD.COM 192.5.6.35
+nserver:      C6.NSTLD.COM 192.26.92.35
+nserver:      D6.NSTLD.COM 192.31.80.35
+nserver:      F6.NSTLD.COM 192.35.51.35
+nserver:      G6.NSTLD.COM 192.42.93.35
+nserver:      H6.NSTLD.COM 192.54.112.35
+nserver:      J6.NSTLD.COM 192.48.79.35
+nserver:      K6.NSTLD.COM 192.52.178.35
+nserver:      L6.NSTLD.COM 192.41.162.35
+nserver:      M6.NSTLD.COM 192.55.83.35
+
+whois:        whois.nic.name
+
+remarks:      Registration information: http://www.name
+
+created:      2001-08-17
+changed:      2009-04-14
+source:       IANA
 
-Registration Date: 17-August-2001
-Last Updated Date: 14-April-2009