Renamed class to be more consistent.