Renamed class to comply with filename... Doooh!