diff --git a/config/crds/cluster_v1alpha1_machine.yaml b/config/crds/machine_v1alpha1_machine.yaml
similarity index 99%
rename from config/crds/cluster_v1alpha1_machine.yaml
rename to config/crds/machine_v1alpha1_machine.yaml
index 68d40a32755b..a5a90b6ed506 100644
--- a/config/crds/cluster_v1alpha1_machine.yaml
+++ b/config/crds/machine_v1alpha1_machine.yaml
@@ -4,9 +4,9 @@ metadata:
   creationTimestamp: null
   labels:
     controller-tools.k8s.io: "1.0"
-  name: machines.cluster.k8s.io
+  name: machines.machine.k8s.io
 spec:
-  group: cluster.k8s.io
+  group: machine.k8s.io
   names:
     kind: Machine
     plural: machines
diff --git a/config/crds/cluster_v1alpha1_machineclass.yaml b/config/crds/machine_v1alpha1_machineclass.yaml
similarity index 95%
rename from config/crds/cluster_v1alpha1_machineclass.yaml
rename to config/crds/machine_v1alpha1_machineclass.yaml
index 149b5ab36aa1..96d1abc419a1 100644
--- a/config/crds/cluster_v1alpha1_machineclass.yaml
+++ b/config/crds/machine_v1alpha1_machineclass.yaml
@@ -4,9 +4,9 @@ metadata:
   creationTimestamp: null
   labels:
     controller-tools.k8s.io: "1.0"
-  name: machineclasses.cluster.k8s.io
+  name: machineclasses.machine.k8s.io
 spec:
-  group: cluster.k8s.io
+  group: machine.k8s.io
   names:
     kind: MachineClass
     plural: machineclasses
diff --git a/config/crds/cluster_v1alpha1_machinedeployment.yaml b/config/crds/machine_v1alpha1_machinedeployment.yaml
similarity index 99%
rename from config/crds/cluster_v1alpha1_machinedeployment.yaml
rename to config/crds/machine_v1alpha1_machinedeployment.yaml
index aefa16ebdb04..c78f85677e65 100644
--- a/config/crds/cluster_v1alpha1_machinedeployment.yaml
+++ b/config/crds/machine_v1alpha1_machinedeployment.yaml
@@ -4,9 +4,9 @@ metadata:
   creationTimestamp: null
   labels:
     controller-tools.k8s.io: "1.0"
-  name: machinedeployments.cluster.k8s.io
+  name: machinedeployments.machine.k8s.io
 spec:
-  group: cluster.k8s.io
+  group: machine.k8s.io
   names:
     kind: MachineDeployment
     plural: machinedeployments
diff --git a/config/crds/cluster_v1alpha1_machineset.yaml b/config/crds/machine_v1alpha1_machineset.yaml
similarity index 99%
rename from config/crds/cluster_v1alpha1_machineset.yaml
rename to config/crds/machine_v1alpha1_machineset.yaml
index e68ff6713e82..3867e876c9b9 100644
--- a/config/crds/cluster_v1alpha1_machineset.yaml
+++ b/config/crds/machine_v1alpha1_machineset.yaml
@@ -4,9 +4,9 @@ metadata:
   creationTimestamp: null
   labels:
     controller-tools.k8s.io: "1.0"
-  name: machinesets.cluster.k8s.io
+  name: machinesets.machine.k8s.io
 spec:
-  group: cluster.k8s.io
+  group: machine.k8s.io
   names:
     kind: MachineSet
     plural: machinesets
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
index 2e1e38c32e66..ce1fd095cc0f 100644
--- a/config/default/kustomization.yaml
+++ b/config/default/kustomization.yaml
@@ -19,10 +19,10 @@ namePrefix: cluster-api-
 # markers ("---").
 resources:
 - ../crds/cluster_v1alpha1_cluster.yaml
