diff --git a/addressbook/conv/Debug_Netscape_to_SQL b/addressbook/conv/Debug_Netscape_to_SQL
index d88c53ca31..e18518e3a7 100644
--- a/addressbook/conv/Debug_Netscape_to_SQL
+++ b/addressbook/conv/Debug_Netscape_to_SQL
@@ -30,24 +30,24 @@
 
 		var $import = array(
 			"title" => "title", 
-			"givenname" => "n_givenname",
+			"givenname" => "n_given",
 			"sn" => "n_family",
 			"cn" => "fn",
 			"o" => "org_name",
 			"ou" => "org_unit",
-			"streetaddress" => "adr_street",
-			"locality" => "adr_locality",
-			"st" => "adr_region",
-			"postalcode" => "adr_postalcode",
-			"countryname" => "adr_countryname",
-			"telephonenumber" => "a_tel",
-			"homephone" => "b_tel",
-			"facsimiletelephonenumber" => "c_tel",
-			"xmozillaanyphone" => "",
-			"cellphone" => "mphone",
+			"streetaddress" => "adr_one_street",
+			"locality" => "adr_one_locality",
+			"st" => "adr_one_region",
+			"postalcode" => "adr_one_postalcode",
+			"countryname" => "adr_one_countryname",
+			"telephonenumber" => "tel_work",
+			"homephone" => "tel_home",
+			"facsimiletelephonenumber" => "tel_fax",
+			"xmozillaanyphone" => "tel_msg",
+			"cellphone" => "tel_cell",
 			"description" => "note",
-			"pagerphone" => "pager",
-			"mail" => "d_email",
+			"pagerphone" => "tel_pager",
+			"mail" => "email",
 			"homeurl" => "url",
 			"xmozillauseconferenceserver" => "",
 			"xmozillanickname" => "",
diff --git a/addressbook/conv/Debug_Outlook_to_SQL b/addressbook/conv/Debug_Outlook_to_SQL
index daa983bcd1..f79238082b 100644
--- a/addressbook/conv/Debug_Outlook_to_SQL
+++ b/addressbook/conv/Debug_Outlook_to_SQL
@@ -37,18 +37,18 @@
 			"Company" => "org_name",  //objectclass: organization
 			"Department" => "org_unit", //objectclass: organizationalPerson
 			"Job Title" => "title", //objectclass: organizationalPerson
-			"Business Street" => "address2",
-			"Business Street 2" => "",
-			"Business Street 3" => "",
-			"Business City" => "",
-			"Business State" => "",
-			"Business Postal Code" => "",
-			"Business Country" => "",
-			"Home Street" => "adr_street",
-			"Home City" => "adr_locality",
-			"Home State" => "adr_region",
-			"Home Postal Code" => "adr_postalcode",
-			"Home Country" => "adr_countryname",
+			"Business Street" => "adr_one_street",
+			"Business Street 2" => "address2",
+			"Business Street 3" => "address3",
+			"Business City" => "adr_one_locality",
+			"Business State" => "adr_one_region",
+			"Business Postal Code" => "adr_one_postalcode",
+			"Business Country" => "adr_one_countryname",
+			"Home Street" => "adr_two_street",
+			"Home City" => "adr_two_locality",
+			"Home State" => "adr_two_region",
+			"Home Postal Code" => "adr_two_postalcode",
+			"Home Country" => "adr_two_countryname",
 			"Home Street 2" => "",
 			"Home Street 3" => "",
 			"Other Street" => "",
@@ -56,18 +56,18 @@
 			"Other State" => "",
 			"Other Postal Code" => "",
 			"Other Country" => "",
-			"Assistant's Phone" => "",
-			"Business Fax" => "c_tel",
-			"Business Phone" => "a_tel",
+			"Assistant's Phone" => "tel_msg",
+			"Business Fax" => "tel_fax",
+			"Business Phone" => "tel_work",
 			"Business Phone 2" => "ophone",
 			"Callback" => "",
-			"Car Phone" => "",
+			"Car Phone" => "tel_car",
 			"Company Main Phone" => "",
 			"Home Fax" => "",
-			"Home Phone" => "b_tel",
+			"Home Phone" => "tel_home",
 			"Home Phone 2" => "", //This will make another homePhone entry
-			"ISDN" => "",
-			"Mobile Phone" => "mphone", //newPilotPerson
+			"ISDN" => "tel_isdn",
+			"Mobile Phone" => "tel_cell", //newPilotPerson
 			"Other Fax" => "",
 			"Other Phone" => "",
 			"Pager" => "pager",
@@ -83,9 +83,9 @@
 			"Categories" => "", 
 			"Children" => "",
 			"Directory Server" => "",
-			"E-mail Address" => "d_email",
+			"E-mail Address" => "email",
 			"E-mail Display Name" => "",
-			"E-mail 2 Address" => "",
+			"E-mail 2 Address" => "email_home",
 			"E-mail 2 Display Name" => "",
 			"E-mail 3 Address" => "", //add another...
 			"E-mail 3 Display Name" => "",
@@ -102,7 +102,7 @@
 			"Notes" => "note",
 			"Office Location" => "",
 			"Organizational ID Number" => "",
-			"PO Box" => "postOfficeBox",
+			"PO Box" => "",
 			"Priority" => "",
 			"Private Profession" => "",
 			"Referred By" => "",