Renamed classes
Refactoring