Renamed stuff to align with new class name.