fixed name vs appName vs serverName issue part 2