Renamed class to align naming conventions