Renamed class and small fixes