Change service names to factories

These services are actually factories that can create the service they
provide