Perhaps rename with "vsphere" suffix in preparation for other CPIs?