[PD-844] Updated the Company Profile model and form

Under-estimated myself. This took way less time than I originally thought. 
We were originally creating the labels using javascript, so this seemed cleaner. The field names are ambiguous, so the alternative to this would have been to prefix the fields. KISS?