Changing services naming