Renamed classes to match convention