Merge "[virtual] Rename all to drop virtual prefix"