Renamed services and some module panels