Refactor Company generator to use name formats