Renamed services and plugin