diff --git a/Handlers.md b/Handlers.md
index 35f565f..43674f3 100644
--- a/Handlers.md
+++ b/Handlers.md
@@ -97,7 +97,7 @@ the following subkeys:
 				   numbers, could have predefined
 				   subkeys or could be amix of numbers
 				   and predefined subkeys. Predefined
-				   subkeys are street, street2, city,
+				   subkeys are street, city,
 				   state, pcode and country
 		phone		-> phone, could also be an array of
 				   phone numers
diff --git a/whois.gtld.core.php b/whois.gtld.core.php
index 107e45a..8ae0184 100644
--- a/whois.gtld.core.php
+++ b/whois.gtld.core.php
@@ -50,8 +50,8 @@ class core_handler
                 "Name Server:" => "domain.nserver.",
                 "Registrant Organization:" => "owner.organization",
                 "Registrant Name:" => "owner.name",
-                "Registrant Address:" => "owner.address.street",
-                "Registrant Address 2:" => "owner.address.street2",
+                "Registrant Address:" => "owner.address.street.0",
+                "Registrant Address 2:" => "owner.address.street.1",
                 "Registrant City:" => "owner.address.city",
                 "Registrant State/Province:" => "owner.address.state",
                 "Registrant Postal Code:" => "owner.address.pcode",
@@ -62,8 +62,8 @@ class core_handler
                 "Admin ID:" => "admin.handle",
                 "Admin Organization:" => "admin.organization",
                 "Admin Name:" => "admin.name",
-                "Admin Address:" => "admin.address.street",
-                "Admin Address 2:" => "admin.address.street2",
+                "Admin Address:" => "admin.address.street.0",
+                "Admin Address 2:" => "admin.address.street.1",
                 "Admin City:" => "admin.address.city",
                 "Admin State/Province:" => "admin.address.state",
                 "Admin Postal Code:" => "admin.address.pcode",
@@ -74,8 +74,8 @@ class core_handler
                 "Tech ID:" => "tech.handle",
                 "Tech Organization:" => "tech.organization",
                 "Tech Name:" => "tech.name",
-                "Tech Address:" => "tech.address.street",
-                "Tech Address 2:" => "tech.address.street2",
+                "Tech Address:" => "tech.address.street.0",
+                "Tech Address 2:" => "tech.address.street.1",
                 "Tech City:" => "tech.address.city",
                 "Tech State/Province:" => "tech.address.state",
                 "Tech Postal Code:" => "tech.address.pcode",
@@ -86,8 +86,8 @@ class core_handler
                 "Zone ID:" => "zone.handle",
                 "Zone Organization:" => "zone.organization",
                 "Zone Name:" => "zone.name",
-                "Zone Address:" => "zone.address.street",
-                "Zone Address 2:" => "zone.address.street2",
+                "Zone Address:" => "zone.address.street.0",
+                "Zone Address 2:" => "zone.address.street.1",
                 "Zone City:" => "zone.address.city",
                 "Zone State/Province:" => "zone.address.state",
                 "Zone Postal Code:" => "zone.address.pcode",