Renamed Authority related classes