diff --git a/pkg/controller/template/render_test.go b/pkg/controller/template/render_test.go
index 6a67ba919d..62181a46f6 100644
--- a/pkg/controller/template/render_test.go
+++ b/pkg/controller/template/render_test.go
@@ -188,7 +188,7 @@ var (
 		"openstack": "./test_data/controller_config_openstack.yaml",
 		"libvirt":   "./test_data/controller_config_libvirt.yaml",
 		"none":      "./test_data/controller_config_none.yaml",
-		"vpshere":   "./test_data/controller_config_vsphere.yaml",
+		"vsphere":   "./test_data/controller_config_vsphere.yaml",
 	}
 )
 
diff --git a/pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-kubernetes-ca.crt b/pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-kubernetes-ca.crt
similarity index 100%
rename from pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-kubernetes-ca.crt
rename to pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-kubernetes-ca.crt
diff --git a/pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy b/pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
similarity index 100%
rename from pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
rename to pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
diff --git a/pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-kubernetes-manifests-etcd-member.yaml b/pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-kubernetes-manifests-etcd-member.yaml
similarity index 100%
rename from pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-kubernetes-manifests-etcd-member.yaml
rename to pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-kubernetes-manifests-etcd-member.yaml
diff --git a/pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-kubernetes-static-pod-resources-etcd-member-ca.crt b/pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-kubernetes-static-pod-resources-etcd-member-ca.crt
similarity index 100%
rename from pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-kubernetes-static-pod-resources-etcd-member-ca.crt
rename to pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-kubernetes-static-pod-resources-etcd-member-ca.crt
diff --git a/pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-kubernetes-static-pod-resources-etcd-member-root-ca.crt b/pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-kubernetes-static-pod-resources-etcd-member-root-ca.crt
similarity index 100%
rename from pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-kubernetes-static-pod-resources-etcd-member-root-ca.crt
rename to pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-kubernetes-static-pod-resources-etcd-member-root-ca.crt
diff --git a/pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-sysconfig-crio-network b/pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-sysconfig-crio-network
similarity index 100%
rename from pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-sysconfig-crio-network
rename to pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-sysconfig-crio-network
diff --git a/pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-sysctl.d-forward.conf b/pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-sysctl.d-forward.conf
similarity index 100%
rename from pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-sysctl.d-forward.conf
rename to pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-sysctl.d-forward.conf
diff --git a/pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-var-lib-kubelet-config.json b/pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-var-lib-kubelet-config.json
similarity index 100%
rename from pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-var-lib-kubelet-config.json
rename to pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-var-lib-kubelet-config.json
diff --git a/pkg/controller/template/test_data/templates/master/01-master-container-runtime/vpshere/files/-etc-containers-registries.conf b/pkg/controller/template/test_data/templates/master/01-master-container-runtime/vsphere/files/-etc-containers-registries.conf
similarity index 100%
rename from pkg/controller/template/test_data/templates/master/01-master-container-runtime/vpshere/files/-etc-containers-registries.conf
rename to pkg/controller/template/test_data/templates/master/01-master-container-runtime/vsphere/files/-etc-containers-registries.conf
diff --git a/pkg/controller/template/test_data/templates/master/01-master-container-runtime/vpshere/files/-etc-containers-storage.conf b/pkg/controller/template/test_data/templates/master/01-master-container-runtime/vsphere/files/-etc-containers-storage.conf
similarity index 100%
rename from pkg/controller/template/test_data/templates/master/01-master-container-runtime/vpshere/files/-etc-containers-storage.conf
rename to pkg/controller/template/test_data/templates/master/01-master-container-runtime/vsphere/files/-etc-containers-storage.conf
diff --git a/pkg/controller/template/test_data/templates/master/01-master-container-runtime/vpshere/files/-etc-crio-crio.conf b/pkg/controller/template/test_data/templates/master/01-master-container-runtime/vsphere/files/-etc-crio-crio.conf
similarity index 100%
rename from pkg/controller/template/test_data/templates/master/01-master-container-runtime/vpshere/files/-etc-crio-crio.conf
rename to pkg/controller/template/test_data/templates/master/01-master-container-runtime/vsphere/files/-etc-crio-crio.conf
diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/vpshere/files/-etc-kubernetes-kubelet.conf b/pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/files/-etc-kubernetes-kubelet.conf
similarity index 100%
rename from pkg/controller/template/test_data/templates/master/01-master-kubelet/vpshere/files/-etc-kubernetes-kubelet.conf
rename to pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/files/-etc-kubernetes-kubelet.conf
diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/vpshere/units/kubelet.service b/pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/units/kubelet.service
similarity index 100%
rename from pkg/controller/template/test_data/templates/master/01-master-kubelet/vpshere/units/kubelet.service
rename to pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/units/kubelet.service
diff --git a/pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-etc-kubernetes-ca.crt b/pkg/controller/template/test_data/templates/worker/00-worker/vsphere/files/-etc-kubernetes-ca.crt
similarity index 100%
rename from pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-etc-kubernetes-ca.crt
rename to pkg/controller/template/test_data/templates/worker/00-worker/vsphere/files/-etc-kubernetes-ca.crt
diff --git a/pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy b/pkg/controller/template/test_data/templates/worker/00-worker/vsphere/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
similarity index 100%
rename from pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
rename to pkg/controller/template/test_data/templates/worker/00-worker/vsphere/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
diff --git a/pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-etc-sysconfig-crio-network b/pkg/controller/template/test_data/templates/worker/00-worker/vsphere/files/-etc-sysconfig-crio-network
similarity index 100%
rename from pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-etc-sysconfig-crio-network
rename to pkg/controller/template/test_data/templates/worker/00-worker/vsphere/files/-etc-sysconfig-crio-network
diff --git a/pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-etc-sysctl.d-forward.conf b/pkg/controller/template/test_data/templates/worker/00-worker/vsphere/files/-etc-sysctl.d-forward.conf
similarity index 100%
rename from pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-etc-sysctl.d-forward.conf
rename to pkg/controller/template/test_data/templates/worker/00-worker/vsphere/files/-etc-sysctl.d-forward.conf
diff --git a/pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-var-lib-kubelet-config.json b/pkg/controller/template/test_data/templates/worker/00-worker/vsphere/files/-var-lib-kubelet-config.json
similarity index 100%
rename from pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-var-lib-kubelet-config.json
rename to pkg/controller/template/test_data/templates/worker/00-worker/vsphere/files/-var-lib-kubelet-config.json
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vpshere/files/-etc-containers-registries.conf b/pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vsphere/files/-etc-containers-registries.conf
similarity index 100%
rename from pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vpshere/files/-etc-containers-registries.conf
rename to pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vsphere/files/-etc-containers-registries.conf
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vpshere/files/-etc-containers-storage.conf b/pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vsphere/files/-etc-containers-storage.conf
similarity index 100%
rename from pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vpshere/files/-etc-containers-storage.conf
rename to pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vsphere/files/-etc-containers-storage.conf
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vpshere/files/-etc-crio-crio.conf b/pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vsphere/files/-etc-crio-crio.conf
similarity index 100%
rename from pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vpshere/files/-etc-crio-crio.conf
rename to pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vsphere/files/-etc-crio-crio.conf
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vpshere/files/-etc-kubernetes-kubelet.conf b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/files/-etc-kubernetes-kubelet.conf
similarity index 100%
rename from pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vpshere/files/-etc-kubernetes-kubelet.conf
rename to pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/files/-etc-kubernetes-kubelet.conf
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vpshere/units/kubelet.service b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/units/kubelet.service
similarity index 100%
rename from pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vpshere/units/kubelet.service
rename to pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/units/kubelet.service