Refactor: Renaming classes