Update Autofill data driven heuristics output files to also include the field names, labels, and values.

BUG=none
TEST=browser_tests --gtest_filter=FormStructureBrowserTest.DataDrivenHeuristics*

Review URL: http://codereview.chromium.org/7531022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94777 0039d316-1c4b-4281-b951-d872f2087c98

82 files changed, 1250 insertions, 1279 deletions

diff --git a/chrome/browser/autofill/form_structure_browsertest.cc b/chrome/browser/autofill/form_structure_browsertest.cc
index eefa88b..37f676b 100644
--- a/chrome/browser/autofill/form_structure_browsertest.cc
+++ b/chrome/browser/autofill/form_structure_browsertest.cc
@@ -77,6 +77,9 @@ std::string FormStructureBrowserTest::FormStructuresToString(
          field_iter != (*iter)->end();
          ++field_iter) {
       forms_string += AutofillType::FieldTypeToString((*field_iter)->type());
+      forms_string += " | " + UTF16ToUTF8((*field_iter)->name);
+      forms_string += " | " + UTF16ToUTF8((*field_iter)->label);
+      forms_string += " | " + UTF16ToUTF8((*field_iter)->value);
       forms_string += "\n";
     }
   }
diff --git a/chrome/test/data/autofill/heuristics/output/00_i18n_de.out b/chrome/test/data/autofill/heuristics/output/00_i18n_de.out
index 8dbc1e1..a744c9a 100644
--- a/chrome/test/data/autofill/heuristics/output/00_i18n_de.out
+++ b/chrome/test/data/autofill/heuristics/output/00_i18n_de.out
@@ -1,15 +1,15 @@
-NAME_FIRST
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_STATE
-EMAIL_ADDRESS
-PHONE_HOME_WHOLE_NUMBER
-PHONE_FAX_WHOLE_NUMBER
-CREDIT_CARD_NAME
-CREDIT_CARD_NUMBER
-CREDIT_CARD_EXP_MONTH
-CREDIT_CARD_EXP_4_DIGIT_YEAR
+NAME_FIRST | fn | Vorname: | 
+NAME_LAST | ln | Nachname: | 
+COMPANY_NAME | cm | Firmenname: | 
+ADDRESS_HOME_LINE1 | a1 | Straße und Hausnummer: | 
+ADDRESS_HOME_LINE2 | a2 | Adresszusatz: | 
+ADDRESS_HOME_CITY | ct | Stadt: | 
+ADDRESS_HOME_ZIP | zc | Postleitzahl: | 
+ADDRESS_HOME_STATE | st | Land: | 
+EMAIL_ADDRESS | em | E-Mail-Adresse: | 
+PHONE_HOME_WHOLE_NUMBER | ph | Telefonnummer: | 
+PHONE_FAX_WHOLE_NUMBER | fx | Fax-Nummer: | 
+CREDIT_CARD_NAME | c1 | Karteninhaber: | 
+CREDIT_CARD_NUMBER | c2 | Kartennummer: | 
+CREDIT_CARD_EXP_MONTH | c3 | gültig bis monat: | 
+CREDIT_CARD_EXP_4_DIGIT_YEAR | c4 | gültig bis jahr: | 
diff --git a/chrome/test/data/autofill/heuristics/output/00_i18n_de2.out b/chrome/test/data/autofill/heuristics/output/00_i18n_de2.out
index 598d731..de837cd 100644
--- a/chrome/test/data/autofill/heuristics/output/00_i18n_de2.out
+++ b/chrome/test/data/autofill/heuristics/output/00_i18n_de2.out
@@ -1,15 +1,15 @@
-NAME_LAST
-NAME_FIRST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_STATE
-EMAIL_ADDRESS
-PHONE_HOME_WHOLE_NUMBER
-PHONE_FAX_WHOLE_NUMBER
-CREDIT_CARD_NAME
-CREDIT_CARD_NUMBER
-CREDIT_CARD_EXP_MONTH
-CREDIT_CARD_EXP_4_DIGIT_YEAR
+NAME_LAST | ln | Nachname: | 
+NAME_FIRST | fn | Vorname: | 
+COMPANY_NAME | cm | Firmenname: | 
+ADDRESS_HOME_LINE1 | a1 | Straße und Hausnummer: | 
+ADDRESS_HOME_LINE2 | a2 | Adresszusatz: | 
+ADDRESS_HOME_CITY | ct | Stadt: | 
+ADDRESS_HOME_ZIP | zc | Postleitzahl: | 
+ADDRESS_HOME_STATE | st | Land: | 
+EMAIL_ADDRESS | em | E-Mail-Adresse: | 
+PHONE_HOME_WHOLE_NUMBER | ph | Telefonnummer: | 
+PHONE_FAX_WHOLE_NUMBER | fx | Fax-Nummer: | 
+CREDIT_CARD_NAME | c1 | Karteninhaber: | 
+CREDIT_CARD_NUMBER | c2 | Kartennummer: | 
+CREDIT_CARD_EXP_MONTH | c3 | gültig bis monat: | 
+CREDIT_CARD_EXP_4_DIGIT_YEAR | c4 | gültig bis jahr: | 
diff --git a/chrome/test/data/autofill/heuristics/output/00_i18n_en.out b/chrome/test/data/autofill/heuristics/output/00_i18n_en.out
index 8dbc1e1..42735d1 100644
--- a/chrome/test/data/autofill/heuristics/output/00_i18n_en.out
+++ b/chrome/test/data/autofill/heuristics/output/00_i18n_en.out
@@ -1,15 +1,15 @@
-NAME_FIRST
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_STATE
-EMAIL_ADDRESS
-PHONE_HOME_WHOLE_NUMBER
-PHONE_FAX_WHOLE_NUMBER
-CREDIT_CARD_NAME
-CREDIT_CARD_NUMBER
-CREDIT_CARD_EXP_MONTH
-CREDIT_CARD_EXP_4_DIGIT_YEAR
+NAME_FIRST | fn | First name: | 
+NAME_LAST | ln | Last name: | 
+COMPANY_NAME | cm | Company Name: | 
+ADDRESS_HOME_LINE1 | a1 | Address line 1: | 
+ADDRESS_HOME_LINE2 | a2 | Address line 2: | 
+ADDRESS_HOME_CITY | ct | City: | 
+ADDRESS_HOME_ZIP | zc | Zip Code: | 
+ADDRESS_HOME_STATE | st | State: | 
+EMAIL_ADDRESS | em | Email: | 
+PHONE_HOME_WHOLE_NUMBER | ph | Phone Number: | 
+PHONE_FAX_WHOLE_NUMBER | fx | Fax Number: | 
+CREDIT_CARD_NAME | c1 | Name on card: | 
+CREDIT_CARD_NUMBER | c2 | Card Number: | 
+CREDIT_CARD_EXP_MONTH | c3 | Expiration Month: | 
+CREDIT_CARD_EXP_4_DIGIT_YEAR | c4 | Expiration Year: | 
diff --git a/chrome/test/data/autofill/heuristics/output/00_i18n_es.out b/chrome/test/data/autofill/heuristics/output/00_i18n_es.out
index 8dbc1e1..4f8fc64 100644
--- a/chrome/test/data/autofill/heuristics/output/00_i18n_es.out
+++ b/chrome/test/data/autofill/heuristics/output/00_i18n_es.out
@@ -1,15 +1,15 @@
-NAME_FIRST
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_STATE
-EMAIL_ADDRESS
-PHONE_HOME_WHOLE_NUMBER
-PHONE_FAX_WHOLE_NUMBER
-CREDIT_CARD_NAME
-CREDIT_CARD_NUMBER
-CREDIT_CARD_EXP_MONTH
-CREDIT_CARD_EXP_4_DIGIT_YEAR
+NAME_FIRST | fn | Nombre: | 
+NAME_LAST | ln | Apellidos: | 
+COMPANY_NAME | cm | Empresa: | 
+ADDRESS_HOME_LINE1 | a1 | Dirección: | 
+ADDRESS_HOME_LINE2 | a2 | Información adicional: | 
+ADDRESS_HOME_CITY | ct | Poblacion: | 
+ADDRESS_HOME_ZIP | zc | Código Postal: | 
+ADDRESS_HOME_STATE | st | Provincia: | 
+EMAIL_ADDRESS | em | E-mail: | 
+PHONE_HOME_WHOLE_NUMBER | ph | Teléfono: | 
+PHONE_FAX_WHOLE_NUMBER | fx | Fax: | 
+CREDIT_CARD_NAME | c1 | Nombre de Tarjeta: | 
+CREDIT_CARD_NUMBER | c2 | Número de Tarjeta: | 
+CREDIT_CARD_EXP_MONTH | c3 | Fecha de Expiración: | 
+CREDIT_CARD_EXP_4_DIGIT_YEAR | c4 | Fecha de Expiración: | 
diff --git a/chrome/test/data/autofill/heuristics/output/00_i18n_fr.out b/chrome/test/data/autofill/heuristics/output/00_i18n_fr.out
index 8dbc1e1..e0a2dff 100644
--- a/chrome/test/data/autofill/heuristics/output/00_i18n_fr.out
+++ b/chrome/test/data/autofill/heuristics/output/00_i18n_fr.out
@@ -1,15 +1,15 @@
-NAME_FIRST
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_STATE
-EMAIL_ADDRESS
-PHONE_HOME_WHOLE_NUMBER
-PHONE_FAX_WHOLE_NUMBER
-CREDIT_CARD_NAME
-CREDIT_CARD_NUMBER
-CREDIT_CARD_EXP_MONTH
-CREDIT_CARD_EXP_4_DIGIT_YEAR
+NAME_FIRST | fn | Prénom: | 
+NAME_LAST | ln | Nom: | 
+COMPANY_NAME | cm | Société: | 
+ADDRESS_HOME_LINE1 | a1 | Adresse: | 
+ADDRESS_HOME_LINE2 | a2 | Complément d'adresse: | 
+ADDRESS_HOME_CITY | ct | Ville: | 
+ADDRESS_HOME_ZIP | zc | Code postal: | 
+ADDRESS_HOME_STATE | st | State: | 
+EMAIL_ADDRESS | em | Email: | 
+PHONE_HOME_WHOLE_NUMBER | ph | Téléphone Fixe: | 
+PHONE_FAX_WHOLE_NUMBER | fx | Télécopie: | 
+CREDIT_CARD_NAME | c1 | Nom complet du détenteur de la carte: | 
+CREDIT_CARD_NUMBER | c2 | Numéro: | 
+CREDIT_CARD_EXP_MONTH | c3 | Date d'expiration: | 
+CREDIT_CARD_EXP_4_DIGIT_YEAR | c4 | Date d'expiration: | 
diff --git a/chrome/test/data/autofill/heuristics/output/00_i18n_it.out b/chrome/test/data/autofill/heuristics/output/00_i18n_it.out
index 8dbc1e1..f4df883 100644
--- a/chrome/test/data/autofill/heuristics/output/00_i18n_it.out
+++ b/chrome/test/data/autofill/heuristics/output/00_i18n_it.out
@@ -1,15 +1,15 @@
-NAME_FIRST
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_STATE
-EMAIL_ADDRESS
-PHONE_HOME_WHOLE_NUMBER
-PHONE_FAX_WHOLE_NUMBER
-CREDIT_CARD_NAME
-CREDIT_CARD_NUMBER
-CREDIT_CARD_EXP_MONTH
-CREDIT_CARD_EXP_4_DIGIT_YEAR
+NAME_FIRST | fn | Nome: | 
+NAME_LAST | ln | Cognome: | 
+COMPANY_NAME | cm | Ragione Sociale: | 
+ADDRESS_HOME_LINE1 | a1 | Indirizzo: | 
+ADDRESS_HOME_LINE2 | a2 | Indirizzo 2: | 
+ADDRESS_HOME_CITY | ct | Localita: | 
+ADDRESS_HOME_ZIP | zc | CAP: | 
+ADDRESS_HOME_STATE | st | Provincia: | 
+EMAIL_ADDRESS | em | E-mail: | 
+PHONE_HOME_WHOLE_NUMBER | ph | Telefono: | 
+PHONE_FAX_WHOLE_NUMBER | fx | Fax Number: | 
+CREDIT_CARD_NAME | c1 | Nome titolare carta: | 
+CREDIT_CARD_NUMBER | c2 | Numero carta di credito: | 
+CREDIT_CARD_EXP_MONTH | c3 | Data di scadenza: | 
+CREDIT_CARD_EXP_4_DIGIT_YEAR | c4 | Data di scadenza: | 
diff --git a/chrome/test/data/autofill/heuristics/output/00_i18n_ja.out b/chrome/test/data/autofill/heuristics/output/00_i18n_ja.out
index 8dbc1e1..b9e284a 100644
--- a/chrome/test/data/autofill/heuristics/output/00_i18n_ja.out
+++ b/chrome/test/data/autofill/heuristics/output/00_i18n_ja.out
@@ -1,15 +1,15 @@
-NAME_FIRST
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_STATE
-EMAIL_ADDRESS
-PHONE_HOME_WHOLE_NUMBER
-PHONE_FAX_WHOLE_NUMBER
-CREDIT_CARD_NAME
-CREDIT_CARD_NUMBER
-CREDIT_CARD_EXP_MONTH
-CREDIT_CARD_EXP_4_DIGIT_YEAR
+NAME_FIRST | fn | 名: | 
+NAME_LAST | ln | 姓: | 
+COMPANY_NAME | cm | 会社: | 
+ADDRESS_HOME_LINE1 | a1 | 住所: | 
+ADDRESS_HOME_LINE2 | a2 | Address line 2: | 
+ADDRESS_HOME_CITY | ct | 市区町村: | 
+ADDRESS_HOME_ZIP | zc | 郵便番号: | 
+ADDRESS_HOME_STATE | st | 都道府県: | 
+EMAIL_ADDRESS | em | メールアドレス: | 
+PHONE_HOME_WHOLE_NUMBER | ph | 電話番号: | 
+PHONE_FAX_WHOLE_NUMBER | fx | ファックス: | 
+CREDIT_CARD_NAME | c1 | 名前（フルネーム）: | 
+CREDIT_CARD_NUMBER | c2 | カード番号: | 
+CREDIT_CARD_EXP_MONTH | c3 | 有効期限: | 
+CREDIT_CARD_EXP_4_DIGIT_YEAR | c4 | 有効期限: | 
diff --git a/chrome/test/data/autofill/heuristics/output/00_i18n_ko.out b/chrome/test/data/autofill/heuristics/output/00_i18n_ko.out
index 2774ace..3bcec94 100644
--- a/chrome/test/data/autofill/heuristics/output/00_i18n_ko.out
+++ b/chrome/test/data/autofill/heuristics/output/00_i18n_ko.out
@@ -1,18 +1,18 @@
-NAME_LAST
-NAME_FIRST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_CITY
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_STATE
-ADDRESS_HOME_STATE
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-PHONE_HOME_WHOLE_NUMBER
-PHONE_HOME_WHOLE_NUMBER
-PHONE_FAX_WHOLE_NUMBER
-PHONE_FAX_WHOLE_NUMBER
+NAME_LAST | ln | 성: | 
+NAME_FIRST | firstname | 이름(名): | 
+COMPANY_NAME | cm1 | 회사: | 
+ADDRESS_HOME_LINE1 | a1 | 주소1: | 
+ADDRESS_HOME_LINE2 | a2 | 주소 2: | 
+ADDRESS_HOME_CITY | ct | 시군구: | 
+ADDRESS_HOME_CITY | ct2 | 시·군·구: | 
+ADDRESS_HOME_ZIP | zc | 우편번호: | 
+ADDRESS_HOME_ZIP | zc2 | 우편 번호: | 
+ADDRESS_HOME_STATE | st | 시도: | 
+ADDRESS_HOME_STATE | st2 | 시・도: | 
+EMAIL_ADDRESS | em | Email: | 
+EMAIL_ADDRESS | em2 | 전자 우편: | 
+EMAIL_ADDRESS | em3 | e-mail 주소 | 
+PHONE_HOME_WHOLE_NUMBER | ph | 전화 번호: | 
+PHONE_HOME_WHOLE_NUMBER | ph2 | 휴대폰번호: | 
+PHONE_FAX_WHOLE_NUMBER | fx | 팩스번호: | 
+PHONE_FAX_WHOLE_NUMBER | fx2 | 팩스: | 
diff --git a/chrome/test/data/autofill/heuristics/output/00_i18n_pt.out b/chrome/test/data/autofill/heuristics/output/00_i18n_pt.out
index 8dbc1e1..421015b 100644
--- a/chrome/test/data/autofill/heuristics/output/00_i18n_pt.out
+++ b/chrome/test/data/autofill/heuristics/output/00_i18n_pt.out
@@ -1,15 +1,15 @@
-NAME_FIRST
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_STATE
-EMAIL_ADDRESS
-PHONE_HOME_WHOLE_NUMBER
-PHONE_FAX_WHOLE_NUMBER
-CREDIT_CARD_NAME
-CREDIT_CARD_NUMBER
-CREDIT_CARD_EXP_MONTH
-CREDIT_CARD_EXP_4_DIGIT_YEAR
+NAME_FIRST | fn | Nome: | 
+NAME_LAST | ln | Sobrenome: | 
+COMPANY_NAME | cm | Empresa: | 
+ADDRESS_HOME_LINE1 | a1 | Endereço: | 
+ADDRESS_HOME_LINE2 | a2 | Complemento: | 
+ADDRESS_HOME_CITY | ct | Cidade: | 
+ADDRESS_HOME_ZIP | zc | CEP: | 
+ADDRESS_HOME_STATE | st | Estado: | 
+EMAIL_ADDRESS | em | email: | 
+PHONE_HOME_WHOLE_NUMBER | ph | Telefone: | 
+PHONE_FAX_WHOLE_NUMBER | fx | Fax Number: | 
+CREDIT_CARD_NAME | c1 | Nome do cartão: | 
+CREDIT_CARD_NUMBER | c2 | Número do cartão: | 
+CREDIT_CARD_EXP_MONTH | c3 | Data de validade: | 
+CREDIT_CARD_EXP_4_DIGIT_YEAR | c4 | Data de validade: | 
diff --git a/chrome/test/data/autofill/heuristics/output/00_i18n_ru.out b/chrome/test/data/autofill/heuristics/output/00_i18n_ru.out
index 8dbc1e1..11aeb88 100644
--- a/chrome/test/data/autofill/heuristics/output/00_i18n_ru.out
+++ b/chrome/test/data/autofill/heuristics/output/00_i18n_ru.out
@@ -1,15 +1,15 @@
-NAME_FIRST
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_STATE
-EMAIL_ADDRESS
-PHONE_HOME_WHOLE_NUMBER
-PHONE_FAX_WHOLE_NUMBER
-CREDIT_CARD_NAME
-CREDIT_CARD_NUMBER
-CREDIT_CARD_EXP_MONTH
-CREDIT_CARD_EXP_4_DIGIT_YEAR
+NAME_FIRST | fn | Имя: | 
+NAME_LAST | ln | Фамилия: | 
+COMPANY_NAME | cm | название компании: | 
+ADDRESS_HOME_LINE1 | a1 | Адрес: | 
+ADDRESS_HOME_LINE2 | a2 | Улица: | 
+ADDRESS_HOME_CITY | ct | Город: | 
+ADDRESS_HOME_ZIP | zc | Почтовый Индекс: | 
+ADDRESS_HOME_STATE | st | область: | 
+EMAIL_ADDRESS | em | Электронной Почты: | 
+PHONE_HOME_WHOLE_NUMBER | ph | телефон: | 
+PHONE_FAX_WHOLE_NUMBER | fx | факс: | 
+CREDIT_CARD_NAME | c1 | Имя владельца карты: | 
+CREDIT_CARD_NUMBER | c2 | Номер кредитной карты: | 
+CREDIT_CARD_EXP_MONTH | c3 | Срок действия карты : | 
+CREDIT_CARD_EXP_4_DIGIT_YEAR | c4 | Срок действия карты : | 
diff --git a/chrome/test/data/autofill/heuristics/output/00_i18n_zh_cn.out b/chrome/test/data/autofill/heuristics/output/00_i18n_zh_cn.out
index 0192a6d..ed35520 100644
--- a/chrome/test/data/autofill/heuristics/output/00_i18n_zh_cn.out
+++ b/chrome/test/data/autofill/heuristics/output/00_i18n_zh_cn.out
@@ -1,14 +1,14 @@
-NAME_FULL
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_STATE
-EMAIL_ADDRESS
-PHONE_HOME_WHOLE_NUMBER
-PHONE_FAX_WHOLE_NUMBER
-CREDIT_CARD_NAME
-CREDIT_CARD_NUMBER
-CREDIT_CARD_EXP_MONTH
-CREDIT_CARD_EXP_4_DIGIT_YEAR
+NAME_FULL | fl | 姓名: | 
+COMPANY_NAME | cm | 公司: | 
+ADDRESS_HOME_LINE1 | a1 | 地址: | 
+ADDRESS_HOME_LINE2 | a2 | 地址2: | 
+ADDRESS_HOME_CITY | ct | 市: | 
+ADDRESS_HOME_ZIP | zc | 邮编: | 
+ADDRESS_HOME_STATE | st | 省: | 
+EMAIL_ADDRESS | em | 邮箱: | 
+PHONE_HOME_WHOLE_NUMBER | ph | 电话: | 
+PHONE_FAX_WHOLE_NUMBER | fx | 传真: | 
+CREDIT_CARD_NAME | c1 | 持卡人姓名： | 
+CREDIT_CARD_NUMBER | c2 | 信用卡号码： | 
+CREDIT_CARD_EXP_MONTH | c3 | 月： | 
+CREDIT_CARD_EXP_4_DIGIT_YEAR | c4 | 年： | 
diff --git a/chrome/test/data/autofill/heuristics/output/00_i18n_zh_tw.out b/chrome/test/data/autofill/heuristics/output/00_i18n_zh_tw.out
index 8dbc1e1..182f7dd 100644
--- a/chrome/test/data/autofill/heuristics/output/00_i18n_zh_tw.out
+++ b/chrome/test/data/autofill/heuristics/output/00_i18n_zh_tw.out
@@ -1,15 +1,15 @@
-NAME_FIRST
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_STATE
-EMAIL_ADDRESS
-PHONE_HOME_WHOLE_NUMBER
-PHONE_FAX_WHOLE_NUMBER
-CREDIT_CARD_NAME
-CREDIT_CARD_NUMBER
-CREDIT_CARD_EXP_MONTH
-CREDIT_CARD_EXP_4_DIGIT_YEAR
+NAME_FIRST | fn | 名字: | 
+NAME_LAST | ln | 姓氏: | 
+COMPANY_NAME | cm | 公司: | 
+ADDRESS_HOME_LINE1 | a1 | 住家地址: | 
+ADDRESS_HOME_LINE2 | a2 | 地址: | 
+ADDRESS_HOME_CITY | ct | 分區: | 
+ADDRESS_HOME_ZIP | zc | 郵遞區號: | 
+ADDRESS_HOME_STATE | st | 地區: | 
+EMAIL_ADDRESS | em | 電郵地址: | 
+PHONE_HOME_WHOLE_NUMBER | ph | 電話: | 
+PHONE_FAX_WHOLE_NUMBER | fx | 傳真: | 
+CREDIT_CARD_NAME | c1 | 持卡人姓名: | 
+CREDIT_CARD_NUMBER | c2 | 信用卡卡號: | 
+CREDIT_CARD_EXP_MONTH | c3 | 月: | 
+CREDIT_CARD_EXP_4_DIGIT_YEAR | c4 | 年: | 
diff --git a/chrome/test/data/autofill/heuristics/output/01_misc_phones.out b/chrome/test/data/autofill/heuristics/output/01_misc_phones.out
index f3e1ba9..ada4626 100644
--- a/chrome/test/data/autofill/heuristics/output/01_misc_phones.out
+++ b/chrome/test/data/autofill/heuristics/output/01_misc_phones.out
@@ -1,48 +1,48 @@
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_WHOLE_NUMBER
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
-UNKNOWN_TYPE
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
-UNKNOWN_TYPE
-PHONE_HOME_COUNTRY_CODE
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
-UNKNOWN_TYPE
-PHONE_HOME_COUNTRY_CODE
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
-UNKNOWN_TYPE
-PHONE_FAX_WHOLE_NUMBER
-PHONE_FAX_CITY_CODE
-PHONE_FAX_NUMBER
-PHONE_FAX_CITY_CODE
-PHONE_FAX_NUMBER
-PHONE_FAX_NUMBER
-UNKNOWN_TYPE
-PHONE_FAX_CITY_CODE
-PHONE_FAX_NUMBER
-PHONE_FAX_NUMBER
-UNKNOWN_TYPE
-PHONE_FAX_COUNTRY_CODE
-PHONE_FAX_CITY_CODE
-PHONE_FAX_NUMBER
-PHONE_FAX_NUMBER
-UNKNOWN_TYPE
-PHONE_FAX_COUNTRY_CODE
-PHONE_FAX_CITY_CODE
-PHONE_FAX_NUMBER
-PHONE_FAX_NUMBER
-UNKNOWN_TYPE
+NAME_FIRST | firstname | First name: | 
+NAME_LAST | lastname | Last name: | 
+ADDRESS_HOME_LINE1 | address | Address: | 
+ADDRESS_HOME_CITY | city | City: | 
+ADDRESS_HOME_STATE | state | State: | 
+ADDRESS_HOME_ZIP | zip | Zip: | 
+PHONE_HOME_WHOLE_NUMBER | phone | Phone: | 
+PHONE_HOME_CITY_CODE | areacode1 | Area Code: | 
+PHONE_HOME_NUMBER | phone1 | Phone: | 
+PHONE_HOME_CITY_CODE | hphone1 | Phone: | 
+PHONE_HOME_NUMBER | hphone2 | - | 
+PHONE_HOME_NUMBER | hphone3 | - | 
+UNKNOWN_TYPE | hphone4 | ext.: | 
+PHONE_HOME_CITY_CODE | hphone1a | Phone:        ( | 
+PHONE_HOME_NUMBER | hphone2a | ) | 
+PHONE_HOME_NUMBER | hphone3a | - | 
+UNKNOWN_TYPE | hphone4a | ext.: | 
+PHONE_HOME_COUNTRY_CODE | hphone1b | Phone: | 
+PHONE_HOME_CITY_CODE | hphone1b |  | 
+PHONE_HOME_NUMBER | hphone2b | - | 
+PHONE_HOME_NUMBER | hphone3b | - | 
+UNKNOWN_TYPE | hphone4b | ext.: | 
+PHONE_HOME_COUNTRY_CODE | hphone1c | Phone: | 
+PHONE_HOME_CITY_CODE | hphone1c | ( | 
+PHONE_HOME_NUMBER | hphone2c | ) | 
+PHONE_HOME_NUMBER | hphone3c | - | 
+UNKNOWN_TYPE | hphone4c | ext.: | 
+PHONE_FAX_WHOLE_NUMBER | fax | Fax: | 
+PHONE_FAX_CITY_CODE | faxareacode1 | Area Code: | 
+PHONE_FAX_NUMBER | fax1 | Fax: | 
+PHONE_FAX_CITY_CODE | hfax1 | Fax: | 
+PHONE_FAX_NUMBER | hfax2 | - | 
+PHONE_FAX_NUMBER | hfax3 | - | 
+UNKNOWN_TYPE | hfax4 | ext.: | 
+PHONE_FAX_CITY_CODE | hfax1a | Fax:        ( | 
+PHONE_FAX_NUMBER | hfax2a | ) | 
+PHONE_FAX_NUMBER | hfax3a | - | 
+UNKNOWN_TYPE | hfax4a | ext.: | 
+PHONE_FAX_COUNTRY_CODE | hfax0b | Fax: | 
+PHONE_FAX_CITY_CODE | hfax1b |  | 
+PHONE_FAX_NUMBER | hfax2b | - | 
+PHONE_FAX_NUMBER | hfax3b | - | 
+UNKNOWN_TYPE | hfax4 | ext.: | 
+PHONE_FAX_COUNTRY_CODE | hfax0c | Fax: | 
+PHONE_FAX_CITY_CODE | hfax1c | ( | 
+PHONE_FAX_NUMBER | hfax2c | ) | 
+PHONE_FAX_NUMBER | hfax3c | - | 
+UNKNOWN_TYPE | hfax4c | ext.: | 
diff --git a/chrome/test/data/autofill/heuristics/output/02_checkout_advanceautoparts.com.out b/chrome/test/data/autofill/heuristics/output/02_checkout_advanceautoparts.com.out
index 89cc9b8..5b826ea 100644
--- a/chrome/test/data/autofill/heuristics/output/02_checkout_advanceautoparts.com.out
+++ b/chrome/test/data/autofill/heuristics/output/02_checkout_advanceautoparts.com.out
@@ -1,24 +1,24 @@
-NAME_FIRST
-NAME_LAST
-ADDRESS_BILLING_LINE1
-ADDRESS_BILLING_LINE2
-ADDRESS_BILLING_CITY
-ADDRESS_BILLING_STATE
-ADDRESS_BILLING_ZIP
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
-EMAIL_ADDRESS
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
+NAME_FIRST | billFirstName | *First Name: | 
+NAME_LAST | billLastName | *Last Name: | 
+ADDRESS_BILLING_LINE1 | billAddress1 | *Street Address 1: | 
+ADDRESS_BILLING_LINE2 | billAddress2 | Street Address 2: | 
+ADDRESS_BILLING_CITY | billCity | *City: | 
+ADDRESS_BILLING_STATE | billState | *State: | AL
+ADDRESS_BILLING_ZIP | billZipCode | *Zip Code: | 
+PHONE_HOME_CITY_CODE | billDayPhonePart1 | ( | 
+PHONE_HOME_NUMBER | billDayPhonePart2 | ) | 
+PHONE_HOME_NUMBER | billDayPhonePart3 | *Day Phone: | 
+EMAIL_ADDRESS | billEmail | *Email Address: | 
+NAME_FIRST | shipFirstName | *First Name: | 
+NAME_LAST | shipLastName | *Last Name: | 
+ADDRESS_HOME_LINE1 | shipAddress1 | *Street Address 1: | 
+ADDRESS_HOME_LINE2 | shipAddress2 | Street Address 2: | 
+ADDRESS_HOME_CITY | shipCity | *City: | 
+ADDRESS_HOME_STATE | shipState | *State: | AL
+ADDRESS_HOME_ZIP | shipZipCode | *Zip Code: | 
+PHONE_HOME_CITY_CODE | shipDayPhonePart1 | ( | 
+PHONE_HOME_NUMBER | shipDayPhonePart2 | ) | 
+PHONE_HOME_NUMBER | shipDayPhonePart3 | *Day Phone: | 
+PHONE_HOME_CITY_CODE | shipNightPhonePart1 | ( | 
+PHONE_HOME_NUMBER | shipNightPhonePart2 | ) | 
+PHONE_HOME_NUMBER | shipNightPhonePart3 | Night Phone: | 
diff --git a/chrome/test/data/autofill/heuristics/output/02_checkout_ae.com.out b/chrome/test/data/autofill/heuristics/output/02_checkout_ae.com.out
index c2057a7..65db6ef 100644
--- a/chrome/test/data/autofill/heuristics/output/02_checkout_ae.com.out
+++ b/chrome/test/data/autofill/heuristics/output/02_checkout_ae.com.out
@@ -1,37 +1,37 @@
-NAME_FIRST
-NAME_LAST
-EMAIL_ADDRESS
-ADDRESS_HOME_COUNTRY
-ADDRESS_HOME_COUNTRY
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-UNKNOWN_TYPE
-CREDIT_CARD_NUMBER
-CREDIT_CARD_EXP_MONTH
-CREDIT_CARD_EXP_4_DIGIT_YEAR
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-ADDRESS_HOME_COUNTRY
-ADDRESS_HOME_COUNTRY
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-PHONE_HOME_WHOLE_NUMBER
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
+NAME_FIRST | firstName | Search wish lists by name | First Name
+NAME_LAST | lastName |  | Last Name
+EMAIL_ADDRESS | email | Or search wish lists by email | Email
+ADDRESS_HOME_COUNTRY | countryType | Country Type | usa
+ADDRESS_HOME_COUNTRY | country | Country, APO/FPO | US
+NAME_FIRST | firstName | First Name | 
+NAME_LAST | lastName | Last Name | 
+ADDRESS_HOME_LINE1 | address1 | Address | 
+ADDRESS_HOME_LINE2 | address2 |  | 
+ADDRESS_HOME_CITY | city | City | 
+ADDRESS_HOME_STATE | state | State | 
+ADDRESS_HOME_ZIP | zip | Zip | 
+UNKNOWN_TYPE | ccType | Card Type: | 
+CREDIT_CARD_NUMBER | ccNumber | Card Number: | 
+CREDIT_CARD_EXP_MONTH | expMonth | Expiration: | 1
+CREDIT_CARD_EXP_4_DIGIT_YEAR | expYear |  | 2011
+UNKNOWN_TYPE | ccSecCode | Security Code: CLOSEVisa, Mastercard & Discover:The security code is a 3-digit number found on the back of the card near the signature strip.American Express:The security code is a 4-digit number found on the front right side of the card. | 
+UNKNOWN_TYPE | birthMonthBMLField | Birthday: CLOSEWe need your birthday for the Bill Me Later® credit check process. | 
+UNKNOWN_TYPE | birthDayBMLField | Birthday: CLOSEWe need your birthday for the Bill Me Later® credit check process. | 
+UNKNOWN_TYPE | birthYearBMLField | Birthday: CLOSEWe need your birthday for the Bill Me Later® credit check process. | 
+UNKNOWN_TYPE | SSN | Last 4 digits of your social security #: CLOSEWe need the last 4 digits of your SSN for the Bill Me Later® credit check process. If you do not have an SSN, you can still pay by Credit Card or PayPal. | 
+ADDRESS_HOME_COUNTRY | countryType | Country Type | usa
+ADDRESS_HOME_COUNTRY | country | Country, APO/FPO | US
+NAME_FIRST | firstName | First Name | 
+NAME_LAST | lastName | Last Name | 
+ADDRESS_HOME_LINE1 | address1 | Address | 
+ADDRESS_HOME_LINE2 | address2 |  | 
+ADDRESS_HOME_CITY | city | City | 
+ADDRESS_HOME_STATE | state | State | 
+ADDRESS_HOME_ZIP | zip | Zip | 
+EMAIL_ADDRESS | email |  | 
+EMAIL_ADDRESS | confirmEmail |  | 
+PHONE_HOME_WHOLE_NUMBER | billingPhone |  | 
+UNKNOWN_TYPE | accessPassNumber | My AEREWARD$ # CLOSEAEREWARD$ NumberEnter the number found on the back of your AEREWARD$ card to earn rewards for your purchase.Learn More about AEREWARD$ | 
+UNKNOWN_TYPE | birthMonthBillAddField | Birthday: CLOSEWe'd love to wish you a happy birthday when it's time! However, you need to be 13 or older to create an account. | 
+UNKNOWN_TYPE | birthDayBillAddField | Birthday: CLOSEWe'd love to wish you a happy birthday when it's time! However, you need to be 13 or older to create an account. | 
+UNKNOWN_TYPE | birthYearBillAddField | Birthday: CLOSEWe'd love to wish you a happy birthday when it's time! However, you need to be 13 or older to create an account. | 
diff --git a/chrome/test/data/autofill/heuristics/output/02_checkout_bedbathandbeyond.com.out b/chrome/test/data/autofill/heuristics/output/02_checkout_bedbathandbeyond.com.out
index 8808781..af6cf0b 100644
--- a/chrome/test/data/autofill/heuristics/output/02_checkout_bedbathandbeyond.com.out
+++ b/chrome/test/data/autofill/heuristics/output/02_checkout_bedbathandbeyond.com.out
@@ -1,35 +1,35 @@
-NAME_FIRST
-NAME_MIDDLE
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-NAME_FIRST
-NAME_MIDDLE
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
+NAME_FIRST | first_nm | *First name | 
+NAME_MIDDLE | mid_nm | Middle name | 
+NAME_LAST | last_nm | *Last name | 
+COMPANY_NAME | company | Company name | 
+ADDRESS_HOME_LINE1 | addr1 | *Address 1 | 
+ADDRESS_HOME_LINE2 | addr2 | Address 2 | 
+ADDRESS_HOME_CITY | city | *City | 
+ADDRESS_HOME_STATE | addr_state | *State | 
+ADDRESS_HOME_ZIP | zip | *Zip Code | 
+PHONE_HOME_CITY_CODE | day_phone_part1 | *Day phone | 
+PHONE_HOME_NUMBER | day_phone_part2 | *Day phone | 
+PHONE_HOME_NUMBER | day_phone_part3 | *Day phone | 
+PHONE_HOME_CITY_CODE | eve_phone_part1 | Evening phone | 
+PHONE_HOME_NUMBER | eve_phone_part2 | Evening phone | 
+PHONE_HOME_NUMBER | eve_phone_part3 | Evening phone | 
+PHONE_HOME_CITY_CODE | mob_phone_part1 | Mobile phone | 
+PHONE_HOME_NUMBER | mob_phone_part2 | Mobile phone | 
+PHONE_HOME_NUMBER | mob_phone_part3 | Mobile phone | 
+EMAIL_ADDRESS | email_addr | *Email | 
+EMAIL_ADDRESS | retype_email_addr | *Re-type email | 
+NAME_FIRST | ship_first_nm | *First name | 
+NAME_MIDDLE | ship_mid_nm | Middle name | 
+NAME_LAST | ship_last_nm | *Last name | 
+COMPANY_NAME | ship_company | Company name | 
+ADDRESS_HOME_LINE1 | ship_addr1 | *Address 1 (No P.O. Boxes) | 
+ADDRESS_HOME_LINE2 | ship_addr2 | Address 2 | 
+ADDRESS_HOME_CITY | ship_city | *City | 
+ADDRESS_HOME_STATE | ship_addr_state | *State | 
+ADDRESS_HOME_ZIP | ship_zip | *Zip Code | 
+PHONE_HOME_CITY_CODE | ship_day_phone_part1 | *Day phone | 
+PHONE_HOME_NUMBER | ship_day_phone_part2 | *Day phone | 
+PHONE_HOME_NUMBER | ship_day_phone_part3 | *Day phone | 
+PHONE_HOME_CITY_CODE | ship_eve_phone_part1 | Evening phone | 
+PHONE_HOME_NUMBER | ship_eve_phone_part2 | Evening phone | 
+PHONE_HOME_NUMBER | ship_eve_phone_part3 | Evening phone | 
diff --git a/chrome/test/data/autofill/heuristics/output/02_checkout_cafepress.com.out b/chrome/test/data/autofill/heuristics/output/02_checkout_cafepress.com.out
index 264eabe..4683755 100644
--- a/chrome/test/data/autofill/heuristics/output/02_checkout_cafepress.com.out
+++ b/chrome/test/data/autofill/heuristics/output/02_checkout_cafepress.com.out
@@ -1,24 +1,24 @@
-NAME_FULL
-ADDRESS_BILLING_COUNTRY
-ADDRESS_BILLING_LINE1
-ADDRESS_BILLING_LINE2
-UNKNOWN_TYPE
-ADDRESS_BILLING_CITY
-ADDRESS_BILLING_STATE
-UNKNOWN_TYPE
-ADDRESS_BILLING_ZIP
-PHONE_HOME_WHOLE_NUMBER
-EMAIL_ADDRESS
-NAME_FULL
-ADDRESS_HOME_COUNTRY
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-UNKNOWN_TYPE
-ADDRESS_HOME_ZIP
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-CREDIT_CARD_NUMBER
-CREDIT_CARD_EXP_MONTH
-CREDIT_CARD_EXP_4_DIGIT_YEAR
+NAME_FULL | BillName | Name on Account* | 
+ADDRESS_BILLING_COUNTRY | BillCountry | Country* | UNITED STATES
+ADDRESS_BILLING_LINE1 | BillStreet1 | Address * | 
+ADDRESS_BILLING_LINE2 | BillStreet2 | Address * | 
+UNKNOWN_TYPE | ddlRedoClassification | Address * | 
+ADDRESS_BILLING_CITY | BillCity | Town/City* | 
+ADDRESS_BILLING_STATE | BillState | State/Province* | 
+UNKNOWN_TYPE | BillStateOther | State/Province* | 
+ADDRESS_BILLING_ZIP | BillZip | Zip/Postal Code* | 
+PHONE_HOME_WHOLE_NUMBER | BillPhone | Phone Number* | 
+EMAIL_ADDRESS | BillEmail | Email Address* | 
+NAME_FULL | ShipName | Recipient Name* | 
+ADDRESS_HOME_COUNTRY | ShipCountry | Country* | UNITED STATES
+ADDRESS_HOME_LINE1 | ShipStreet1 | Address* | 
+ADDRESS_HOME_LINE2 | ShipStreet2 | Address* | 
+ADDRESS_HOME_CITY | ShipCity | Town/City* | 
+ADDRESS_HOME_STATE | ShipState | State/Province* | 
+UNKNOWN_TYPE | ShipStateOther | State/Province* | 
+ADDRESS_HOME_ZIP | ShipZip | Zip/Postal Code* | 
+UNKNOWN_TYPE | countdown | You have | 300
+UNKNOWN_TYPE | txtCoupon | Apply Promo Code | 
+CREDIT_CARD_NUMBER | txtCCAccount | Credit Card No.* | 
+CREDIT_CARD_EXP_MONTH | ccExp$MonthDrop | Expiration Date* | 06 (June)
+CREDIT_CARD_EXP_4_DIGIT_YEAR | ccExp$YearDrop | Expiration Date* | 2011
diff --git a/chrome/test/data/autofill/heuristics/output/03_checkout_cduniverse.com.out b/chrome/test/data/autofill/heuristics/output/03_checkout_cduniverse.com.out
index 5c02ba2..5017bf3 100644
--- a/chrome/test/data/autofill/heuristics/output/03_checkout_cduniverse.com.out
+++ b/chrome/test/data/autofill/heuristics/output/03_checkout_cduniverse.com.out
@@ -1,17 +1,17 @@
-NAME_FIRST
-NAME_LAST
-EMAIL_ADDRESS
-ADDRESS_BILLING_LINE1
-ADDRESS_BILLING_LINE2
-ADDRESS_BILLING_CITY
-ADDRESS_BILLING_STATE
-ADDRESS_BILLING_ZIP
-PHONE_HOME_WHOLE_NUMBER
-ADDRESS_BILLING_COUNTRY
-NAME_FULL
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_COUNTRY
+NAME_FIRST | HT_First_Name | First Name | 
+NAME_LAST | HT_Last_Name | Last Name | 
+EMAIL_ADDRESS | HT_email | Email | 
+ADDRESS_BILLING_LINE1 | HT_Bill_Address1 | Address 1 | 
+ADDRESS_BILLING_LINE2 | HT_Bill_Address2 | Address 2 | 
+ADDRESS_BILLING_CITY | HT_Bill_City | City | 
+ADDRESS_BILLING_STATE | HT_Bill_State | State/Province | 
+ADDRESS_BILLING_ZIP | HT_Bill_Zip | Zip/Postal Code | 
+PHONE_HOME_WHOLE_NUMBER | HT_phone | Phone | 
+ADDRESS_BILLING_COUNTRY | HT_Bill_Country | Country | USA
+NAME_FULL | HT_Ship_Name | Full Name | 
+ADDRESS_HOME_LINE1 | HT_Ship_Address1 | Address 1 | 
+ADDRESS_HOME_LINE2 | HT_Ship_Address2 | Address 2 | 
+ADDRESS_HOME_CITY | HT_Ship_City | City | 
+ADDRESS_HOME_STATE | HT_Ship_State | State/Province | 
+ADDRESS_HOME_ZIP | HT_Ship_Zip | Zip/Postal Code | 
+ADDRESS_HOME_COUNTRY | HT_Ship_Country | Country | 
diff --git a/chrome/test/data/autofill/heuristics/output/03_checkout_crutchfield.com.out b/chrome/test/data/autofill/heuristics/output/03_checkout_crutchfield.com.out
index c677727..52a7d60 100644
--- a/chrome/test/data/autofill/heuristics/output/03_checkout_crutchfield.com.out
+++ b/chrome/test/data/autofill/heuristics/output/03_checkout_crutchfield.com.out
@@ -1,20 +1,20 @@
-NAME_FIRST
-NAME_MIDDLE_INITIAL
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_WHOLE_NUMBER
-EMAIL_ADDRESS
-NAME_FIRST
-NAME_MIDDLE_INITIAL
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_WHOLE_NUMBER
-UNKNOWN_TYPE
+NAME_FIRST | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$firstname | * M.I. | 
+NAME_MIDDLE_INITIAL | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$mi | * M.I. | 
+NAME_LAST | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$lastname | * | 
+COMPANY_NAME | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$address2 | Company | 
+ADDRESS_HOME_LINE1 | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$address1 | * | 
+ADDRESS_HOME_CITY | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$city | City | 
+ADDRESS_HOME_STATE | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$state | State | Select Your State
+ADDRESS_HOME_ZIP | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$zip | * | 
+PHONE_HOME_WHOLE_NUMBER | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$billphone2 | * | 
+EMAIL_ADDRESS | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$email2 | * | 
+NAME_FIRST | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$shippingFirstname | * M.I. | 
+NAME_MIDDLE_INITIAL | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$shippingMi | * M.I. | 
+NAME_LAST | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$shippingLastname | * | 
+COMPANY_NAME | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$shippingAddress2 | Company | 
+ADDRESS_HOME_LINE1 | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$shippingAddress1 | * | 
+ADDRESS_HOME_CITY | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$shippingCity | City | 
+ADDRESS_HOME_STATE | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$shippingState | State | Select Your State
+ADDRESS_HOME_ZIP | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$shippingZip | * | 
+PHONE_HOME_WHOLE_NUMBER | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$shippingPhone | * | 
+UNKNOWN_TYPE | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$customerID | Located in the orange box on the back of your catalog. | 
diff --git a/chrome/test/data/autofill/heuristics/output/03_checkout_gamestop.com.out b/chrome/test/data/autofill/heuristics/output/03_checkout_gamestop.com.out
index ff4040d..9a91474 100644
--- a/chrome/test/data/autofill/heuristics/output/03_checkout_gamestop.com.out
+++ b/chrome/test/data/autofill/heuristics/output/03_checkout_gamestop.com.out
@@ -1,21 +1,21 @@
-UNKNOWN_TYPE
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_COUNTRY
-PHONE_HOME_WHOLE_NUMBER
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_COUNTRY
-PHONE_HOME_WHOLE_NUMBER
+UNKNOWN_TYPE | ctl00$ctl00$ctl00$BaseContentPlaceHolder$cHeader$searchtext |  | 
+NAME_FIRST | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$AddressDetails$AddressDetails$textFirstName | First Name: | 
+NAME_LAST | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$AddressDetails$AddressDetails$textLastName | Last Name: | 
+ADDRESS_HOME_LINE1 | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$AddressDetails$AddressDetails$textAddressLine1 | Address 1: | 
+ADDRESS_HOME_LINE2 | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$AddressDetails$AddressDetails$textAddressLine2 | Address 2: (optional) | 
+ADDRESS_HOME_CITY | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$AddressDetails$AddressDetails$textCity | City: | 
+ADDRESS_HOME_STATE | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$AddressDetails$AddressDetails$ddlState | State/Province: | -1
+ADDRESS_HOME_ZIP | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$AddressDetails$AddressDetails$textZip | Zip/Postal: | 
+ADDRESS_HOME_COUNTRY | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$AddressDetails$AddressDetails$ddlCountry | Country: | US
+PHONE_HOME_WHOLE_NUMBER | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$AddressDetails$AddressDetails$textPhoneNumberDaytime | Phone Number: | 
+EMAIL_ADDRESS | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$AddressDetails$AddressDetails$txtEmailAddress | Purchaser's Email: | 
+EMAIL_ADDRESS | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$AddressDetails$AddressDetails$txtEmailAddressConfirm | Confirm Email: | 
+NAME_FIRST | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$aspShippingAddress$popAddressSelection$AddressDetails1$textFirstName | First Name: | 
+NAME_LAST | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$aspShippingAddress$popAddressSelection$AddressDetails1$textLastName | Last Name: | 
+ADDRESS_HOME_LINE1 | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$aspShippingAddress$popAddressSelection$AddressDetails1$textAddressLine1 | Address 1: | 
+ADDRESS_HOME_LINE2 | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$aspShippingAddress$popAddressSelection$AddressDetails1$textAddressLine2 | Address 2: (optional) | 
+ADDRESS_HOME_CITY | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$aspShippingAddress$popAddressSelection$AddressDetails1$textCity | City: | 
+ADDRESS_HOME_STATE | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$aspShippingAddress$popAddressSelection$AddressDetails1$ddlState | State/Province: | -1
+ADDRESS_HOME_ZIP | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$aspShippingAddress$popAddressSelection$AddressDetails1$textZip | Zip/Postal: | 
+ADDRESS_HOME_COUNTRY | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$aspShippingAddress$popAddressSelection$AddressDetails1$ddlCountry | Country: | US
+PHONE_HOME_WHOLE_NUMBER | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$aspShippingAddress$popAddressSelection$AddressDetails1$textPhoneNumberDaytime | Phone Number: | 
diff --git a/chrome/test/data/autofill/heuristics/output/03_checkout_homedepot.com.out b/chrome/test/data/autofill/heuristics/output/03_checkout_homedepot.com.out
index d51f528..70ecb00 100644
--- a/chrome/test/data/autofill/heuristics/output/03_checkout_homedepot.com.out
+++ b/chrome/test/data/autofill/heuristics/output/03_checkout_homedepot.com.out
@@ -1,13 +1,13 @@
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
+NAME_FIRST | firstName_1 | *First Name: | 
+NAME_LAST | lastName_1 | *Last Name: | 
+ADDRESS_HOME_LINE1 | address1_1 | *Address 1: | 
+ADDRESS_HOME_LINE2 | address2_1 | Address 2: | 
+ADDRESS_HOME_CITY | city_1 | *City: | 
+ADDRESS_HOME_STATE | state_1 | *State: | 
+ADDRESS_HOME_ZIP | zipCode_1 | *ZIP Code: | 
+PHONE_HOME_CITY_CODE | fieldphone1_1 | *Phone Number on Record: | 
+PHONE_HOME_NUMBER | fieldphone2_1 | *Phone Number on Record: | 
+PHONE_HOME_NUMBER | fieldphone3_1 | *Phone Number on Record: | 
+PHONE_HOME_CITY_CODE | altfieldphone1_1 | Alternate Phone: | 
+PHONE_HOME_NUMBER | altfieldphone2_1 | Alternate Phone: | 
+PHONE_HOME_NUMBER | altfieldphone3_1 | Alternate Phone: | 
diff --git a/chrome/test/data/autofill/heuristics/output/03_checkout_hsn.com.out b/chrome/test/data/autofill/heuristics/output/03_checkout_hsn.com.out
index 2c2c0d4..645885b 100644
--- a/chrome/test/data/autofill/heuristics/output/03_checkout_hsn.com.out
+++ b/chrome/test/data/autofill/heuristics/output/03_checkout_hsn.com.out
@@ -1,23 +1,23 @@
-NAME_FIRST
-NAME_LAST
-ADDRESS_BILLING_LINE1
-ADDRESS_BILLING_LINE2
-ADDRESS_BILLING_CITY
-ADDRESS_BILLING_STATE
-ADDRESS_BILLING_ZIP
-PHONE_HOME_WHOLE_NUMBER
-PHONE_HOME_WHOLE_NUMBER
-EMAIL_ADDRESS
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_WHOLE_NUMBER
-CREDIT_CARD_NUMBER
-CREDIT_CARD_EXP_MONTH
-CREDIT_CARD_EXP_4_DIGIT_YEAR
-CREDIT_CARD_NAME
-UNKNOWN_TYPE
+NAME_FIRST | Body$BillingAddress$_firstName | First Name | 
+NAME_LAST | Body$BillingAddress$_lastName | Last Name | 
+ADDRESS_BILLING_LINE1 | Body$BillingAddress$_address1 | Address Line 1 | 
+ADDRESS_BILLING_LINE2 | Body$BillingAddress$_address2 | Address Line 2(optional) | 
+ADDRESS_BILLING_CITY | Body$BillingAddress$_city | City | 
+ADDRESS_BILLING_STATE | Body$BillingAddress$_state | State |   
+ADDRESS_BILLING_ZIP | Body$BillingAddress$_zipcode | Zip Code | 
+PHONE_HOME_WHOLE_NUMBER | Body$BillingAddress$_PrimaryPhone | Primary Phone | 
+PHONE_HOME_WHOLE_NUMBER | Body$BillingAddress$_Alt1Phone | Alternate Phone2(optional) | 
+EMAIL_ADDRESS | Body$NewEmailAddress2 | Email Address | 
+NAME_FIRST | Body$ShippingAddress$_firstName | First Name | 
+NAME_LAST | Body$ShippingAddress$_lastName | Last Name | 
+ADDRESS_HOME_LINE1 | Body$ShippingAddress$_address1 | Address Line 1 | 
+ADDRESS_HOME_LINE2 | Body$ShippingAddress$_address2 | Address Line 2(optional) | 
+ADDRESS_HOME_CITY | Body$ShippingAddress$_city | City | 
+ADDRESS_HOME_STATE | Body$ShippingAddress$_state | State |   
+ADDRESS_HOME_ZIP | Body$ShippingAddress$_zipcode | Zip Code | 
+PHONE_HOME_WHOLE_NUMBER | Body$ShippingAddress$_telephone | Phone Number | 
+CREDIT_CARD_NUMBER | Body$CCNumber | Card Number | 
+CREDIT_CARD_EXP_MONTH | Body$CCExpirationDateMonth | Expiration Date | 0
+CREDIT_CARD_EXP_4_DIGIT_YEAR | Body$CCExpirationDateYear | Expiration Date | 0
+CREDIT_CARD_NAME | Body$CCNameOnCard | Name on Card | 
+UNKNOWN_TYPE | Body$NewPasswordHint | Password Hint (optional) | 
diff --git a/chrome/test/data/autofill/heuristics/output/04_checkout_ikea.com.out b/chrome/test/data/autofill/heuristics/output/04_checkout_ikea.com.out
index 93be3dc..88e344f 100644
--- a/chrome/test/data/autofill/heuristics/output/04_checkout_ikea.com.out
+++ b/chrome/test/data/autofill/heuristics/output/04_checkout_ikea.com.out
@@ -1,15 +1,15 @@
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_CITY
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-PHONE_HOME_WHOLE_NUMBER
-UNKNOWN_TYPE
-PHONE_HOME_WHOLE_NUMBER
-UNKNOWN_TYPE
-PHONE_FAX_WHOLE_NUMBER
-UNKNOWN_TYPE
+NAME_FIRST | firstName |  | 
+NAME_LAST | lastName |  | 
+ADDRESS_HOME_LINE1 | address1 |  | 
+ADDRESS_HOME_LINE2 | address2 |  | 
+ADDRESS_HOME_STATE | state |  | 
+ADDRESS_HOME_ZIP | zipCode |  | 
+ADDRESS_HOME_CITY | city |  | 
+EMAIL_ADDRESS | email1 |  | 
+EMAIL_ADDRESS | email1retype |  | 
+PHONE_HOME_WHOLE_NUMBER | phone1 | Ext: (Optional) | 
+UNKNOWN_TYPE | phone1ext | Ext: (Optional) | 
+PHONE_HOME_WHOLE_NUMBER | phone2 | Ext: (Optional) | 
+UNKNOWN_TYPE | phone2ext | Ext: (Optional) | 
+PHONE_FAX_WHOLE_NUMBER | fax1 | Ext: (Optional) | 
+UNKNOWN_TYPE | fax1ext | Ext: (Optional) | 
diff --git a/chrome/test/data/autofill/heuristics/output/04_checkout_jcrew.com.out b/chrome/test/data/autofill/heuristics/output/04_checkout_jcrew.com.out
index 5acb519..c36cad0 100644
--- a/chrome/test/data/autofill/heuristics/output/04_checkout_jcrew.com.out
+++ b/chrome/test/data/autofill/heuristics/output/04_checkout_jcrew.com.out
@@ -1,11 +1,11 @@
-ADDRESS_HOME_COUNTRY
-NAME_FIRST
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_WHOLE_NUMBER
-UNKNOWN_TYPE
+ADDRESS_HOME_COUNTRY | ADDRESS<>country_cd | country * | US
+NAME_FIRST | ADDRESS<>firstName | first name * | 
+NAME_LAST | ADDRESS<>lastName | last name * | 
+COMPANY_NAME | ADDRESS<>address3 | company/care of | 
+ADDRESS_HOME_LINE1 | ADDRESS<>address1 | address line 1 * | 
+ADDRESS_HOME_LINE2 | ADDRESS<>address2 | address line 2 | 
+ADDRESS_HOME_CITY | ADDRESS<>city | city * | 
+ADDRESS_HOME_STATE | ADDRESS<>state_cd | state/province * | 
+ADDRESS_HOME_ZIP | ADDRESS<>postal | zip code * | 
+PHONE_HOME_WHOLE_NUMBER | ADDRESS<>phone | phone number (numbers only) * | 
+UNKNOWN_TYPE | anonPasswordHint | create password hint | 
diff --git a/chrome/test/data/autofill/heuristics/output/04_checkout_jr.com.out b/chrome/test/data/autofill/heuristics/output/04_checkout_jr.com.out
index 7bb0539..59241fc 100644
--- a/chrome/test/data/autofill/heuristics/output/04_checkout_jr.com.out
+++ b/chrome/test/data/autofill/heuristics/output/04_checkout_jr.com.out
@@ -1,24 +1,24 @@
-NAME_FIRST
-NAME_LAST
-ADDRESS_BILLING_LINE1
-ADDRESS_BILLING_LINE2
-ADDRESS_BILLING_CITY
-ADDRESS_BILLING_STATE
-ADDRESS_BILLING_ZIP
-ADDRESS_BILLING_COUNTRY
-PHONE_HOME_WHOLE_NUMBER
-EMAIL_ADDRESS
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_COUNTRY
-PHONE_HOME_WHOLE_NUMBER
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-EMAIL_ADDRESS
+NAME_FIRST | billingAddress.firstName | * | 
+NAME_LAST | billingAddress.lastName | * | 
+ADDRESS_BILLING_LINE1 | billingAddress.address1 | * | 
+ADDRESS_BILLING_LINE2 | billingAddress.address2 |  | 
+ADDRESS_BILLING_CITY | billingAddress.city | * | 
+ADDRESS_BILLING_STATE | billingAddress.stateCode | * | XX
+ADDRESS_BILLING_ZIP | billingAddress.postalCode | * | 
+ADDRESS_BILLING_COUNTRY | billingAddress.country | International billing instructions | US
+PHONE_HOME_WHOLE_NUMBER | billingAddress.phoneNumber | * | 
+EMAIL_ADDRESS | customer.emailAddress | * | 
+NAME_FIRST | shippingAddress.firstName | * | 
+NAME_LAST | shippingAddress.lastName | * | 
+ADDRESS_HOME_LINE1 | shippingAddress.address1 | * | 
+ADDRESS_HOME_LINE2 | shippingAddress.address2 |  | 
+ADDRESS_HOME_CITY | shippingAddress.city | * | 
+ADDRESS_HOME_STATE | shippingAddress.stateCode | * | XX
+ADDRESS_HOME_ZIP | shippingAddress.postalCode | * | 
+ADDRESS_HOME_COUNTRY | shippingAddress.country | * | US
+PHONE_HOME_WHOLE_NUMBER | shippingAddress.phoneNumber | * | 
+UNKNOWN_TYPE | customOrderHeader.internationalBilling |  | 
+UNKNOWN_TYPE | customOrderHeader.salespersonNumber |  | 
+UNKNOWN_TYPE | customOrderHeader.giftFromName |  | 
+UNKNOWN_TYPE | customOrderHeader.giftMessage |  | 
+EMAIL_ADDRESS | customOrderHeader.giftEmailAddress |  | 
diff --git a/chrome/test/data/autofill/heuristics/output/04_checkout_kohls.com.out b/chrome/test/data/autofill/heuristics/output/04_checkout_kohls.com.out
index ebd4198..bfd1f7f 100644
--- a/chrome/test/data/autofill/heuristics/output/04_checkout_kohls.com.out
+++ b/chrome/test/data/autofill/heuristics/output/04_checkout_kohls.com.out
@@ -1,24 +1,24 @@
-NAME_FIRST
-NAME_LAST
-ADDRESS_BILLING_LINE1
-ADDRESS_BILLING_LINE2
-ADDRESS_BILLING_CITY
-ADDRESS_BILLING_STATE
-ADDRESS_BILLING_ZIP
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-UNKNOWN_TYPE
-PHONE_HOME_WHOLE_NUMBER
-EMAIL_ADDRESS
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-UNKNOWN_TYPE
-PHONE_HOME_WHOLE_NUMBER
-UNKNOWN_TYPE
+NAME_FIRST | BILL_TO_ADDRESS<>firstName | First Name: | 
+NAME_LAST | BILL_TO_ADDRESS<>lastName | Last Name: | 
+ADDRESS_BILLING_LINE1 | BILL_TO_ADDRESS<>address1 | Address: | 
+ADDRESS_BILLING_LINE2 | BILL_TO_ADDRESS<>address2 | Apt. or Suite #: | 
+ADDRESS_BILLING_CITY | BILL_TO_ADDRESS<>city | City: | 
+ADDRESS_BILLING_STATE | BILL_TO_ADDRESS<>state_cd | State: | 
+ADDRESS_BILLING_ZIP | BILL_TO_ADDRESS<>postal | ZIP Code: | 
+PHONE_HOME_CITY_CODE | BILL_PHONE<>areacode | Area Code | 
+PHONE_HOME_NUMBER | BILL_PHONE<>exchange | Exchange | 
+UNKNOWN_TYPE | BILL_PHONE<>extension | Extension | 
+PHONE_HOME_WHOLE_NUMBER | bill_phone | Contact Phone: | 
+EMAIL_ADDRESS | CURRENT_USER<>email | E-mail Address: | 
+NAME_FIRST | SHIP_TO_ADDRESS<>firstName | First Name: | 
+NAME_LAST | SHIP_TO_ADDRESS<>lastName | Last Name: | 
+ADDRESS_HOME_LINE1 | SHIP_TO_ADDRESS<>address1 | Address: | 
+ADDRESS_HOME_LINE2 | SHIP_TO_ADDRESS<>address2 | Apt. or Suite #: | 
+ADDRESS_HOME_CITY | SHIP_TO_ADDRESS<>city | City: | 
+ADDRESS_HOME_STATE | SHIP_TO_ADDRESS<>state_cd | State: | 
+ADDRESS_HOME_ZIP | SHIP_TO_ADDRESS<>postal | ZIP Code: | 
+PHONE_HOME_CITY_CODE | SHIP_PHONE<>areacode | Area Code | 
+PHONE_HOME_NUMBER | SHIP_PHONE<>exchange | Exchange | 
+UNKNOWN_TYPE | SHIP_PHONE<>extension | Extension | 
+PHONE_HOME_WHOLE_NUMBER | ship_phone | Contact Phone: | 
+UNKNOWN_TYPE | validShippingMethodList | Shipping Method: | 7037973929746575
diff --git a/chrome/test/data/autofill/heuristics/output/04_checkout_lowes.com.out b/chrome/test/data/autofill/heuristics/output/04_checkout_lowes.com.out
index 42622a9..4b2d951 100644
--- a/chrome/test/data/autofill/heuristics/output/04_checkout_lowes.com.out
+++ b/chrome/test/data/autofill/heuristics/output/04_checkout_lowes.com.out
@@ -1,17 +1,17 @@
-ADDRESS_HOME_COUNTRY
-ADDRESS_HOME_LINE1
-NAME_FIRST
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_CITY
-EMAIL_ADDRESS
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
-EMAIL_ADDRESS
-UNKNOWN_TYPE
+ADDRESS_HOME_COUNTRY | country |  | USA
+ADDRESS_HOME_LINE1 | addressField2 | Address Name: | 
+NAME_FIRST | firstName | First Name: | 
+NAME_LAST | lastName | Last Name: | 
+COMPANY_NAME | addressField1 | Company Name: | 
+ADDRESS_HOME_LINE1 | address1 | Address Line 1: | 
+ADDRESS_HOME_LINE2 | address2 | Address Line 2: | 
+ADDRESS_HOME_CITY | city | City: | 
+ADDRESS_HOME_STATE | state | State: | 
+ADDRESS_HOME_ZIP | zipCode | ZIP Code: | 
+ADDRESS_HOME_CITY | taxGeoCode | Municipality: As an additional way to make sure you receive your order, we ask that you select the name of your municipality (city, town, borough, village, etc.) followed by the county, township, or parish in which you reside. | 
+EMAIL_ADDRESS | email1 | E-mail Address: Example: xxx@domain.com | 
+PHONE_HOME_CITY_CODE | billphone1 | Contact Phone: | 
+PHONE_HOME_NUMBER | billphone2 | Contact Phone: We will contact you only about your orders and deliveries. | 
+PHONE_HOME_NUMBER | billphone3 | Contact Phone: We will contact you only about your orders and deliveries. | 
+EMAIL_ADDRESS | selfAddress | This is also my billing address. Please enter the phone number and e-mail address associated with this billing address.E-mail Address: Contact Phone: | 0
+UNKNOWN_TYPE | save-address |  | on
diff --git a/chrome/test/data/autofill/heuristics/output/05_checkout_macys.com.out b/chrome/test/data/autofill/heuristics/output/05_checkout_macys.com.out
index b38c8bf..4debb59 100644
--- a/chrome/test/data/autofill/heuristics/output/05_checkout_macys.com.out
+++ b/chrome/test/data/autofill/heuristics/output/05_checkout_macys.com.out
@@ -1,10 +1,10 @@
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
+NAME_FIRST | currentShipment.shipmentAddress.firstName | First Name: | 
+NAME_LAST | currentShipment.shipmentAddress.lastName | Last Name: | 
+ADDRESS_HOME_LINE1 | currentShipment.shipmentAddress.address1 | Address: | 
+ADDRESS_HOME_LINE2 | currentShipment.shipmentAddress.address2 | * Address: | 
+ADDRESS_HOME_CITY | currentShipment.shipmentAddress.city | City: | 
+ADDRESS_HOME_STATE | currentShipment.shipmentAddress.state | State: | NOSELECTION
+ADDRESS_HOME_ZIP | currentShipment.shipmentAddress.zipCode | ZipCode: | 
+PHONE_HOME_CITY_CODE | currentShipment.shipmentAddress.dayPhone.areaCode | Phone: | 
+PHONE_HOME_NUMBER | currentShipment.shipmentAddress.dayPhone.exchangeNbr | - | 
+PHONE_HOME_NUMBER | currentShipment.shipmentAddress.dayPhone.subscriberNbr | - | 
diff --git a/chrome/test/data/autofill/heuristics/output/05_checkout_nordstrom.com.out b/chrome/test/data/autofill/heuristics/output/05_checkout_nordstrom.com.out
index 37ea306..eba1f86 100644
--- a/chrome/test/data/autofill/heuristics/output/05_checkout_nordstrom.com.out
+++ b/chrome/test/data/autofill/heuristics/output/05_checkout_nordstrom.com.out
@@ -1,20 +1,20 @@
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-PHONE_HOME_WHOLE_NUMBER
-NAME_FIRST
-NAME_MIDDLE_INITIAL
-NAME_LAST
-ADDRESS_BILLING_LINE1
-ADDRESS_BILLING_LINE2
-ADDRESS_BILLING_CITY
-ADDRESS_BILLING_STATE
-ADDRESS_BILLING_ZIP
-ADDRESS_BILLING_COUNTRY
-NAME_FIRST
-NAME_MIDDLE_INITIAL
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
+EMAIL_ADDRESS | ctl00$mainContentPlaceHolder$emailAddress | E-mail Address | 
+EMAIL_ADDRESS | ctl00$mainContentPlaceHolder$emailAddressConfirm | Confirm E-mail | 
+PHONE_HOME_WHOLE_NUMBER | ctl00$mainContentPlaceHolder$phoneNumber | Phone Number | 
+NAME_FIRST | ctl00$mainContentPlaceHolder$billingAddressForm$firstName | First Name | 
+NAME_MIDDLE_INITIAL | ctl00$mainContentPlaceHolder$billingAddressForm$middleInitial | M.I. | 
+NAME_LAST | ctl00$mainContentPlaceHolder$billingAddressForm$lastName | Last Name | 
+ADDRESS_BILLING_LINE1 | ctl00$mainContentPlaceHolder$billingAddressForm$address1 | Address | 
+ADDRESS_BILLING_LINE2 | ctl00$mainContentPlaceHolder$billingAddressForm$address2 | Address The Billing Address field is a required field. The Address field contains invalid characters. | 
+ADDRESS_BILLING_CITY | ctl00$mainContentPlaceHolder$billingAddressForm$city | City | 
+ADDRESS_BILLING_STATE | ctl00$mainContentPlaceHolder$billingAddressForm$stateProvince | State/Province | -1
+ADDRESS_BILLING_ZIP | ctl00$mainContentPlaceHolder$billingAddressForm$zipCode | Zip/Postal Code | 
+ADDRESS_BILLING_COUNTRY | ctl00$mainContentPlaceHolder$billingAddressForm$country | Country | 249
+NAME_FIRST | ctl00$mainContentPlaceHolder$shippingAddressForm$firstName | First Name | 
+NAME_MIDDLE_INITIAL | ctl00$mainContentPlaceHolder$shippingAddressForm$middleInitial | M.I. | 
+NAME_LAST | ctl00$mainContentPlaceHolder$shippingAddressForm$lastName | Last Name | 
+ADDRESS_HOME_LINE1 | ctl00$mainContentPlaceHolder$shippingAddressForm$address1 | Address | 
+ADDRESS_HOME_LINE2 | ctl00$mainContentPlaceHolder$shippingAddressForm$address2 | Address The Shipping Address field is a required field. The Address field contains invalid characters. | 
+ADDRESS_HOME_CITY | ctl00$mainContentPlaceHolder$shippingAddressForm$city | City | 
+ADDRESS_HOME_STATE | ctl00$mainContentPlaceHolder$shippingAddressForm$stateProvince | State/Province | -1
+ADDRESS_HOME_ZIP | ctl00$mainContentPlaceHolder$shippingAddressForm$zipCode | Zip/Postal Code | 
diff --git a/chrome/test/data/autofill/heuristics/output/05_checkout_officemax.com.out b/chrome/test/data/autofill/heuristics/output/05_checkout_officemax.com.out
index 0979216..5c468cb 100644
--- a/chrome/test/data/autofill/heuristics/output/05_checkout_officemax.com.out
+++ b/chrome/test/data/autofill/heuristics/output/05_checkout_officemax.com.out
@@ -1,13 +1,13 @@
-NAME_FIRST
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_WHOLE_NUMBER
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-UNKNOWN_TYPE
-UNKNOWN_TYPE
+NAME_FIRST | fname | * First Name: | 
+NAME_LAST | lname | * Last Name: | 
+COMPANY_NAME | business | Business Name: | 
+ADDRESS_HOME_LINE1 | address | *Address line 1:(no P.O. Boxes) | 
+ADDRESS_HOME_LINE2 | address2 | Address Line 2: | 
+ADDRESS_HOME_CITY | city | *City: | 
+ADDRESS_HOME_STATE | /atg/commerce/order/purchase/ShippingGroupFormHandler.editValue.state | *State: | 
+ADDRESS_HOME_ZIP | zip | *Zip Code: | 
+PHONE_HOME_WHOLE_NUMBER | phone | *Phone number: | 
+EMAIL_ADDRESS | /atg/commerce/order/purchase/ShippingGroupFormHandler.emailAddress | *Email Address: | 
+EMAIL_ADDRESS | /atg/commerce/order/purchase/ShippingGroupFormHandler.confirmEmailAddress | *Confirm Email Address: | 
+UNKNOWN_TYPE | /atg/commerce/order/purchase/ShippingGroupFormHandler.maxPerksNumber | MaxPerks® ID: < What is this? | 
+UNKNOWN_TYPE | TaxExemptID | Tax Exempt ID: < What is this? | 
diff --git a/chrome/test/data/autofill/heuristics/output/05_checkout_overstock.com.out b/chrome/test/data/autofill/heuristics/output/05_checkout_overstock.com.out
index cc8f1ad..5912be0 100644
--- a/chrome/test/data/autofill/heuristics/output/05_checkout_overstock.com.out
+++ b/chrome/test/data/autofill/heuristics/output/05_checkout_overstock.com.out
@@ -1,42 +1,42 @@
-NAME_FIRST
-NAME_LAST
-ADDRESS_BILLING_LINE1
-ADDRESS_BILLING_LINE2
-ADDRESS_BILLING_CITY
-ADDRESS_BILLING_STATE
-ADDRESS_BILLING_ZIP
-PHONE_HOME_WHOLE_NUMBER
-PHONE_HOME_WHOLE_NUMBER
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-UNKNOWN_TYPE
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-UNKNOWN_TYPE
-CREDIT_CARD_NUMBER
-CREDIT_CARD_EXP_MONTH
-CREDIT_CARD_EXP_4_DIGIT_YEAR
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
+NAME_FIRST | BillingFirstName | First Name | David
+NAME_LAST | BillingLastName | Last Name | Yu
+ADDRESS_BILLING_LINE1 | BillingAddress1 | Address Line 1 | 7540 Donegal Dr
+ADDRESS_BILLING_LINE2 | BillingAddress2 | Address Line 2 | 
+ADDRESS_BILLING_CITY | BillingCity | City | Cupertino
+ADDRESS_BILLING_STATE | BillingState | State | CA
+ADDRESS_BILLING_ZIP | BillingZipCode | Zip | 95014
+PHONE_HOME_WHOLE_NUMBER | BillingDaytimePhone | Day Phone | 4088737223
+PHONE_HOME_WHOLE_NUMBER | BillingEveningPhone | Evening Phone | 
+NAME_FIRST | ShippingFirstName | First Name | 
+NAME_LAST | ShippingLastName | Last Name | 
+ADDRESS_HOME_LINE1 | lineone | Address Line 1 | 7540 Donegal Dr
+ADDRESS_HOME_LINE2 | linetwo | Address Line 2 | 
+UNKNOWN_TYPE | ShippingAddressType | Address Type | H
+ADDRESS_HOME_CITY | city | City | Cupertino
+ADDRESS_HOME_STATE | state | State | CA
+ADDRESS_HOME_ZIP | zip | Zip | 95014
+UNKNOWN_TYPE | product6496917 | Black-plated Tungsten Carbide Comfort Fit Band (8 mm) Options: 10 1 | GROUND6496917
+CREDIT_CARD_NUMBER | CC_number | Credit Card #: | 
+CREDIT_CARD_EXP_MONTH | exp_month | Expiration Date: | 0
+CREDIT_CARD_EXP_4_DIGIT_YEAR | exp_year | Expiration Date: | 
+UNKNOWN_TYPE | PromoCode | See Terms | 
+UNKNOWN_TYPE | GiftCardNumber0 | Gift Card 1: | 
+UNKNOWN_TYPE | PINNumber0 | PIN: | 
+UNKNOWN_TYPE | GiftCardNumber1 | Gift Card 2: | 
+UNKNOWN_TYPE | PINNumber1 | PIN: | 
+UNKNOWN_TYPE | GiftCardNumber2 | Gift Card 3: | 
+UNKNOWN_TYPE | PINNumber2 | PIN: | 
+UNKNOWN_TYPE | GiftCardNumber3 | Gift Card 4: | 
+UNKNOWN_TYPE | PINNumber3 | PIN: | 
+UNKNOWN_TYPE | GiftCardNumber4 | Gift Card 5: | 
+UNKNOWN_TYPE | PINNumber4 | PIN: | 
+UNKNOWN_TYPE | GiftCardNumber5 | Gift Card 6: | 
+UNKNOWN_TYPE | PINNumber5 | PIN: | 
+UNKNOWN_TYPE | GiftCardNumber6 | Gift Card 7: | 
+UNKNOWN_TYPE | PINNumber6 | PIN: | 
+UNKNOWN_TYPE | GiftCardNumber7 | Gift Card 8: | 
+UNKNOWN_TYPE | PINNumber7 | PIN: | 
+UNKNOWN_TYPE | GiftCardNumber8 | Gift Card 9: | 
+UNKNOWN_TYPE | PINNumber8 | PIN: | 
+UNKNOWN_TYPE | GiftCardNumber9 | Gift Card 10: | 
+UNKNOWN_TYPE | PINNumber9 | PIN: | 
diff --git a/chrome/test/data/autofill/heuristics/output/05_checkout_petco.com.out b/chrome/test/data/autofill/heuristics/output/05_checkout_petco.com.out
index 604c5f1..edee471 100644
--- a/chrome/test/data/autofill/heuristics/output/05_checkout_petco.com.out
+++ b/chrome/test/data/autofill/heuristics/output/05_checkout_petco.com.out
@@ -1,11 +1,11 @@
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
-UNKNOWN_TYPE
+NAME_FIRST | ctl00$ctl00$cphBody$cphBody$txtSA_FirstName | First Name * | 
+NAME_LAST | ctl00$ctl00$cphBody$cphBody$txtSA_LastName | Last Name * | 
+ADDRESS_HOME_LINE1 | ctl00$ctl00$cphBody$cphBody$txtSA_Address1 | Address Line 1 * | 
+ADDRESS_HOME_LINE2 | ctl00$ctl00$cphBody$cphBody$txtSA_Address2 | Address Line 2 | 
+ADDRESS_HOME_CITY | ctl00$ctl00$cphBody$cphBody$txtSA_City | City * | 
+ADDRESS_HOME_STATE | ctl00$ctl00$cphBody$cphBody$ddlSA_State | * | 
+ADDRESS_HOME_ZIP | ctl00$ctl00$cphBody$cphBody$txtSA_Zip | ZIP Code * | 
+PHONE_HOME_CITY_CODE | ctl00$ctl00$cphBody$cphBody$txtSA_Phone1 | * | 
+PHONE_HOME_NUMBER | ctl00$ctl00$cphBody$cphBody$txtSA_Phone2 | ZIP Code * | 
+PHONE_HOME_NUMBER | ctl00$ctl00$cphBody$cphBody$txtSA_Phone3 | ZIP Code * | 
+UNKNOWN_TYPE | ctl00$ctl00$cphBody$cphBody$txtSA_PhoneExt | Ext. | 
diff --git a/chrome/test/data/autofill/heuristics/output/06_checkout_petsmart.com.out b/chrome/test/data/autofill/heuristics/output/06_checkout_petsmart.com.out
index 89eb47b..60e27b9 100644
--- a/chrome/test/data/autofill/heuristics/output/06_checkout_petsmart.com.out
+++ b/chrome/test/data/autofill/heuristics/output/06_checkout_petsmart.com.out
@@ -1,11 +1,11 @@
-ADDRESS_BILLING_COUNTRY
-NAME_FIRST
-NAME_LAST
-ADDRESS_BILLING_LINE1
-ADDRESS_BILLING_LINE2
-ADDRESS_BILLING_CITY
-ADDRESS_BILLING_STATE
-UNKNOWN_TYPE
-ADDRESS_BILLING_ZIP
-PHONE_HOME_WHOLE_NUMBER
-EMAIL_ADDRESS
+ADDRESS_BILLING_COUNTRY | billCountry | • Country: | US
+NAME_FIRST | billFname | • First Name: | 
+NAME_LAST | billLname | • Last Name: | 
+ADDRESS_BILLING_LINE1 | billAddr1 | • Address: | 
+ADDRESS_BILLING_LINE2 | billAddr2 | Apt / Suite | 
+ADDRESS_BILLING_CITY | billCity | • City or APO/FPO: | 
+ADDRESS_BILLING_STATE | billState | • State/Province: | 
+UNKNOWN_TYPE | altBillState | • Other State/Province: | 
+ADDRESS_BILLING_ZIP | billZip | • Zip/Postal Code: | 
+PHONE_HOME_WHOLE_NUMBER | billPhone | • Telephone: | 
+EMAIL_ADDRESS | guestEmail | • Email Address: | 
diff --git a/chrome/test/data/autofill/heuristics/output/06_checkout_qvc.com.out b/chrome/test/data/autofill/heuristics/output/06_checkout_qvc.com.out
index 6b78288..7f4dd3f 100644
--- a/chrome/test/data/autofill/heuristics/output/06_checkout_qvc.com.out
+++ b/chrome/test/data/autofill/heuristics/output/06_checkout_qvc.com.out
@@ -1,24 +1,24 @@
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-UNKNOWN_TYPE
-NAME_FIRST
-NAME_LAST
-ADDRESS_BILLING_LINE1
-ADDRESS_BILLING_LINE2
-ADDRESS_BILLING_CITY
-ADDRESS_BILLING_STATE
-ADDRESS_BILLING_ZIP
-ADDRESS_BILLING_COUNTRY
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-UNKNOWN_TYPE
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_COUNTRY
+EMAIL_ADDRESS | EmailAddress | * E-mail Address: | 
+EMAIL_ADDRESS | EmailAddressVerify | * Confirm E-mail Address: | 
+UNKNOWN_TYPE | Prefix | * Title: | 06
+NAME_FIRST | BilltoFirstName | * First Name: | 
+NAME_LAST | BilltoLastName | * Last Name: | 
+ADDRESS_BILLING_LINE1 | BilltoAddress1 | * Address Line 1: | 
+ADDRESS_BILLING_LINE2 | BilltoAddress2 | Address Line 2: | 
+ADDRESS_BILLING_CITY | BilltoCity | City: | 
+ADDRESS_BILLING_STATE | BilltoState | State/Province: | AL
+ADDRESS_BILLING_ZIP | BilltoZipCode | * ZIP/Postal Code: ZIP/Postal Code is a required field | 
+ADDRESS_BILLING_COUNTRY | BilltoCountry | * Country: | US
+PHONE_HOME_CITY_CODE | BilltoHpArea | * Home Phone: | 
+PHONE_HOME_NUMBER | BilltoHpExchange | * Home Phone:Home Phone is a required field | 
+UNKNOWN_TYPE | BilltoHpExt | * Home Phone:Home Phone is a required field | 
+PHONE_HOME_CITY_CODE | BilltoWpArea | Work Phone: | 
+PHONE_HOME_NUMBER | BilltoWpExchange | Work Phone: | 
+UNKNOWN_TYPE | BilltoWpExt | Work Phone: | 
+UNKNOWN_TYPE | ShiptoFirstName | * Name: | 
+ADDRESS_HOME_LINE1 | ShiptoAddress1 | * Address Line 1: | 
+ADDRESS_HOME_LINE2 | ShiptoAddress2 | Address Line 2: | 
+ADDRESS_HOME_CITY | ShiptoCity | City: | 
+ADDRESS_HOME_STATE | ShiptoState | State/Province: | AL
+ADDRESS_HOME_ZIP | ShiptoZipCode | * Postal Code: ZIP/Postal Code is a required field | 
+ADDRESS_HOME_COUNTRY | ShiptoCountry | * Country: | US
diff --git a/chrome/test/data/autofill/heuristics/output/06_checkout_sears.com.out b/chrome/test/data/autofill/heuristics/output/06_checkout_sears.com.out
index 883933d..159b9f1 100644
--- a/chrome/test/data/autofill/heuristics/output/06_checkout_sears.com.out
+++ b/chrome/test/data/autofill/heuristics/output/06_checkout_sears.com.out
@@ -1,21 +1,21 @@
-EMAIL_ADDRESS
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_WHOLE_NUMBER
-UNKNOWN_TYPE
-ADDRESS_HOME_STATE
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_WHOLE_NUMBER
-UNKNOWN_TYPE
-ADDRESS_HOME_STATE
+EMAIL_ADDRESS | address_email | Email* | ne00_99@yahoo.com
+NAME_FIRST | shipping_firstName | First Name* | 
+NAME_LAST | shipping_lastName | Last Name* | 
+ADDRESS_HOME_LINE1 | shipping_address1 | Street Address Line 1* | 
+ADDRESS_HOME_LINE2 | shipping_address2 | Street Address Line 2 | 
+ADDRESS_HOME_CITY | shipping_city | City* | 
+ADDRESS_HOME_STATE | shipping_state | State* | AL
+ADDRESS_HOME_ZIP | shipping_zipCode | ZIP Code* | 
+PHONE_HOME_WHOLE_NUMBER | shipping_day1 | Phone Number* | 
+UNKNOWN_TYPE | shipping_ext1 | Ext. | 
+ADDRESS_HOME_STATE | shipping_county | County | UNKNOWN
+NAME_FIRST | firstName | First Name* | 
+NAME_LAST | lastName | Last Name* | 
+ADDRESS_HOME_LINE1 | address1 | Street Address Line 1* | 
+ADDRESS_HOME_LINE2 | address2 | Street Address Line 2 | 
+ADDRESS_HOME_CITY | city | City* | 
+ADDRESS_HOME_STATE | state | State*State* | AL
+ADDRESS_HOME_ZIP | zipCode | ZIP Code*ZIP Code* | 
+PHONE_HOME_WHOLE_NUMBER | day1 | Phone Number* | 
+UNKNOWN_TYPE | ext1 | Ext. | 
+ADDRESS_HOME_STATE | county | CountyCounty | UNKNOWN
diff --git a/chrome/test/data/autofill/heuristics/output/06_checkout_target.com.out b/chrome/test/data/autofill/heuristics/output/06_checkout_target.com.out
index fa27f81..dc38dba 100644
--- a/chrome/test/data/autofill/heuristics/output/06_checkout_target.com.out
+++ b/chrome/test/data/autofill/heuristics/output/06_checkout_target.com.out
@@ -1,7 +1,7 @@
-NAME_FULL
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_WHOLE_NUMBER
+NAME_FULL | name | Full Name*: | 
+ADDRESS_HOME_LINE1 | address1 | Address 1*: | 
+ADDRESS_HOME_LINE2 | address2 | Address 2 (optional): | 
+ADDRESS_HOME_CITY | city | City*: | 
+ADDRESS_HOME_STATE | state | State*: | 
+ADDRESS_HOME_ZIP | zip | Zip Code*: | 
+PHONE_HOME_WHOLE_NUMBER | voice | Phone Number*: | 
diff --git a/chrome/test/data/autofill/heuristics/output/06_checkout_urbanoutfitters.com.out b/chrome/test/data/autofill/heuristics/output/06_checkout_urbanoutfitters.com.out
index eb1ee4b..82e8d97 100644
--- a/chrome/test/data/autofill/heuristics/output/06_checkout_urbanoutfitters.com.out
+++ b/chrome/test/data/autofill/heuristics/output/06_checkout_urbanoutfitters.com.out
@@ -1,27 +1,27 @@
-UNKNOWN_TYPE
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_COUNTRY
-PHONE_HOME_WHOLE_NUMBER
-PHONE_HOME_WHOLE_NUMBER
-NAME_FIRST
-NAME_LAST
-ADDRESS_BILLING_LINE1
-ADDRESS_BILLING_LINE2
-ADDRESS_BILLING_CITY
-ADDRESS_BILLING_STATE
-ADDRESS_BILLING_ZIP
-ADDRESS_BILLING_COUNTRY
-PHONE_HOME_WHOLE_NUMBER
-PHONE_HOME_WHOLE_NUMBER
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-CREDIT_CARD_NUMBER
-CREDIT_CARD_EXP_MONTH
-CREDIT_CARD_EXP_4_DIGIT_YEAR
-UNKNOWN_TYPE
+UNKNOWN_TYPE | shipto | Select a Saved Shipping Addressenter a new shipping address | 
+NAME_FIRST | shippingFirstName |  | First Name
+NAME_LAST | shippingLastName |  | Last Name
+ADDRESS_HOME_LINE1 | shippingAddress |  | Street Address
+ADDRESS_HOME_LINE2 | shippingAddress2 |  | Apt / Flr / Bldg (optional)
+ADDRESS_HOME_CITY | shippingCity |  | City
+ADDRESS_HOME_STATE | shippingStates |  | 
+ADDRESS_HOME_ZIP | shippingPostalCode |  | Postal Code
+ADDRESS_HOME_COUNTRY | shippingCountries |  | 
+PHONE_HOME_WHOLE_NUMBER | shippingPhone |  | Phone
+PHONE_HOME_WHOLE_NUMBER | altShippingPhone |  | Alternate Phone (optional)
+NAME_FIRST | billingFirstName |  | First Name
+NAME_LAST | billingLastName |  | Last Name
+ADDRESS_BILLING_LINE1 | billingAddress |  | Street Address
+ADDRESS_BILLING_LINE2 | billingAddress2 |  | Apt / Flr / Bldg (optional)
+ADDRESS_BILLING_CITY | billingCity |  | City
+ADDRESS_BILLING_STATE | billingStates |  | 
+ADDRESS_BILLING_ZIP | billingPostalCode |  | Postal Code
+ADDRESS_BILLING_COUNTRY | billingCountries |  | 
+PHONE_HOME_WHOLE_NUMBER | billingPhone |  | Phone
+PHONE_HOME_WHOLE_NUMBER | altBillingPhone |  | Alternate Phone (optional)
+UNKNOWN_TYPE | savedCreditCard | enter a new credit card | 
+UNKNOWN_TYPE | payment_cardtype |  | 
+CREDIT_CARD_NUMBER | payment_acctnum |  | Card Number (no spaces or dashes)
+CREDIT_CARD_EXP_MONTH | expmonth |  | 
+CREDIT_CARD_EXP_4_DIGIT_YEAR | expyear |  | 
+UNKNOWN_TYPE | payment_cidnew |  | CID / Security Code
diff --git a/chrome/test/data/autofill/heuristics/output/07_checkout_vitacost.com.out b/chrome/test/data/autofill/heuristics/output/07_checkout_vitacost.com.out
index 688148c..5ac520f 100644
--- a/chrome/test/data/autofill/heuristics/output/07_checkout_vitacost.com.out
+++ b/chrome/test/data/autofill/heuristics/output/07_checkout_vitacost.com.out
@@ -1,11 +1,11 @@
-UNKNOWN_TYPE
-NAME_FIRST
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_COUNTRY
-PHONE_HOME_WHOLE_NUMBER
+UNKNOWN_TYPE | ucMasterFrame$ctl02$objAddForm$ddPrefix |  | 
+NAME_FIRST | ucMasterFrame$ctl02$objAddForm$txtFirstName | *First Name: | 
+NAME_LAST | ucMasterFrame$ctl02$objAddForm$txtLastName | *Last Name: | 
+COMPANY_NAME | ucMasterFrame$ctl02$objAddForm$txtCompany | Company: | 
+ADDRESS_HOME_LINE1 | ucMasterFrame$ctl02$objAddForm$txtAddress | *Address: | 
+ADDRESS_HOME_LINE2 | ucMasterFrame$ctl02$objAddForm$txtAddress2 | Apt., Suite, Unit: | 
+ADDRESS_HOME_CITY | ucMasterFrame$ctl02$objAddForm$txtCity | *City: | 
+ADDRESS_HOME_STATE | ucMasterFrame$ctl02$objAddForm$ddState | *State: | 
+ADDRESS_HOME_ZIP | ucMasterFrame$ctl02$objAddForm$txtZip | *Zip/Postal Code: | 
+ADDRESS_HOME_COUNTRY | ucMasterFrame$ctl02$objAddForm$ddCountry | Country: | 228
+PHONE_HOME_WHOLE_NUMBER | ucMasterFrame$ctl02$objAddForm$txtPhone | *Phone: | 
diff --git a/chrome/test/data/autofill/heuristics/output/07_checkout_williams-sonoma.com.out b/chrome/test/data/autofill/heuristics/output/07_checkout_williams-sonoma.com.out
index 24108b9..30dc665 100644
--- a/chrome/test/data/autofill/heuristics/output/07_checkout_williams-sonoma.com.out
+++ b/chrome/test/data/autofill/heuristics/output/07_checkout_williams-sonoma.com.out
@@ -1,10 +1,10 @@
-NAME_FULL
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_WHOLE_NUMBER
-PHONE_HOME_WHOLE_NUMBER
-EMAIL_ADDRESS
-EMAIL_ADDRESS
+NAME_FULL | shipTos[0].address.fullName | Full Name* | 
+ADDRESS_HOME_LINE1 | shipTos[0].address.addrLine1 | Address* | 
+ADDRESS_HOME_LINE2 | shipTos[0].address.addrLine2 | Address Line 2 | 
+ADDRESS_HOME_CITY | shipTos[0].address.city | City* | 
+ADDRESS_HOME_STATE | shipTos[0].address.state | State* | 
+ADDRESS_HOME_ZIP | shipTos[0].address.zip | Zip* | 
+PHONE_HOME_WHOLE_NUMBER | shipTos[0].address.dayPhone | Daytime Phone* | 
+PHONE_HOME_WHOLE_NUMBER | shipTos[0].address.eveningPhone | Alternate Phone | 
+EMAIL_ADDRESS | shipTos[0].address.emailAddr | Email* | 
+EMAIL_ADDRESS | shipTos[0].confirmEmailAddr | Confirm Email* | 
diff --git a/chrome/test/data/autofill/heuristics/output/08_register_adobe.com.out b/chrome/test/data/autofill/heuristics/output/08_register_adobe.com.out
index 25d868f..aff2f0c 100644
--- a/chrome/test/data/autofill/heuristics/output/08_register_adobe.com.out
+++ b/chrome/test/data/autofill/heuristics/output/08_register_adobe.com.out
@@ -1,4 +1,4 @@
-EMAIL_ADDRESS
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_COUNTRY
+EMAIL_ADDRESS | adobeId | E-Mail AddressThis will be your Adobe ID | 
+NAME_FIRST | firstName | First Name | 
+NAME_LAST | lastName | Last Name | 
+ADDRESS_HOME_COUNTRY | countryCode | Country | 
diff --git a/chrome/test/data/autofill/heuristics/output/08_register_amazon.com.out b/chrome/test/data/autofill/heuristics/output/08_register_amazon.com.out
index 4a0b658..d8c9168 100644
--- a/chrome/test/data/autofill/heuristics/output/08_register_amazon.com.out
+++ b/chrome/test/data/autofill/heuristics/output/08_register_amazon.com.out
@@ -1,3 +1,3 @@
-UNKNOWN_TYPE
-EMAIL_ADDRESS
-EMAIL_ADDRESS
+UNKNOWN_TYPE | userName | First and Last Name: | 
+EMAIL_ADDRESS | email | E-mail Address: | 
+EMAIL_ADDRESS | emailCheck | Re-type E-mail Address: | 
diff --git a/chrome/test/data/autofill/heuristics/output/08_register_aol.com.out b/chrome/test/data/autofill/heuristics/output/08_register_aol.com.out
index fd5ddc4..5cd5839 100644
--- a/chrome/test/data/autofill/heuristics/output/08_register_aol.com.out
+++ b/chrome/test/data/autofill/heuristics/output/08_register_aol.com.out
@@ -1,12 +1,12 @@
-NAME_FIRST
-NAME_LAST
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-ADDRESS_HOME_ZIP
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-EMAIL_ADDRESS
-UNKNOWN_TYPE
+NAME_FIRST | {actionForm.firstName} | First Name | 
+NAME_LAST | {actionForm.lastName} | Last Name | 
+UNKNOWN_TYPE | {actionForm.desiredSN} | NEW! Pick a username: What's new? | 
+UNKNOWN_TYPE | verifyPasswordHint | Password | Retype password
+UNKNOWN_TYPE | wlw-select_key:{actionForm.dobMonth} | Select Month | 
+UNKNOWN_TYPE | {actionForm.dobDay} | Select Month | Day (dd)
+UNKNOWN_TYPE | {actionForm.dobYear} | Select Month | Year (yyyy)
+ADDRESS_HOME_ZIP | {actionForm.zipCode} | Zip Code | 
+UNKNOWN_TYPE | wlw-select_key:{actionForm.acctSecurityQuestion} | Set a Security Question | 
+UNKNOWN_TYPE | {actionForm.acctSecurityAnswer} | Set a Security Question | Your Answer
+EMAIL_ADDRESS | {actionForm.altEMail} | Alternate Email(optional) | 
+UNKNOWN_TYPE | {actionForm.wordVerify} | Enter what you see above | 
diff --git a/chrome/test/data/autofill/heuristics/output/08_register_bestbuy.com.out b/chrome/test/data/autofill/heuristics/output/08_register_bestbuy.com.out
index cdfbd5c..83673d3 100644
--- a/chrome/test/data/autofill/heuristics/output/08_register_bestbuy.com.out
+++ b/chrome/test/data/autofill/heuristics/output/08_register_bestbuy.com.out
@@ -1,7 +1,7 @@
-NAME_FIRST
-NAME_MIDDLE_INITIAL
-NAME_LAST
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-ADDRESS_HOME_ZIP
-UNKNOWN_TYPE
+NAME_FIRST | TxtFirstName | *First Name | 
+NAME_MIDDLE_INITIAL | TxtMI | MI | 
+NAME_LAST | TxtLastName | *Last Name | 
+EMAIL_ADDRESS | TxtEmail | *E-Mail Address | 
+EMAIL_ADDRESS | TxtEmailConfirm | *Retype E-Mail Address | 
+ADDRESS_HOME_ZIP | TxtPostalCode | *ZIP Code | 
+UNKNOWN_TYPE | TxtRzMembershipId | Enter 10-Digit Member ID (optional) | 
diff --git a/chrome/test/data/autofill/heuristics/output/08_register_continental.com.out b/chrome/test/data/autofill/heuristics/output/08_register_continental.com.out
index 950ff97..5f19833 100644
--- a/chrome/test/data/autofill/heuristics/output/08_register_continental.com.out
+++ b/chrome/test/data/autofill/heuristics/output/08_register_continental.com.out
@@ -1,27 +1,27 @@
-ADDRESS_HOME_STATE
-UNKNOWN_TYPE
-NAME_FIRST
-NAME_MIDDLE_INITIAL
-NAME_LAST
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-UNKNOWN_TYPE
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_COUNTRY
-PHONE_HOME_WHOLE_NUMBER
-UNKNOWN_TYPE
-ADDRESS_HOME_COUNTRY
-PHONE_HOME_WHOLE_NUMBER
-UNKNOWN_TYPE
-ADDRESS_HOME_COUNTRY
-UNKNOWN_TYPE
-EMAIL_ADDRESS
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
+ADDRESS_HOME_STATE | ctl00$CustomerHeader$ddlCountries | CountryClose Please select your location or where you receive credit card billing  statements to see pricing in your local currency.Available Languages:Save this preference | US
+UNKNOWN_TYPE | ctl00$ContentInfo$Name$cboTitle$cboTitle | Title: | 
+NAME_FIRST | ctl00$ContentInfo$Name$FName$txtFName | First Name: | 
+NAME_MIDDLE_INITIAL | ctl00$ContentInfo$Name$MName$txtMName | Middle Initial (optional): | 
+NAME_LAST | ctl00$ContentInfo$Name$LName$txtLName | Last Name: | 
+UNKNOWN_TYPE | ctl00$ContentInfo$Name$suffix$txtSuffix | Suffix (optional): | 
+UNKNOWN_TYPE | ctl00$ContentInfo$BirthDate$txtDOB | Minor’s Date of Birth: | mm/dd/yyyy
+ADDRESS_HOME_LINE1 | ctl00$ContentInfo$Address$address1$txtAddress1 | Street Address: | 
+ADDRESS_HOME_LINE2 | ctl00$ContentInfo$Address$address2$txtAddress2 | Street Address: | 
+UNKNOWN_TYPE | ctl00$ContentInfo$Address$address3$txtAddress2 | Street Address: | 
+ADDRESS_HOME_CITY | ctl00$ContentInfo$Address$city$txtCity | City/Town/Department: | 
+ADDRESS_HOME_STATE | ctl00$ContentInfo$Address$state$txtState | State/Province/Region/County: | 
+ADDRESS_HOME_ZIP | ctl00$ContentInfo$Address$zip$txtZip | ZIP/Postal Code: | 
+ADDRESS_HOME_COUNTRY | ctl00$ContentInfo$Address$country$cboCountry | Country: | US
+PHONE_HOME_WHOLE_NUMBER | ctl00$ContentInfo$HomePhone$txtNumber$txtPhone | Home PhoneNumber: | 
+UNKNOWN_TYPE | ctl00$ContentInfo$HomePhone$txtExt$txtPhoneExt | Ext./PIN (optional): | 
+ADDRESS_HOME_COUNTRY | ctl00$ContentInfo$HomePhone$cboCountry$cboCountry | Country: | US
+PHONE_HOME_WHOLE_NUMBER | ctl00$ContentInfo$BusinessPhone$txtNumber$txtPhone | Business/Other PhoneNumber: | 
+UNKNOWN_TYPE | ctl00$ContentInfo$BusinessPhone$txtExt$txtPhoneExt | Ext./PIN (optional): | 
+ADDRESS_HOME_COUNTRY | ctl00$ContentInfo$BusinessPhone$cboCountry$cboCountry | Country: | US
+UNKNOWN_TYPE | ctl00$ContentInfo$HomeAirport$txtAirport | Home Airport (optional): | 
+EMAIL_ADDRESS | ctl00$ContentInfo$Email$txtEmail | E-mail Address: | 
+UNKNOWN_TYPE | ctl00$ContentInfo$UsernamePassword$username$txtUsername | Username: | 
+UNKNOWN_TYPE | ctl00$ContentInfo$PINPasswordReminder$PINReminder1$txtPINReminder | PIN Reminder: (cannot include any numbers) | 
+UNKNOWN_TYPE | ctl00$ContentInfo$SecurityQuestionAnswer$Question$txtSecurity | Security Question: | 
+UNKNOWN_TYPE | ctl00$ContentInfo$SecurityQuestionAnswer$Answer$txtSecurity | Answer: | 
+UNKNOWN_TYPE | ctl00$ContentInfo$SecurityQuestionAnswer$AnswerReType$txtSecurity | Re-type Answer: | 
diff --git a/chrome/test/data/autofill/heuristics/output/09_register_deviantart.com.out b/chrome/test/data/autofill/heuristics/output/09_register_deviantart.com.out
index 7236983..5db87ae7 100644
--- a/chrome/test/data/autofill/heuristics/output/09_register_deviantart.com.out
+++ b/chrome/test/data/autofill/heuristics/output/09_register_deviantart.com.out
@@ -1,3 +1,3 @@
-EMAIL_ADDRESS
-NAME_FULL
-ADDRESS_HOME_COUNTRY
+EMAIL_ADDRESS | emailAddress | Email Address | 
+NAME_FULL | name | Full Name | 
+ADDRESS_HOME_COUNTRY | country | Country | 0
diff --git a/chrome/test/data/autofill/heuristics/output/09_register_ebay.com.out b/chrome/test/data/autofill/heuristics/output/09_register_ebay.com.out
index d69e717..c0be21f 100644
--- a/chrome/test/data/autofill/heuristics/output/09_register_ebay.com.out
+++ b/chrome/test/data/autofill/heuristics/output/09_register_ebay.com.out
@@ -1,24 +1,24 @@
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_COUNTRY
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
-UNKNOWN_TYPE
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
+NAME_FIRST | firstname | First name | 
+NAME_LAST | lastname | Last name | 
+ADDRESS_HOME_LINE1 | address1 | Street address | 
+ADDRESS_HOME_LINE2 | address2 | Street address continued. Apartment number, floor number, suite number, etc. - optional | 
+ADDRESS_HOME_CITY | city | City | 
+ADDRESS_HOME_STATE | state | State / Province | default
+ADDRESS_HOME_ZIP | zip | ZIP / Postal code | 
+ADDRESS_HOME_COUNTRY | countryId | Country or region | 1
+PHONE_HOME_CITY_CODE | dayphone1 | Primary telephone number - - | 
+PHONE_HOME_NUMBER | dayphone2 | - | 
+PHONE_HOME_NUMBER | dayphone3 | - | 
+UNKNOWN_TYPE | dayphone4 | ext.: | 
+EMAIL_ADDRESS | email | Email address | 
+EMAIL_ADDRESS | retype_email | Re-enter email address | 
+UNKNOWN_TYPE | userid | Create your eBay user ID | 
+UNKNOWN_TYPE | canned | Pick a secret question | 0
+UNKNOWN_TYPE | myanswer | Your secret answer | 
+UNKNOWN_TYPE | birthdate2 | Date of birth, Month | 0
+UNKNOWN_TYPE | birthdate1 | Date of birth, Day | 0
+UNKNOWN_TYPE | birthdate3 | Year of birth, four digit format. | 0
+UNKNOWN_TYPE | tokentext | For added security - opens in a new window or tab, please enter the verification code hidden in the image. | 
+UNKNOWN_TYPE | uword1 | Give us some word and we'll suggest some user IDs for you. Word 1 | 
+UNKNOWN_TYPE | uword2 | Word 2 | 
+UNKNOWN_TYPE | uword3 | Word 3 | 
diff --git a/chrome/test/data/autofill/heuristics/output/09_register_ecomm.dell.com.out b/chrome/test/data/autofill/heuristics/output/09_register_ecomm.dell.com.out
index 1c0f8bb..8ad5d37 100644
--- a/chrome/test/data/autofill/heuristics/output/09_register_ecomm.dell.com.out
+++ b/chrome/test/data/autofill/heuristics/output/09_register_ecomm.dell.com.out
@@ -1,10 +1,10 @@
-NAME_FIRST
-NAME_MIDDLE_INITIAL
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-UNKNOWN_TYPE
-EMAIL_ADDRESS
+NAME_FIRST | name$ctl00$name$_EditView$first | First NameMILast Name | 
+NAME_MIDDLE_INITIAL | name$ctl00$name$_EditView$mi | First NameMILast Name | 
+NAME_LAST | name$ctl00$name$_EditView$last | First NameMILast Name | 
+ADDRESS_HOME_LINE1 | address$ctl00$address$addressValidator$_EditView$line1 | Address Please see address guidelines. Learn More | 
+ADDRESS_HOME_LINE2 | address$ctl00$address$addressValidator$_EditView$line2 | Address Please see address guidelines. Learn More | 
+ADDRESS_HOME_CITY | address$ctl00$address$addressValidator$_EditView$city | CityState | 
+ADDRESS_HOME_STATE | address$ctl00$address$addressValidator$_EditView$region$ctl01 | CityState | 
+ADDRESS_HOME_ZIP | address$ctl00$address$addressValidator$_EditView$postal_code | Zip Code4-digit Ext. | 
+UNKNOWN_TYPE | address$ctl00$address$addressValidator$_EditView$postal_code2 | - | 
+EMAIL_ADDRESS | email$ctl07 | Email Address (used to sign into your account) | 
diff --git a/chrome/test/data/autofill/heuristics/output/09_register_epson.com.out b/chrome/test/data/autofill/heuristics/output/09_register_epson.com.out
index 0739861..42fd2ef 100644
--- a/chrome/test/data/autofill/heuristics/output/09_register_epson.com.out
+++ b/chrome/test/data/autofill/heuristics/output/09_register_epson.com.out
@@ -1,3 +1,3 @@
-NAME_FIRST
-NAME_LAST
-EMAIL_ADDRESS
+NAME_FIRST | fname | * First Name | 
+NAME_LAST | lname | * Last Name | 
+EMAIL_ADDRESS | emLogin | * E-mail address | 
diff --git a/chrome/test/data/autofill/heuristics/output/09_register_google.com.out b/chrome/test/data/autofill/heuristics/output/09_register_google.com.out
index 96c67e2..815f67d 100644
--- a/chrome/test/data/autofill/heuristics/output/09_register_google.com.out
+++ b/chrome/test/data/autofill/heuristics/output/09_register_google.com.out
@@ -1,11 +1,11 @@
-NAME_FIRST
-NAME_LAST
-UNKNOWN_TYPE
-EMAIL_ADDRESS
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-EMAIL_ADDRESS
-ADDRESS_HOME_COUNTRY
-UNKNOWN_TYPE
-UNKNOWN_TYPE
+NAME_FIRST | FirstName | First name: | 
+NAME_LAST | LastName | Last name: | 
+UNKNOWN_TYPE | UsernameSelector |  | header
+EMAIL_ADDRESS | Email |  | 
+UNKNOWN_TYPE | selection | Security question: | choosequestion
+UNKNOWN_TYPE | ownquestion | Security question: | 
+UNKNOWN_TYPE | IdentityAnswer | Answer: | 
+EMAIL_ADDRESS | SecondaryEmail | Recovery email: | 
+ADDRESS_HOME_COUNTRY | loc | Location: | US
+UNKNOWN_TYPE | Birthday | Birthday: | 
+UNKNOWN_TYPE | newaccountcaptcha | Type the characters you see in the picture below. | 
diff --git a/chrome/test/data/autofill/heuristics/output/10_register_gymboree.com.out b/chrome/test/data/autofill/heuristics/output/10_register_gymboree.com.out
index fa61321..5fcbb9f 100644
--- a/chrome/test/data/autofill/heuristics/output/10_register_gymboree.com.out
+++ b/chrome/test/data/autofill/heuristics/output/10_register_gymboree.com.out
@@ -1,12 +1,12 @@
-EMAIL_ADDRESS
-ADDRESS_HOME_COUNTRY
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-UNKNOWN_TYPE
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_WHOLE_NUMBER
-UNKNOWN_TYPE
+EMAIL_ADDRESS | LOYALTY_ACCOUNT<>email | Email* | 
+ADDRESS_HOME_COUNTRY | LOYALTY_ADDRESS<>country_cd | Country* | US
+NAME_FIRST | USER_ACCOUNT<>firstName | First Name* | 
+NAME_LAST | USER_ACCOUNT<>lastName | Last Name* | 
+ADDRESS_HOME_LINE1 | LOYALTY_ADDRESS<>address1 | Address Line 1* | 
+ADDRESS_HOME_LINE2 | LOYALTY_ADDRESS<>address2 | Address Line 2 | 
+UNKNOWN_TYPE | LOYALTY_ADDRESS<>address3 | Address Line 3 | 
+ADDRESS_HOME_CITY | LOYALTY_ADDRESS<>city | City* | 
+ADDRESS_HOME_STATE | LOYALTY_ADDRESS<>state_cd | State/Province* | 
+ADDRESS_HOME_ZIP | LOYALTY_ADDRESS<>postal | Zip/Postal Code*! | 
+PHONE_HOME_WHOLE_NUMBER | LOYALTY_ADDRESS<>phone | Daytime Phone* | 
+UNKNOWN_TYPE | LOYALTY_ACCOUNT<>ATR_USER_Password_Hint | Password Hint* | 
diff --git a/chrome/test/data/autofill/heuristics/output/10_register_hotels.com.out b/chrome/test/data/autofill/heuristics/output/10_register_hotels.com.out
index 52af4fe..5535ff7 100644
--- a/chrome/test/data/autofill/heuristics/output/10_register_hotels.com.out
+++ b/chrome/test/data/autofill/heuristics/output/10_register_hotels.com.out
@@ -1,14 +1,14 @@
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-UNKNOWN_TYPE
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_COUNTRY
-PHONE_HOME_WHOLE_NUMBER
-COMPANY_NAME
-UNKNOWN_TYPE
+EMAIL_ADDRESS | profileInformation.email | Email address* | 
+EMAIL_ADDRESS | confirmEmail | Confirm email address* | 
+UNKNOWN_TYPE | profileInformation.customerContact.title | Title | NONE
+NAME_FIRST | profileInformation.customerContact.firstName | First name* | 
+NAME_LAST | profileInformation.customerContact.lastName | Last name* | 
+ADDRESS_HOME_LINE1 | profileInformation.customerContact.address1 | Address line 1* | 
+ADDRESS_HOME_LINE2 | profileInformation.customerContact.address2 | Address line 2 | 
+ADDRESS_HOME_CITY | profileInformation.customerContact.city | City or APO/FPO* | 
+ADDRESS_HOME_STATE | profileInformation.customerContact.stateOrProvince | State/Province* | 
+ADDRESS_HOME_ZIP | profileInformation.customerContact.zipOrPostalCode | Zip/Postal code | 
+ADDRESS_HOME_COUNTRY | profileInformation.customerContact.country | Country* | US
+PHONE_HOME_WHOLE_NUMBER | profileInformation.customerContact.primaryPhone | Phone number | 
+COMPANY_NAME | profileInformation.businessName | Company name | 
+UNKNOWN_TYPE | profileInformation.currency | Preferred currency | USD
diff --git a/chrome/test/data/autofill/heuristics/output/10_register_imdb.com.out b/chrome/test/data/autofill/heuristics/output/10_register_imdb.com.out
index 818e4f5b..d61d001 100644
--- a/chrome/test/data/autofill/heuristics/output/10_register_imdb.com.out
+++ b/chrome/test/data/autofill/heuristics/output/10_register_imdb.com.out
@@ -1,5 +1,5 @@
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-UNKNOWN_TYPE
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_COUNTRY
+EMAIL_ADDRESS | email1 | E-mail: | 
+EMAIL_ADDRESS | email2 | Confirm E-mail: | 
+UNKNOWN_TYPE | year | Year of Birth: | 
+ADDRESS_HOME_ZIP | postal | ZIP/Postal Code: | 
+ADDRESS_HOME_COUNTRY | country | Country: | US
diff --git a/chrome/test/data/autofill/heuristics/output/10_register_jbox.com.out b/chrome/test/data/autofill/heuristics/output/10_register_jbox.com.out
index 9153ad44d..d44278d 100644
--- a/chrome/test/data/autofill/heuristics/output/10_register_jbox.com.out
+++ b/chrome/test/data/autofill/heuristics/output/10_register_jbox.com.out
@@ -1,11 +1,11 @@
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_COUNTRY
-PHONE_HOME_WHOLE_NUMBER
-EMAIL_ADDRESS
-UNKNOWN_TYPE
-UNKNOWN_TYPE
+NAME_FIRST | firstname | First | 
+NAME_LAST | lastname | Last | 
+ADDRESS_HOME_LINE1 | address1 | Street Address | 
+ADDRESS_HOME_CITY | city | City | 
+ADDRESS_HOME_STATE | state | State / Province / Region | 
+ADDRESS_HOME_ZIP | zip | Postal / Zip Code | 
+ADDRESS_HOME_COUNTRY | country | Country | United States
+PHONE_HOME_WHOLE_NUMBER | phone |  | 
+EMAIL_ADDRESS | email |  | 
+UNKNOWN_TYPE | referred_by | Where did you hear about J-List/JBOX? | Don't Know!
+UNKNOWN_TYPE | referred_by_other | If other, please specify | 
diff --git a/chrome/test/data/autofill/heuristics/output/10_register_live.com.out b/chrome/test/data/autofill/heuristics/output/10_register_live.com.out
index 8d66eef..0675335 100644
--- a/chrome/test/data/autofill/heuristics/output/10_register_live.com.out
+++ b/chrome/test/data/autofill/heuristics/output/10_register_live.com.out
@@ -1,12 +1,12 @@
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-NAME_FIRST
-NAME_LAST
-UNKNOWN_TYPE
+UNKNOWN_TYPE | imembernamelive | Windows Live ID: | 
+UNKNOWN_TYPE | idomain | Domains | hotmail.com
+UNKNOWN_TYPE | isug1 | Enter a word |  Enter a word
+UNKNOWN_TYPE | isug2 | Enter another word |  Enter another word
+UNKNOWN_TYPE | isug3 | Enter another word |  Enter another word
+EMAIL_ADDRESS | imembernameeasi | Use your email address: | Example: someone@example.com
+EMAIL_ADDRESS | iAltEmail | Alternate email address: | 
+UNKNOWN_TYPE | iSQ | Question: | 0
+UNKNOWN_TYPE | iSA | Secret answer: | 
+NAME_FIRST | iFirstName | First name: | 
+NAME_LAST | iLastName | Last name: | 
+UNKNOWN_TYPE | iBirthYear | Birth year: | Example: 1990
diff --git a/chrome/test/data/autofill/heuristics/output/11_register_livejournal.com.out b/chrome/test/data/autofill/heuristics/output/11_register_livejournal.com.out
index aae51d6..9e8ee32 100644
--- a/chrome/test/data/autofill/heuristics/output/11_register_livejournal.com.out
+++ b/chrome/test/data/autofill/heuristics/output/11_register_livejournal.com.out
@@ -1,6 +1,6 @@
-UNKNOWN_TYPE
-EMAIL_ADDRESS
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
+UNKNOWN_TYPE | Widget[CreateAccount]_user | Username: | 
+EMAIL_ADDRESS | Widget[CreateAccount]_email | Email Address: | 
+UNKNOWN_TYPE | Widget[CreateAccount]_gender | Gender: | 
+UNKNOWN_TYPE | Widget[CreateAccount]_bday_mm | Birthdate: | 1
+UNKNOWN_TYPE | Widget[CreateAccount]_bday_dd | Birthdate: | 
+UNKNOWN_TYPE | Widget[CreateAccount]_bday_yyyy | Birthdate: | 
diff --git a/chrome/test/data/autofill/heuristics/output/11_register_macys.com.out b/chrome/test/data/autofill/heuristics/output/11_register_macys.com.out
index 00fb59f..1292791 100644
--- a/chrome/test/data/autofill/heuristics/output/11_register_macys.com.out
+++ b/chrome/test/data/autofill/heuristics/output/11_register_macys.com.out
@@ -1,16 +1,16 @@
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_ZIP
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
-UNKNOWN_TYPE
-UNKNOWN_TYPE
+NAME_FIRST | FirstName | First Name | 
+NAME_LAST | LastName | Last Name | 
+ADDRESS_HOME_LINE1 | Address1 | Address | 
+ADDRESS_HOME_LINE2 | Address2 | P.O. Box/Apt # | 
+ADDRESS_HOME_ZIP | PostalCode | Zip Code | 
+EMAIL_ADDRESS | EmailAddress | Email | 
+EMAIL_ADDRESS | ConfirmEmailAddress | Verify Email | 
+UNKNOWN_TYPE | BirthMonth | Birth date | NOSELECTION
+UNKNOWN_TYPE | BirthDay |  | NOSELECTION
+UNKNOWN_TYPE | BirthYear |  | NOSELECTION
+UNKNOWN_TYPE | Gender | Gender | NOSELECTION
+PHONE_HOME_CITY_CODE | MobilePhoneAreaCode |  | 
+PHONE_HOME_NUMBER | MobilePhoneExchangeNbr | - | 
+PHONE_HOME_NUMBER | MobilePhoneSubscriberNbr | - | 
+UNKNOWN_TYPE | MaskedAccountNumber | Macy's Account Number: | 
+UNKNOWN_TYPE | SSN4 | Last 4 digits of SSN: | 
diff --git a/chrome/test/data/autofill/heuristics/output/11_register_mcphee.com.out b/chrome/test/data/autofill/heuristics/output/11_register_mcphee.com.out
index af6d591..14afb1b 100644
--- a/chrome/test/data/autofill/heuristics/output/11_register_mcphee.com.out
+++ b/chrome/test/data/autofill/heuristics/output/11_register_mcphee.com.out
@@ -1,11 +1,11 @@
-EMAIL_ADDRESS
-NAME_FIRST
-NAME_LAST
-COMPANY_NAME
-PHONE_HOME_WHOLE_NUMBER
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_COUNTRY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
+EMAIL_ADDRESS | FormField[1][1] | * Email Address: | 
+NAME_FIRST | FormField[2][4] | * First Name: | 
+NAME_LAST | FormField[2][5] | * Last Name: | 
+COMPANY_NAME | FormField[2][6] | * Company Name: | 
+PHONE_HOME_WHOLE_NUMBER | FormField[2][7] | * Phone Number: | 
+ADDRESS_HOME_LINE1 | FormField[2][8] | * Address Line 1: | 
+ADDRESS_HOME_LINE2 | FormField[2][9] | * Address Line 2: | 
+ADDRESS_HOME_CITY | FormField[2][10] | * Suburb/City: | 
+ADDRESS_HOME_COUNTRY | FormField[2][11] | * Country: | United States
+ADDRESS_HOME_STATE | FormField[2][12] | * State/Province: | 
+ADDRESS_HOME_ZIP | FormField[2][13] | * Zip/Postcode: | 
diff --git a/chrome/test/data/autofill/heuristics/output/11_register_myspace.com.out b/chrome/test/data/autofill/heuristics/output/11_register_myspace.com.out
index 4e51c7d..0c1f23d 100644
--- a/chrome/test/data/autofill/heuristics/output/11_register_myspace.com.out
+++ b/chrome/test/data/autofill/heuristics/output/11_register_myspace.com.out
@@ -1,9 +1,9 @@
-NAME_FIRST
-NAME_LAST
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-EMAIL_ADDRESS
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
+NAME_FIRST | tbxFirstName | First Name | 
+NAME_LAST | tbxLastName | Last Name | 
+UNKNOWN_TYPE | tbxMusicianName | Artist Name | 
+UNKNOWN_TYPE | ddlGenre | Genre | 
+UNKNOWN_TYPE | ddlLabel | Label Type | 
+EMAIL_ADDRESS | tbxEmail | Email | 
+UNKNOWN_TYPE | ddlMonth | Birthday | 
+UNKNOWN_TYPE | ddlDay |  | 
+UNKNOWN_TYPE | ddlYear |  | 
diff --git a/chrome/test/data/autofill/heuristics/output/11_register_newegg.com.out b/chrome/test/data/autofill/heuristics/output/11_register_newegg.com.out
index 0737cd6..af2f9f2 100644
--- a/chrome/test/data/autofill/heuristics/output/11_register_newegg.com.out
+++ b/chrome/test/data/autofill/heuristics/output/11_register_newegg.com.out
@@ -1,39 +1,39 @@
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-NAME_FIRST
-NAME_MIDDLE_INITIAL
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
-UNKNOWN_TYPE
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
-UNKNOWN_TYPE
-NAME_FIRST
-NAME_MIDDLE_INITIAL
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
+EMAIL_ADDRESS | LoginName | Email Address* | 
+EMAIL_ADDRESS | LoginName1 | Confirm Email Address* | 
+NAME_FIRST | FirstName | First Name* | 
+NAME_MIDDLE_INITIAL | BMI | MI | 
+NAME_LAST | LastName | Last Name* | 
+COMPANY_NAME | BCompany | Company Name | 
+ADDRESS_HOME_LINE1 | BAddress1 | Address* | 
+ADDRESS_HOME_LINE2 | BAddress2 | Address 2 | 
+ADDRESS_HOME_CITY | BCity | City* | 
+ADDRESS_HOME_STATE | BState | State* | AK
+ADDRESS_HOME_ZIP | BZip | Zip Code* | 
+PHONE_HOME_CITY_CODE | BNightPhone_tel1 | Shipping Phone* | 
+PHONE_HOME_NUMBER | BNightPhone_tel2 | Exchange | 
+PHONE_HOME_NUMBER | BNightPhone_tel3 | Last four digits | 
+UNKNOWN_TYPE | BNightPhone_ext1 | Ext | 
+PHONE_HOME_CITY_CODE | BDayPhone_tel1 | Daytime Phone | 
+PHONE_HOME_NUMBER | BDayPhone_tel2 | Exchange | 
+PHONE_HOME_NUMBER | BDayPhone_tel3 | Last four digits | 
+UNKNOWN_TYPE | BDayPhone_ext1 | Ext | 
+NAME_FIRST | SFirstName | First Name* | 
+NAME_MIDDLE_INITIAL | SMI | MI | 
+NAME_LAST | SLastName | Last Name* | 
+COMPANY_NAME | SCompanyName | Company Name | 
+ADDRESS_HOME_LINE1 | SAddress1 | Address* | 
+ADDRESS_HOME_LINE2 | SAddress2 | Address 2 | 
+ADDRESS_HOME_CITY | SCity | City* | 
+ADDRESS_HOME_STATE | SState | State* | AK
+ADDRESS_HOME_ZIP | SZip | Zip Code* | 
+PHONE_HOME_CITY_CODE | ShippingPhone_tel1 | Shipping Phone* | 
+PHONE_HOME_NUMBER | ShippingPhone_tel2 | ) | 
+PHONE_HOME_NUMBER | ShippingPhone_tel3 | - | 
+UNKNOWN_TYPE | ShippingPhone_ext1 | Ext | 
+UNKNOWN_TYPE | custtype | Is this purchase for personal or business use? | 200
+UNKNOWN_TYPE | Age | Age | 
+UNKNOWN_TYPE | income | Income | 0
+UNKNOWN_TYPE | education | Education | 0
+UNKNOWN_TYPE | hob | Where did you hear about Newegg.com? | 0
+UNKNOWN_TYPE | FirstPurchase | Is this your first Newegg.com purchase? | 0
+UNKNOWN_TYPE | GameHours | How many hours per week do you play PC games? | 0
diff --git a/chrome/test/data/autofill/heuristics/output/12_register_officedepot.com.out b/chrome/test/data/autofill/heuristics/output/12_register_officedepot.com.out
index a1454d1..58b2ebf 100644
--- a/chrome/test/data/autofill/heuristics/output/12_register_officedepot.com.out
+++ b/chrome/test/data/autofill/heuristics/output/12_register_officedepot.com.out
@@ -1,37 +1,37 @@
-NAME_FIRST
-NAME_MIDDLE_INITIAL
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
-UNKNOWN_TYPE
-PHONE_FAX_CITY_CODE
-PHONE_FAX_NUMBER
-PHONE_FAX_NUMBER
-EMAIL_ADDRESS
-UNKNOWN_TYPE
-CREDIT_CARD_NUMBER
-CREDIT_CARD_EXP_MONTH
-CREDIT_CARD_EXP_4_DIGIT_YEAR
-UNKNOWN_TYPE
-NAME_FIRST
-NAME_MIDDLE_INITIAL
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_CITY_CODE
-PHONE_HOME_NUMBER
-PHONE_HOME_NUMBER
-UNKNOWN_TYPE
-EMAIL_ADDRESS
-UNKNOWN_TYPE
+NAME_FIRST | addrsForm[0].firstName | *First Name: | 
+NAME_MIDDLE_INITIAL | addrsForm[0].middleInitial | Middle Initial: | 
+NAME_LAST | addrsForm[0].lastName | *Last Name: | 
+COMPANY_NAME | addrsForm[0].shiptoName | Company Name | 
+ADDRESS_HOME_LINE1 | addrsForm[0].address1 | *Address | 
+ADDRESS_HOME_LINE2 | addrsForm[0].address2 | *First Name:Middle Initial:*Last Name:Company Name | 
+ADDRESS_HOME_CITY | addrsForm[0].city | *City | 
+ADDRESS_HOME_STATE | addrsForm[0].state | *State | {blank}
+ADDRESS_HOME_ZIP | addrsForm[0].postalCode1 | *Zip Code | 
+PHONE_HOME_CITY_CODE | addrsForm[0].phoneNumber1 | *Phone Number: | 
+PHONE_HOME_NUMBER | addrsForm[0].phoneNumber2 | - | 
+PHONE_HOME_NUMBER | addrsForm[0].phoneNumber3 | - | 
+UNKNOWN_TYPE | addrsForm[0].phoneNumber4 | ext. | 
+PHONE_FAX_CITY_CODE | addrsForm[0].faxNumber1 | Fax: | 
+PHONE_FAX_NUMBER | addrsForm[0].faxNumber2 | - | 
+PHONE_FAX_NUMBER | addrsForm[0].faxNumber3 | - | 
+EMAIL_ADDRESS | addrsForm[0].email | *Email Address: | 
+UNKNOWN_TYPE | paymentFormInfo.creditCardType | Credit Card Type: |  
+CREDIT_CARD_NUMBER | paymentFormInfo.creditCardNumber | Credit Card Number: | 
+CREDIT_CARD_EXP_MONTH | paymentFormInfo.creditCardExpMonth | Expiration Date: / (mm/yyyy) |  
+CREDIT_CARD_EXP_4_DIGIT_YEAR | paymentFormInfo.creditCardExpYear | / | -1
+UNKNOWN_TYPE | paymentFormInfo.creditCardCvv | CID | 
+NAME_FIRST | addrsForm[2].firstName | *First Name: | 
+NAME_MIDDLE_INITIAL | addrsForm[2].middleInitial | Middle Initial: | 
+NAME_LAST | addrsForm[2].lastName | *Last Name: | 
+COMPANY_NAME | addrsForm[2].shiptoName | Company Name | 
+ADDRESS_HOME_LINE1 | addrsForm[2].address1 | *Address | 
+ADDRESS_HOME_LINE2 | addrsForm[2].address2 | * Indicates required field *First Name:Middle Initial:*Last Name:Company Name | 
+ADDRESS_HOME_CITY | addrsForm[2].city | *City | 
+ADDRESS_HOME_STATE | addrsForm[2].state | *State | {blank}
+ADDRESS_HOME_ZIP | addrsForm[2].postalCode1 | *Zip Code | 
+PHONE_HOME_CITY_CODE | addrsForm[2].phoneNumber1 | *Phone Number: | 
+PHONE_HOME_NUMBER | addrsForm[2].phoneNumber2 | - | 
+PHONE_HOME_NUMBER | addrsForm[2].phoneNumber3 | - | 
+UNKNOWN_TYPE | addrsForm[2].phoneNumber4 | ext. | 
+EMAIL_ADDRESS | addrsForm[2].email | *Email Address: | 
+UNKNOWN_TYPE | loginForm.loginName | *Login Name: | 
diff --git a/chrome/test/data/autofill/heuristics/output/12_register_officemax.com.out b/chrome/test/data/autofill/heuristics/output/12_register_officemax.com.out
index 8ccd1ae..4e027e1 100644
--- a/chrome/test/data/autofill/heuristics/output/12_register_officemax.com.out
+++ b/chrome/test/data/autofill/heuristics/output/12_register_officemax.com.out
@@ -1,6 +1,6 @@
-UNKNOWN_TYPE
-NAME_FIRST
-NAME_LAST
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-ADDRESS_HOME_ZIP
+UNKNOWN_TYPE | /atg/userprofiling/ProfileFormHandler.value.maxPerks | MaxPerks® ID No. | 
+NAME_FIRST | /atg/userprofiling/ProfileFormHandler.value.firstName | * First Name: | 
+NAME_LAST | /atg/userprofiling/ProfileFormHandler.value.lastName | * Last Name: | 
+EMAIL_ADDRESS | /atg/userprofiling/ProfileFormHandler.value.login | * Email Address: | 
+EMAIL_ADDRESS | /atg/userprofiling/ProfileFormHandler.confirmEmailAddress | * Confirm Email: | 
+ADDRESS_HOME_ZIP | /atg/userprofiling/ProfileFormHandler.value.zip | * Zip: | 
diff --git a/chrome/test/data/autofill/heuristics/output/12_register_pyramidcollection.com.out b/chrome/test/data/autofill/heuristics/output/12_register_pyramidcollection.com.out
index ea6c509..16e2d49 100644
--- a/chrome/test/data/autofill/heuristics/output/12_register_pyramidcollection.com.out
+++ b/chrome/test/data/autofill/heuristics/output/12_register_pyramidcollection.com.out
@@ -1,21 +1,21 @@
-EMAIL_ADDRESS
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_COUNTRY
-ADDRESS_HOME_ZIP
-PHONE_HOME_WHOLE_NUMBER
-PHONE_HOME_WHOLE_NUMBER
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_COUNTRY
-ADDRESS_HOME_ZIP
-PHONE_HOME_WHOLE_NUMBER
-PHONE_HOME_WHOLE_NUMBER
+EMAIL_ADDRESS | E1 | Email Address * | 
+NAME_FIRST | F1 | First Name * | 
+NAME_LAST | L1 | Last Name * | 
+ADDRESS_HOME_LINE1 | S1 | Address Line 1 * | 
+ADDRESS_HOME_LINE2 | R1 | Address Line 2 | 
+ADDRESS_HOME_CITY | C2 | City * | 
+ADDRESS_HOME_STATE | S2 | State * | 
+ADDRESS_HOME_COUNTRY | C3 | Country * | 0000
+ADDRESS_HOME_ZIP | Z1 | Zip Code * | 
+PHONE_HOME_WHOLE_NUMBER | P2 | Day Phone * | 
+PHONE_HOME_WHOLE_NUMBER | P3 | Evening Phone | 
+NAME_FIRST | SF1 | First Name * | 
+NAME_LAST | SL1 | Last Name * | 
+ADDRESS_HOME_LINE1 | SS1 | Address Line 1 * | 
+ADDRESS_HOME_LINE2 | SR1 | Address Line 2 | 
+ADDRESS_HOME_CITY | SC2 | City * | 
+ADDRESS_HOME_STATE | SS2 | State * | 
+ADDRESS_HOME_COUNTRY | SC3 | Country * | 0000
+ADDRESS_HOME_ZIP | SZ1 | Zip Code * | 
+PHONE_HOME_WHOLE_NUMBER | SP2 | Day Phone * | 
+PHONE_HOME_WHOLE_NUMBER | SP3 | Evening Phone | 
diff --git a/chrome/test/data/autofill/heuristics/output/12_register_rediff.com.out b/chrome/test/data/autofill/heuristics/output/12_register_rediff.com.out
index 639d4c5..628660d 100644
--- a/chrome/test/data/autofill/heuristics/output/12_register_rediff.com.out
+++ b/chrome/test/data/autofill/heuristics/output/12_register_rediff.com.out
@@ -1,12 +1,12 @@
-NAME_FULL
-UNKNOWN_TYPE
-EMAIL_ADDRESS
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-ADDRESS_HOME_COUNTRY
-ADDRESS_HOME_CITY
-UNKNOWN_TYPE
-UNKNOWN_TYPE
+NAME_FULL | name | : | 
+UNKNOWN_TYPE | login | : | 
+EMAIL_ADDRESS | altemail | : | 
+UNKNOWN_TYPE | hintq | : | 
+UNKNOWN_TYPE | mothername | : | 
+UNKNOWN_TYPE | DOB_Day | : | 
+UNKNOWN_TYPE | DOB_Month | : | 
+UNKNOWN_TYPE | DOB_Year | : | 
+ADDRESS_HOME_COUNTRY | country | : | 99
+ADDRESS_HOME_CITY | city | : | 
+UNKNOWN_TYPE | othercity | City : | 
+UNKNOWN_TYPE | 75cd7feb6ce926e1efbb8b96c0fb71c0 | : | 
diff --git a/chrome/test/data/autofill/heuristics/output/12_register_rei.com.out b/chrome/test/data/autofill/heuristics/output/12_register_rei.com.out
index 5de570c..f8946ee 100644
--- a/chrome/test/data/autofill/heuristics/output/12_register_rei.com.out
+++ b/chrome/test/data/autofill/heuristics/output/12_register_rei.com.out
@@ -1,5 +1,5 @@
-NAME_FIRST
-NAME_MIDDLE_INITIAL
-NAME_LAST
-ADDRESS_HOME_ZIP
-EMAIL_ADDRESS
+NAME_FIRST | firstName | First Name:* | 
+NAME_MIDDLE_INITIAL | middleName | Middle Initial: | 
+NAME_LAST | lastName | Last Name:* | 
+ADDRESS_HOME_ZIP | zipCode | ZIP (Postal) Code:* | 
+EMAIL_ADDRESS | email1 | E-mail Address:* | 
diff --git a/chrome/test/data/autofill/heuristics/output/13_register_rocketlawyer.com.out b/chrome/test/data/autofill/heuristics/output/13_register_rocketlawyer.com.out
index c6e9a36..bdfc780 100644
--- a/chrome/test/data/autofill/heuristics/output/13_register_rocketlawyer.com.out
+++ b/chrome/test/data/autofill/heuristics/output/13_register_rocketlawyer.com.out
@@ -1,5 +1,5 @@
-UNKNOWN_TYPE
-NAME_FIRST
-NAME_LAST
-EMAIL_ADDRESS
-EMAIL_ADDRESS
+UNKNOWN_TYPE | ctl00$ctl00$ctl00$SiteMasterBody$NewNavigationTabs$txtQuery |  | 
+NAME_FIRST | ctl00$ctl00$ctl00$SiteMasterBody$ContentPlaceHolder1$ContentPlaceHolder1$txtFirstName | First Name * | 
+NAME_LAST | ctl00$ctl00$ctl00$SiteMasterBody$ContentPlaceHolder1$ContentPlaceHolder1$txtLastName | Last Name * | 
+EMAIL_ADDRESS | ctl00$ctl00$ctl00$SiteMasterBody$ContentPlaceHolder1$ContentPlaceHolder1$txtUserName | Email Address * | 
+EMAIL_ADDRESS | ctl00$ctl00$ctl00$SiteMasterBody$ContentPlaceHolder1$ContentPlaceHolder1$txtConfirmUserName | Confirm Email Address * | 
diff --git a/chrome/test/data/autofill/heuristics/output/13_register_signup.clicksor.com.out b/chrome/test/data/autofill/heuristics/output/13_register_signup.clicksor.com.out
index 9385802..d10e60e 100644
--- a/chrome/test/data/autofill/heuristics/output/13_register_signup.clicksor.com.out
+++ b/chrome/test/data/autofill/heuristics/output/13_register_signup.clicksor.com.out
@@ -1,13 +1,13 @@
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-UNKNOWN_TYPE
-PHONE_HOME_WHOLE_NUMBER
-UNKNOWN_TYPE
-NAME_FULL
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_COUNTRY
-UNKNOWN_TYPE
+EMAIL_ADDRESS | email1 | Email: | 
+EMAIL_ADDRESS | email2 | Confirm                           email: | 
+UNKNOWN_TYPE | website | Website: | 
+PHONE_HOME_WHOLE_NUMBER | phone | Phone: | 
+UNKNOWN_TYPE | timezone | Time Zone: | 1
+NAME_FULL | name | Name: | 
+COMPANY_NAME | company | Company: | 
+ADDRESS_HOME_LINE1 | address | Address: | 
+ADDRESS_HOME_CITY | city | City: | 
+ADDRESS_HOME_STATE | province | State: | 
+ADDRESS_HOME_ZIP | zipCode | Zip                           code: | 
+ADDRESS_HOME_COUNTRY | country | Country: | US
+UNKNOWN_TYPE | securityCode | Enter                           the security code shown below: | 
diff --git a/chrome/test/data/autofill/heuristics/output/13_register_signup.live.com.out b/chrome/test/data/autofill/heuristics/output/13_register_signup.live.com.out
index 8d66eef..0675335 100644
--- a/chrome/test/data/autofill/heuristics/output/13_register_signup.live.com.out
+++ b/chrome/test/data/autofill/heuristics/output/13_register_signup.live.com.out
@@ -1,12 +1,12 @@
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-NAME_FIRST
-NAME_LAST
-UNKNOWN_TYPE
+UNKNOWN_TYPE | imembernamelive | Windows Live ID: | 
+UNKNOWN_TYPE | idomain | Domains | hotmail.com
+UNKNOWN_TYPE | isug1 | Enter a word |  Enter a word
+UNKNOWN_TYPE | isug2 | Enter another word |  Enter another word
+UNKNOWN_TYPE | isug3 | Enter another word |  Enter another word
+EMAIL_ADDRESS | imembernameeasi | Use your email address: | Example: someone@example.com
+EMAIL_ADDRESS | iAltEmail | Alternate email address: | 
+UNKNOWN_TYPE | iSQ | Question: | 0
+UNKNOWN_TYPE | iSA | Secret answer: | 
+NAME_FIRST | iFirstName | First name: | 
+NAME_LAST | iLastName | Last name: | 
+UNKNOWN_TYPE | iBirthYear | Birth year: | Example: 1990
diff --git a/chrome/test/data/autofill/heuristics/output/13_register_sourceforge.net.out b/chrome/test/data/autofill/heuristics/output/13_register_sourceforge.net.out
index 52346c8..fae3fb3 100644
--- a/chrome/test/data/autofill/heuristics/output/13_register_sourceforge.net.out
+++ b/chrome/test/data/autofill/heuristics/output/13_register_sourceforge.net.out
@@ -1,13 +1,13 @@
-NAME_FULL
-EMAIL_ADDRESS
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-ADDRESS_HOME_COUNTRY
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
+NAME_FULL | X1mRVeMqejLnZpd1etxNGHllat2M | Name: | 
+EMAIL_ADDRESS | X129ZdMbfixhIflk8_zHDFWB72qk | Email: | 
+UNKNOWN_TYPE | X2n9HcN3dx1-mSbLywp_L-szMydw | Username: | 
+UNKNOWN_TYPE | X2mZVe8jGx1WmSbLywp_L-szMydw | Language: | 275
+ADDRESS_HOME_COUNTRY | X1WlbYMHH1EvuThNjGRupsu5JwuU | Country: | US
+UNKNOWN_TYPE | X2n5deMrJyVymSbLywp_L-szMydw | Time Zone: | America/New_York
+UNKNOWN_TYPE | Xw3lRdtrBz0a6O-kMvS36tMzvLDU | Security Question: | What was the name of your first pet?
+UNKNOWN_TYPE | X3WlBZtvcy22yEf0KrDfhs46rigU | Security Question: | 
+UNKNOWN_TYPE | X3XlRdtrBz0a6O_kXqynrr46rigU | Security Answer: | 
+UNKNOWN_TYPE | X0WBbd4KZLSgCIb8WlZZNJ3g3fVk | Job Title: | 
+UNKNOWN_TYPE | X229ZZcPc31emF7VTU0RPmITuTNc | Number of Employees: | 
+UNKNOWN_TYPE | X1GJbe8rKlh_p74K4nXnhkGtC-8Q | You seem to have CSS turned off. Please don't fill out this field. | 
+UNKNOWN_TYPE | X1GJbe8rKlx_p74K4nXnhkGtC-8Q | You seem to have CSS turned off. Please don't fill out this field. | 
diff --git a/chrome/test/data/autofill/heuristics/output/13_register_supershuttle.com.out b/chrome/test/data/autofill/heuristics/output/13_register_supershuttle.com.out
index b2492c1..435f639 100644
--- a/chrome/test/data/autofill/heuristics/output/13_register_supershuttle.com.out
+++ b/chrome/test/data/autofill/heuristics/output/13_register_supershuttle.com.out
@@ -1,7 +1,7 @@
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-NAME_FIRST
-NAME_LAST
-PHONE_HOME_WHOLE_NUMBER
-PHONE_HOME_COUNTRY_CODE
-PHONE_HOME_CITY_AND_NUMBER
+EMAIL_ADDRESS | ctl00$cphLeft$InnerLogin1$txtEmailAddress | Email Address | 
+EMAIL_ADDRESS | ctl00$cphRight$Registration1$txtEmailAddress | Email Address | 
+NAME_FIRST | ctl00$cphRight$Registration1$txtFirstName | First Name | 
+NAME_LAST | ctl00$cphRight$Registration1$txtLastName | Last Name | 
+PHONE_HOME_WHOLE_NUMBER | ctl00$cphRight$Registration1$txtCellPhone | If outside the US (Country Code/Phone Number) | 
+PHONE_HOME_COUNTRY_CODE | ctl00$cphRight$Registration1$txtCountryCode | If outside the US (Country Code/Phone Number) | 
+PHONE_HOME_CITY_AND_NUMBER | ctl00$cphRight$Registration1$txtIntPhoneNumber | If outside the US (Country Code/Phone Number) | 
diff --git a/chrome/test/data/autofill/heuristics/output/14_register_target.com.out b/chrome/test/data/autofill/heuristics/output/14_register_target.com.out
index 4a0b658..86af5f9 100644
--- a/chrome/test/data/autofill/heuristics/output/14_register_target.com.out
+++ b/chrome/test/data/autofill/heuristics/output/14_register_target.com.out
@@ -1,3 +1,3 @@
-UNKNOWN_TYPE
-EMAIL_ADDRESS
-EMAIL_ADDRESS
+UNKNOWN_TYPE | userName | Your name:* | 
+EMAIL_ADDRESS | email | Your email address:* | 
+EMAIL_ADDRESS | emailCheck | Re-enter email address:* | 
diff --git a/chrome/test/data/autofill/heuristics/output/14_register_threadless.com.out b/chrome/test/data/autofill/heuristics/output/14_register_threadless.com.out
index 6288fad..fe661d2 100644
--- a/chrome/test/data/autofill/heuristics/output/14_register_threadless.com.out
+++ b/chrome/test/data/autofill/heuristics/output/14_register_threadless.com.out
@@ -1,3 +1,3 @@
-UNKNOWN_TYPE
-EMAIL_ADDRESS
-UNKNOWN_TYPE
+UNKNOWN_TYPE | create_username | Desired username | 
+EMAIL_ADDRESS | email | Email | 
+UNKNOWN_TYPE | recaptcha_response_field | Type the words aboveType the numbers you hear | 
diff --git a/chrome/test/data/autofill/heuristics/output/14_register_trueblue.jetblue.com.out b/chrome/test/data/autofill/heuristics/output/14_register_trueblue.jetblue.com.out
index 6b5df26..02fb20d 100644
--- a/chrome/test/data/autofill/heuristics/output/14_register_trueblue.jetblue.com.out
+++ b/chrome/test/data/autofill/heuristics/output/14_register_trueblue.jetblue.com.out
@@ -1,19 +1,19 @@
-UNKNOWN_TYPE
-NAME_FIRST
-NAME_MIDDLE
-NAME_LAST
-UNKNOWN_TYPE
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_COUNTRY
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-PHONE_HOME_WHOLE_NUMBER
-UNKNOWN_TYPE
-PHONE_HOME_WHOLE_NUMBER
-UNKNOWN_TYPE
-PHONE_FAX_WHOLE_NUMBER
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-UNKNOWN_TYPE
+UNKNOWN_TYPE | accountData.title | Title: | 
+NAME_FIRST | accountData.firstName | First name: | 
+NAME_MIDDLE | accountData.middleName | Middle name : | 
+NAME_LAST | accountData.lastName | Last name: | 
+UNKNOWN_TYPE | accountData.suffix | Suffix: | 
+ADDRESS_HOME_LINE1 | accountData.address | Street address 1: | 
+ADDRESS_HOME_LINE2 | accountData.address2 | Street address 2: | 
+ADDRESS_HOME_COUNTRY | accountData.country | Country: | USA
+ADDRESS_HOME_CITY | accountData.city | City: | 
+ADDRESS_HOME_STATE | accountData.state | State/Province: | 
+ADDRESS_HOME_ZIP | accountData.zip | Zip/Postal code: | 
+PHONE_HOME_WHOLE_NUMBER | accountData.phone | Phone number: | 
+UNKNOWN_TYPE | accountData.phoneType | Phone number: | M
+PHONE_HOME_WHOLE_NUMBER | accountData.alternatePhone | Alternate phone: | 
+UNKNOWN_TYPE | accountData.alternatePhoneType | Alternate phone: | 
+PHONE_FAX_WHOLE_NUMBER | accountData.fax | Fax: | 
+EMAIL_ADDRESS | accountData.email | Email address: | 
+EMAIL_ADDRESS | accountData.confirmEmail | Confirm email: | 
+UNKNOWN_TYPE | accountData.entrollmentCode | Enrollment code: | 
diff --git a/chrome/test/data/autofill/heuristics/output/14_register_uhaul.com.out b/chrome/test/data/autofill/heuristics/output/14_register_uhaul.com.out
index c45340d..5f42704 100644
--- a/chrome/test/data/autofill/heuristics/output/14_register_uhaul.com.out
+++ b/chrome/test/data/autofill/heuristics/output/14_register_uhaul.com.out
@@ -1,8 +1,8 @@
-NAME_FULL
-COMPANY_NAME
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-PHONE_HOME_WHOLE_NUMBER
-UNKNOWN_TYPE
+NAME_FULL | _ctl0:cphMainBody:txtName | Name | 
+COMPANY_NAME | _ctl0:cphMainBody:txtCompany | Company | 
+UNKNOWN_TYPE | _ctl0:cphMainBody:txtVendNo | Vendor Number | 
+UNKNOWN_TYPE | _ctl0:cphMainBody:txtEntity | U-Haul Shop Entity Number | 
+EMAIL_ADDRESS | _ctl0:cphMainBody:txtEmail | Email | 
+EMAIL_ADDRESS | _ctl0:cphMainBody:txtEmail0 | ReConfirm Email | 
+PHONE_HOME_WHOLE_NUMBER | _ctl0:cphMainBody:txtPhone | Phone | 
+UNKNOWN_TYPE | _ctl0:cphMainBody:txtComments | Comments: | 
diff --git a/chrome/test/data/autofill/heuristics/output/14_register_yahoo.com.out b/chrome/test/data/autofill/heuristics/output/14_register_yahoo.com.out
index d67354c..08dc1ac 100644
--- a/chrome/test/data/autofill/heuristics/output/14_register_yahoo.com.out
+++ b/chrome/test/data/autofill/heuristics/output/14_register_yahoo.com.out
@@ -1,18 +1,18 @@
-NAME_FIRST
-NAME_LAST
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-ADDRESS_HOME_COUNTRY
-ADDRESS_HOME_ZIP
-EMAIL_ADDRESS
-UNKNOWN_TYPE
-EMAIL_ADDRESS
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
+NAME_FIRST | firstname |  | 
+NAME_LAST | secondname |  | 
+UNKNOWN_TYPE | gender |  | 
+UNKNOWN_TYPE | mm |  | 
+UNKNOWN_TYPE | dd |  | 
+UNKNOWN_TYPE | yyyy |  | 
+ADDRESS_HOME_COUNTRY | country | Country | us
+ADDRESS_HOME_ZIP | postalcode | Postal Code | 
+EMAIL_ADDRESS | yahooid | Yahoo! ID and Email | 
+UNKNOWN_TYPE | domain | @ | yahoo.com
+EMAIL_ADDRESS | altemail | Alternate Email (optional) | 
+UNKNOWN_TYPE | secquestion | Secret Question 1 | 
+UNKNOWN_TYPE | customsecquestion1 | Specify Your Question | 
+UNKNOWN_TYPE | secquestionanswer | Your Answer | 
+UNKNOWN_TYPE | secquestion2 | Secret Question 2 | 
+UNKNOWN_TYPE | customsecquestion2 | Specify Your Question | 
+UNKNOWN_TYPE | secquestionanswer2 | Your Answer | 
+UNKNOWN_TYPE | cword | Type the code shown | 
diff --git a/chrome/test/data/autofill/heuristics/output/15_crbug_40687.out b/chrome/test/data/autofill/heuristics/output/15_crbug_40687.out
index dc21972..53f26fc 100644
--- a/chrome/test/data/autofill/heuristics/output/15_crbug_40687.out
+++ b/chrome/test/data/autofill/heuristics/output/15_crbug_40687.out
@@ -1,15 +1,15 @@
-NAME_FIRST
-NAME_LAST
-ADDRESS_BILLING_LINE1
-ADDRESS_BILLING_LINE2
-ADDRESS_BILLING_CITY
-ADDRESS_BILLING_STATE
-ADDRESS_BILLING_ZIP
-ADDRESS_BILLING_COUNTRY
-PHONE_HOME_WHOLE_NUMBER
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-CREDIT_CARD_NUMBER
-CREDIT_CARD_EXP_MONTH
-CREDIT_CARD_EXP_4_DIGIT_YEAR
-UNKNOWN_TYPE
+NAME_FIRST | user[billing][firstname] | First Name | 
+NAME_LAST | user[billing][lastname] | Last Name | 
+ADDRESS_BILLING_LINE1 | user[billing][address_first] | Billing Address | 
+ADDRESS_BILLING_LINE2 | user[billing][address_second] | Billing Suite/Apt # | 
+ADDRESS_BILLING_CITY | user[billing][city] | Billing City | 
+ADDRESS_BILLING_STATE | user[billing][state] | State/Province | CA
+ADDRESS_BILLING_ZIP | user[billing][zip] | Billing Postal Code | 94043
+ADDRESS_BILLING_COUNTRY | user[billing][country] | Billing Country | US
+PHONE_HOME_WHOLE_NUMBER | user[phone_first] | Phone Number | 
+EMAIL_ADDRESS | user[email] | Email Address | 
+EMAIL_ADDRESS | user[email_confirm] | Confirm Email Address | 
+CREDIT_CARD_NUMBER | payment[cc_number] | Credit Card Number | 
+CREDIT_CARD_EXP_MONTH | payment[cc_expmo] | MM (TWO DIGIT MONTH) | 
+CREDIT_CARD_EXP_4_DIGIT_YEAR | payment[cc_expyr] | YYYY (FOUR DIGIT YEAR) | 
+UNKNOWN_TYPE | payment[sigpanel] | What's this? | 
diff --git a/chrome/test/data/autofill/heuristics/output/15_crbug_52198.out b/chrome/test/data/autofill/heuristics/output/15_crbug_52198.out
index 27c2886..1de3682 100644
--- a/chrome/test/data/autofill/heuristics/output/15_crbug_52198.out
+++ b/chrome/test/data/autofill/heuristics/output/15_crbug_52198.out
@@ -1,18 +1,18 @@
-NAME_FIRST
-NAME_MIDDLE
-NAME_LAST
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_COUNTRY
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-EMAIL_ADDRESS
-EMAIL_ADDRESS
+NAME_FIRST | firstName | *First (Given) Name: | 
+NAME_MIDDLE | middleName | Middle Name: | 
+NAME_LAST | lastName | *Last (Family) Name: | 
+UNKNOWN_TYPE | suffix | Generational Suffix: | 
+UNKNOWN_TYPE | otherFirstName | Other First Names: (For example, your nickname.) | 
+UNKNOWN_TYPE | otherLastName | Other Last Names: (For example, your maiden name.) | 
+UNKNOWN_TYPE | monthOfBirth | Month: | -
+UNKNOWN_TYPE | dayOfBirth | Day: | -
+UNKNOWN_TYPE | yearOfBirth | Year: | -
+ADDRESS_HOME_CITY | cityOrTownOfBirth | City or Town of Birth: | 
+ADDRESS_HOME_STATE | stateOrProvinceOfBirth | State or Province of Birth: (only if born in the US or Canada) | 
+ADDRESS_HOME_COUNTRY | countryOfBirth | Country of Birth: | 
+UNKNOWN_TYPE | studentSSNa | U.S. Social Security Number: (Why do we ask for your SSN?) | 
+UNKNOWN_TYPE | studentSSNb | - | 
+UNKNOWN_TYPE | studentSSNc | - | 
+UNKNOWN_TYPE | idCardNumber | UT Austin ID Card Number: | 
+EMAIL_ADDRESS | emailAddress | E-mail Address: | 
+EMAIL_ADDRESS | emailAddressVerify | Verify Your E-mail Address: | 
diff --git a/chrome/test/data/autofill/heuristics/output/15_crbug_53075.out b/chrome/test/data/autofill/heuristics/output/15_crbug_53075.out
index e4303a5..9cd5540 100644
--- a/chrome/test/data/autofill/heuristics/output/15_crbug_53075.out
+++ b/chrome/test/data/autofill/heuristics/output/15_crbug_53075.out
@@ -1,24 +1,24 @@
-COMPANY_NAME
-UNKNOWN_TYPE
-NAME_FIRST
-NAME_LAST
-PHONE_HOME_WHOLE_NUMBER
-PHONE_HOME_WHOLE_NUMBER
-EMAIL_ADDRESS
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_COUNTRY
-UNKNOWN_TYPE
-NAME_FIRST
-NAME_LAST
-PHONE_HOME_WHOLE_NUMBER
-PHONE_HOME_WHOLE_NUMBER
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_COUNTRY
+COMPANY_NAME | ecomms_company_name | Company Name: | 
+UNKNOWN_TYPE | ecomms_title | Title: * | 
+NAME_FIRST | ecomms_first_name | First Name: * | 
+NAME_LAST | ecomms_last_name | Last Name: * | 
+PHONE_HOME_WHOLE_NUMBER | ecomms_telephone | Telephone: * | 
+PHONE_HOME_WHOLE_NUMBER | ecomms_mobile | Mobile: * | 
+EMAIL_ADDRESS | ecomms_email | Email Address: * | x@foo.com
+ADDRESS_HOME_LINE1 | ecomms_address1 | Address1: * | 
+ADDRESS_HOME_LINE2 | ecomms_address2 | Address2: | 
+ADDRESS_HOME_CITY | ecomms_town | Town / City: * | 
+ADDRESS_HOME_STATE | ecomms_county | County: * | 
+ADDRESS_HOME_ZIP | ecomms_postcode | Postcode: * | 
+ADDRESS_HOME_COUNTRY | ecomms_country | Country: | 224
+UNKNOWN_TYPE | del_title | Title: * | 
+NAME_FIRST | del_first_name | First Name: * | 
+NAME_LAST | del_last_name | Last Name: * | 
+PHONE_HOME_WHOLE_NUMBER | del_telephone | Telephone: * | 
+PHONE_HOME_WHOLE_NUMBER | del_mobile | Mobile: * | 
+ADDRESS_HOME_LINE1 | del_address1 | Address1: * | 
+ADDRESS_HOME_LINE2 | del_address2 | Address2: | 
+ADDRESS_HOME_CITY | del_town | Town / City: * | 
+ADDRESS_HOME_STATE | del_county | County: * | 
+ADDRESS_HOME_ZIP | del_postcode | Postcode: * | 
+ADDRESS_HOME_COUNTRY | ecomms_del_country | Country: | 224
diff --git a/chrome/test/data/autofill/heuristics/output/15_crbug_64569.out b/chrome/test/data/autofill/heuristics/output/15_crbug_64569.out
index 1f740fe..8e11f15 100644
--- a/chrome/test/data/autofill/heuristics/output/15_crbug_64569.out
+++ b/chrome/test/data/autofill/heuristics/output/15_crbug_64569.out
@@ -1,12 +1,12 @@
-CREDIT_CARD_NAME
-CREDIT_CARD_NUMBER
-CREDIT_CARD_EXP_MONTH
-CREDIT_CARD_EXP_4_DIGIT_YEAR
-UNKNOWN_TYPE
-NAME_FIRST
-NAME_LAST
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_LINE2
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
+CREDIT_CARD_NAME | ccFullName | (as it appears on the card) | 
+CREDIT_CARD_NUMBER | ccNumber | (no dashes or spaces) | 
+CREDIT_CARD_EXP_MONTH | ccExpMonth | Expiration date | 1
+CREDIT_CARD_EXP_4_DIGIT_YEAR | ccExpYear | Your name (as it appears on the card) Credit card number (no dashes or spaces) Expiration date | 2011
+UNKNOWN_TYPE | ccSecurity | Security code | 
+NAME_FIRST | addrFirstName | First name | 
+NAME_LAST | addrLastName | Last name | 
+ADDRESS_HOME_LINE1 | addrStreet1 | (street address, PO box, company name) | 
+ADDRESS_HOME_LINE2 | addrStreet2 | (apt, suite, building, floor, etc) | 
+ADDRESS_HOME_CITY | addrCity | City | 
+ADDRESS_HOME_STATE | addrState | State |  
+ADDRESS_HOME_ZIP | addrZip | Postal code | 
diff --git a/chrome/test/data/autofill/heuristics/output/15_crbug_74918.out b/chrome/test/data/autofill/heuristics/output/15_crbug_74918.out
index 837ef56..20fb70e 100644
--- a/chrome/test/data/autofill/heuristics/output/15_crbug_74918.out
+++ b/chrome/test/data/autofill/heuristics/output/15_crbug_74918.out
@@ -1,6 +1,6 @@
-UNKNOWN_TYPE
-NAME_FULL
-PHONE_HOME_WHOLE_NUMBER
-UNKNOWN_TYPE
-PHONE_HOME_WHOLE_NUMBER
-UNKNOWN_TYPE
+UNKNOWN_TYPE | TopicList | Category | Topic10
+NAME_FULL | Name | From | 
+PHONE_HOME_WHOLE_NUMBER | DayPhone | Daytime Phone | 
+UNKNOWN_TYPE | Subject | Subject | 
+PHONE_HOME_WHOLE_NUMBER | EvePhone | Evening Phone | 
+UNKNOWN_TYPE | AccountList | Account | NO_SELECTION
diff --git a/chrome/test/data/autofill/heuristics/output/15_crbug_77678.out b/chrome/test/data/autofill/heuristics/output/15_crbug_77678.out
deleted file mode 100644
index b6d2cf2..0000000
--- a/chrome/test/data/autofill/heuristics/output/15_crbug_77678.out
+++ /dev/null
@@ -1,32 +0,0 @@
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-NAME_FIRST
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_COUNTRY
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-PHONE_HOME_WHOLE_NUMBER
-NAME_FIRST
-NAME_LAST
-COMPANY_NAME
-ADDRESS_HOME_LINE1
-ADDRESS_HOME_CITY
-ADDRESS_HOME_STATE
-ADDRESS_HOME_ZIP
-ADDRESS_HOME_COUNTRY
-EMAIL_ADDRESS
-EMAIL_ADDRESS
-PHONE_HOME_WHOLE_NUMBER
-UNKNOWN_TYPE
diff --git a/chrome/test/data/autofill/heuristics/output/20_register_epson.com.mx.out b/chrome/test/data/autofill/heuristics/output/20_register_epson.com.mx.out
index 21721490..0e7f964 100644
--- a/chrome/test/data/autofill/heuristics/output/20_register_epson.com.mx.out
+++ b/chrome/test/data/autofill/heuristics/output/20_register_epson.com.mx.out
@@ -1,9 +1,9 @@
-UNKNOWN_TYPE
-ADDRESS_HOME_COUNTRY
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-UNKNOWN_TYPE
-EMAIL_ADDRESS
-NAME_FIRST
-NAME_LAST
-EMAIL_ADDRESS
+UNKNOWN_TYPE | doAction |  | 
+ADDRESS_HOME_COUNTRY | idPaiseReg | n del producto *dd/mm/yyyySerial *Acerca del nro. de Serie | MX
+UNKNOWN_TYPE | fechaCompra | *dd/mm/yyyy | 
+UNKNOWN_TYPE | serialNumber | Serial * | 
+UNKNOWN_TYPE | idProducto | Serial * | 
+EMAIL_ADDRESS | emailLogin | Email * | 
+NAME_FIRST | nombre | Nombre * | 
+NAME_LAST | apellido | Apellido * | 
+EMAIL_ADDRESS | emailRegistro | Email * |