fixed name vs appName vs serverName issue