WS-1706 Add ip address support to VMs and refactor method names a bit