Renamed default classes
Renamed default classes