refactored the names of the services a little