-- ../crds/cluster_v1alpha1_machine.yaml
-- ../crds/cluster_v1alpha1_machineclass.yaml
-- ../crds/cluster_v1alpha1_machinedeployment.yaml
-- ../crds/cluster_v1alpha1_machineset.yaml
+- ../crds/machine_v1alpha1_machine.yaml
+- ../crds/machine_v1alpha1_machineclass.yaml
+- ../crds/machine_v1alpha1_machinedeployment.yaml
+- ../crds/machine_v1alpha1_machineset.yaml
 - ../rbac/rbac_role.yaml
 - ../rbac/rbac_role_binding.yaml
 - ../manager/manager.yaml
diff --git a/config/rbac/rbac_role.yaml b/config/rbac/rbac_role.yaml
index 96d379664354..1431af827d71 100644
--- a/config/rbac/rbac_role.yaml
+++ b/config/rbac/rbac_role.yaml
@@ -17,7 +17,7 @@ rules:
   - patch
   - delete
 - apiGroups:
-  - cluster.k8s.io
+  - machine.k8s.io
   resources:
   - machines
   verbs:
@@ -29,7 +29,7 @@ rules:
   - patch
   - delete
 - apiGroups:
-  - cluster.k8s.io
+  - machine.k8s.io
   resources:
   - machinedeployments
   verbs:
@@ -41,7 +41,7 @@ rules:
   - patch
   - delete
 - apiGroups:
-  - cluster.k8s.io
+  - machine.k8s.io
   resources:
   - machinesets
   verbs:
@@ -53,7 +53,7 @@ rules:
   - patch
   - delete
 - apiGroups:
-  - cluster.k8s.io
+  - machine.k8s.io
   resources:
   - machines
   verbs:
@@ -77,7 +77,7 @@ rules:
   - patch
   - delete
 - apiGroups:
-  - cluster.k8s.io
+  - machine.k8s.io
   resources:
   - machines
   verbs:
diff --git a/config/samples/cluster_v1alpha1_machine.yaml b/config/samples/machine_v1alpha1_machine.yaml
similarity index 78%
rename from config/samples/cluster_v1alpha1_machine.yaml
rename to config/samples/machine_v1alpha1_machine.yaml
index 9b374017899d..afe2e1ee2daf 100644
--- a/config/samples/cluster_v1alpha1_machine.yaml
+++ b/config/samples/machine_v1alpha1_machine.yaml
@@ -1,4 +1,4 @@
-apiVersion: cluster.k8s.io/v1alpha1
+apiVersion: machine.k8s.io/v1alpha1
 kind: Machine
 metadata:
   labels:
diff --git a/config/samples/cluster_v1alpha1_machinedeployment.yaml b/config/samples/machine_v1alpha1_machinedeployment.yaml
similarity index 87%
rename from config/samples/cluster_v1alpha1_machinedeployment.yaml
rename to config/samples/machine_v1alpha1_machinedeployment.yaml
index d2f072342d2c..21a42203db30 100644
--- a/config/samples/cluster_v1alpha1_machinedeployment.yaml
+++ b/config/samples/machine_v1alpha1_machinedeployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: cluster.k8s.io/v1alpha1
+apiVersion: machine.k8s.io/v1alpha1
 kind: MachineDeployment
 metadata:
   labels:
diff --git a/config/samples/cluster_v1alpha1_machineset.yaml b/config/samples/machine_v1alpha1_machineset.yaml
similarity index 87%
rename from config/samples/cluster_v1alpha1_machineset.yaml
rename to config/samples/machine_v1alpha1_machineset.yaml
index 929af0869858..da0eb366d2a2 100644
--- a/config/samples/cluster_v1alpha1_machineset.yaml
+++ b/config/samples/machine_v1alpha1_machineset.yaml
@@ -1,4 +1,4 @@
-apiVersion: cluster.k8s.io/v1alpha1
+apiVersion: machine.k8s.io/v1alpha1
 kind: MachineSet
 metadata:
   labels: