Refactor: Renaming some classes