diff --git a/manifests/function/k8scontrol-capo/cluster.yaml b/manifests/function/k8scontrol-capo/cluster.yaml
index 22c72dc71..6af812fda 100644
--- a/manifests/function/k8scontrol-capo/cluster.yaml
+++ b/manifests/function/k8scontrol-capo/cluster.yaml
@@ -1,7 +1,7 @@
 apiVersion: cluster.x-k8s.io/v1alpha3
 kind: Cluster
 metadata:
-  name: ostgt
+  name: target-cluster
   namespace: default
 spec:
   clusterNetwork:
@@ -12,23 +12,23 @@ spec:
   controlPlaneRef:
     apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
     kind: KubeadmControlPlane
-    name: ostgt-control-plane
+    name: target-cluster-control-plane
   infrastructureRef:
     apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
     kind: OpenStackCluster
-    name: ostgt
+    name: target-cluster
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
 kind: OpenStackCluster
 metadata:
-  name: ostgt
+  name: target-cluster
   namespace: default
 spec:
   apiServerLoadBalancerFloatingIP: ${OPENSTACK_CONTROLPLANE_IP}
   apiServerLoadBalancerPort: 6443
   cloudName: devstack
   cloudsSecret:
-    name: ostgt-cloud-config
+    name: target-cluster-cloud-config
     namespace: default
   disablePortSecurity: false
   disableServerTags: true
@@ -43,7 +43,7 @@ spec:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: ostgt-cloud-config
+  name: target-cluster-cloud-config
   namespace: default
 data:
   cacert: ${CLOUD_CERT_B64}
diff --git a/manifests/function/k8scontrol-capo/controlplane.yaml b/manifests/function/k8scontrol-capo/controlplane.yaml
index 92e38aa0b..1aca6977b 100644
--- a/manifests/function/k8scontrol-capo/controlplane.yaml
+++ b/manifests/function/k8scontrol-capo/controlplane.yaml
@@ -1,13 +1,13 @@
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
 kind: KubeadmControlPlane
 metadata:
-  name: ostgt-control-plane
+  name: target-cluster-control-plane
   namespace: default
 spec:
   infrastructureTemplate:
     apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
     kind: OpenStackMachineTemplate
-    name: ostgt-control-plane
+    name: target-cluster-control-plane
   kubeadmConfigSpec:
     clusterConfiguration:
       apiServer:
@@ -70,14 +70,14 @@ spec:
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
 kind: OpenStackMachineTemplate
 metadata:
-  name: ostgt-control-plane
+  name: target-cluster-control-plane
   namespace: default
 spec:
   template:
     spec:
       cloudName: devstack
       cloudsSecret:
-        name: ostgt-cloud-config
+        name: target-cluster-cloud-config
         namespace: default
       flavor: ${CONTROLPLANE_MACHINE_FLAVOR}
       image: ubuntu-1910-kube-v1.17.3
diff --git a/manifests/function/workers-capo/workers.yaml b/manifests/function/workers-capo/workers.yaml
index 83a65c7f8..5e24a83f8 100644
--- a/manifests/function/workers-capo/workers.yaml
+++ b/manifests/function/workers-capo/workers.yaml
@@ -1,10 +1,10 @@
 apiVersion: cluster.x-k8s.io/v1alpha3
 kind: MachineDeployment
 metadata:
-  name: ostgt-md-0
+  name: target-cluster-md-0
   namespace: default
 spec:
-  clusterName: ostgt
+  clusterName: target-cluster
   replicas: 0
   selector:
     matchLabels: null
@@ -14,26 +14,26 @@ spec:
         configRef:
           apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
           kind: KubeadmConfigTemplate
-          name: ostgt-md-0
-      clusterName: ostgt
+          name: target-cluster-md-0
+      clusterName: target-cluster
       failureDomain: nova
       infrastructureRef:
         apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
         kind: OpenStackMachineTemplate
-        name: ostgt-md-0
+        name: target-cluster-md-0
       version: v1.17.3
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
 kind: OpenStackMachineTemplate
 metadata:
-  name: ostgt-md-0
+  name: target-cluster-md-0
   namespace: default
 spec:
   template:
     spec:
       cloudName: devstack
       cloudsSecret:
