Fixed issues after rename the services