Misc fixes from vSphere to vCloud naming convention