-        name: ostgt-cloud-config
+        name: target-cluster-cloud-config
         namespace: default
       flavor: ${WORKER_MACHINE_FLAVOR}
       image: ubuntu-1910-kube-v1.17.3
@@ -41,7 +41,7 @@ spec:
 apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
 kind: KubeadmConfigTemplate
 metadata:
-  name: ostgt-md-0
+  name: target-cluster-md-0
   namespace: default
 spec:
   template:
diff --git a/manifests/site/openstack-test-site/target/controlplane/cluster_clouds_yaml_patch.yaml b/manifests/site/openstack-test-site/target/controlplane/cluster_clouds_yaml_patch.yaml
index 26a3da7ed..1bbe0eee6 100644
--- a/manifests/site/openstack-test-site/target/controlplane/cluster_clouds_yaml_patch.yaml
+++ b/manifests/site/openstack-test-site/target/controlplane/cluster_clouds_yaml_patch.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: ostgt-cloud-config
+  name: target-cluster-cloud-config
   namespace: default
 data:
   cacert: Cg==
diff --git a/manifests/site/openstack-test-site/target/controlplane/control_plane_config_patch.yaml b/manifests/site/openstack-test-site/target/controlplane/control_plane_config_patch.yaml
index 1940e121d..b22ea1855 100644
--- a/manifests/site/openstack-test-site/target/controlplane/control_plane_config_patch.yaml
+++ b/manifests/site/openstack-test-site/target/controlplane/control_plane_config_patch.yaml
@@ -1,13 +1,13 @@
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
 kind: KubeadmControlPlane
 metadata:
-  name: ostgt-control-plane
+  name: target-cluster-control-plane
   namespace: default
 spec:
   infrastructureTemplate:
     apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
     kind: OpenStackMachineTemplate
-    name: ostgt-control-plane
+    name: target-cluster-control-plane
   kubeadmConfigSpec:
     files:
     - path: /etc/kubernetes/cloud.conf
diff --git a/manifests/site/openstack-test-site/target/controlplane/control_plane_ip_patch.yaml b/manifests/site/openstack-test-site/target/controlplane/control_plane_ip_patch.yaml
index 636b52856..7307576bd 100644
--- a/manifests/site/openstack-test-site/target/controlplane/control_plane_ip_patch.yaml
+++ b/manifests/site/openstack-test-site/target/controlplane/control_plane_ip_patch.yaml
@@ -1,7 +1,7 @@
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
 kind: KubeadmControlPlane
 metadata:
-  name: ostgt-control-plane
+  name: target-cluster-control-plane
   namespace: default
 spec:
   kubeadmConfigSpec:
diff --git a/manifests/site/openstack-test-site/target/controlplane/control_plane_machine_count_patch.yaml b/manifests/site/openstack-test-site/target/controlplane/control_plane_machine_count_patch.yaml
index c0f7b128c..a76f7f1bf 100644
--- a/manifests/site/openstack-test-site/target/controlplane/control_plane_machine_count_patch.yaml
+++ b/manifests/site/openstack-test-site/target/controlplane/control_plane_machine_count_patch.yaml
@@ -1,7 +1,7 @@
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
 kind: KubeadmControlPlane
 metadata:
-  name: ostgt-control-plane
+  name: target-cluster-control-plane
   namespace: default
 spec:
   replicas: 1
diff --git a/manifests/site/openstack-test-site/target/controlplane/control_plane_machine_flavor_patch.yaml b/manifests/site/openstack-test-site/target/controlplane/control_plane_machine_flavor_patch.yaml
index b524b4a29..b0f4509aa 100644
--- a/manifests/site/openstack-test-site/target/controlplane/control_plane_machine_flavor_patch.yaml
+++ b/manifests/site/openstack-test-site/target/controlplane/control_plane_machine_flavor_patch.yaml
@@ -1,7 +1,7 @@
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
 kind: OpenStackMachineTemplate
 metadata:
-  name: ostgt-control-plane
+  name: target-cluster-control-plane
   namespace: default
 spec:
   template:
