Renamed class to match convention