Changing "Contact" to "Company" in a Person Provider Entry Address entry

When adding an address to a provider that is a person, there is no field for "Company." There used to be, but it seems to have been replaced with "Contact," which is a little redundant in a provider entry that is an individual. The contact is the provider. What is needed here is a place to include their business name without having to put that in the Address fields. I would think that this should be included in any FULL ADDRESS Neos tags or a copy of name and address (for pasting) as well.