Renamed 2 classes