Renamed class a little more accurately...