Changes to support adding name to VMWare client