Renaming name to company_name and adjusting field widths