Renamed class to comply with conventions