diff --git a/manifests/site/openstack-test-site/target/controlplane/kustomization.yaml b/manifests/site/openstack-test-site/target/controlplane/kustomization.yaml
index 656960058..cf0678f6e 100755
--- a/manifests/site/openstack-test-site/target/controlplane/kustomization.yaml
+++ b/manifests/site/openstack-test-site/target/controlplane/kustomization.yaml
@@ -9,21 +9,21 @@ patchesJson6902:
       group: infrastructure.cluster.x-k8s.io
       version: v1alpha3
       kind: OpenStackCluster
-      name: "ostgt"
+      name: "target-cluster"
     path: control_plane_ip.json
 
   - target:
       group: infrastructure.cluster.x-k8s.io
       version: v1alpha3
       kind: OpenStackCluster
-      name: "ostgt"
+      name: "target-cluster"
     path: dns_servers.json
 
   - target:
       group: infrastructure.cluster.x-k8s.io
       version: v1alpha3
       kind: OpenStackCluster
-      name: "ostgt"
+      name: "target-cluster"
     path: external_network_id.json
 
 patchesStrategicMerge:
diff --git a/manifests/site/openstack-test-site/target/controlplane/ssh_key_patch.yaml b/manifests/site/openstack-test-site/target/controlplane/ssh_key_patch.yaml
index 975a2c0bc..f52015db6 100644
--- a/manifests/site/openstack-test-site/target/controlplane/ssh_key_patch.yaml
+++ b/manifests/site/openstack-test-site/target/controlplane/ssh_key_patch.yaml
@@ -1,7 +1,7 @@
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
 kind: KubeadmControlPlane
 metadata:
-  name: ostgt-control-plane
+  name: target-cluster-control-plane
   namespace: default
 spec:
   kubeadmConfigSpec:
diff --git a/manifests/site/openstack-test-site/target/workers/workers_cloud_conf_patch.yaml b/manifests/site/openstack-test-site/target/workers/workers_cloud_conf_patch.yaml
index f39385763..6f12e4553 100644
--- a/manifests/site/openstack-test-site/target/workers/workers_cloud_conf_patch.yaml
+++ b/manifests/site/openstack-test-site/target/workers/workers_cloud_conf_patch.yaml
@@ -1,7 +1,7 @@
 apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
 kind: KubeadmConfigTemplate
 metadata:
-  name: ostgt-md-0
+  name: target-cluster-md-0
   namespace: default
 spec:
   template:
diff --git a/manifests/site/openstack-test-site/target/workers/workers_machine_count_patch.yaml b/manifests/site/openstack-test-site/target/workers/workers_machine_count_patch.yaml
index e0343ff50..a801ed5c5 100644
--- a/manifests/site/openstack-test-site/target/workers/workers_machine_count_patch.yaml
+++ b/manifests/site/openstack-test-site/target/workers/workers_machine_count_patch.yaml
@@ -1,8 +1,8 @@
 apiVersion: cluster.x-k8s.io/v1alpha3
 kind: MachineDeployment
 metadata:
-  name: ostgt-md-0
+  name: target-cluster-md-0
   namespace: default
 spec:
-  clusterName: ostgt
+  clusterName: target-cluster
   replicas: 3
diff --git a/manifests/site/openstack-test-site/target/workers/workers_machine_flavor_patch.yaml b/manifests/site/openstack-test-site/target/workers/workers_machine_flavor_patch.yaml
index 86592e5f5..f4d53bfc8 100644
--- a/manifests/site/openstack-test-site/target/workers/workers_machine_flavor_patch.yaml
+++ b/manifests/site/openstack-test-site/target/workers/workers_machine_flavor_patch.yaml
@@ -1,7 +1,7 @@
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
 kind: OpenStackMachineTemplate
 metadata:
-  name: ostgt-md-0
+  name: target-cluster-md-0
   namespace: default
 spec:
   template:
diff --git a/manifests/site/openstack-test-site/target/workers/workers_ssh_key_patch.yaml b/manifests/site/openstack-test-site/target/workers/workers_ssh_key_patch.yaml
index 26b623e74..caca9c7d4 100644
--- a/manifests/site/openstack-test-site/target/workers/workers_ssh_key_patch.yaml
+++ b/manifests/site/openstack-test-site/target/workers/workers_ssh_key_patch.yaml
@@ -1,7 +1,7 @@
 apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
 kind: KubeadmConfigTemplate
 metadata:
-  name: ostgt-md-0
+  name: target-cluster-md-0
   namespace: default
 spec:
   template: