diff --git a/api/v1alpha3/kubeadm_control_plane_types.go b/api/v1alpha3/kubeadm_control_plane_types.go
index 710c4dc3387d..9c03386ef285 100644
--- a/api/v1alpha3/kubeadm_control_plane_types.go
+++ b/api/v1alpha3/kubeadm_control_plane_types.go
@@ -85,16 +85,16 @@ type KubeadmControlPlaneStatus struct {
 	// +optional
 	Ready bool `json:"ready,omitempty"`
 
-	// ErrorReason indicates that there is a problem reconciling the
+	// FailureReason indicates that there is a terminal problem reconciling the
 	// state, and will be set to a token value suitable for
 	// programmatic interpretation.
 	// +optional
-	ErrorReason KubeadmControlPlaneStatusError `json:"errorReason,omitempty"`
+	FailureReason KubeadmControlPlaneStatusError `json:"failureReason,omitempty"`
 
-	// ErrorMessage indicates that there is a problem reconciling the
+	// ErrorMessage indicates that there is a terminal problem reconciling the
 	// state, and will be set to a descriptive error message.
 	// +optional
-	ErrorMessage *string `json:"errorMessage,omitempty"`
+	FailureMessage *string `json:"failureMessage,omitempty"`
 }
 
 // +kubebuilder:object:root=true
diff --git a/api/v1alpha3/zz_generated.deepcopy.go b/api/v1alpha3/zz_generated.deepcopy.go
index 65d2ad475f91..ba4e6a2d6464 100644
--- a/api/v1alpha3/zz_generated.deepcopy.go
+++ b/api/v1alpha3/zz_generated.deepcopy.go
@@ -311,8 +311,8 @@ func (in *KubeadmControlPlaneSpec) DeepCopy() *KubeadmControlPlaneSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *KubeadmControlPlaneStatus) DeepCopyInto(out *KubeadmControlPlaneStatus) {
 	*out = *in
-	if in.ErrorMessage != nil {
-		in, out := &in.ErrorMessage, &out.ErrorMessage
+	if in.FailureMessage != nil {
+		in, out := &in.FailureMessage, &out.FailureMessage
 		*out = new(string)
 		**out = **in
 	}
diff --git a/config/crd/bases/cluster.x-k8s.io_kubeadmcontrolplanes.yaml b/config/crd/bases/cluster.x-k8s.io_kubeadmcontrolplanes.yaml
index 3c48c4eeb2be..21c870bfbbd7 100644
--- a/config/crd/bases/cluster.x-k8s.io_kubeadmcontrolplanes.yaml
+++ b/config/crd/bases/cluster.x-k8s.io_kubeadmcontrolplanes.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.2
+    controller-gen.kubebuilder.io/version: v0.2.3
   creationTimestamp: null
   name: kubeadmcontrolplanes.cluster.x-k8s.io
 spec:
@@ -18,6 +18,7 @@ spec:
     shortNames:
     - kcp
     singular: kubeadmcontrolplane
+  preserveUnknownFields: false
   scope: Namespaced
   subresources:
     scale:
@@ -878,14 +879,14 @@ spec:
         status:
           description: KubeadmControlPlaneStatus defines the observed state of KubeadmControlPlane.
           properties:
-            errorMessage:
-              description: ErrorMessage indicates that there is a problem reconciling
-                the state, and will be set to a descriptive error message.
+            failureMessage:
+              description: ErrorMessage indicates that there is a terminal problem
+                reconciling the state, and will be set to a descriptive error message.
               type: string
-            errorReason:
-              description: ErrorReason indicates that there is a problem reconciling
-                the state, and will be set to a token value suitable for programmatic
-                interpretation.
+            failureReason:
+              description: FailureReason indicates that there is a terminal problem
+                reconciling the state, and will be set to a token value suitable for
+                programmatic interpretation.
               type: string
             initialized:
               description: Initialized denotes whether or not the control plane has