fix typos and service names