Renaming classes before beginning refactoring