Fix up company names.