Renamed classes used in 725