Additional Address label is confusing, consider changing it back to Supplemental Address

At least 3 times since the beginning of the year a client has told me their address field in a profile isn't working right. When I check it out, I see they chose the first address field they see in the list, which is "Additional Address 1". This is confusing to a new person. Before you dismiss this complaint, consider the state of mind of the average non-profit worker: overworked, underpaid, and utterly confused by CiviCRM.

Solutions:

1. Consider changing the label of this field back to Supplemental Address 1, so it shows up BELOW Street Address which what they are looking for 90%+ of the time.

2. Failing that, keep the name the same, but reorder Additional Address 1 below Street Address, so at least they see Street Address first.