Renamed some auth classes