Renamed a few classes

Fixed docs