Merge "Initial rename to IpServer"