Refactor to correctly name all services, capitals should only be used for constructors