TheCompany: Renaming refactoring