Renamed refactored classes