Fixed services naming