Renamed services according to paper