MNT: Renamed classes