Removed redundant name qualifier for "type" fields.

A field name like phone_type within a phone number doesn't need the phone_ prefix.