Renamed services to handlers.