Add separate field for business/org name to address fields. This would be especially helpful for constituents who receive mail at their work but are not primary contacts for their businesses (or their businesses aren't constituents). This way the business name does not need to be entered into an address line.

I think it could be set up like a relationship where you can add a business name and address and then have the option to link to an existing constituent if that business is already in the database.