Renamed class to match convention and other fixes.