Improved naming of services and repositories.