service name and port name fix