Simplify upstream server name