Renamed existing services and interfaces