Repository: kubernetes-sigs/cluster-api
Pull request #7618 (2022-11-24 19:16:02)

⚠️ Use consistent naming for API constants
Signed-off-by: Chirayu Kapoor <dev.csociety@gmail.com>

**What this PR does / why we need it**:
Fixes the inconsistent constant names

**Which issue(s) this PR fixes** 
Fixes https://github.com/kubernetes-sigs/cluster-api/issues/7611


k8s-ci-robot: [APPROVALNOTIFIER] This PR is **NOT APPROVED**

This pull-request has been approved by:
**Once this PR has been reviewed and has the lgtm label**, please assign enxebre for approval by writing `/assign @enxebre` in a comment. For more information see [the Kubernetes Code Review Process](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process).

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=kubernetes-sigs%2Fcluster-api).

<details open>
Needs approval from an approver in each of these files:

- **[OWNERS](https://github.com/kubernetes-sigs/cluster-api/blob/main/OWNERS)**

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":["enxebre"]} -->
k8s-ci-robot: Hi @chiukapoor. Thanks for your PR.

I'm waiting for a [kubernetes-sigs](https://github.com/orgs/kubernetes-sigs/people) member to verify that this patch is reasonable to test. If it is, they should reply with `/ok-to-test` on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should [join the org](https://git.k8s.io/community/community-membership.md#member) to skip this step.

Once the patch is verified, the new status will be reflected by the `ok-to-test` label.

I understand the commands that are listed [here](https://go.k8s.io/bot-commands?repo=kubernetes-sigs%2Fcluster-api).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
</details>

sbueringer: /ok-to-test
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | 5a34e0927e8efdd6c886a18e4266095ad575638a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1595998788667838464) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
sbueringer: In general looks fine +/- the comments above.

Given the amount of files that have to be touched for those renames. Maybe you can do further renames for now in separate commits and then we can see how big the impact overall is and potentially decide to move individual commits to separate PRs?

Although this label should be pretty much the one with the most usage.
sbueringer: Sounds perfect, thank you!
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | 815aff51bc4ef15dcd2fe721fa8f9bba7782c3cb | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1596067444441485312) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
chiukapoor: Updated the constant from `ClusterTopologyMachineDeploymentLabelName' to `ClusterTopologyMachineDeploymentNameLabel`
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | 1f69025ecf7184d5c88b96959e6232ab771a194c | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1596078436068102144) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | 80c5d19492a9e8207d20d665ed5bd4442e9d3e8e | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1596080620822335488) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | 124f2a2b780a9de9c5e3428cad735b05f85c4460 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1596083051190816768) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
chiukapoor: Updated the constant from `ProviderLabelName` to `ProviderLabel`, executed the test using `make test` [passed] 
chiukapoor: While working on label `ProvideLabel`, the file `hack/tools/tilt-prepare/main.go` was updated. Do we need to run `make tilt-prepare` to update the Tiltfile?
sbueringer: > While working on label `ProvideLabel`, the file `hack/tools/tilt-prepare/main.go` was updated. Do we need to run `make tilt-prepare` to update the Tiltfile?

No that's fine. The tiltfile is using the tilt-prepare binary at runtime. tilt-prepare does not generate the TIltfile.
k8s-ci-robot: @chiukapoor: PR needs rebase.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
</details>
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | f9903f8509c116b5346041c3eb1b36ee68365062 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597234615599239168) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | fb9cc38b9b0df7ef0df5a81d9747b9c51a4c830d | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597239512897949696) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | fb9cc38b9b0df7ef0df5a81d9747b9c51a4c830d | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597239512897949696) | false | `/test pull-cluster-api-apidiff-main`
pull-cluster-api-build-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-build-main/1597469204712263680) | true | `/test pull-cluster-api-build-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-build-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-build-main/1597469204712263680) | true | `/test pull-cluster-api-build-main`
pull-cluster-api-apidiff-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597469204754206720) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-build-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-build-main/1597469204712263680) | true | `/test pull-cluster-api-build-main`
pull-cluster-api-apidiff-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597469204754206720) | false | `/test pull-cluster-api-apidiff-main`
pull-cluster-api-e2e-informing-ipv6-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-ipv6-main/1597469204989087744) | false | `/test pull-cluster-api-e2e-informing-ipv6-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-build-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-build-main/1597469204712263680) | true | `/test pull-cluster-api-build-main`
pull-cluster-api-apidiff-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597469204754206720) | false | `/test pull-cluster-api-apidiff-main`
pull-cluster-api-e2e-informing-ipv6-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-ipv6-main/1597469204989087744) | false | `/test pull-cluster-api-e2e-informing-ipv6-main`
pull-cluster-api-e2e-informing-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-main/1597469204955533312) | false | `/test pull-cluster-api-e2e-informing-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-build-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-build-main/1597469204712263680) | true | `/test pull-cluster-api-build-main`
pull-cluster-api-apidiff-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597469204754206720) | false | `/test pull-cluster-api-apidiff-main`
pull-cluster-api-e2e-informing-ipv6-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-ipv6-main/1597469204989087744) | false | `/test pull-cluster-api-e2e-informing-ipv6-main`
pull-cluster-api-e2e-informing-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-main/1597469204955533312) | false | `/test pull-cluster-api-e2e-informing-main`
pull-cluster-api-e2e-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-main/1597469204909395968) | true | `/test pull-cluster-api-e2e-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-build-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-build-main/1597469204712263680) | true | `/test pull-cluster-api-build-main`
pull-cluster-api-apidiff-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597469204754206720) | false | `/test pull-cluster-api-apidiff-main`
pull-cluster-api-e2e-informing-ipv6-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-ipv6-main/1597469204989087744) | false | `/test pull-cluster-api-e2e-informing-ipv6-main`
pull-cluster-api-e2e-informing-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-main/1597469204955533312) | false | `/test pull-cluster-api-e2e-informing-main`
pull-cluster-api-e2e-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-main/1597469204909395968) | true | `/test pull-cluster-api-e2e-main`
pull-cluster-api-test-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-main/1597469204829704192) | true | `/test pull-cluster-api-test-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-build-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-build-main/1597469204712263680) | true | `/test pull-cluster-api-build-main`
pull-cluster-api-apidiff-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597469204754206720) | false | `/test pull-cluster-api-apidiff-main`
pull-cluster-api-e2e-informing-ipv6-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-ipv6-main/1597469204989087744) | false | `/test pull-cluster-api-e2e-informing-ipv6-main`
pull-cluster-api-e2e-informing-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-main/1597469204955533312) | false | `/test pull-cluster-api-e2e-informing-main`
pull-cluster-api-e2e-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-main/1597469204909395968) | true | `/test pull-cluster-api-e2e-main`
pull-cluster-api-test-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-main/1597469204829704192) | true | `/test pull-cluster-api-test-main`
pull-cluster-api-test-mink8s-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-mink8s-main/1597469204867452928) | true | `/test pull-cluster-api-test-mink8s-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: PR needs rebase.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
</details>
k8s-ci-robot: @chiukapoor: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-build-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-build-main/1597469204712263680) | true | `/test pull-cluster-api-build-main`
pull-cluster-api-e2e-informing-ipv6-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-ipv6-main/1597469204989087744) | false | `/test pull-cluster-api-e2e-informing-ipv6-main`
pull-cluster-api-e2e-informing-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-main/1597469204955533312) | false | `/test pull-cluster-api-e2e-informing-main`
pull-cluster-api-e2e-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-main/1597469204909395968) | true | `/test pull-cluster-api-e2e-main`
pull-cluster-api-test-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-main/1597469204829704192) | true | `/test pull-cluster-api-test-main`
pull-cluster-api-test-mink8s-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-mink8s-main/1597469204867452928) | true | `/test pull-cluster-api-test-mink8s-main`
pull-cluster-api-apidiff-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597475593799077888) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-build-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-build-main/1597469204712263680) | true | `/test pull-cluster-api-build-main`
pull-cluster-api-e2e-informing-ipv6-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-ipv6-main/1597469204989087744) | false | `/test pull-cluster-api-e2e-informing-ipv6-main`
pull-cluster-api-e2e-informing-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-main/1597469204955533312) | false | `/test pull-cluster-api-e2e-informing-main`
pull-cluster-api-e2e-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-main/1597469204909395968) | true | `/test pull-cluster-api-e2e-main`
pull-cluster-api-test-mink8s-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-mink8s-main/1597469204867452928) | true | `/test pull-cluster-api-test-mink8s-main`
pull-cluster-api-apidiff-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597475593799077888) | false | `/test pull-cluster-api-apidiff-main`
pull-cluster-api-test-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-main/1597475593882963968) | true | `/test pull-cluster-api-test-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-e2e-informing-ipv6-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-ipv6-main/1597469204989087744) | false | `/test pull-cluster-api-e2e-informing-ipv6-main`
pull-cluster-api-e2e-informing-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-main/1597469204955533312) | false | `/test pull-cluster-api-e2e-informing-main`
pull-cluster-api-e2e-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-main/1597469204909395968) | true | `/test pull-cluster-api-e2e-main`
pull-cluster-api-test-mink8s-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-mink8s-main/1597469204867452928) | true | `/test pull-cluster-api-test-mink8s-main`
pull-cluster-api-apidiff-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597475593799077888) | false | `/test pull-cluster-api-apidiff-main`
pull-cluster-api-test-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-main/1597475593882963968) | true | `/test pull-cluster-api-test-main`
pull-cluster-api-build-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-build-main/1597475593761329152) | true | `/test pull-cluster-api-build-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-e2e-informing-ipv6-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-ipv6-main/1597469204989087744) | false | `/test pull-cluster-api-e2e-informing-ipv6-main`
pull-cluster-api-e2e-informing-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-main/1597469204955533312) | false | `/test pull-cluster-api-e2e-informing-main`
pull-cluster-api-e2e-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-main/1597469204909395968) | true | `/test pull-cluster-api-e2e-main`
pull-cluster-api-apidiff-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597475593799077888) | false | `/test pull-cluster-api-apidiff-main`
pull-cluster-api-test-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-main/1597475593882963968) | true | `/test pull-cluster-api-test-main`
pull-cluster-api-build-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-build-main/1597475593761329152) | true | `/test pull-cluster-api-build-main`
pull-cluster-api-test-mink8s-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-mink8s-main/1597475593916518400) | true | `/test pull-cluster-api-test-mink8s-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-e2e-informing-ipv6-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-ipv6-main/1597469204989087744) | false | `/test pull-cluster-api-e2e-informing-ipv6-main`
pull-cluster-api-e2e-informing-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-main/1597469204955533312) | false | `/test pull-cluster-api-e2e-informing-main`
pull-cluster-api-e2e-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-main/1597469204909395968) | true | `/test pull-cluster-api-e2e-main`
pull-cluster-api-apidiff-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597475593799077888) | false | `/test pull-cluster-api-apidiff-main`
pull-cluster-api-test-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-main/1597475593882963968) | true | `/test pull-cluster-api-test-main`
pull-cluster-api-build-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-build-main/1597475593761329152) | true | `/test pull-cluster-api-build-main`
pull-cluster-api-test-mink8s-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-mink8s-main/1597475593916518400) | true | `/test pull-cluster-api-test-mink8s-main`
pull-cluster-api-verify-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-verify-main/1597475593836826624) | true | `/test pull-cluster-api-verify-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-e2e-informing-ipv6-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-ipv6-main/1597469204989087744) | false | `/test pull-cluster-api-e2e-informing-ipv6-main`
pull-cluster-api-e2e-informing-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-main/1597469204955533312) | false | `/test pull-cluster-api-e2e-informing-main`
pull-cluster-api-apidiff-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597475593799077888) | false | `/test pull-cluster-api-apidiff-main`
pull-cluster-api-test-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-main/1597475593882963968) | true | `/test pull-cluster-api-test-main`
pull-cluster-api-build-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-build-main/1597475593761329152) | true | `/test pull-cluster-api-build-main`
pull-cluster-api-test-mink8s-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-mink8s-main/1597475593916518400) | true | `/test pull-cluster-api-test-mink8s-main`
pull-cluster-api-verify-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-verify-main/1597475593836826624) | true | `/test pull-cluster-api-verify-main`
pull-cluster-api-e2e-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-main/1597475593966850048) | true | `/test pull-cluster-api-e2e-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-e2e-informing-main | 6009a5e46dda1a40c73a29541b994463a4933ae9 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-main/1597469204955533312) | false | `/test pull-cluster-api-e2e-informing-main`
pull-cluster-api-apidiff-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597475593799077888) | false | `/test pull-cluster-api-apidiff-main`
pull-cluster-api-test-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-main/1597475593882963968) | true | `/test pull-cluster-api-test-main`
pull-cluster-api-build-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-build-main/1597475593761329152) | true | `/test pull-cluster-api-build-main`
pull-cluster-api-test-mink8s-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-mink8s-main/1597475593916518400) | true | `/test pull-cluster-api-test-mink8s-main`
pull-cluster-api-verify-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-verify-main/1597475593836826624) | true | `/test pull-cluster-api-verify-main`
pull-cluster-api-e2e-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-main/1597475593966850048) | true | `/test pull-cluster-api-e2e-main`
pull-cluster-api-e2e-informing-ipv6-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-ipv6-main/1597475594054930432) | false | `/test pull-cluster-api-e2e-informing-ipv6-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597475593799077888) | false | `/test pull-cluster-api-apidiff-main`
pull-cluster-api-test-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-main/1597475593882963968) | true | `/test pull-cluster-api-test-main`
pull-cluster-api-build-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-build-main/1597475593761329152) | true | `/test pull-cluster-api-build-main`
pull-cluster-api-test-mink8s-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-mink8s-main/1597475593916518400) | true | `/test pull-cluster-api-test-mink8s-main`
pull-cluster-api-verify-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-verify-main/1597475593836826624) | true | `/test pull-cluster-api-verify-main`
pull-cluster-api-e2e-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-main/1597475593966850048) | true | `/test pull-cluster-api-e2e-main`
pull-cluster-api-e2e-informing-ipv6-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-ipv6-main/1597475594054930432) | false | `/test pull-cluster-api-e2e-informing-ipv6-main`
pull-cluster-api-e2e-informing-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-main/1597475594008793088) | false | `/test pull-cluster-api-e2e-informing-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-test-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-main/1597475593882963968) | true | `/test pull-cluster-api-test-main`
pull-cluster-api-build-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-build-main/1597475593761329152) | true | `/test pull-cluster-api-build-main`
pull-cluster-api-test-mink8s-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-mink8s-main/1597475593916518400) | true | `/test pull-cluster-api-test-mink8s-main`
pull-cluster-api-verify-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-verify-main/1597475593836826624) | true | `/test pull-cluster-api-verify-main`
pull-cluster-api-e2e-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-main/1597475593966850048) | true | `/test pull-cluster-api-e2e-main`
pull-cluster-api-e2e-informing-ipv6-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-ipv6-main/1597475594054930432) | false | `/test pull-cluster-api-e2e-informing-ipv6-main`
pull-cluster-api-e2e-informing-main | fade95bfa7fe5353e05dee722846bba1a4ad515a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-e2e-informing-main/1597475594008793088) | false | `/test pull-cluster-api-e2e-informing-main`
pull-cluster-api-apidiff-main | f9903f8509c116b5346041c3eb1b36ee68365062 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597477770185674752) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | f9194276b26a0236416b350da5c996253b152c79 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597485255852298240) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | a405b1a66ce7eb51728df73a945fb4a62f2327ee | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597494294174765056) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | d9297d5f1196b76cbb75e8a1954ecb472f965b46 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597497128131760128) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | d7b1a60814aacf9a273d9ed3118551555594a35a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597498736072724480) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | 9f6c30cbfc51a1251982e843f9fd5091295f5278 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597500115436703744) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | 209391cc68052918e88e0c7c9941e21bfa2b22d0 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597502110771974144) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | 61a989825af8f02b32a61af731e1ad6df03873e6 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597523056761245696) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | 3bd5c3fffe338ceb5c0a29df2ca950a75c427f69 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597524973415567360) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | b37acb0d9c94b51f6305445e098d34c3c04d292b | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597525991880658944) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | 01cd40849602e3296ce24f6fbd3699c06ec7c419 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597527034479775744) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | 05c3dcc378da54e007f8b63c08de55350cfa642b | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597531386661572608) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | 27a385f5e62f55a35e309a58f19d810441245d8d | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597532418745569280) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | 8c3c87f477cb3e7d223e7751ec1bea4099e8ac96 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597533358475186176) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | 236822f56f8d63710d0678c42a388124c9898875 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597537890777174016) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
chiukapoor: Hello @sbueringer and @fabriziopandini, I have fixed all the constants with inconsistency mentioned in https://github.com/kubernetes-sigs/cluster-api/issues/7611 and have made the requested change of `ProviderLabel` to `ProviderNameLabel`.

PTAL
fabriziopandini: Please squash commits, I will take a look right after
k8s-ci-robot: @chiukapoor: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | 2cecd86a35b951f7971d36ce811a958b5e4c7cd1 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597603097117462528) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | 2cecd86a35b951f7971d36ce811a958b5e4c7cd1 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597603097117462528) | false | `/test pull-cluster-api-apidiff-main`
pull-cluster-api-test-mink8s-main | 2cecd86a35b951f7971d36ce811a958b5e4c7cd1 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-mink8s-main/1597603097243291648) | true | `/test pull-cluster-api-test-mink8s-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-apidiff-main | 2cecd86a35b951f7971d36ce811a958b5e4c7cd1 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597603097117462528) | false | `/test pull-cluster-api-apidiff-main`
pull-cluster-api-test-mink8s-main | 2cecd86a35b951f7971d36ce811a958b5e4c7cd1 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-mink8s-main/1597603097243291648) | true | `/test pull-cluster-api-test-mink8s-main`
pull-cluster-api-test-main | 2cecd86a35b951f7971d36ce811a958b5e4c7cd1 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-main/1597603097205542912) | true | `/test pull-cluster-api-test-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
k8s-ci-robot: @chiukapoor: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
pull-cluster-api-test-mink8s-main | 2cecd86a35b951f7971d36ce811a958b5e4c7cd1 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-mink8s-main/1597603097243291648) | true | `/test pull-cluster-api-test-mink8s-main`
pull-cluster-api-test-main | 2cecd86a35b951f7971d36ce811a958b5e4c7cd1 | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-test-main/1597603097205542912) | true | `/test pull-cluster-api-test-main`
pull-cluster-api-apidiff-main | a751073460c2bbabd553ec0722491946a145e18a | [link](https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7618/pull-cluster-api-apidiff-main/1597626916393717760) | false | `/test pull-cluster-api-apidiff-main`

[Full PR test history](https://prow.k8s.io/pr-history?org=kubernetes-sigs&repo=cluster-api&pr=7618). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3Achiukapoor). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/kubernetes-sigs/cluster-api/issues?q=is:issue+is:open) when you hit one in your PR.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->

Patch:
diff --git a/api/v1beta1/common_types.go b/api/v1beta1/common_types.go
index 113c4e95f..421e44469 100644
--- a/api/v1beta1/common_types.go
+++ b/api/v1beta1/common_types.go
@@ -22,9 +22,9 @@ import (
 )
 
 const (
-	// ClusterLabelName is the label set on machines linked to a cluster and
+	// ClusterNameLabel is the label set on machines linked to a cluster and
 	// external objects(bootstrap and infrastructure providers).
-	ClusterLabelName = "cluster.x-k8s.io/cluster-name"
+	ClusterNameLabel = "cluster.x-k8s.io/cluster-name"
 
 	// ClusterTopologyOwnedLabel is the label set on all the object which are managed as part of a ClusterTopology.
 	ClusterTopologyOwnedLabel = "topology.cluster.x-k8s.io/owned"
@@ -45,18 +45,18 @@ const (
 	// When removing also remove from staticcheck exclude-rules for SA1019 in golangci.yml.
 	ClusterTopologyManagedFieldsAnnotation = "topology.cluster.x-k8s.io/managed-field-paths"
 
-	// ClusterTopologyMachineDeploymentLabelName is the label set on the generated  MachineDeployment objects
+	// ClusterTopologyMachineDeploymentNameLabel is the label set on the generated  MachineDeployment objects
 	// to track the name of the MachineDeployment topology it represents.
-	ClusterTopologyMachineDeploymentLabelName = "topology.cluster.x-k8s.io/deployment-name"
+	ClusterTopologyMachineDeploymentNameLabel = "topology.cluster.x-k8s.io/deployment-name"
 
 	// ClusterTopologyUnsafeUpdateClassNameAnnotation can be used to disable the webhook check on
 	// update that disallows a pre-existing Cluster to be populated with Topology information and Class.
 	ClusterTopologyUnsafeUpdateClassNameAnnotation = "unsafe.topology.cluster.x-k8s.io/disable-update-class-name-check"
 
-	// ProviderLabelName is the label set on components in the provider manifest.
+	// ProviderNameLabel is the label set on components in the provider manifest.
 	// This label allows to easily identify all the components belonging to a provider; the clusterctl
 	// tool uses this label for implementing provider's lifecycle operations.
-	ProviderLabelName = "cluster.x-k8s.io/provider"
+	ProviderNameLabel = "cluster.x-k8s.io/provider"
 
 	// ClusterNameAnnotation is the annotation set on nodes identifying the name of the cluster the node belongs to.
 	ClusterNameAnnotation = "cluster.x-k8s.io/cluster-name"
@@ -80,10 +80,10 @@ const (
 	// on the reconciled object.
 	PausedAnnotation = "cluster.x-k8s.io/paused"
 
-	// DisableMachineCreate is an annotation that can be used to signal a MachineSet to stop creating new machines.
+	// DisableMachineCreateAnnotation is an annotation that can be used to signal a MachineSet to stop creating new machines.
 	// It is utilized in the OnDelete MachineDeploymentStrategy to allow the MachineDeployment controller to scale down
 	// older MachineSets when Machines are deleted and add the new replicas to the latest MachineSet.
-	DisableMachineCreate = "cluster.x-k8s.io/disable-machine-create"
+	DisableMachineCreateAnnotation = "cluster.x-k8s.io/disable-machine-create"
 
 	// WatchLabel is a label othat can be applied to any Cluster API object.
 	//
diff --git a/api/v1beta1/condition_consts.go b/api/v1beta1/condition_consts.go
index 2fb383a9a..a4b5739a6 100644
--- a/api/v1beta1/condition_consts.go
+++ b/api/v1beta1/condition_consts.go
@@ -166,19 +166,19 @@ const (
 	// RemediationInProgressReason is the reason used when an unhealthy machine is being remediated by the remediation owner.
 	RemediationInProgressReason = "RemediationInProgress"
 
-	// ExternalRemediationTemplateAvailable is set on machinehealthchecks when MachineHealthCheck controller uses external remediation.
-	// ExternalRemediationTemplateAvailable is set to false if external remediation template is not found.
-	ExternalRemediationTemplateAvailable ConditionType = "ExternalRemediationTemplateAvailable"
+	// ExternalRemediationTemplateAvailableCondition is set on machinehealthchecks when MachineHealthCheck controller uses external remediation.
+	// ExternalRemediationTemplateAvailableCondition is set to false if external remediation template is not found.
+	ExternalRemediationTemplateAvailableCondition ConditionType = "ExternalRemediationTemplateAvailable"
 
-	// ExternalRemediationTemplateNotFound is the reason used when a machine health check fails to find external remediation template.
-	ExternalRemediationTemplateNotFound = "ExternalRemediationTemplateNotFound"
+	// ExternalRemediationTemplateNotFoundReason is the reason used when a machine health check fails to find external remediation template.
+	ExternalRemediationTemplateNotFoundReason = "ExternalRemediationTemplateNotFound"
 
-	// ExternalRemediationRequestAvailable is set on machinehealthchecks when MachineHealthCheck controller uses external remediation.
-	// ExternalRemediationRequestAvailable is set to false if creating external remediation request fails.
-	ExternalRemediationRequestAvailable ConditionType = "ExternalRemediationRequestAvailable"
+	// ExternalRemediationRequestAvailableCondition is set on machinehealthchecks when MachineHealthCheck controller uses external remediation.
+	// ExternalRemediationRequestAvailableCondition is set to false if creating external remediation request fails.
+	ExternalRemediationRequestAvailableCondition ConditionType = "ExternalRemediationRequestAvailable"
 
-	// ExternalRemediationRequestCreationFailed is the reason used when a machine health check fails to create external remediation request.
-	ExternalRemediationRequestCreationFailed = "ExternalRemediationRequestCreationFailed"
+	// ExternalRemediationRequestCreationFailedReason is the reason used when a machine health check fails to create external remediation request.
+	ExternalRemediationRequestCreationFailedReason = "ExternalRemediationRequestCreationFailed"
 )
 
 // Conditions and condition Reasons for the Machine's Node object.
diff --git a/api/v1beta1/machine_types.go b/api/v1beta1/machine_types.go
index 48448db4d..73bb663a0 100644
--- a/api/v1beta1/machine_types.go
+++ b/api/v1beta1/machine_types.go
@@ -27,8 +27,8 @@ const (
 	// MachineFinalizer is set on PrepareForCreate callback.
 	MachineFinalizer = "machine.cluster.x-k8s.io"
 
-	// MachineControlPlaneLabelName is the label set on machines or related objects that are part of a control plane.
-	MachineControlPlaneLabelName = "cluster.x-k8s.io/control-plane"
+	// MachineControlPlaneLabel is the label set on machines or related objects that are part of a control plane.
+	MachineControlPlaneLabel = "cluster.x-k8s.io/control-plane"
 
 	// ExcludeNodeDrainingAnnotation annotation explicitly skips node draining if set.
 	ExcludeNodeDrainingAnnotation = "machine.cluster.x-k8s.io/exclude-node-draining"
@@ -36,11 +36,11 @@ const (
 	// ExcludeWaitForNodeVolumeDetachAnnotation annotation explicitly skips the waiting for node volume detaching if set.
 	ExcludeWaitForNodeVolumeDetachAnnotation = "machine.cluster.x-k8s.io/exclude-wait-for-node-volume-detach"
 
-	// MachineSetLabelName is the label set on machines if they're controlled by MachineSet.
-	MachineSetLabelName = "cluster.x-k8s.io/set-name"
+	// MachineSetNameLabel is the label set on machines if they're controlled by MachineSet.
+	MachineSetNameLabel = "cluster.x-k8s.io/set-name"
 
-	// MachineDeploymentLabelName is the label set on machines if they're controlled by MachineDeployment.
-	MachineDeploymentLabelName = "cluster.x-k8s.io/deployment-name"
+	// MachineDeploymentNameLabel is the label set on machines if they're controlled by MachineDeployment.
+	MachineDeploymentNameLabel = "cluster.x-k8s.io/deployment-name"
 
 	// MachineControlPlaneNameLabel is the label set on machines if they're controlled by a ControlPlane.
 	MachineControlPlaneNameLabel = "cluster.x-k8s.io/control-plane-name"
diff --git a/api/v1beta1/machine_webhook.go b/api/v1beta1/machine_webhook.go
index 80e6e5dea..4a21872ea 100644
--- a/api/v1beta1/machine_webhook.go
+++ b/api/v1beta1/machine_webhook.go
@@ -50,7 +50,7 @@ func (m *Machine) Default() {
 	if m.Labels == nil {
 		m.Labels = make(map[string]string)
 	}
-	m.Labels[ClusterLabelName] = m.Spec.ClusterName
+	m.Labels[ClusterNameLabel] = m.Spec.ClusterName
 
 	if m.Spec.Bootstrap.ConfigRef != nil && m.Spec.Bootstrap.ConfigRef.Namespace == "" {
 		m.Spec.Bootstrap.ConfigRef.Namespace = m.Namespace
diff --git a/api/v1beta1/machinedeployment_webhook.go b/api/v1beta1/machinedeployment_webhook.go
index 65fa45f48..5cce26c03 100644
--- a/api/v1beta1/machinedeployment_webhook.go
+++ b/api/v1beta1/machinedeployment_webhook.go
@@ -149,7 +149,7 @@ func PopulateDefaultsMachineDeployment(d *MachineDeployment) {
 	if d.Labels == nil {
 		d.Labels = make(map[string]string)
 	}
-	d.Labels[ClusterLabelName] = d.Spec.ClusterName
+	d.Labels[ClusterNameLabel] = d.Spec.ClusterName
 
 	if d.Spec.MinReadySeconds == nil {
 		d.Spec.MinReadySeconds = pointer.Int32(0)
@@ -197,10 +197,10 @@ func PopulateDefaultsMachineDeployment(d *MachineDeployment) {
 	// If no selector has been provided, add label and selector for the
 	// MachineDeployment's name as a default way of providing uniqueness.
 	if len(d.Spec.Selector.MatchLabels) == 0 && len(d.Spec.Selector.MatchExpressions) == 0 {
-		d.Spec.Selector.MatchLabels[MachineDeploymentLabelName] = d.Name
-		d.Spec.Template.Labels[MachineDeploymentLabelName] = d.Name
+		d.Spec.Selector.MatchLabels[MachineDeploymentNameLabel] = d.Name
+		d.Spec.Template.Labels[MachineDeploymentNameLabel] = d.Name
 	}
 	// Make sure selector and template to be in the same cluster.
-	d.Spec.Selector.MatchLabels[ClusterLabelName] = d.Spec.ClusterName
-	d.Spec.Template.Labels[ClusterLabelName] = d.Spec.ClusterName
+	d.Spec.Selector.MatchLabels[ClusterNameLabel] = d.Spec.ClusterName
+	d.Spec.Template.Labels[ClusterNameLabel] = d.Spec.ClusterName
 }
diff --git a/api/v1beta1/machinehealthcheck_webhook.go b/api/v1beta1/machinehealthcheck_webhook.go
index 6d6a3449d..d50510eaa 100644
--- a/api/v1beta1/machinehealthcheck_webhook.go
+++ b/api/v1beta1/machinehealthcheck_webhook.go
@@ -67,7 +67,7 @@ func (m *MachineHealthCheck) Default() {
 	if m.Labels == nil {
 		m.Labels = make(map[string]string)
 	}
-	m.Labels[ClusterLabelName] = m.Spec.ClusterName
+	m.Labels[ClusterNameLabel] = m.Spec.ClusterName
 
 	if m.Spec.MaxUnhealthy == nil {
 		defaultMaxUnhealthy := intstr.FromString("100%")
@@ -123,7 +123,7 @@ func (m *MachineHealthCheck) validate(old *MachineHealthCheck) error {
 		)
 	}
 
-	if clusterName, ok := m.Spec.Selector.MatchLabels[ClusterLabelName]; ok && clusterName != m.Spec.ClusterName {
+	if clusterName, ok := m.Spec.Selector.MatchLabels[ClusterNameLabel]; ok && clusterName != m.Spec.ClusterName {
 		allErrs = append(
 			allErrs,
 			field.Invalid(specPath.Child("selector"), m.Spec.Selector, "cannot specify a cluster selector other than the one specified by ClusterName"))
diff --git a/api/v1beta1/machineset_webhook.go b/api/v1beta1/machineset_webhook.go
index 37ef1c1cd..50e096de3 100644
--- a/api/v1beta1/machineset_webhook.go
+++ b/api/v1beta1/machineset_webhook.go
@@ -48,7 +48,7 @@ func (m *MachineSet) Default() {
 	if m.Labels == nil {
 		m.Labels = make(map[string]string)
 	}
-	m.Labels[ClusterLabelName] = m.Spec.ClusterName
+	m.Labels[ClusterNameLabel] = m.Spec.ClusterName
 
 	if m.Spec.DeletePolicy == "" {
 		randomPolicy := string(RandomMachineSetDeletePolicy)
@@ -64,8 +64,8 @@ func (m *MachineSet) Default() {
 	}
 
 	if len(m.Spec.Selector.MatchLabels) == 0 && len(m.Spec.Selector.MatchExpressions) == 0 {
-		m.Spec.Selector.MatchLabels[MachineSetLabelName] = m.Name
-		m.Spec.Template.Labels[MachineSetLabelName] = m.Name
+		m.Spec.Selector.MatchLabels[MachineSetNameLabel] = m.Name
+		m.Spec.Template.Labels[MachineSetNameLabel] = m.Name
 	}
 
 	if m.Spec.Template.Spec.Version != nil && !strings.HasPrefix(*m.Spec.Template.Spec.Version, "v") {
diff --git a/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go b/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go
index d46246b45..e8ebe12a5 100644
--- a/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go
+++ b/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go
@@ -810,7 +810,7 @@ func (r *KubeadmConfigReconciler) ClusterToKubeadmConfigs(o client.Object) []ctr
 	selectors := []client.ListOption{
 		client.InNamespace(c.Namespace),
 		client.MatchingLabels{
-			clusterv1.ClusterLabelName: c.Name,
+			clusterv1.ClusterNameLabel: c.Name,
 		},
 	}
 
@@ -999,7 +999,7 @@ func (r *KubeadmConfigReconciler) storeBootstrapData(ctx context.Context, scope
 			Name:      scope.Config.Name,
 			Namespace: scope.Config.Namespace,
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: scope.Cluster.Name,
+				clusterv1.ClusterNameLabel: scope.Cluster.Name,
 			},
 			OwnerReferences: []metav1.OwnerReference{
 				{
diff --git a/bootstrap/kubeadm/internal/locking/control_plane_init_mutex.go b/bootstrap/kubeadm/internal/locking/control_plane_init_mutex.go
index 4ea28815c..ace07f149 100644
--- a/bootstrap/kubeadm/internal/locking/control_plane_init_mutex.go
+++ b/bootstrap/kubeadm/internal/locking/control_plane_init_mutex.go
@@ -177,7 +177,7 @@ func (s *semaphore) setMetadata(cluster *clusterv1.Cluster) {
 		Namespace: cluster.Namespace,
 		Name:      configMapName(cluster.Name),
 		Labels: map[string]string{
-			clusterv1.ClusterLabelName: cluster.Name,
+			clusterv1.ClusterNameLabel: cluster.Name,
 		},
 		OwnerReferences: []metav1.OwnerReference{
 			{
diff --git a/bootstrap/util/configowner.go b/bootstrap/util/configowner.go
index 1d42e4c7e..d10fadd1b 100644
--- a/bootstrap/util/configowner.go
+++ b/bootstrap/util/configowner.go
@@ -100,7 +100,7 @@ func (co ConfigOwner) IsControlPlaneMachine() bool {
 	if labels == nil {
 		return false
 	}
-	_, ok := labels[clusterv1.MachineControlPlaneLabelName]
+	_, ok := labels[clusterv1.MachineControlPlaneLabel]
 	return ok
 }
 
diff --git a/cmd/clusterctl/api/v1alpha3/labels.go b/cmd/clusterctl/api/v1alpha3/labels.go
index 3b0c0409b..5b848c29c 100644
--- a/cmd/clusterctl/api/v1alpha3/labels.go
+++ b/cmd/clusterctl/api/v1alpha3/labels.go
@@ -19,23 +19,23 @@ package v1alpha3
 import "fmt"
 
 const (
-	// ClusterctlLabelName is applied to all components managed by clusterctl.
-	ClusterctlLabelName = "clusterctl.cluster.x-k8s.io"
+	// ClusterctlLabel is applied to all components managed by clusterctl.
+	ClusterctlLabel = "clusterctl.cluster.x-k8s.io"
 
-	// ClusterctlCoreLabelName is applied to all the core objects managed by clusterctl.
-	ClusterctlCoreLabelName = "clusterctl.cluster.x-k8s.io/core"
+	// ClusterctlCoreLabel is applied to all the core objects managed by clusterctl.
+	ClusterctlCoreLabel = "clusterctl.cluster.x-k8s.io/core"
 
-	// ClusterctlCoreLabelInventoryValue define the value for ClusterctlCoreLabelName to be used for inventory objects.
+	// ClusterctlCoreLabelInventoryValue define the value for ClusterctlCoreLabel to be used for inventory objects.
 	ClusterctlCoreLabelInventoryValue = "inventory"
 
-	// ClusterctlCoreLabelCertManagerValue define the value for ClusterctlCoreLabelName to be used for cert-manager objects.
+	// ClusterctlCoreLabelCertManagerValue define the value for ClusterctlCoreLabel to be used for cert-manager objects.
 	ClusterctlCoreLabelCertManagerValue = "cert-manager"
 
-	// ClusterctlMoveLabelName can be set on CRDs that providers wish to move but that are not part of a Cluster.
-	ClusterctlMoveLabelName = "clusterctl.cluster.x-k8s.io/move"
+	// ClusterctlMoveLabel can be set on CRDs that providers wish to move but that are not part of a Cluster.
+	ClusterctlMoveLabel = "clusterctl.cluster.x-k8s.io/move"
 
-	// ClusterctlMoveHierarchyLabelName can be set on CRDs that providers wish to move with their entire hierarchy, but that are not part of a Cluster.
-	ClusterctlMoveHierarchyLabelName = "clusterctl.cluster.x-k8s.io/move-hierarchy"
+	// ClusterctlMoveHierarchyLabel can be set on CRDs that providers wish to move with their entire hierarchy, but that are not part of a Cluster.
+	ClusterctlMoveHierarchyLabel = "clusterctl.cluster.x-k8s.io/move-hierarchy"
 )
 
 // ManifestLabel returns the cluster.x-k8s.io/provider label value for a provider/type.
diff --git a/cmd/clusterctl/client/cluster/cert_manager.go b/cmd/clusterctl/client/cluster/cert_manager.go
index a99e6b73c..2c10b6485 100644
--- a/cmd/clusterctl/client/cluster/cert_manager.go
+++ b/cmd/clusterctl/client/cluster/cert_manager.go
@@ -203,7 +203,7 @@ func (cm *certManagerClient) install() error {
 func (cm *certManagerClient) PlanUpgrade() (CertManagerUpgradePlan, error) {
 	log := logf.Log
 
-	objs, err := cm.proxy.ListResources(map[string]string{clusterctlv1.ClusterctlCoreLabelName: clusterctlv1.ClusterctlCoreLabelCertManagerValue}, certManagerNamespace)
+	objs, err := cm.proxy.ListResources(map[string]string{clusterctlv1.ClusterctlCoreLabel: clusterctlv1.ClusterctlCoreLabelCertManagerValue}, certManagerNamespace)
 	if err != nil {
 		return CertManagerUpgradePlan{}, errors.Wrap(err, "failed get cert manager components")
 	}
@@ -232,7 +232,7 @@ func (cm *certManagerClient) PlanUpgrade() (CertManagerUpgradePlan, error) {
 func (cm *certManagerClient) EnsureLatestVersion() error {
 	log := logf.Log
 
-	objs, err := cm.proxy.ListResources(map[string]string{clusterctlv1.ClusterctlCoreLabelName: clusterctlv1.ClusterctlCoreLabelCertManagerValue}, certManagerNamespace)
+	objs, err := cm.proxy.ListResources(map[string]string{clusterctlv1.ClusterctlCoreLabel: clusterctlv1.ClusterctlCoreLabelCertManagerValue}, certManagerNamespace)
 	if err != nil {
 		return errors.Wrap(err, "failed get cert manager components")
 	}
@@ -443,8 +443,8 @@ func addCerManagerLabel(objs []unstructured.Unstructured) []unstructured.Unstruc
 		if labels == nil {
 			labels = map[string]string{}
 		}
-		labels[clusterctlv1.ClusterctlLabelName] = ""
-		labels[clusterctlv1.ClusterctlCoreLabelName] = clusterctlv1.ClusterctlCoreLabelCertManagerValue
+		labels[clusterctlv1.ClusterctlLabel] = ""
+		labels[clusterctlv1.ClusterctlCoreLabel] = clusterctlv1.ClusterctlCoreLabelCertManagerValue
 		o.SetLabels(labels)
 	}
 	return objs
diff --git a/cmd/clusterctl/client/cluster/components.go b/cmd/clusterctl/client/cluster/components.go
index 3fe8dd69e..7e1634307 100644
--- a/cmd/clusterctl/client/cluster/components.go
+++ b/cmd/clusterctl/client/cluster/components.go
@@ -134,8 +134,8 @@ func (p *providerComponents) Delete(options DeleteOptions) error {
 	// Fetch all the components belonging to a provider.
 	// We want that the delete operation is able to clean-up everything.
 	labels := map[string]string{
-		clusterctlv1.ClusterctlLabelName: "",
-		clusterv1.ProviderLabelName:      options.Provider.ManifestLabel(),
+		clusterctlv1.ClusterctlLabel: "",
+		clusterv1.ProviderNameLabel:  options.Provider.ManifestLabel(),
 	}
 
 	namespaces := []string{options.Provider.Namespace}
diff --git a/cmd/clusterctl/client/cluster/inventory.go b/cmd/clusterctl/client/cluster/inventory.go
index f150c6dbd..3d14d1369 100644
--- a/cmd/clusterctl/client/cluster/inventory.go
+++ b/cmd/clusterctl/client/cluster/inventory.go
@@ -256,7 +256,7 @@ func (p *inventoryClient) createObj(o unstructured.Unstructured) error {
 	if labels == nil {
 		labels = map[string]string{}
 	}
-	labels[clusterctlv1.ClusterctlCoreLabelName] = clusterctlv1.ClusterctlCoreLabelInventoryValue
+	labels[clusterctlv1.ClusterctlCoreLabel] = clusterctlv1.ClusterctlCoreLabelInventoryValue
 	o.SetLabels(labels)
 
 	if err := c.Create(ctx, &o); err != nil {
diff --git a/cmd/clusterctl/client/cluster/objectgraph.go b/cmd/clusterctl/client/cluster/objectgraph.go
index cedcb95c2..3d6c86e1f 100644
--- a/cmd/clusterctl/client/cluster/objectgraph.go
+++ b/cmd/clusterctl/client/cluster/objectgraph.go
@@ -286,10 +286,10 @@ func (o *objectGraph) objInfoToNode(obj *unstructured.Unstructured, n *node) err
 
 func (o *objectGraph) objMetaToNode(obj *unstructured.Unstructured, n *node) {
 	n.identity.Namespace = obj.GetNamespace()
-	if _, ok := obj.GetLabels()[clusterctlv1.ClusterctlMoveLabelName]; ok {
+	if _, ok := obj.GetLabels()[clusterctlv1.ClusterctlMoveLabel]; ok {
 		n.forceMove = true
 	}
-	if _, ok := obj.GetLabels()[clusterctlv1.ClusterctlMoveHierarchyLabelName]; ok {
+	if _, ok := obj.GetLabels()[clusterctlv1.ClusterctlMoveHierarchyLabel]; ok {
 		n.forceMoveHierarchy = true
 	}
 
@@ -341,14 +341,14 @@ func (o *objectGraph) getDiscoveryTypes() error {
 			if crd.Spec.Group == addonsv1.GroupVersion.Group && crd.Spec.Names.Kind == "ClusterResourceSet" {
 				forceMoveHierarchy = true
 			}
-			if _, ok := crd.Labels[clusterctlv1.ClusterctlMoveHierarchyLabelName]; ok {
+			if _, ok := crd.Labels[clusterctlv1.ClusterctlMoveHierarchyLabel]; ok {
 				forceMoveHierarchy = true
 			}
 
 			// If a CRD is with as force move, keep track of this so all the objects of this type could be moved.
 			// NOTE: if a kind is set for force move-hierarchy, it is also automatically force moved.
 			forceMove := forceMoveHierarchy
-			if _, ok := crd.Labels[clusterctlv1.ClusterctlMoveLabelName]; ok {
+			if _, ok := crd.Labels[clusterctlv1.ClusterctlMoveLabel]; ok {
 				forceMove = true
 			}
 
@@ -391,7 +391,7 @@ func getCRDList(proxy Proxy, crdList *apiextensionsv1.CustomResourceDefinitionLi
 		return err
 	}
 
-	if err := c.List(ctx, crdList, client.HasLabels{clusterctlv1.ClusterctlLabelName}); err != nil {
+	if err := c.List(ctx, crdList, client.HasLabels{clusterctlv1.ClusterctlLabel}); err != nil {
 		return errors.Wrap(err, "failed to get the list of CRDs required for the move discovery phase")
 	}
 	return nil
diff --git a/cmd/clusterctl/client/cluster/proxy.go b/cmd/clusterctl/client/cluster/proxy.go
index 2951a9c1d..52db45ef8 100644
--- a/cmd/clusterctl/client/cluster/proxy.go
+++ b/cmd/clusterctl/client/cluster/proxy.go
@@ -244,8 +244,8 @@ func (k *proxy) ListResources(labels map[string]string, namespaces ...string) ([
 		return nil, errors.Wrap(err, "failed to list CRDs")
 	}
 	for _, crd := range crdList.Items {
-		component, isCoreComponent := labels[clusterctlv1.ClusterctlCoreLabelName]
-		_, isProviderResource := crd.Labels[clusterv1.ProviderLabelName]
+		component, isCoreComponent := labels[clusterctlv1.ClusterctlCoreLabel]
+		_, isProviderResource := crd.Labels[clusterv1.ProviderNameLabel]
 		if (isCoreComponent && component == clusterctlv1.ClusterctlCoreLabelCertManagerValue) || isProviderResource {
 			for _, version := range crd.Spec.Versions {
 				crdsToExclude.Insert(metav1.GroupVersionKind{
diff --git a/cmd/clusterctl/client/cluster/upgrader.go b/cmd/clusterctl/client/cluster/upgrader.go
index a51935c4f..58195533e 100644
--- a/cmd/clusterctl/client/cluster/upgrader.go
+++ b/cmd/clusterctl/client/cluster/upgrader.go
@@ -469,8 +469,8 @@ func (u *providerUpgrader) scaleDownProvider(provider clusterctlv1.Provider) err
 		deploymentList,
 		client.InNamespace(provider.Namespace),
 		client.MatchingLabels{
-			clusterctlv1.ClusterctlLabelName: "",
-			clusterv1.ProviderLabelName:      provider.ManifestLabel(),
+			clusterctlv1.ClusterctlLabel: "",
+			clusterv1.ProviderNameLabel:  provider.ManifestLabel(),
 		}); err != nil {
 		return errors.Wrapf(err, "failed to list Deployments for provider %s", provider.Name)
 	}
diff --git a/cmd/clusterctl/client/repository/components.go b/cmd/clusterctl/client/repository/components.go
index 2ee48fcaa..fca0e7a9e 100644
--- a/cmd/clusterctl/client/repository/components.go
+++ b/cmd/clusterctl/client/repository/components.go
@@ -119,7 +119,7 @@ func (c *components) TargetNamespace() string {
 
 func (c *components) InventoryObject() clusterctlv1.Provider {
 	labels := getCommonLabels(c.Provider)
-	labels[clusterctlv1.ClusterctlCoreLabelName] = clusterctlv1.ClusterctlCoreLabelInventoryValue
+	labels[clusterctlv1.ClusterctlCoreLabel] = clusterctlv1.ClusterctlCoreLabelInventoryValue
 
 	return clusterctlv1.Provider{
 		TypeMeta: metav1.TypeMeta{
@@ -583,7 +583,7 @@ func addCommonLabels(objs []unstructured.Unstructured, provider config.Provider)
 
 func getCommonLabels(provider config.Provider) map[string]string {
 	return map[string]string{
-		clusterctlv1.ClusterctlLabelName: "",
-		clusterv1.ProviderLabelName:      provider.ManifestLabel(),
+		clusterctlv1.ClusterctlLabel: "",
+		clusterv1.ProviderNameLabel:  provider.ManifestLabel(),
 	}
 }
diff --git a/cmd/clusterctl/client/tree/discovery.go b/cmd/clusterctl/client/tree/discovery.go
index 1f003e682..e16b250ac 100644
--- a/cmd/clusterctl/client/tree/discovery.go
+++ b/cmd/clusterctl/client/tree/discovery.go
@@ -304,7 +304,7 @@ func getMachinesInCluster(ctx context.Context, c client.Client, namespace, name
 	}
 
 	machineList := &clusterv1.MachineList{}
-	labels := map[string]string{clusterv1.ClusterLabelName: name}
+	labels := map[string]string{clusterv1.ClusterNameLabel: name}
 
 	if err := c.List(ctx, machineList, client.InNamespace(namespace), client.MatchingLabels(labels)); err != nil {
 		return nil, err
@@ -319,7 +319,7 @@ func getMachineDeploymentsInCluster(ctx context.Context, c client.Client, namesp
 	}
 
 	machineDeploymentList := &clusterv1.MachineDeploymentList{}
-	labels := map[string]string{clusterv1.ClusterLabelName: name}
+	labels := map[string]string{clusterv1.ClusterNameLabel: name}
 
 	if err := c.List(ctx, machineDeploymentList, client.InNamespace(namespace), client.MatchingLabels(labels)); err != nil {
 		return nil, err
@@ -334,7 +334,7 @@ func getMachineSetsInCluster(ctx context.Context, c client.Client, namespace, na
 	}
 
 	machineSetList := &clusterv1.MachineSetList{}
-	labels := map[string]string{clusterv1.ClusterLabelName: name}
+	labels := map[string]string{clusterv1.ClusterNameLabel: name}
 
 	if err := c.List(ctx, machineSetList, client.InNamespace(namespace), client.MatchingLabels(labels)); err != nil {
 		return nil, err
@@ -349,7 +349,7 @@ func getMachinePoolsInCluster(ctx context.Context, c client.Client, namespace, n
 	}
 
 	machinePoolList := &expv1.MachinePoolList{}
-	labels := map[string]string{clusterv1.ClusterLabelName: name}
+	labels := map[string]string{clusterv1.ClusterNameLabel: name}
 
 	if err := c.List(ctx, machinePoolList, client.InNamespace(namespace), client.MatchingLabels(labels)); err != nil {
 		return nil, err
diff --git a/controllers/external/util.go b/controllers/external/util.go
index 182b4ce51..2d0e409cb 100644
--- a/controllers/external/util.go
+++ b/controllers/external/util.go
@@ -238,7 +238,7 @@ func GenerateTemplate(in *GenerateTemplateInput) (*unstructured.Unstructured, er
 	for key, value := range in.Labels {
 		labels[key] = value
 	}
-	labels[clusterv1.ClusterLabelName] = in.ClusterName
+	labels[clusterv1.ClusterNameLabel] = in.ClusterName
 	to.SetLabels(labels)
 
 	// Set the owner reference.
diff --git a/controlplane/kubeadm/internal/cluster.go b/controlplane/kubeadm/internal/cluster.go
index 173cda014..28176a37e 100644
--- a/controlplane/kubeadm/internal/cluster.go
+++ b/controlplane/kubeadm/internal/cluster.go
@@ -88,7 +88,7 @@ func (m *Management) GetMachinePoolsForCluster(ctx context.Context, cluster *clu
 	selectors := []client.ListOption{
 		client.InNamespace(cluster.GetNamespace()),
 		client.MatchingLabels{
-			clusterv1.ClusterLabelName: cluster.GetName(),
+			clusterv1.ClusterNameLabel: cluster.GetName(),
 		},
 	}
 	machinePoolList := &expv1.MachinePoolList{}
diff --git a/controlplane/kubeadm/internal/cluster_labels.go b/controlplane/kubeadm/internal/cluster_labels.go
index 288bfad2a..420c57f74 100644
--- a/controlplane/kubeadm/internal/cluster_labels.go
+++ b/controlplane/kubeadm/internal/cluster_labels.go
@@ -32,8 +32,8 @@ func ControlPlaneMachineLabelsForCluster(kcp *controlplanev1.KubeadmControlPlane
 	}
 
 	// Always force these labels over the ones coming from the spec.
-	labels[clusterv1.ClusterLabelName] = clusterName
-	labels[clusterv1.MachineControlPlaneLabelName] = ""
+	labels[clusterv1.ClusterNameLabel] = clusterName
+	labels[clusterv1.MachineControlPlaneLabel] = ""
 	labels[clusterv1.MachineControlPlaneNameLabel] = kcp.Name
 	return labels
 }
diff --git a/controlplane/kubeadm/internal/controllers/controller.go b/controlplane/kubeadm/internal/controllers/controller.go
index 072ce2f96..358e81f1b 100644
--- a/controlplane/kubeadm/internal/controllers/controller.go
+++ b/controlplane/kubeadm/internal/controllers/controller.go
@@ -757,7 +757,7 @@ func (r *KubeadmControlPlaneReconciler) adoptMachines(ctx context.Context, kcp *
 
 func (r *KubeadmControlPlaneReconciler) adoptOwnedSecrets(ctx context.Context, kcp *controlplanev1.KubeadmControlPlane, currentOwner *bootstrapv1.KubeadmConfig, clusterName string) error {
 	secrets := corev1.SecretList{}
-	if err := r.Client.List(ctx, &secrets, client.InNamespace(kcp.Namespace), client.MatchingLabels{clusterv1.ClusterLabelName: clusterName}); err != nil {
+	if err := r.Client.List(ctx, &secrets, client.InNamespace(kcp.Namespace), client.MatchingLabels{clusterv1.ClusterNameLabel: clusterName}); err != nil {
 		return errors.Wrap(err, "error finding secrets for adoption")
 	}
 
diff --git a/docs/proposals/20220712-cluster-api-addon-orchestration.md b/docs/proposals/20220712-cluster-api-addon-orchestration.md
index 0449c0c75..76a683797 100644
--- a/docs/proposals/20220712-cluster-api-addon-orchestration.md
+++ b/docs/proposals/20220712-cluster-api-addon-orchestration.md
@@ -344,7 +344,7 @@ First, the simplest is to let the package manager maintain the list. For example
 
 The solution implemented in the ClusterAddonProvider for Helm is to use HelmReleaseProxy to maintain an inventory. Each HelmReleaseProxy corresponds to a Helm release installed through HelmChartProxy. The controller only orchestrates Helm releases with a corresponding HelmReleaseProxy, ensuring that out of band Helm releases won’t be affected. 
 
-Additionally, each HelmReleaseProxy includes a `clusterv1.ClusterLabelName` and an additional label indicating the HelmChartProxy it corresponds to. This provides a way to query for all Helm releases installed on a Cluster and to query for all Helm releases belonging to a HelmChartProxy.
+Additionally, each HelmReleaseProxy includes a `clusterv1.ClusterNameLabel` and an additional label indicating the HelmChartProxy it corresponds to. This provides a way to query for all Helm releases installed on a Cluster and to query for all Helm releases belonging to a HelmChartProxy.
 
 #### Surface Cluster add-ons status
 
diff --git a/exp/api/v1beta1/machinepool_webhook.go b/exp/api/v1beta1/machinepool_webhook.go
index 7d7752ba1..10a3db671 100644
--- a/exp/api/v1beta1/machinepool_webhook.go
+++ b/exp/api/v1beta1/machinepool_webhook.go
@@ -49,7 +49,7 @@ func (m *MachinePool) Default() {
 	if m.Labels == nil {
 		m.Labels = make(map[string]string)
 	}
-	m.Labels[clusterv1.ClusterLabelName] = m.Spec.ClusterName
+	m.Labels[clusterv1.ClusterNameLabel] = m.Spec.ClusterName
 
 	if m.Spec.Replicas == nil {
 		m.Spec.Replicas = pointer.Int32(1)
diff --git a/exp/internal/controllers/machinepool_controller.go b/exp/internal/controllers/machinepool_controller.go
index 631167755..9948b8082 100644
--- a/exp/internal/controllers/machinepool_controller.go
+++ b/exp/internal/controllers/machinepool_controller.go
@@ -174,7 +174,7 @@ func (r *MachinePoolReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	if mp.Labels == nil {
 		mp.Labels = make(map[string]string)
 	}
-	mp.Labels[clusterv1.ClusterLabelName] = mp.Spec.ClusterName
+	mp.Labels[clusterv1.ClusterNameLabel] = mp.Spec.ClusterName
 
 	// Add finalizer first if not exist to avoid the race condition between init and delete
 	if !controllerutil.ContainsFinalizer(mp, expv1.MachinePoolFinalizer) {
diff --git a/exp/internal/controllers/machinepool_controller_phases.go b/exp/internal/controllers/machinepool_controller_phases.go
index c6cb361aa..4bed050bc 100644
--- a/exp/internal/controllers/machinepool_controller_phases.go
+++ b/exp/internal/controllers/machinepool_controller_phases.go
@@ -135,7 +135,7 @@ func (r *MachinePoolReconciler) reconcileExternal(ctx context.Context, cluster *
 	if labels == nil {
 		labels = make(map[string]string)
 	}
-	labels[clusterv1.ClusterLabelName] = m.Spec.ClusterName
+	labels[clusterv1.ClusterNameLabel] = m.Spec.ClusterName
 	obj.SetLabels(labels)
 
 	// Always attempt to Patch the external object.
diff --git a/hack/tools/tilt-prepare/main.go b/hack/tools/tilt-prepare/main.go
index 6e92d8b3d..bbb009b03 100644
--- a/hack/tools/tilt-prepare/main.go
+++ b/hack/tools/tilt-prepare/main.go
@@ -715,7 +715,7 @@ func workloadTask(name, workloadType, binaryName, containerName string, ts *tilt
 			if labels == nil {
 				labels = map[string]string{}
 			}
-			labels[clusterctlv1.ClusterctlLabelName] = ""
+			labels[clusterctlv1.ClusterctlLabel] = ""
 			o.SetLabels(labels)
 		}
 
@@ -870,14 +870,14 @@ func getProviderObj(prefix string, objs []unstructured.Unstructured) (*unstructu
 		}
 
 		namespace = objs[i].GetName()
-		manifestLabel = objs[i].GetLabels()[clusterv1.ProviderLabelName]
+		manifestLabel = objs[i].GetLabels()[clusterv1.ProviderNameLabel]
 		break
 	}
 
 	if manifestLabel == "" {
 		return nil, errors.Errorf(
 			"Could not find any Namespace object with label %s and therefore failed to deduce provider name and type",
-			clusterv1.ProviderLabelName)
+			clusterv1.ProviderNameLabel)
 	}
 
 	providerType := string(clusterctlv1.CoreProviderType)
@@ -912,9 +912,9 @@ func getProviderObj(prefix string, objs []unstructured.Unstructured) (*unstructu
 			Name:      manifestLabel,
 			Namespace: namespace,
 			Labels: map[string]string{
-				clusterv1.ProviderLabelName:          manifestLabel,
-				clusterctlv1.ClusterctlLabelName:     "",
-				clusterctlv1.ClusterctlCoreLabelName: clusterctlv1.ClusterctlCoreLabelInventoryValue,
+				clusterv1.ProviderNameLabel:      manifestLabel,
+				clusterctlv1.ClusterctlLabel:     "",
+				clusterctlv1.ClusterctlCoreLabel: clusterctlv1.ClusterctlCoreLabelInventoryValue,
 			},
 		},
 		ProviderName: providerName,
diff --git a/internal/controllers/cluster/cluster_controller.go b/internal/controllers/cluster/cluster_controller.go
index fb70a9ee0..960fc2c96 100644
--- a/internal/controllers/cluster/cluster_controller.go
+++ b/internal/controllers/cluster/cluster_controller.go
@@ -399,7 +399,7 @@ func (r *Reconciler) listDescendants(ctx context.Context, cluster *clusterv1.Clu
 
 	listOptions := []client.ListOption{
 		client.InNamespace(cluster.Namespace),
-		client.MatchingLabels(map[string]string{clusterv1.ClusterLabelName: cluster.Name}),
+		client.MatchingLabels(map[string]string{clusterv1.ClusterNameLabel: cluster.Name}),
 	}
 
 	if err := r.Client.List(ctx, &descendants.machineDeployments, listOptions...); err != nil {
diff --git a/internal/controllers/cluster/cluster_controller_phases.go b/internal/controllers/cluster/cluster_controller_phases.go
index 741a423cb..7be09c483 100644
--- a/internal/controllers/cluster/cluster_controller_phases.go
+++ b/internal/controllers/cluster/cluster_controller_phases.go
@@ -102,7 +102,7 @@ func (r *Reconciler) reconcileExternal(ctx context.Context, cluster *clusterv1.C
 	if labels == nil {
 		labels = make(map[string]string)
 	}
-	labels[clusterv1.ClusterLabelName] = cluster.Name
+	labels[clusterv1.ClusterNameLabel] = cluster.Name
 	obj.SetLabels(labels)
 
 	// Always attempt to Patch the external object.
diff --git a/internal/controllers/machine/machine_controller.go b/internal/controllers/machine/machine_controller.go
index c1c19f650..f32f1b7d4 100644
--- a/internal/controllers/machine/machine_controller.go
+++ b/internal/controllers/machine/machine_controller.go
@@ -197,7 +197,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
 	if m.Labels == nil {
 		m.Labels = make(map[string]string)
 	}
-	m.Labels[clusterv1.ClusterLabelName] = m.Spec.ClusterName
+	m.Labels[clusterv1.ClusterNameLabel] = m.Spec.ClusterName
 
 	// Add finalizer first if not exist to avoid the race condition between init and delete
 	if !controllerutil.ContainsFinalizer(m, clusterv1.MachineFinalizer) {
@@ -764,7 +764,7 @@ func (r *Reconciler) shouldAdopt(m *clusterv1.Machine) bool {
 	// MachineSet/ControlPlane controller are racing to adopt Machines, see https://github.com/kubernetes-sigs/cluster-api/issues/7529
 
 	// If the Machine is originated by a MachineSet, it should not be adopted directly by the Cluster as a stand-alone Machine.
-	if _, ok := m.Labels[clusterv1.MachineSetLabelName]; ok {
+	if _, ok := m.Labels[clusterv1.MachineSetNameLabel]; ok {
 		return false
 	}
 
@@ -807,7 +807,7 @@ func (r *Reconciler) nodeToMachine(o client.Object) []reconcile.Request {
 	// Match by clusterName when the node has the annotation.
 	if clusterName, ok := node.GetAnnotations()[clusterv1.ClusterNameAnnotation]; ok {
 		filters = append(filters, client.MatchingLabels{
-			clusterv1.ClusterLabelName: clusterName,
+			clusterv1.ClusterNameLabel: clusterName,
 		})
 	}
 
diff --git a/internal/controllers/machine/machine_controller_phases.go b/internal/controllers/machine/machine_controller_phases.go
index 7fd3ebb15..db961bd4e 100644
--- a/internal/controllers/machine/machine_controller_phases.go
+++ b/internal/controllers/machine/machine_controller_phases.go
@@ -133,7 +133,7 @@ func (r *Reconciler) reconcileExternal(ctx context.Context, cluster *clusterv1.C
 	if labels == nil {
 		labels = make(map[string]string)
 	}
-	labels[clusterv1.ClusterLabelName] = m.Spec.ClusterName
+	labels[clusterv1.ClusterNameLabel] = m.Spec.ClusterName
 	obj.SetLabels(labels)
 
 	// Always attempt to Patch the external object.
@@ -388,7 +388,7 @@ func removeOnCreateOwnerRefs(cluster *clusterv1.Cluster, m *clusterv1.Machine, o
 // This function checks that the Machine is managed by a control plane, and then retrieves the Kind from the Cluster's
 // .spec.controlPlaneRef.
 func getControlPlaneGVKForMachine(cluster *clusterv1.Cluster, machine *clusterv1.Machine) *schema.GroupVersionKind {
-	if _, ok := machine.GetLabels()[clusterv1.MachineControlPlaneLabelName]; ok {
+	if _, ok := machine.GetLabels()[clusterv1.MachineControlPlaneLabel]; ok {
 		if cluster.Spec.ControlPlaneRef != nil {
 			gvk := cluster.Spec.ControlPlaneRef.GroupVersionKind()
 			return &gvk
diff --git a/internal/controllers/machinedeployment/machinedeployment_controller.go b/internal/controllers/machinedeployment/machinedeployment_controller.go
index 51a3373ff..d276a037a 100644
--- a/internal/controllers/machinedeployment/machinedeployment_controller.go
+++ b/internal/controllers/machinedeployment/machinedeployment_controller.go
@@ -198,7 +198,7 @@ func (r *Reconciler) reconcile(ctx context.Context, cluster *clusterv1.Cluster,
 		d.Spec.Template.Labels = make(map[string]string)
 	}
 
-	d.Labels[clusterv1.ClusterLabelName] = d.Spec.ClusterName
+	d.Labels[clusterv1.ClusterNameLabel] = d.Spec.ClusterName
 
 	// Set the MachineDeployment as directly owned by the Cluster (if not already present).
 	if r.shouldAdopt(d) {
@@ -234,17 +234,17 @@ func (r *Reconciler) reconcile(ctx context.Context, cluster *clusterv1.Cluster,
 	// to all MachineSets created by a MachineDeployment or if a user manually removed the label.
 	for idx := range msList {
 		machineSet := msList[idx]
-		if name, ok := machineSet.Labels[clusterv1.MachineDeploymentLabelName]; ok && name == d.Name {
+		if name, ok := machineSet.Labels[clusterv1.MachineDeploymentNameLabel]; ok && name == d.Name {
 			continue
 		}
 
 		helper, err := patch.NewHelper(machineSet, r.Client)
 		if err != nil {
-			return ctrl.Result{}, errors.Wrapf(err, "failed to apply %s label to MachineSet %q", clusterv1.MachineDeploymentLabelName, machineSet.Name)
+			return ctrl.Result{}, errors.Wrapf(err, "failed to apply %s label to MachineSet %q", clusterv1.MachineDeploymentNameLabel, machineSet.Name)
 		}
-		machineSet.Labels[clusterv1.MachineDeploymentLabelName] = d.Name
+		machineSet.Labels[clusterv1.MachineDeploymentNameLabel] = d.Name
 		if err := helper.Patch(ctx, machineSet); err != nil {
-			return ctrl.Result{}, errors.Wrapf(err, "failed to apply %s label to MachineSet %q", clusterv1.MachineDeploymentLabelName, machineSet.Name)
+			return ctrl.Result{}, errors.Wrapf(err, "failed to apply %s label to MachineSet %q", clusterv1.MachineDeploymentNameLabel, machineSet.Name)
 		}
 	}
 
diff --git a/internal/controllers/machinedeployment/machinedeployment_rollout_ondelete.go b/internal/controllers/machinedeployment/machinedeployment_rollout_ondelete.go
index 55be548ad..dbe9a9a3b 100644
--- a/internal/controllers/machinedeployment/machinedeployment_rollout_ondelete.go
+++ b/internal/controllers/machinedeployment/machinedeployment_rollout_ondelete.go
@@ -93,13 +93,13 @@ func (r *Reconciler) reconcileOldMachineSetsOnDelete(ctx context.Context, oldMSs
 		if oldMS.Annotations == nil {
 			oldMS.Annotations = map[string]string{}
 		}
-		if _, ok := oldMS.Annotations[clusterv1.DisableMachineCreate]; !ok {
+		if _, ok := oldMS.Annotations[clusterv1.DisableMachineCreateAnnotation]; !ok {
 			log.V(4).Info("setting annotation on old MachineSet to disable machine creation")
 			patchHelper, err := patch.NewHelper(oldMS, r.Client)
 			if err != nil {
 				return err
 			}
-			oldMS.Annotations[clusterv1.DisableMachineCreate] = "true"
+			oldMS.Annotations[clusterv1.DisableMachineCreateAnnotation] = "true"
 			if err := patchHelper.Patch(ctx, oldMS); err != nil {
 				return err
 			}
@@ -169,13 +169,13 @@ func (r *Reconciler) reconcileNewMachineSetOnDelete(ctx context.Context, allMSs
 	log := ctrl.LoggerFrom(ctx, "MachineSet", klog.KObj(newMS))
 
 	if newMS.Annotations != nil {
-		if _, ok := newMS.Annotations[clusterv1.DisableMachineCreate]; ok {
+		if _, ok := newMS.Annotations[clusterv1.DisableMachineCreateAnnotation]; ok {
 			log.V(4).Info("removing annotation on latest MachineSet to enable machine creation")
 			patchHelper, err := patch.NewHelper(newMS, r.Client)
 			if err != nil {
 				return err
 			}
-			delete(newMS.Annotations, clusterv1.DisableMachineCreate)
+			delete(newMS.Annotations, clusterv1.DisableMachineCreateAnnotation)
 			err = patchHelper.Patch(ctx, newMS)
 			if err != nil {
 				return err
diff --git a/internal/controllers/machinedeployment/machinedeployment_sync.go b/internal/controllers/machinedeployment/machinedeployment_sync.go
index 459cb999f..a020a12cd 100644
--- a/internal/controllers/machinedeployment/machinedeployment_sync.go
+++ b/internal/controllers/machinedeployment/machinedeployment_sync.go
@@ -179,15 +179,15 @@ func (r *Reconciler) getNewMachineSet(ctx context.Context, d *clusterv1.MachineD
 
 	// Set the labels from newMSTemplate as top-level labels for the new MS.
 	// Note: We can't just set `newMSTemplate.Labels` directly and thus "share" the labels map between top-level and
-	// .spec.template.metadata.labels. This would mean that adding the MachineDeploymentLabelName later top-level
+	// .spec.template.metadata.labels. This would mean that adding the MachineDeploymentNameLabel later top-level
 	// would also add the label to .spec.template.metadata.labels.
 	for k, v := range newMSTemplate.Labels {
 		newMS.Labels[k] = v
 	}
 
-	// Enforce that the MachineDeploymentLabelName label is set
-	// Note: the MachineDeploymentLabelName is added by the default webhook to MachineDeployment.spec.template.labels if spec.selector is empty.
-	newMS.Labels[clusterv1.MachineDeploymentLabelName] = d.Name
+	// Enforce that the MachineDeploymentNameLabel label is set
+	// Note: the MachineDeploymentNameLabel is added by the default webhook to MachineDeployment.spec.template.labels if spec.selector is empty.
+	newMS.Labels[clusterv1.MachineDeploymentNameLabel] = d.Name
 
 	if d.Spec.Strategy.RollingUpdate.DeletePolicy != nil {
 		newMS.Spec.DeletePolicy = *d.Spec.Strategy.RollingUpdate.DeletePolicy
diff --git a/internal/controllers/machinehealthcheck/machinehealthcheck_controller.go b/internal/controllers/machinehealthcheck/machinehealthcheck_controller.go
index 3833d18fe..14117c3c1 100644
--- a/internal/controllers/machinehealthcheck/machinehealthcheck_controller.go
+++ b/internal/controllers/machinehealthcheck/machinehealthcheck_controller.go
@@ -170,7 +170,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
 	if m.Labels == nil {
 		m.Labels = make(map[string]string)
 	}
-	m.Labels[clusterv1.ClusterLabelName] = m.Spec.ClusterName
+	m.Labels[clusterv1.ClusterNameLabel] = m.Spec.ClusterName
 
 	result, err := r.reconcile(ctx, log, cluster, m)
 	if err != nil {
@@ -394,7 +394,7 @@ func (r *Reconciler) patchUnhealthyTargets(ctx context.Context, logger logr.Logg
 
 				from, err := external.Get(ctx, r.Client, m.Spec.RemediationTemplate, t.Machine.Namespace)
 				if err != nil {
-					conditions.MarkFalse(m, clusterv1.ExternalRemediationTemplateAvailable, clusterv1.ExternalRemediationTemplateNotFound, clusterv1.ConditionSeverityError, err.Error())
+					conditions.MarkFalse(m, clusterv1.ExternalRemediationTemplateAvailableCondition, clusterv1.ExternalRemediationTemplateNotFoundReason, clusterv1.ConditionSeverityError, err.Error())
 					errList = append(errList, errors.Wrapf(err, "error retrieving remediation template %v %q for machine %q in namespace %q within cluster %q", m.Spec.RemediationTemplate.GroupVersionKind(), m.Spec.RemediationTemplate.Name, t.Machine.Name, t.Machine.Namespace, m.Spec.ClusterName))
 					return errList
 				}
@@ -423,7 +423,7 @@ func (r *Reconciler) patchUnhealthyTargets(ctx context.Context, logger logr.Logg
 				logger.Info("Target has failed health check, creating an external remediation request", "remediation request name", to.GetName(), "target", t.string(), "reason", condition.Reason, "message", condition.Message)
 				// Create the external clone.
 				if err := r.Client.Create(ctx, to); err != nil {
-					conditions.MarkFalse(m, clusterv1.ExternalRemediationRequestAvailable, clusterv1.ExternalRemediationRequestCreationFailed, clusterv1.ConditionSeverityError, err.Error())
+					conditions.MarkFalse(m, clusterv1.ExternalRemediationRequestAvailableCondition, clusterv1.ExternalRemediationRequestCreationFailedReason, clusterv1.ConditionSeverityError, err.Error())
 					errList = append(errList, errors.Wrapf(err, "error creating remediation request for machine %q in namespace %q within cluster %q", t.Machine.Name, t.Machine.Namespace, t.Machine.Spec.ClusterName))
 					return errList
 				}
@@ -465,7 +465,7 @@ func (r *Reconciler) clusterToMachineHealthCheck(o client.Object) []reconcile.Re
 		context.TODO(),
 		mhcList,
 		client.InNamespace(c.Namespace),
-		client.MatchingLabels{clusterv1.ClusterLabelName: c.Name},
+		client.MatchingLabels{clusterv1.ClusterNameLabel: c.Name},
 	); err != nil {
 		return nil
 	}
@@ -492,7 +492,7 @@ func (r *Reconciler) machineToMachineHealthCheck(o client.Object) []reconcile.Re
 		context.TODO(),
 		mhcList,
 		client.InNamespace(m.Namespace),
-		client.MatchingLabels{clusterv1.ClusterLabelName: m.Spec.ClusterName},
+		client.MatchingLabels{clusterv1.ClusterNameLabel: m.Spec.ClusterName},
 	); err != nil {
 		return nil
 	}
diff --git a/internal/controllers/machinehealthcheck/machinehealthcheck_targets.go b/internal/controllers/machinehealthcheck/machinehealthcheck_targets.go
index 96f1b4c03..97eb0659b 100644
--- a/internal/controllers/machinehealthcheck/machinehealthcheck_targets.go
+++ b/internal/controllers/machinehealthcheck/machinehealthcheck_targets.go
@@ -237,7 +237,7 @@ func (r *Reconciler) getTargetsFromMHC(ctx context.Context, logger logr.Logger,
 // label selector.
 func (r *Reconciler) getMachinesFromMHC(ctx context.Context, mhc *clusterv1.MachineHealthCheck) ([]clusterv1.Machine, error) {
 	selector, err := metav1.LabelSelectorAsSelector(metav1.CloneSelectorAndAddLabel(
-		&mhc.Spec.Selector, clusterv1.ClusterLabelName, mhc.Spec.ClusterName,
+		&mhc.Spec.Selector, clusterv1.ClusterNameLabel, mhc.Spec.ClusterName,
 	))
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to build selector")
diff --git a/internal/controllers/machineset/machineset_controller.go b/internal/controllers/machineset/machineset_controller.go
index 0f8b5a1bb..485621aee 100644
--- a/internal/controllers/machineset/machineset_controller.go
+++ b/internal/controllers/machineset/machineset_controller.go
@@ -213,7 +213,7 @@ func (r *Reconciler) reconcile(ctx context.Context, cluster *clusterv1.Cluster,
 	if machineSet.Labels == nil {
 		machineSet.Labels = make(map[string]string)
 	}
-	machineSet.Labels[clusterv1.ClusterLabelName] = machineSet.Spec.ClusterName
+	machineSet.Labels[clusterv1.ClusterNameLabel] = machineSet.Spec.ClusterName
 
 	// If the machine set is a stand alone one, meaning not originated from a MachineDeployment, then set it as directly
 	// owned by the Cluster (if not already present).
@@ -246,8 +246,8 @@ func (r *Reconciler) reconcile(ctx context.Context, cluster *clusterv1.Cluster,
 		machineSet.Spec.Template.Labels = make(map[string]string)
 	}
 
-	machineSet.Spec.Selector.MatchLabels[clusterv1.ClusterLabelName] = machineSet.Spec.ClusterName
-	machineSet.Spec.Template.Labels[clusterv1.ClusterLabelName] = machineSet.Spec.ClusterName
+	machineSet.Spec.Selector.MatchLabels[clusterv1.ClusterNameLabel] = machineSet.Spec.ClusterName
+	machineSet.Spec.Template.Labels[clusterv1.ClusterNameLabel] = machineSet.Spec.ClusterName
 
 	selectorMap, err := metav1.LabelSelectorAsMap(&machineSet.Spec.Selector)
 	if err != nil {
@@ -295,10 +295,10 @@ func (r *Reconciler) reconcile(ctx context.Context, cluster *clusterv1.Cluster,
 	// which were created before the `cluster.x-k8s.io/set-name` label was added to
 	// all Machines created by a MachineSet or if a user manually removed the label.
 	for _, machine := range filteredMachines {
-		mdNameOnMachineSet, mdNameSetOnMachineSet := machineSet.Labels[clusterv1.MachineDeploymentLabelName]
-		mdNameOnMachine := machine.Labels[clusterv1.MachineDeploymentLabelName]
+		mdNameOnMachineSet, mdNameSetOnMachineSet := machineSet.Labels[clusterv1.MachineDeploymentNameLabel]
+		mdNameOnMachine := machine.Labels[clusterv1.MachineDeploymentNameLabel]
 
-		if msName, ok := machine.Labels[clusterv1.MachineSetLabelName]; ok && msName == machineSet.Name &&
+		if msName, ok := machine.Labels[clusterv1.MachineSetNameLabel]; ok && msName == machineSet.Name &&
 			(!mdNameSetOnMachineSet || mdNameOnMachineSet == mdNameOnMachine) {
 			// Continue if the MachineSet name label is already set correctly and
 			// either the MachineDeployment name label is not set on the MachineSet or
@@ -308,15 +308,15 @@ func (r *Reconciler) reconcile(ctx context.Context, cluster *clusterv1.Cluster,
 
 		helper, err := patch.NewHelper(machine, r.Client)
 		if err != nil {
-			return ctrl.Result{}, errors.Wrapf(err, "failed to apply %s label to Machine %q", clusterv1.MachineSetLabelName, machine.Name)
+			return ctrl.Result{}, errors.Wrapf(err, "failed to apply %s label to Machine %q", clusterv1.MachineSetNameLabel, machine.Name)
 		}
-		machine.Labels[clusterv1.MachineSetLabelName] = machineSet.Name
-		// Propagate the MachineDeploymentLabelName from MachineSet to Machine if it is set on the MachineSet.
+		machine.Labels[clusterv1.MachineSetNameLabel] = machineSet.Name
+		// Propagate the MachineDeploymentNameLabel from MachineSet to Machine if it is set on the MachineSet.
 		if mdNameSetOnMachineSet {
-			machine.Labels[clusterv1.MachineDeploymentLabelName] = mdNameOnMachineSet
+			machine.Labels[clusterv1.MachineDeploymentNameLabel] = mdNameOnMachineSet
 		}
 		if err := helper.Patch(ctx, machine); err != nil {
-			return ctrl.Result{}, errors.Wrapf(err, "failed to apply %s label to Machine %q", clusterv1.MachineSetLabelName, machine.Name)
+			return ctrl.Result{}, errors.Wrapf(err, "failed to apply %s label to Machine %q", clusterv1.MachineSetNameLabel, machine.Name)
 		}
 	}
 
@@ -398,7 +398,7 @@ func (r *Reconciler) syncReplicas(ctx context.Context, ms *clusterv1.MachineSet,
 		diff *= -1
 		log.Info(fmt.Sprintf("MachineSet is scaling up to %d replicas by creating %d machines", *(ms.Spec.Replicas), diff), "replicas", *(ms.Spec.Replicas), "machineCount", len(machines))
 		if ms.Annotations != nil {
-			if _, ok := ms.Annotations[clusterv1.DisableMachineCreate]; ok {
+			if _, ok := ms.Annotations[clusterv1.DisableMachineCreateAnnotation]; ok {
 				log.Info("Automatic creation of new machines disabled for machine set")
 				return nil
 			}
@@ -550,18 +550,18 @@ func (r *Reconciler) getNewMachine(machineSet *clusterv1.MachineSet) *clusterv1.
 	// Set the labels from machineSet.Spec.Template.Labels as labels for the new Machine.
 	// Note: We can't just set `machineSet.Spec.Template.Labels` directly and thus "share" the labels
 	// map between Machine and machineSet.Spec.Template.Labels. This would mean that adding the
-	// MachineSetLabelName and MachineDeploymentLabelName later on the Machine would also add the labels
+	// MachineSetNameLabel and MachineDeploymentNameLabel later on the Machine would also add the labels
 	// to machineSet.Spec.Template.Labels and thus modify the labels of the MachineSet.
 	for k, v := range machineSet.Spec.Template.Labels {
 		machine.Labels[k] = v
 	}
 
-	// Enforce that the MachineSetLabelName label is set
-	// Note: the MachineSetLabelName is added by the default webhook to MachineSet.spec.template.labels if a spec.selector is empty.
-	machine.Labels[clusterv1.MachineSetLabelName] = machineSet.Name
-	// Propagate the MachineDeploymentLabelName from MachineSet to Machine if it exists.
-	if mdName, ok := machineSet.Labels[clusterv1.MachineDeploymentLabelName]; ok {
-		machine.Labels[clusterv1.MachineDeploymentLabelName] = mdName
+	// Enforce that the MachineSetNameLabel label is set
+	// Note: the MachineSetNameLabel is added by the default webhook to MachineSet.spec.template.labels if a spec.selector is empty.
+	machine.Labels[clusterv1.MachineSetNameLabel] = machineSet.Name
+	// Propagate the MachineDeploymentNameLabel from MachineSet to Machine if it exists.
+	if mdName, ok := machineSet.Labels[clusterv1.MachineDeploymentNameLabel]; ok {
+		machine.Labels[clusterv1.MachineDeploymentNameLabel] = mdName
 	}
 
 	return machine
@@ -703,7 +703,7 @@ func (r *Reconciler) shouldAdopt(ms *clusterv1.MachineSet) bool {
 	// If the MachineSet is originated by a MachineDeployment object, it should not be adopted directly by the Cluster as a stand-alone MachineSet.
 	// Note: this is required because after restore from a backup both the MachineSet controller and the
 	// MachineDeployment controller are racing to adopt MachineSets, see https://github.com/kubernetes-sigs/cluster-api/issues/7529
-	if _, ok := ms.Labels[clusterv1.MachineDeploymentLabelName]; ok {
+	if _, ok := ms.Labels[clusterv1.MachineDeploymentNameLabel]; ok {
 		return false
 	}
 	return true
diff --git a/internal/controllers/topology/cluster/current_state.go b/internal/controllers/topology/cluster/current_state.go
index 44d85d9ba..ec3006820 100644
--- a/internal/controllers/topology/cluster/current_state.go
+++ b/internal/controllers/topology/cluster/current_state.go
@@ -164,7 +164,7 @@ func (r *Reconciler) getCurrentMachineDeploymentState(ctx context.Context, bluep
 	md := &clusterv1.MachineDeploymentList{}
 	err := r.APIReader.List(ctx, md,
 		client.MatchingLabels{
-			clusterv1.ClusterLabelName:          cluster.Name,
+			clusterv1.ClusterNameLabel:          cluster.Name,
 			clusterv1.ClusterTopologyOwnedLabel: "",
 		},
 		client.InNamespace(cluster.Namespace),
@@ -180,16 +180,16 @@ func (r *Reconciler) getCurrentMachineDeploymentState(ctx context.Context, bluep
 
 		// Retrieve the name which is assigned in Cluster's topology
 		// from a well-defined label.
-		mdTopologyName, ok := m.ObjectMeta.Labels[clusterv1.ClusterTopologyMachineDeploymentLabelName]
+		mdTopologyName, ok := m.ObjectMeta.Labels[clusterv1.ClusterTopologyMachineDeploymentNameLabel]
 		if !ok || mdTopologyName == "" {
-			return nil, fmt.Errorf("failed to find label %s in %s", clusterv1.ClusterTopologyMachineDeploymentLabelName, tlog.KObj{Obj: m})
+			return nil, fmt.Errorf("failed to find label %s in %s", clusterv1.ClusterTopologyMachineDeploymentNameLabel, tlog.KObj{Obj: m})
 		}
 
 		// Make sure that the name of the MachineDeployment stays unique.
 		// If we've already seen a MachineDeployment with the same name
 		// this is an error, probably caused from manual modifications or a race condition.
 		if _, ok := state[mdTopologyName]; ok {
-			return nil, fmt.Errorf("duplicate %s found for label %s: %s", tlog.KObj{Obj: m}, clusterv1.ClusterTopologyMachineDeploymentLabelName, mdTopologyName)
+			return nil, fmt.Errorf("duplicate %s found for label %s: %s", tlog.KObj{Obj: m}, clusterv1.ClusterTopologyMachineDeploymentNameLabel, mdTopologyName)
 		}
 
 		// Gets the bootstrapRef.
diff --git a/internal/controllers/topology/cluster/desired_state.go b/internal/controllers/topology/cluster/desired_state.go
index b4d8828c1..874d57dc4 100644
--- a/internal/controllers/topology/cluster/desired_state.go
+++ b/internal/controllers/topology/cluster/desired_state.go
@@ -234,7 +234,7 @@ func (r *Reconciler) computeControlPlane(ctx context.Context, s *scope.Scope, in
 		if machineLabels == nil {
 			machineLabels = map[string]string{}
 		}
-		machineLabels[clusterv1.ClusterLabelName] = cluster.Name
+		machineLabels[clusterv1.ClusterNameLabel] = cluster.Name
 		machineLabels[clusterv1.ClusterTopologyOwnedLabel] = ""
 		if err := contract.ControlPlane().MachineTemplate().Metadata().Set(controlPlane,
 			&clusterv1.ObjectMeta{
@@ -460,7 +460,7 @@ func computeCluster(_ context.Context, s *scope.Scope, infrastructureCluster, co
 	if cluster.Labels == nil {
 		cluster.Labels = map[string]string{}
 	}
-	cluster.Labels[clusterv1.ClusterLabelName] = cluster.Name
+	cluster.Labels[clusterv1.ClusterNameLabel] = cluster.Name
 	cluster.Labels[clusterv1.ClusterTopologyOwnedLabel] = ""
 
 	// Set the references to the infrastructureCluster and controlPlane objects.
@@ -572,7 +572,7 @@ func computeMachineDeployment(_ context.Context, s *scope.Scope, desiredControlP
 		bootstrapTemplateLabels = map[string]string{}
 	}
 	// Add ClusterTopologyMachineDeploymentLabel to the generated Bootstrap template
-	bootstrapTemplateLabels[clusterv1.ClusterTopologyMachineDeploymentLabelName] = machineDeploymentTopology.Name
+	bootstrapTemplateLabels[clusterv1.ClusterTopologyMachineDeploymentNameLabel] = machineDeploymentTopology.Name
 	desiredMachineDeployment.BootstrapTemplate.SetLabels(bootstrapTemplateLabels)
 
 	// Compute the Infrastructure template.
@@ -597,7 +597,7 @@ func computeMachineDeployment(_ context.Context, s *scope.Scope, desiredControlP
 		infraMachineTemplateLabels = map[string]string{}
 	}
 	// Add ClusterTopologyMachineDeploymentLabel to the generated InfrastructureMachine template
-	infraMachineTemplateLabels[clusterv1.ClusterTopologyMachineDeploymentLabelName] = machineDeploymentTopology.Name
+	infraMachineTemplateLabels[clusterv1.ClusterTopologyMachineDeploymentNameLabel] = machineDeploymentTopology.Name
 	desiredMachineDeployment.InfrastructureMachineTemplate.SetLabels(infraMachineTemplateLabels)
 	version, err := computeMachineDeploymentVersion(s, desiredControlPlaneState, currentMachineDeployment)
 	if err != nil {
@@ -687,18 +687,18 @@ func computeMachineDeployment(_ context.Context, s *scope.Scope, desiredControlP
 	// NOTE: On top of all the labels applied to managed objects we are applying the ClusterTopologyMachineDeploymentLabel
 	// keeping track of the MachineDeployment name from the Topology; this will be used to identify the object in next reconcile loops.
 	labels := map[string]string{}
-	labels[clusterv1.ClusterLabelName] = s.Current.Cluster.Name
+	labels[clusterv1.ClusterNameLabel] = s.Current.Cluster.Name
 	labels[clusterv1.ClusterTopologyOwnedLabel] = ""
-	labels[clusterv1.ClusterTopologyMachineDeploymentLabelName] = machineDeploymentTopology.Name
+	labels[clusterv1.ClusterTopologyMachineDeploymentNameLabel] = machineDeploymentTopology.Name
 	desiredMachineDeploymentObj.SetLabels(labels)
 
 	// Set the selector with the subset of labels identifying controlled machines.
 	// NOTE: this prevents the web hook to add cluster.x-k8s.io/deployment-name label, that is
 	// redundant for managed MachineDeployments given that we already have topology.cluster.x-k8s.io/deployment-name.
 	desiredMachineDeploymentObj.Spec.Selector.MatchLabels = map[string]string{}
-	desiredMachineDeploymentObj.Spec.Selector.MatchLabels[clusterv1.ClusterLabelName] = s.Current.Cluster.Name
+	desiredMachineDeploymentObj.Spec.Selector.MatchLabels[clusterv1.ClusterNameLabel] = s.Current.Cluster.Name
 	desiredMachineDeploymentObj.Spec.Selector.MatchLabels[clusterv1.ClusterTopologyOwnedLabel] = ""
-	desiredMachineDeploymentObj.Spec.Selector.MatchLabels[clusterv1.ClusterTopologyMachineDeploymentLabelName] = machineDeploymentTopology.Name
+	desiredMachineDeploymentObj.Spec.Selector.MatchLabels[clusterv1.ClusterTopologyMachineDeploymentNameLabel] = machineDeploymentTopology.Name
 
 	// Also set the labels in .spec.template.labels so that they are propagated to
 	// MachineSet.labels and MachineSet.spec.template.labels and thus to Machine.labels.
@@ -706,9 +706,9 @@ func computeMachineDeployment(_ context.Context, s *scope.Scope, desiredControlP
 	if desiredMachineDeploymentObj.Spec.Template.Labels == nil {
 		desiredMachineDeploymentObj.Spec.Template.Labels = map[string]string{}
 	}
-	desiredMachineDeploymentObj.Spec.Template.Labels[clusterv1.ClusterLabelName] = s.Current.Cluster.Name
+	desiredMachineDeploymentObj.Spec.Template.Labels[clusterv1.ClusterNameLabel] = s.Current.Cluster.Name
 	desiredMachineDeploymentObj.Spec.Template.Labels[clusterv1.ClusterTopologyOwnedLabel] = ""
-	desiredMachineDeploymentObj.Spec.Template.Labels[clusterv1.ClusterTopologyMachineDeploymentLabelName] = machineDeploymentTopology.Name
+	desiredMachineDeploymentObj.Spec.Template.Labels[clusterv1.ClusterTopologyMachineDeploymentNameLabel] = machineDeploymentTopology.Name
 
 	// Set the desired replicas.
 	desiredMachineDeploymentObj.Spec.Replicas = machineDeploymentTopology.Replicas
@@ -849,7 +849,7 @@ func templateToObject(in templateToInput) (*unstructured.Unstructured, error) {
 	// NOTE: The cluster label is added at creation time so this object could be read by the ClusterTopology
 	// controller immediately after creation, even before other controllers are going to add the label (if missing).
 	labels := map[string]string{}
-	labels[clusterv1.ClusterLabelName] = in.cluster.Name
+	labels[clusterv1.ClusterNameLabel] = in.cluster.Name
 	labels[clusterv1.ClusterTopologyOwnedLabel] = ""
 
 	// Generate the object from the template.
@@ -901,7 +901,7 @@ func templateToTemplate(in templateToInput) *unstructured.Unstructured {
 	if labels == nil {
 		labels = map[string]string{}
 	}
-	labels[clusterv1.ClusterLabelName] = in.cluster.Name
+	labels[clusterv1.ClusterNameLabel] = in.cluster.Name
 	labels[clusterv1.ClusterTopologyOwnedLabel] = ""
 	template.SetLabels(labels)
 
@@ -995,8 +995,8 @@ func selectorForControlPlaneMHC() *metav1.LabelSelector {
 	// It does not include any labels set in ClusterClass, Cluster Topology or elsewhere.
 	return &metav1.LabelSelector{
 		MatchLabels: map[string]string{
-			clusterv1.ClusterTopologyOwnedLabel:    "",
-			clusterv1.MachineControlPlaneLabelName: "",
+			clusterv1.ClusterTopologyOwnedLabel: "",
+			clusterv1.MachineControlPlaneLabel:  "",
 		},
 	}
 }
@@ -1006,7 +1006,7 @@ func selectorForMachineDeploymentMHC(md *clusterv1.MachineDeployment) *metav1.La
 	// It does not include any labels set in ClusterClass, Cluster Topology or elsewhere.
 	return &metav1.LabelSelector{MatchLabels: map[string]string{
 		clusterv1.ClusterTopologyOwnedLabel:                 "",
-		clusterv1.ClusterTopologyMachineDeploymentLabelName: md.Spec.Selector.MatchLabels[clusterv1.ClusterTopologyMachineDeploymentLabelName],
+		clusterv1.ClusterTopologyMachineDeploymentNameLabel: md.Spec.Selector.MatchLabels[clusterv1.ClusterTopologyMachineDeploymentNameLabel],
 	},
 	}
 }
diff --git a/internal/controllers/topology/cluster/structuredmerge/options.go b/internal/controllers/topology/cluster/structuredmerge/options.go
index 7649237bc..7dc6707f4 100644
--- a/internal/controllers/topology/cluster/structuredmerge/options.go
+++ b/internal/controllers/topology/cluster/structuredmerge/options.go
@@ -53,9 +53,9 @@ var (
 		{"metadata", "namespace"},
 		// uid is optional for a server side apply intent but sets the expectation of an object getting created or a specific one updated.
 		{"metadata", "uid"},
-		// the topology controller controls/has an opinion for the labels ClusterLabelName
+		// the topology controller controls/has an opinion for the labels ClusterNameLabel
 		// and ClusterTopologyOwnedLabel as well as infrastructureRef and controlPlaneRef in spec.
-		{"metadata", "labels", clusterv1.ClusterLabelName},
+		{"metadata", "labels", clusterv1.ClusterNameLabel},
 		{"metadata", "labels", clusterv1.ClusterTopologyOwnedLabel},
 		{"spec", "infrastructureRef"},
 		{"spec", "controlPlaneRef"},
diff --git a/internal/controllers/topology/machineset/util.go b/internal/controllers/topology/machineset/util.go
index 39db6a986..bc3cb7613 100644
--- a/internal/controllers/topology/machineset/util.go
+++ b/internal/controllers/topology/machineset/util.go
@@ -37,7 +37,7 @@ func GetMachineSetsForDeployment(ctx context.Context, c client.Reader, md types.
 	// List MachineSets based on the MachineDeployment label.
 	msList := &clusterv1.MachineSetList{}
 	if err := c.List(ctx, msList,
-		client.InNamespace(md.Namespace), client.MatchingLabels{clusterv1.MachineDeploymentLabelName: md.Name}); err != nil {
+		client.InNamespace(md.Namespace), client.MatchingLabels{clusterv1.MachineDeploymentNameLabel: md.Name}); err != nil {
 		return nil, errors.Wrapf(err, "failed to list MachineSets for MachineDeployment/%s", md.Name)
 	}
 
diff --git a/internal/log/log.go b/internal/log/log.go
index 60b12b6ca..e7055e483 100644
--- a/internal/log/log.go
+++ b/internal/log/log.go
@@ -114,7 +114,7 @@ func (l *topologyReconcileLogger) WithRef(ref *corev1.ObjectReference) Logger {
 
 // WithMachineDeployment adds to the logger information about the MachineDeployment object being processed.
 func (l *topologyReconcileLogger) WithMachineDeployment(md *clusterv1.MachineDeployment) Logger {
-	topologyName := md.Labels[clusterv1.ClusterTopologyMachineDeploymentLabelName]
+	topologyName := md.Labels[clusterv1.ClusterTopologyMachineDeploymentNameLabel]
 	return &topologyReconcileLogger{
 		Logger: l.Logger.WithValues(
 			"MachineDeployment", klog.KObj(md),
diff --git a/util/collections/helpers.go b/util/collections/helpers.go
index 96ecd043e..706cd7bd6 100644
--- a/util/collections/helpers.go
+++ b/util/collections/helpers.go
@@ -35,7 +35,7 @@ func GetFilteredMachinesForCluster(ctx context.Context, c client.Reader, cluster
 		ml,
 		client.InNamespace(cluster.Namespace),
 		client.MatchingLabels{
-			clusterv1.ClusterLabelName: cluster.Name,
+			clusterv1.ClusterNameLabel: cluster.Name,
 		},
 	); err != nil {
 		return nil, errors.Wrap(err, "failed to list machines")
diff --git a/util/collections/machine_filters.go b/util/collections/machine_filters.go
index 37a1d1925..a4f69b2fd 100644
--- a/util/collections/machine_filters.go
+++ b/util/collections/machine_filters.go
@@ -217,8 +217,8 @@ func ControlPlaneSelectorForCluster(clusterName string) labels.Selector {
 		return *r
 	}
 	return labels.NewSelector().Add(
-		must(labels.NewRequirement(clusterv1.ClusterLabelName, selection.Equals, []string{clusterName})),
-		must(labels.NewRequirement(clusterv1.MachineControlPlaneLabelName, selection.Exists, []string{})),
+		must(labels.NewRequirement(clusterv1.ClusterNameLabel, selection.Equals, []string{clusterName})),
+		must(labels.NewRequirement(clusterv1.MachineControlPlaneLabel, selection.Exists, []string{})),
 	)
 }
 
diff --git a/util/kubeconfig/kubeconfig.go b/util/kubeconfig/kubeconfig.go
index 2c8872bbb..3c5338f68 100644
--- a/util/kubeconfig/kubeconfig.go
+++ b/util/kubeconfig/kubeconfig.go
@@ -136,7 +136,7 @@ func GenerateSecretWithOwner(clusterName client.ObjectKey, data []byte, owner me
 			Name:      secret.Name(clusterName.Name, secret.Kubeconfig),
 			Namespace: clusterName.Namespace,
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: clusterName.Name,
+				clusterv1.ClusterNameLabel: clusterName.Name,
 			},
 			OwnerReferences: []metav1.OwnerReference{
 				owner,
diff --git a/util/secret/certificates.go b/util/secret/certificates.go
index e3aadfbc7..205694cb8 100644
--- a/util/secret/certificates.go
+++ b/util/secret/certificates.go
@@ -312,7 +312,7 @@ func (c *Certificate) AsSecret(clusterName client.ObjectKey, owner metav1.OwnerR
 			Namespace: clusterName.Namespace,
 			Name:      Name(clusterName.Name, c.Purpose),
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: clusterName.Name,
+				clusterv1.ClusterNameLabel: clusterName.Name,
 			},
 		},
 		Data: map[string][]byte{
diff --git a/util/util.go b/util/util.go
index ee62166ee..bffad10cd 100644
--- a/util/util.go
+++ b/util/util.go
@@ -60,7 +60,7 @@ var (
 
 	// ErrNoCluster is returned when the cluster
 	// label could not be found on the object passed in.
-	ErrNoCluster = fmt.Errorf("no %q label present", clusterv1.ClusterLabelName)
+	ErrNoCluster = fmt.Errorf("no %q label present", clusterv1.ClusterNameLabel)
 
 	// ErrUnstructuredFieldNotFound determines that a field
 	// in an unstructured object could not be found.
@@ -131,7 +131,7 @@ func GetMachineIfExists(ctx context.Context, c client.Client, namespace, name st
 
 // IsControlPlaneMachine checks machine is a control plane node.
 func IsControlPlaneMachine(machine *clusterv1.Machine) bool {
-	_, ok := machine.ObjectMeta.Labels[clusterv1.MachineControlPlaneLabelName]
+	_, ok := machine.ObjectMeta.Labels[clusterv1.MachineControlPlaneLabel]
 	return ok
 }
 
@@ -148,10 +148,10 @@ func IsNodeReady(node *corev1.Node) bool {
 
 // GetClusterFromMetadata returns the Cluster object (if present) using the object metadata.
 func GetClusterFromMetadata(ctx context.Context, c client.Client, obj metav1.ObjectMeta) (*clusterv1.Cluster, error) {
-	if obj.Labels[clusterv1.ClusterLabelName] == "" {
+	if obj.Labels[clusterv1.ClusterNameLabel] == "" {
 		return nil, errors.WithStack(ErrNoCluster)
 	}
-	return GetClusterByName(ctx, c, obj.Namespace, obj.Labels[clusterv1.ClusterLabelName])
+	return GetClusterByName(ctx, c, obj.Namespace, obj.Labels[clusterv1.ClusterNameLabel])
 }
 
 // GetOwnerCluster returns the Cluster object owning the current resource.
@@ -492,7 +492,7 @@ func (k KubeAwareAPIVersions) Less(i, j int) bool {
 
 // ClusterToObjectsMapper returns a mapper function that gets a cluster and lists all objects for the object passed in
 // and returns a list of requests.
-// NB: The objects are required to have `clusterv1.ClusterLabelName` applied.
+// NB: The objects are required to have `clusterv1.ClusterNameLabel` applied.
 func ClusterToObjectsMapper(c client.Client, ro client.ObjectList, scheme *runtime.Scheme) (handler.MapFunc, error) {
 	gvk, err := apiutil.GVKForObject(ro, scheme)
 	if err != nil {
@@ -512,7 +512,7 @@ func ClusterToObjectsMapper(c client.Client, ro client.ObjectList, scheme *runti
 
 		listOpts := []client.ListOption{
 			client.MatchingLabels{
-				clusterv1.ClusterLabelName: cluster.Name,
+				clusterv1.ClusterNameLabel: cluster.Name,
 			},
 		}
 


Test patch:
diff --git a/api/v1beta1/machine_webhook_test.go b/api/v1beta1/machine_webhook_test.go
index fd52cf319..485330aa3 100644
--- a/api/v1beta1/machine_webhook_test.go
+++ b/api/v1beta1/machine_webhook_test.go
@@ -42,7 +42,7 @@ func TestMachineDefault(t *testing.T) {
 	t.Run("for Machine", utildefaulting.DefaultValidateTest(m))
 	m.Default()
 
-	g.Expect(m.Labels[ClusterLabelName]).To(Equal(m.Spec.ClusterName))
+	g.Expect(m.Labels[ClusterNameLabel]).To(Equal(m.Spec.ClusterName))
 	g.Expect(m.Spec.Bootstrap.ConfigRef.Namespace).To(Equal(m.Namespace))
 	g.Expect(m.Spec.InfrastructureRef.Namespace).To(Equal(m.Namespace))
 	g.Expect(*m.Spec.Version).To(Equal("v1.17.5"))
diff --git a/api/v1beta1/machinedeployment_webhook_test.go b/api/v1beta1/machinedeployment_webhook_test.go
index 4ab87a471..dfde281c0 100644
--- a/api/v1beta1/machinedeployment_webhook_test.go
+++ b/api/v1beta1/machinedeployment_webhook_test.go
@@ -44,13 +44,13 @@ func TestMachineDeploymentDefault(t *testing.T) {
 	t.Run("for MachineDeployment", utildefaulting.DefaultValidateTest(md))
 	md.Default()
 
-	g.Expect(md.Labels[ClusterLabelName]).To(Equal(md.Spec.ClusterName))
+	g.Expect(md.Labels[ClusterNameLabel]).To(Equal(md.Spec.ClusterName))
 	g.Expect(md.Spec.MinReadySeconds).To(Equal(pointer.Int32(0)))
 	g.Expect(md.Spec.RevisionHistoryLimit).To(Equal(pointer.Int32(1)))
 	g.Expect(md.Spec.ProgressDeadlineSeconds).To(Equal(pointer.Int32(600)))
 	g.Expect(md.Spec.Strategy).ToNot(BeNil())
-	g.Expect(md.Spec.Selector.MatchLabels).To(HaveKeyWithValue(MachineDeploymentLabelName, "test-md"))
-	g.Expect(md.Spec.Template.Labels).To(HaveKeyWithValue(MachineDeploymentLabelName, "test-md"))
+	g.Expect(md.Spec.Selector.MatchLabels).To(HaveKeyWithValue(MachineDeploymentNameLabel, "test-md"))
+	g.Expect(md.Spec.Template.Labels).To(HaveKeyWithValue(MachineDeploymentNameLabel, "test-md"))
 	g.Expect(md.Spec.Strategy.Type).To(Equal(RollingUpdateMachineDeploymentStrategyType))
 	g.Expect(md.Spec.Strategy.RollingUpdate).ToNot(BeNil())
 	g.Expect(md.Spec.Strategy.RollingUpdate.MaxSurge.IntValue()).To(Equal(1))
@@ -259,8 +259,8 @@ func TestMachineDeploymentWithSpec(t *testing.T) {
 	}
 
 	md.Default()
-	g.Expect(md.Spec.Selector.MatchLabels).To(HaveKeyWithValue(ClusterLabelName, "test-cluster"))
-	g.Expect(md.Spec.Template.Labels).To(HaveKeyWithValue(ClusterLabelName, "test-cluster"))
+	g.Expect(md.Spec.Selector.MatchLabels).To(HaveKeyWithValue(ClusterNameLabel, "test-cluster"))
+	g.Expect(md.Spec.Template.Labels).To(HaveKeyWithValue(ClusterNameLabel, "test-cluster"))
 }
 
 func TestMachineDeploymentClusterNameImmutable(t *testing.T) {
diff --git a/api/v1beta1/machinehealthcheck_webhook_test.go b/api/v1beta1/machinehealthcheck_webhook_test.go
index e560efe96..fbb3a7f9a 100644
--- a/api/v1beta1/machinehealthcheck_webhook_test.go
+++ b/api/v1beta1/machinehealthcheck_webhook_test.go
@@ -50,7 +50,7 @@ func TestMachineHealthCheckDefault(t *testing.T) {
 	t.Run("for MachineHealthCheck", utildefaulting.DefaultValidateTest(mhc))
 	mhc.Default()
 
-	g.Expect(mhc.Labels[ClusterLabelName]).To(Equal(mhc.Spec.ClusterName))
+	g.Expect(mhc.Labels[ClusterNameLabel]).To(Equal(mhc.Spec.ClusterName))
 	g.Expect(mhc.Spec.MaxUnhealthy.String()).To(Equal("100%"))
 	g.Expect(mhc.Spec.NodeStartupTimeout).ToNot(BeNil())
 	g.Expect(*mhc.Spec.NodeStartupTimeout).To(Equal(metav1.Duration{Duration: 10 * time.Minute}))
@@ -378,7 +378,7 @@ func TestMachineHealthCheckClusterNameSelectorValidation(t *testing.T) {
 			ClusterName: "foo",
 			Selector: metav1.LabelSelector{
 				MatchLabels: map[string]string{
-					ClusterLabelName: "bar",
+					ClusterNameLabel: "bar",
 					"baz":            "qux",
 				},
 			},
@@ -394,9 +394,9 @@ func TestMachineHealthCheckClusterNameSelectorValidation(t *testing.T) {
 	g.Expect(err).To(HaveOccurred())
 	g.Expect(err.Error()).To(ContainSubstring("cannot specify a cluster selector other than the one specified by ClusterName"))
 
-	mhc.Spec.Selector.MatchLabels[ClusterLabelName] = "foo"
+	mhc.Spec.Selector.MatchLabels[ClusterNameLabel] = "foo"
 	g.Expect(mhc.validate(nil)).To(Succeed())
-	delete(mhc.Spec.Selector.MatchLabels, ClusterLabelName)
+	delete(mhc.Spec.Selector.MatchLabels, ClusterNameLabel)
 	g.Expect(mhc.validate(nil)).To(Succeed())
 }
 
diff --git a/api/v1beta1/machineset_webhook_test.go b/api/v1beta1/machineset_webhook_test.go
index 2111d4abd..43fd79a5f 100644
--- a/api/v1beta1/machineset_webhook_test.go
+++ b/api/v1beta1/machineset_webhook_test.go
@@ -43,10 +43,10 @@ func TestMachineSetDefault(t *testing.T) {
 	t.Run("for MachineSet", utildefaulting.DefaultValidateTest(ms))
 	ms.Default()
 
-	g.Expect(ms.Labels[ClusterLabelName]).To(Equal(ms.Spec.ClusterName))
+	g.Expect(ms.Labels[ClusterNameLabel]).To(Equal(ms.Spec.ClusterName))
 	g.Expect(ms.Spec.DeletePolicy).To(Equal(string(RandomMachineSetDeletePolicy)))
-	g.Expect(ms.Spec.Selector.MatchLabels).To(HaveKeyWithValue(MachineSetLabelName, "test-ms"))
-	g.Expect(ms.Spec.Template.Labels).To(HaveKeyWithValue(MachineSetLabelName, "test-ms"))
+	g.Expect(ms.Spec.Selector.MatchLabels).To(HaveKeyWithValue(MachineSetNameLabel, "test-ms"))
+	g.Expect(ms.Spec.Template.Labels).To(HaveKeyWithValue(MachineSetNameLabel, "test-ms"))
 	g.Expect(*ms.Spec.Template.Spec.Version).To(Equal("v1.19.10"))
 }
 
diff --git a/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller_test.go b/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller_test.go
index db6a11e70..240143a8d 100644
--- a/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller_test.go
+++ b/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller_test.go
@@ -935,7 +935,7 @@ func TestKubeadmConfigSecretCreatedStatusNotPatched(t *testing.T) {
 			Name:      workerJoinConfig.Name,
 			Namespace: workerJoinConfig.Namespace,
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: cluster.Name,
+				clusterv1.ClusterNameLabel: cluster.Name,
 			},
 			OwnerReferences: []metav1.OwnerReference{
 				{
@@ -2179,13 +2179,13 @@ func newWorkerMachineForCluster(cluster *clusterv1.Cluster) *clusterv1.Machine {
 		Build()
 }
 
-// newControlPlaneMachine returns a Machine with the passed Cluster information and a MachineControlPlaneLabelName.
+// newControlPlaneMachine returns a Machine with the passed Cluster information and a MachineControlPlaneLabel.
 func newControlPlaneMachine(cluster *clusterv1.Cluster, name string) *clusterv1.Machine {
 	m := builder.Machine(cluster.Namespace, name).
 		WithVersion("v1.19.1").
 		WithBootstrapTemplate(bootstrapbuilder.KubeadmConfig(metav1.NamespaceDefault, "cfg").Unstructured()).
 		WithClusterName(cluster.Name).
-		WithLabels(map[string]string{clusterv1.MachineControlPlaneLabelName: ""}).
+		WithLabels(map[string]string{clusterv1.MachineControlPlaneLabel: ""}).
 		Build()
 	return m
 }
@@ -2194,7 +2194,7 @@ func newControlPlaneMachine(cluster *clusterv1.Cluster, name string) *clusterv1.
 func newMachinePool(cluster *clusterv1.Cluster, name string) *expv1.MachinePool {
 	m := builder.MachinePool(cluster.Namespace, name).
 		WithClusterName(cluster.Name).
-		WithLabels(map[string]string{clusterv1.ClusterLabelName: cluster.Name}).
+		WithLabels(map[string]string{clusterv1.ClusterNameLabel: cluster.Name}).
 		WithBootstrapTemplate(bootstrapbuilder.KubeadmConfig(cluster.Namespace, "conf1").Unstructured()).
 		WithVersion("1.19.1").
 		Build()
diff --git a/bootstrap/util/configowner_test.go b/bootstrap/util/configowner_test.go
index 295ed2834..78b6a5483 100644
--- a/bootstrap/util/configowner_test.go
+++ b/bootstrap/util/configowner_test.go
@@ -41,7 +41,7 @@ func TestGetConfigOwner(t *testing.T) {
 				Name:      "my-machine",
 				Namespace: metav1.NamespaceDefault,
 				Labels: map[string]string{
-					clusterv1.MachineControlPlaneLabelName: "",
+					clusterv1.MachineControlPlaneLabel: "",
 				},
 			},
 			Spec: clusterv1.MachineSpec{
@@ -90,7 +90,7 @@ func TestGetConfigOwner(t *testing.T) {
 				Name:      "my-machine-pool",
 				Namespace: metav1.NamespaceDefault,
 				Labels: map[string]string{
-					clusterv1.MachineControlPlaneLabelName: "",
+					clusterv1.MachineControlPlaneLabel: "",
 				},
 			},
 			Spec: expv1.MachinePoolSpec{
diff --git a/cmd/clusterctl/client/alpha/rollout_rollbacker_test.go b/cmd/clusterctl/client/alpha/rollout_rollbacker_test.go
index fbd7a6739..03e3fbc4d 100644
--- a/cmd/clusterctl/client/alpha/rollout_rollbacker_test.go
+++ b/cmd/clusterctl/client/alpha/rollout_rollbacker_test.go
@@ -32,8 +32,8 @@ import (
 
 func Test_ObjectRollbacker(t *testing.T) {
 	labels := map[string]string{
-		clusterv1.ClusterLabelName:           "test",
-		clusterv1.MachineDeploymentLabelName: "test-md-0",
+		clusterv1.ClusterNameLabel:           "test",
+		clusterv1.MachineDeploymentNameLabel: "test-md-0",
 	}
 	currentVersion := "v1.19.3"
 	rollbackVersion := "v1.19.1"
@@ -45,7 +45,7 @@ func Test_ObjectRollbacker(t *testing.T) {
 			Name:      "test-md-0",
 			Namespace: "default",
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: "test",
+				clusterv1.ClusterNameLabel: "test",
 			},
 			Annotations: map[string]string{
 				clusterv1.RevisionAnnotation: "2",
@@ -55,7 +55,7 @@ func Test_ObjectRollbacker(t *testing.T) {
 			ClusterName: "test",
 			Selector: metav1.LabelSelector{
 				MatchLabels: map[string]string{
-					clusterv1.ClusterLabelName: "test",
+					clusterv1.ClusterNameLabel: "test",
 				},
 			},
 			Template: clusterv1.MachineTemplateSpec{
@@ -106,7 +106,7 @@ func Test_ObjectRollbacker(t *testing.T) {
 								*metav1.NewControllerRef(deployment, clusterv1.GroupVersion.WithKind("MachineDeployment")),
 							},
 							Labels: map[string]string{
-								clusterv1.ClusterLabelName: "test",
+								clusterv1.ClusterNameLabel: "test",
 							},
 							Annotations: map[string]string{
 								clusterv1.RevisionAnnotation: "2",
@@ -124,7 +124,7 @@ func Test_ObjectRollbacker(t *testing.T) {
 								*metav1.NewControllerRef(deployment, clusterv1.GroupVersion.WithKind("MachineDeployment")),
 							},
 							Labels: map[string]string{
-								clusterv1.ClusterLabelName: "test",
+								clusterv1.ClusterNameLabel: "test",
 							},
 							Annotations: map[string]string{
 								clusterv1.RevisionAnnotation: "999",
@@ -134,7 +134,7 @@ func Test_ObjectRollbacker(t *testing.T) {
 							ClusterName: "test",
 							Selector: metav1.LabelSelector{
 								MatchLabels: map[string]string{
-									clusterv1.ClusterLabelName: "test",
+									clusterv1.ClusterNameLabel: "test",
 								},
 							},
 							Template: clusterv1.MachineTemplateSpec{
@@ -185,7 +185,7 @@ func Test_ObjectRollbacker(t *testing.T) {
 								*metav1.NewControllerRef(deployment, clusterv1.GroupVersion.WithKind("MachineDeployment")),
 							},
 							Labels: map[string]string{
-								clusterv1.ClusterLabelName: "test",
+								clusterv1.ClusterNameLabel: "test",
 							},
 							Annotations: map[string]string{
 								clusterv1.RevisionAnnotation: "2",
@@ -218,7 +218,7 @@ func Test_ObjectRollbacker(t *testing.T) {
 								*metav1.NewControllerRef(deployment, clusterv1.GroupVersion.WithKind("MachineDeployment")),
 							},
 							Labels: map[string]string{
-								clusterv1.ClusterLabelName: "test",
+								clusterv1.ClusterNameLabel: "test",
 							},
 							Annotations: map[string]string{
 								clusterv1.RevisionAnnotation: "2",
diff --git a/cmd/clusterctl/client/cluster/cert_manager_test.go b/cmd/clusterctl/client/cluster/cert_manager_test.go
index 8ef973652..480cbca88 100644
--- a/cmd/clusterctl/client/cluster/cert_manager_test.go
+++ b/cmd/clusterctl/client/cluster/cert_manager_test.go
@@ -144,9 +144,9 @@ func Test_getManifestObjs(t *testing.T) {
 			for i := range got {
 				o := &got[i]
 				// Assert Get adds clusterctl labels.
-				g.Expect(o.GetLabels()).To(HaveKey(clusterctlv1.ClusterctlLabelName))
-				g.Expect(o.GetLabels()).To(HaveKey(clusterctlv1.ClusterctlCoreLabelName))
-				g.Expect(o.GetLabels()[clusterctlv1.ClusterctlCoreLabelName]).To(Equal(clusterctlv1.ClusterctlCoreLabelCertManagerValue))
+				g.Expect(o.GetLabels()).To(HaveKey(clusterctlv1.ClusterctlLabel))
+				g.Expect(o.GetLabels()).To(HaveKey(clusterctlv1.ClusterctlCoreLabel))
+				g.Expect(o.GetLabels()[clusterctlv1.ClusterctlCoreLabel]).To(Equal(clusterctlv1.ClusterctlCoreLabelCertManagerValue))
 
 				// Assert Get adds clusterctl annotations.
 				g.Expect(o.GetAnnotations()).To(HaveKey(clusterctlv1.CertManagerVersionAnnotation))
@@ -461,7 +461,7 @@ func Test_certManagerClient_deleteObjs(t *testing.T) {
 						},
 						ObjectMeta: metav1.ObjectMeta{
 							Name:   "foo",
-							Labels: map[string]string{clusterctlv1.ClusterctlCoreLabelName: clusterctlv1.ClusterctlCoreLabelCertManagerValue},
+							Labels: map[string]string{clusterctlv1.ClusterctlCoreLabel: clusterctlv1.ClusterctlCoreLabelCertManagerValue},
 						},
 					},
 				},
@@ -480,7 +480,7 @@ func Test_certManagerClient_deleteObjs(t *testing.T) {
 						},
 						ObjectMeta: metav1.ObjectMeta{
 							Name:   "foo",
-							Labels: map[string]string{clusterctlv1.ClusterctlCoreLabelName: clusterctlv1.ClusterctlCoreLabelCertManagerValue},
+							Labels: map[string]string{clusterctlv1.ClusterctlCoreLabel: clusterctlv1.ClusterctlCoreLabelCertManagerValue},
 						},
 					},
 				},
@@ -499,7 +499,7 @@ func Test_certManagerClient_deleteObjs(t *testing.T) {
 						},
 						ObjectMeta: metav1.ObjectMeta{
 							Name:   "foo",
-							Labels: map[string]string{clusterctlv1.ClusterctlCoreLabelName: clusterctlv1.ClusterctlCoreLabelCertManagerValue},
+							Labels: map[string]string{clusterctlv1.ClusterctlCoreLabel: clusterctlv1.ClusterctlCoreLabelCertManagerValue},
 						},
 					},
 				},
@@ -518,7 +518,7 @@ func Test_certManagerClient_deleteObjs(t *testing.T) {
 						},
 						ObjectMeta: metav1.ObjectMeta{
 							Name:   "foo",
-							Labels: map[string]string{clusterctlv1.ClusterctlCoreLabelName: clusterctlv1.ClusterctlCoreLabelCertManagerValue},
+							Labels: map[string]string{clusterctlv1.ClusterctlCoreLabel: clusterctlv1.ClusterctlCoreLabelCertManagerValue},
 						},
 					},
 				},
@@ -537,7 +537,7 @@ func Test_certManagerClient_deleteObjs(t *testing.T) {
 						},
 						ObjectMeta: metav1.ObjectMeta{
 							Name:   "foo",
-							Labels: map[string]string{clusterctlv1.ClusterctlCoreLabelName: clusterctlv1.ClusterctlCoreLabelCertManagerValue},
+							Labels: map[string]string{clusterctlv1.ClusterctlCoreLabel: clusterctlv1.ClusterctlCoreLabelCertManagerValue},
 						},
 					},
 					&appsv1.Deployment{
@@ -547,7 +547,7 @@ func Test_certManagerClient_deleteObjs(t *testing.T) {
 						},
 						ObjectMeta: metav1.ObjectMeta{
 							Name:   "bar",
-							Labels: map[string]string{clusterctlv1.ClusterctlCoreLabelName: clusterctlv1.ClusterctlCoreLabelCertManagerValue},
+							Labels: map[string]string{clusterctlv1.ClusterctlCoreLabel: clusterctlv1.ClusterctlCoreLabelCertManagerValue},
 						},
 					},
 				},
@@ -566,7 +566,7 @@ func Test_certManagerClient_deleteObjs(t *testing.T) {
 				proxy:               proxy,
 			}
 
-			objBefore, err := proxy.ListResources(map[string]string{clusterctlv1.ClusterctlCoreLabelName: clusterctlv1.ClusterctlCoreLabelCertManagerValue})
+			objBefore, err := proxy.ListResources(map[string]string{clusterctlv1.ClusterctlCoreLabel: clusterctlv1.ClusterctlCoreLabelCertManagerValue})
 			g.Expect(err).ToNot(HaveOccurred())
 
 			err = cm.deleteObjs(objBefore)
@@ -621,7 +621,7 @@ func Test_certManagerClient_PlanUpgrade(t *testing.T) {
 					},
 					ObjectMeta: metav1.ObjectMeta{
 						Name:   "cert-manager",
-						Labels: map[string]string{clusterctlv1.ClusterctlCoreLabelName: clusterctlv1.ClusterctlCoreLabelCertManagerValue},
+						Labels: map[string]string{clusterctlv1.ClusterctlCoreLabel: clusterctlv1.ClusterctlCoreLabelCertManagerValue},
 					},
 				},
 			},
@@ -642,7 +642,7 @@ func Test_certManagerClient_PlanUpgrade(t *testing.T) {
 					},
 					ObjectMeta: metav1.ObjectMeta{
 						Name:        "cert-manager",
-						Labels:      map[string]string{clusterctlv1.ClusterctlCoreLabelName: clusterctlv1.ClusterctlCoreLabelCertManagerValue},
+						Labels:      map[string]string{clusterctlv1.ClusterctlCoreLabel: clusterctlv1.ClusterctlCoreLabelCertManagerValue},
 						Annotations: map[string]string{clusterctlv1.CertManagerVersionAnnotation: "v0.10.2"},
 					},
 				},
@@ -664,7 +664,7 @@ func Test_certManagerClient_PlanUpgrade(t *testing.T) {
 					},
 					ObjectMeta: metav1.ObjectMeta{
 						Name:        "cert-manager",
-						Labels:      map[string]string{clusterctlv1.ClusterctlCoreLabelName: clusterctlv1.ClusterctlCoreLabelCertManagerValue},
+						Labels:      map[string]string{clusterctlv1.ClusterctlCoreLabel: clusterctlv1.ClusterctlCoreLabelCertManagerValue},
 						Annotations: map[string]string{clusterctlv1.CertManagerVersionAnnotation: config.CertManagerDefaultVersion},
 					},
 				},
@@ -686,7 +686,7 @@ func Test_certManagerClient_PlanUpgrade(t *testing.T) {
 					},
 					ObjectMeta: metav1.ObjectMeta{
 						Name:        "cert-manager",
-						Labels:      map[string]string{clusterctlv1.ClusterctlCoreLabelName: clusterctlv1.ClusterctlCoreLabelCertManagerValue},
+						Labels:      map[string]string{clusterctlv1.ClusterctlCoreLabel: clusterctlv1.ClusterctlCoreLabelCertManagerValue},
 						Annotations: map[string]string{clusterctlv1.CertManagerVersionAnnotation: "bad-sem-ver"},
 					},
 				},
diff --git a/cmd/clusterctl/client/cluster/components_test.go b/cmd/clusterctl/client/cluster/components_test.go
index fc41e9f69..667077072 100644
--- a/cmd/clusterctl/client/cluster/components_test.go
+++ b/cmd/clusterctl/client/cluster/components_test.go
@@ -37,7 +37,7 @@ import (
 
 func Test_providerComponents_Delete(t *testing.T) {
 	labels := map[string]string{
-		clusterv1.ProviderLabelName: "infrastructure-infra",
+		clusterv1.ProviderNameLabel: "infrastructure-infra",
 	}
 
 	crd := unstructured.Unstructured{}
@@ -340,7 +340,7 @@ func Test_providerComponents_DeleteCoreProviderWebhookNamespace(t *testing.T) {
 
 func Test_providerComponents_Create(t *testing.T) {
 	labelsOne := map[string]string{
-		clusterv1.ProviderLabelName: "infrastructure-infra",
+		clusterv1.ProviderNameLabel: "infrastructure-infra",
 	}
 	commonObjects := []client.Object{
 		// Namespace for the provider
diff --git a/cmd/clusterctl/client/cluster/objectgraph_test.go b/cmd/clusterctl/client/cluster/objectgraph_test.go
index 79cc6d1d3..7fda08ab8 100644
--- a/cmd/clusterctl/client/cluster/objectgraph_test.go
+++ b/cmd/clusterctl/client/cluster/objectgraph_test.go
@@ -155,7 +155,7 @@ func TestObjectGraph_getDiscoveryTypeMetaList(t *testing.T) {
 					WithObjs(
 						func() client.Object {
 							crd := test.FakeNamespacedCustomResourceDefinition("foo", "Bar", "v1")
-							crd.Labels[clusterctlv1.ClusterctlMoveLabelName] = ""
+							crd.Labels[clusterctlv1.ClusterctlMoveLabel] = ""
 							return crd
 						}(),
 					),
@@ -189,7 +189,7 @@ func TestObjectGraph_getDiscoveryTypeMetaList(t *testing.T) {
 					WithObjs(
 						func() client.Object {
 							crd := test.FakeNamespacedCustomResourceDefinition("foo", "Bar", "v1")
-							crd.Labels[clusterctlv1.ClusterctlMoveHierarchyLabelName] = ""
+							crd.Labels[clusterctlv1.ClusterctlMoveHierarchyLabel] = ""
 							return crd
 						}(),
 					),
diff --git a/cmd/clusterctl/client/cluster/upgrader_info_test.go b/cmd/clusterctl/client/cluster/upgrader_info_test.go
index 58c89f678..2fb6117b3 100644
--- a/cmd/clusterctl/client/cluster/upgrader_info_test.go
+++ b/cmd/clusterctl/client/cluster/upgrader_info_test.go
@@ -446,9 +446,9 @@ func fakeProvider(name string, providerType clusterctlv1.ProviderType, version,
 			Namespace:       targetNamespace,
 			Name:            clusterctlv1.ManifestLabel(name, providerType),
 			Labels: map[string]string{
-				clusterctlv1.ClusterctlLabelName:     "",
-				clusterv1.ProviderLabelName:          clusterctlv1.ManifestLabel(name, providerType),
-				clusterctlv1.ClusterctlCoreLabelName: clusterctlv1.ClusterctlCoreLabelInventoryValue,
+				clusterctlv1.ClusterctlLabel:     "",
+				clusterv1.ProviderNameLabel:      clusterctlv1.ManifestLabel(name, providerType),
+				clusterctlv1.ClusterctlCoreLabel: clusterctlv1.ClusterctlCoreLabelInventoryValue,
 			},
 		},
 		ProviderName: name,
diff --git a/cmd/clusterctl/client/cluster/workload_cluster_test.go b/cmd/clusterctl/client/cluster/workload_cluster_test.go
index 18a55a376..50333d3ef 100644
--- a/cmd/clusterctl/client/cluster/workload_cluster_test.go
+++ b/cmd/clusterctl/client/cluster/workload_cluster_test.go
@@ -55,7 +55,7 @@ users:
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      "test1-kubeconfig",
 				Namespace: "test",
-				Labels:    map[string]string{clusterv1.ClusterLabelName: "test1"},
+				Labels:    map[string]string{clusterv1.ClusterNameLabel: "test1"},
 			},
 			Data: map[string][]byte{
 				secret.KubeconfigDataName: []byte(validKubeConfig),
diff --git a/cmd/clusterctl/client/repository/components_client_test.go b/cmd/clusterctl/client/repository/components_client_test.go
index 4ac5ab34b..54fde746f 100644
--- a/cmd/clusterctl/client/repository/components_client_test.go
+++ b/cmd/clusterctl/client/repository/components_client_test.go
@@ -300,7 +300,7 @@ func Test_componentsClient_Get(t *testing.T) {
 			}
 
 			for _, o := range got.Objs() {
-				for _, v := range []string{clusterctlv1.ClusterctlLabelName, clusterv1.ProviderLabelName} {
+				for _, v := range []string{clusterctlv1.ClusterctlLabel, clusterv1.ProviderNameLabel} {
 					gs.Expect(o.GetLabels()).To(HaveKey(v))
 				}
 			}
diff --git a/cmd/clusterctl/client/repository/components_test.go b/cmd/clusterctl/client/repository/components_test.go
index f5c0573d8..bdef3475e 100644
--- a/cmd/clusterctl/client/repository/components_test.go
+++ b/cmd/clusterctl/client/repository/components_test.go
@@ -930,8 +930,8 @@ func Test_addCommonLabels(t *testing.T) {
 						"kind": "ClusterRole",
 						"metadata": map[string]interface{}{
 							"labels": map[string]interface{}{
-								clusterctlv1.ClusterctlLabelName: "",
-								clusterv1.ProviderLabelName:      "infrastructure-provider",
+								clusterctlv1.ClusterctlLabel: "",
+								clusterv1.ProviderNameLabel:  "infrastructure-provider",
 							},
 						},
 					},
@@ -966,8 +966,8 @@ func TestAlterComponents(t *testing.T) {
 				"kind": "ClusterRole",
 				"metadata": map[string]interface{}{
 					"labels": map[string]interface{}{
-						clusterctlv1.ClusterctlLabelName: "",
-						clusterv1.ProviderLabelName:      "infrastructure-provider",
+						clusterctlv1.ClusterctlLabel: "",
+						clusterv1.ProviderNameLabel:  "infrastructure-provider",
 					},
 				},
 			},
diff --git a/cmd/clusterctl/client/upgrade_test.go b/cmd/clusterctl/client/upgrade_test.go
index db2798052..b65bfa788 100644
--- a/cmd/clusterctl/client/upgrade_test.go
+++ b/cmd/clusterctl/client/upgrade_test.go
@@ -359,9 +359,9 @@ func fakeProvider(name string, providerType clusterctlv1.ProviderType, version,
 			Namespace: targetNamespace,
 			Name:      clusterctlv1.ManifestLabel(name, providerType),
 			Labels: map[string]string{
-				clusterctlv1.ClusterctlLabelName:     "",
-				clusterv1.ProviderLabelName:          clusterctlv1.ManifestLabel(name, providerType),
-				clusterctlv1.ClusterctlCoreLabelName: clusterctlv1.ClusterctlCoreLabelInventoryValue,
+				clusterctlv1.ClusterctlLabel:     "",
+				clusterv1.ProviderNameLabel:      clusterctlv1.ManifestLabel(name, providerType),
+				clusterctlv1.ClusterctlCoreLabel: clusterctlv1.ClusterctlCoreLabelInventoryValue,
 			},
 		},
 		ProviderName:     name,
diff --git a/cmd/clusterctl/internal/test/fake_objects.go b/cmd/clusterctl/internal/test/fake_objects.go
index 52d016c6b..8bb404ce6 100644
--- a/cmd/clusterctl/internal/test/fake_objects.go
+++ b/cmd/clusterctl/internal/test/fake_objects.go
@@ -157,7 +157,7 @@ func (f *FakeCluster) Objs() []client.Object {
 		},
 	})
 	clusterInfrastructure.SetLabels(map[string]string{
-		clusterv1.ClusterLabelName: cluster.Name,
+		clusterv1.ClusterNameLabel: cluster.Name,
 	})
 
 	caSecret := &corev1.Secret{ // provided by the user -- ** NOT RECONCILED **
@@ -190,7 +190,7 @@ func (f *FakeCluster) Objs() []client.Object {
 		}
 
 		cloudSecret.SetLabels(map[string]string{
-			clusterctlv1.ClusterctlMoveLabelName: "",
+			clusterctlv1.ClusterctlMoveLabel: "",
 		})
 		objs = append(objs, cloudSecret)
 	}
@@ -338,7 +338,7 @@ func (f *FakeControlPlane) Objs(cluster *clusterv1.Cluster) []client.Object {
 				},
 			},
 			Labels: map[string]string{ // cluster.x-k8s.io/cluster-name=cluster, Added by the control plane controller (see below) -- RECONCILED
-				clusterv1.ClusterLabelName: cluster.Name,
+				clusterv1.ClusterNameLabel: cluster.Name,
 			},
 		},
 		Spec: fakecontrolplane.GenericControlPlaneSpec{
@@ -478,7 +478,7 @@ func (f *FakeMachinePool) Objs(cluster *clusterv1.Cluster) []client.Object {
 				},
 			},
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: cluster.Name, // Added by the machinePool controller (mirrors machinePoolt.spec.ClusterName) -- RECONCILED
+				clusterv1.ClusterNameLabel: cluster.Name, // Added by the machinePool controller (mirrors machinePoolt.spec.ClusterName) -- RECONCILED
 			},
 		},
 		Spec: expv1.MachinePoolSpec{
@@ -610,7 +610,7 @@ func (f *FakeMachineDeployment) Objs(cluster *clusterv1.Cluster) []client.Object
 				},
 			},
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: cluster.Name, // Added by the machineDeployment controller (mirrors machineDeployment.spec.ClusterName) -- RECONCILED
+				clusterv1.ClusterNameLabel: cluster.Name, // Added by the machineDeployment controller (mirrors machineDeployment.spec.ClusterName) -- RECONCILED
 			},
 		},
 		Spec: clusterv1.MachineDeploymentSpec{
@@ -693,7 +693,7 @@ func (f *FakeMachineSet) Objs(cluster *clusterv1.Cluster, machineDeployment *clu
 			Namespace: cluster.Namespace,
 			// Owner reference set by machineSet controller or by machineDeployment controller (see below)
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: cluster.Name, // Added by the machineSet controller (mirrors machineSet.spec.ClusterName) -- RECONCILED
+				clusterv1.ClusterNameLabel: cluster.Name, // Added by the machineSet controller (mirrors machineSet.spec.ClusterName) -- RECONCILED
 			},
 		},
 		Spec: clusterv1.MachineSetSpec{
@@ -854,7 +854,7 @@ func (f *FakeMachine) Objs(cluster *clusterv1.Cluster, generateCerts bool, machi
 				*metav1.NewControllerRef(machineBootstrap, machineBootstrap.GroupVersionKind()),
 			},
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: cluster.Name, // derives from Config -(ownerRef)-> machine.spec.ClusterName
+				clusterv1.ClusterNameLabel: cluster.Name, // derives from Config -(ownerRef)-> machine.spec.ClusterName
 			},
 		},
 	}
@@ -869,7 +869,7 @@ func (f *FakeMachine) Objs(cluster *clusterv1.Cluster, generateCerts bool, machi
 			Namespace: cluster.Namespace,
 			// Owner reference set by machine controller or by machineSet controller (see below)
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: cluster.Name, // Added by the machine controller (mirrors machine.spec.ClusterName) -- RECONCILED
+				clusterv1.ClusterNameLabel: cluster.Name, // Added by the machine controller (mirrors machine.spec.ClusterName) -- RECONCILED
 			},
 		},
 		Spec: clusterv1.MachineSpec{
@@ -905,7 +905,7 @@ func (f *FakeMachine) Objs(cluster *clusterv1.Cluster, generateCerts bool, machi
 		// If this machine belong to a controlPlane, it is controlled by it / ownership set by the controlPlane controller -- ** NOT RECONCILED ?? **
 		machine.SetOwnerReferences([]metav1.OwnerReference{*metav1.NewControllerRef(controlPlane, controlPlane.GroupVersionKind())})
 		// Sets the MachineControlPlane Label
-		machine.Labels[clusterv1.MachineControlPlaneLabelName] = ""
+		machine.Labels[clusterv1.MachineControlPlaneLabel] = ""
 	default:
 		// If this machine does not belong to a machineSet or to a control plane, it is owned by the cluster / ownership set by the machine controller -- RECONCILED
 		machine.SetOwnerReferences([]metav1.OwnerReference{{
@@ -944,7 +944,7 @@ func (f *FakeMachine) Objs(cluster *clusterv1.Cluster, generateCerts bool, machi
 		},
 	})
 	machineInfrastructure.SetLabels(map[string]string{
-		clusterv1.ClusterLabelName: machine.Spec.ClusterName,
+		clusterv1.ClusterNameLabel: machine.Spec.ClusterName,
 	})
 
 	machineBootstrap.SetOwnerReferences([]metav1.OwnerReference{
@@ -956,7 +956,7 @@ func (f *FakeMachine) Objs(cluster *clusterv1.Cluster, generateCerts bool, machi
 		},
 	})
 	machineBootstrap.SetLabels(map[string]string{
-		clusterv1.ClusterLabelName: machine.Spec.ClusterName,
+		clusterv1.ClusterNameLabel: machine.Spec.ClusterName,
 	})
 
 	objs := []client.Object{
@@ -1332,7 +1332,7 @@ func fakeCRD(group string, kind string, versions []string) *apiextensionsv1.Cust
 		ObjectMeta: metav1.ObjectMeta{
 			Name: fmt.Sprintf("%s.%s", strings.ToLower(kind), group), // NB. this technically should use plural(kind), but for the sake of test what really matters is to generate a unique name
 			Labels: map[string]string{
-				clusterctlv1.ClusterctlLabelName: "",
+				clusterctlv1.ClusterctlLabel: "",
 			},
 		},
 		Spec: apiextensionsv1.CustomResourceDefinitionSpec{ // NB. the spec contains only what is strictly required by the move test
@@ -1360,14 +1360,14 @@ func FakeCRDList() []*apiextensionsv1.CustomResourceDefinition {
 
 	// Ensure CRD for external objects is set as for "force move"
 	externalCRD := FakeNamespacedCustomResourceDefinition(fakeexternal.GroupVersion.Group, "GenericExternalObject", version)
-	externalCRD.Labels[clusterctlv1.ClusterctlMoveLabelName] = ""
+	externalCRD.Labels[clusterctlv1.ClusterctlMoveLabel] = ""
 
 	clusterExternalCRD := FakeClusterCustomResourceDefinition(fakeexternal.GroupVersion.Group, "GenericClusterExternalObject", version)
-	clusterExternalCRD.Labels[clusterctlv1.ClusterctlMoveLabelName] = ""
+	clusterExternalCRD.Labels[clusterctlv1.ClusterctlMoveLabel] = ""
 
 	// Ensure CRD for GenericClusterInfrastructureIdentity is set for "force move hierarchy"
 	clusterInfrastructureIdentityCRD := FakeClusterCustomResourceDefinition(fakeinfrastructure.GroupVersion.Group, "GenericClusterInfrastructureIdentity", version)
-	clusterInfrastructureIdentityCRD.Labels[clusterctlv1.ClusterctlMoveHierarchyLabelName] = ""
+	clusterInfrastructureIdentityCRD.Labels[clusterctlv1.ClusterctlMoveHierarchyLabel] = ""
 
 	return []*apiextensionsv1.CustomResourceDefinition{
 		FakeNamespacedCustomResourceDefinition(clusterv1.GroupVersion.Group, "Cluster", version),
diff --git a/cmd/clusterctl/internal/test/fake_proxy.go b/cmd/clusterctl/internal/test/fake_proxy.go
index 79ffe5c23..13129e44f 100644
--- a/cmd/clusterctl/internal/test/fake_proxy.go
+++ b/cmd/clusterctl/internal/test/fake_proxy.go
@@ -175,9 +175,9 @@ func (f *FakeProxy) WithProviderInventory(name string, providerType clusterctlv1
 			Namespace:       targetNamespace,
 			Name:            clusterctlv1.ManifestLabel(name, providerType),
 			Labels: map[string]string{
-				clusterctlv1.ClusterctlLabelName:     "",
-				clusterv1.ProviderLabelName:          clusterctlv1.ManifestLabel(name, providerType),
-				clusterctlv1.ClusterctlCoreLabelName: clusterctlv1.ClusterctlCoreLabelInventoryValue,
+				clusterctlv1.ClusterctlLabel:     "",
+				clusterv1.ProviderNameLabel:      clusterctlv1.ManifestLabel(name, providerType),
+				clusterctlv1.ClusterctlCoreLabel: clusterctlv1.ClusterctlCoreLabelInventoryValue,
 			},
 		},
 		ProviderName: name,
diff --git a/controllers/external/util_test.go b/controllers/external/util_test.go
index c78d7a363..9d9e94d85 100644
--- a/controllers/external/util_test.go
+++ b/controllers/external/util_test.go
@@ -177,7 +177,7 @@ func TestCloneTemplateResourceFound(t *testing.T) {
 		OwnerRef:    owner.DeepCopy(),
 		Labels: map[string]string{
 			"precedence":               "input",
-			clusterv1.ClusterLabelName: "should-be-overwritten",
+			clusterv1.ClusterNameLabel: "should-be-overwritten",
 		},
 		Annotations: map[string]string{
 			"precedence": "input",
@@ -206,7 +206,7 @@ func TestCloneTemplateResourceFound(t *testing.T) {
 	g.Expect(cloneSpec).To(Equal(expectedSpec))
 
 	cloneLabels := clone.GetLabels()
-	g.Expect(cloneLabels).To(HaveKeyWithValue(clusterv1.ClusterLabelName, testClusterName))
+	g.Expect(cloneLabels).To(HaveKeyWithValue(clusterv1.ClusterNameLabel, testClusterName))
 	g.Expect(cloneLabels).To(HaveKeyWithValue("test-template", "label"))
 	g.Expect(cloneLabels).To(HaveKeyWithValue("precedence", "input"))
 
@@ -252,7 +252,7 @@ func TestCloneTemplateResourceFoundNoOwner(t *testing.T) {
 
 	expectedKind := "Yellow"
 	expectedAPIVersion := templateAPIVersion
-	expectedLabels := map[string]string{clusterv1.ClusterLabelName: testClusterName}
+	expectedLabels := map[string]string{clusterv1.ClusterNameLabel: testClusterName}
 
 	expectedSpec, ok, err := unstructured.NestedMap(template.UnstructuredContent(), "spec", "template", "spec")
 	g.Expect(err).NotTo(HaveOccurred())
diff --git a/controlplane/kubeadm/internal/cluster_test.go b/controlplane/kubeadm/internal/cluster_test.go
index 6fb7fb9a7..f1944712c 100644
--- a/controlplane/kubeadm/internal/cluster_test.go
+++ b/controlplane/kubeadm/internal/cluster_test.go
@@ -259,13 +259,13 @@ func machineListForTestGetMachinesForCluster() *clusterv1.MachineList {
 				Name:      name,
 				Namespace: metav1.NamespaceDefault,
 				Labels: map[string]string{
-					clusterv1.ClusterLabelName: "my-cluster",
+					clusterv1.ClusterNameLabel: "my-cluster",
 				},
 			},
 		}
 	}
 	controlPlaneMachine := machine("first-machine")
-	controlPlaneMachine.ObjectMeta.Labels[clusterv1.MachineControlPlaneLabelName] = ""
+	controlPlaneMachine.ObjectMeta.Labels[clusterv1.MachineControlPlaneLabel] = ""
 	controlPlaneMachine.OwnerReferences = ownedRef
 
 	return &clusterv1.MachineList{
diff --git a/controlplane/kubeadm/internal/controllers/controller_test.go b/controlplane/kubeadm/internal/controllers/controller_test.go
index ac35301c0..a1c0cbb7f 100644
--- a/controlplane/kubeadm/internal/controllers/controller_test.go
+++ b/controlplane/kubeadm/internal/controllers/controller_test.go
@@ -1238,7 +1238,7 @@ kubernetesVersion: metav1.16.1`,
 		kubeadmCM.DeepCopy(),
 		corednsDepl.DeepCopy(),
 	)
-	expectedLabels := map[string]string{clusterv1.ClusterLabelName: "foo"}
+	expectedLabels := map[string]string{clusterv1.ClusterNameLabel: "foo"}
 	r := &KubeadmControlPlaneReconciler{
 		Client:    fakeClient,
 		APIReader: fakeClient,
@@ -1638,7 +1638,7 @@ func TestKubeadmControlPlaneReconciler_reconcileDelete(t *testing.T) {
 				Name:      "worker",
 				Namespace: cluster.Namespace,
 				Labels: map[string]string{
-					clusterv1.ClusterLabelName: cluster.Name,
+					clusterv1.ClusterNameLabel: cluster.Name,
 				},
 			},
 		}
@@ -1669,7 +1669,7 @@ func TestKubeadmControlPlaneReconciler_reconcileDelete(t *testing.T) {
 
 		controlPlaneMachines := clusterv1.MachineList{}
 		labels := map[string]string{
-			clusterv1.MachineControlPlaneLabelName: "",
+			clusterv1.MachineControlPlaneLabel: "",
 		}
 		g.Expect(fakeClient.List(ctx, &controlPlaneMachines, client.MatchingLabels(labels))).To(Succeed())
 		g.Expect(controlPlaneMachines.Items).To(HaveLen(3))
@@ -1687,7 +1687,7 @@ func TestKubeadmControlPlaneReconciler_reconcileDelete(t *testing.T) {
 				Name:      "worker",
 				Namespace: cluster.Namespace,
 				Labels: map[string]string{
-					clusterv1.ClusterLabelName: cluster.Name,
+					clusterv1.ClusterNameLabel: cluster.Name,
 				},
 			},
 		}
@@ -1718,7 +1718,7 @@ func TestKubeadmControlPlaneReconciler_reconcileDelete(t *testing.T) {
 
 		controlPlaneMachines := clusterv1.MachineList{}
 		labels := map[string]string{
-			clusterv1.MachineControlPlaneLabelName: "",
+			clusterv1.MachineControlPlaneLabel: "",
 		}
 		g.Expect(fakeClient.List(ctx, &controlPlaneMachines, client.MatchingLabels(labels))).To(Succeed())
 		g.Expect(controlPlaneMachines.Items).To(HaveLen(3))
diff --git a/controlplane/kubeadm/internal/controllers/helpers_test.go b/controlplane/kubeadm/internal/controllers/helpers_test.go
index 032275112..1886271ec 100644
--- a/controlplane/kubeadm/internal/controllers/helpers_test.go
+++ b/controlplane/kubeadm/internal/controllers/helpers_test.go
@@ -243,7 +243,7 @@ func TestReconcileKubeconfigSecretDoesNotAdoptsUserSecrets(t *testing.T) {
 			Name:      secret.Name("foo", secret.Kubeconfig),
 			Namespace: metav1.NamespaceDefault,
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: "foo",
+				clusterv1.ClusterNameLabel: "foo",
 			},
 			OwnerReferences: []metav1.OwnerReference{},
 		},
@@ -332,7 +332,7 @@ func TestKubeadmControlPlaneReconciler_reconcileKubeconfig(t *testing.T) {
 	g.Expect(r.Client.Get(ctx, secretName, kubeconfigSecret)).To(Succeed())
 	g.Expect(kubeconfigSecret.OwnerReferences).NotTo(BeEmpty())
 	g.Expect(kubeconfigSecret.OwnerReferences).To(ContainElement(*metav1.NewControllerRef(kcp, controlplanev1.GroupVersion.WithKind("KubeadmControlPlane"))))
-	g.Expect(kubeconfigSecret.Labels).To(HaveKeyWithValue(clusterv1.ClusterLabelName, cluster.Name))
+	g.Expect(kubeconfigSecret.Labels).To(HaveKeyWithValue(clusterv1.ClusterNameLabel, cluster.Name))
 }
 
 func TestCloneConfigsAndGenerateMachine(t *testing.T) {
@@ -561,8 +561,8 @@ func TestKubeadmControlPlaneReconciler_generateMachine(t *testing.T) {
 	for k, v := range kcpMachineTemplateObjectMeta.Labels {
 		g.Expect(machine.Labels[k]).To(Equal(v))
 	}
-	g.Expect(machine.Labels[clusterv1.ClusterLabelName]).To(Equal(cluster.Name))
-	g.Expect(machine.Labels[clusterv1.MachineControlPlaneLabelName]).To(Equal(""))
+	g.Expect(machine.Labels[clusterv1.ClusterNameLabel]).To(Equal(cluster.Name))
+	g.Expect(machine.Labels[clusterv1.MachineControlPlaneLabel]).To(Equal(""))
 	g.Expect(machine.Labels[clusterv1.MachineControlPlaneNameLabel]).To(Equal(kcp.Name))
 
 	for k, v := range kcpMachineTemplateObjectMeta.Annotations {
@@ -570,8 +570,8 @@ func TestKubeadmControlPlaneReconciler_generateMachine(t *testing.T) {
 	}
 
 	// Verify that machineTemplate.ObjectMeta in KCP has not been modified.
-	g.Expect(kcp.Spec.MachineTemplate.ObjectMeta.Labels).NotTo(HaveKey(clusterv1.ClusterLabelName))
-	g.Expect(kcp.Spec.MachineTemplate.ObjectMeta.Labels).NotTo(HaveKey(clusterv1.MachineControlPlaneLabelName))
+	g.Expect(kcp.Spec.MachineTemplate.ObjectMeta.Labels).NotTo(HaveKey(clusterv1.ClusterNameLabel))
+	g.Expect(kcp.Spec.MachineTemplate.ObjectMeta.Labels).NotTo(HaveKey(clusterv1.MachineControlPlaneLabel))
 	g.Expect(kcp.Spec.MachineTemplate.ObjectMeta.Labels).NotTo(HaveKey(clusterv1.MachineControlPlaneNameLabel))
 	g.Expect(kcp.Spec.MachineTemplate.ObjectMeta.Annotations).NotTo(HaveKey(controlplanev1.KubeadmClusterConfigurationAnnotation))
 }
diff --git a/exp/api/v1beta1/machinepool_webhook_test.go b/exp/api/v1beta1/machinepool_webhook_test.go
index ec0ac47aa..7fd1eca0a 100644
--- a/exp/api/v1beta1/machinepool_webhook_test.go
+++ b/exp/api/v1beta1/machinepool_webhook_test.go
@@ -53,7 +53,7 @@ func TestMachinePoolDefault(t *testing.T) {
 	t.Run("for MachinePool", utildefaulting.DefaultValidateTest(m))
 	m.Default()
 
-	g.Expect(m.Labels[clusterv1.ClusterLabelName]).To(Equal(m.Spec.ClusterName))
+	g.Expect(m.Labels[clusterv1.ClusterNameLabel]).To(Equal(m.Spec.ClusterName))
 	g.Expect(m.Spec.Replicas).To(Equal(pointer.Int32(1)))
 	g.Expect(m.Spec.MinReadySeconds).To(Equal(pointer.Int32(0)))
 	g.Expect(m.Spec.Template.Spec.Bootstrap.ConfigRef.Namespace).To(Equal(m.Namespace))
diff --git a/exp/internal/controllers/machinepool_controller_phases_test.go b/exp/internal/controllers/machinepool_controller_phases_test.go
index 221b4c958..9d0f71969 100644
--- a/exp/internal/controllers/machinepool_controller_phases_test.go
+++ b/exp/internal/controllers/machinepool_controller_phases_test.go
@@ -135,12 +135,12 @@ func TestReconcileMachinePoolPhases(t *testing.T) {
 		g.Expect(r.Client.Get(ctx, types.NamespacedName{Name: bootstrapConfig.GetName(), Namespace: bootstrapConfig.GetNamespace()}, bootstrapConfig)).To(Succeed())
 
 		g.Expect(bootstrapConfig.GetOwnerReferences()).To(HaveLen(1))
-		g.Expect(bootstrapConfig.GetLabels()[clusterv1.ClusterLabelName]).To(BeEquivalentTo(clusterName))
+		g.Expect(bootstrapConfig.GetLabels()[clusterv1.ClusterNameLabel]).To(BeEquivalentTo(clusterName))
 
 		g.Expect(r.Client.Get(ctx, types.NamespacedName{Name: infraConfig.GetName(), Namespace: infraConfig.GetNamespace()}, infraConfig)).To(Succeed())
 
 		g.Expect(infraConfig.GetOwnerReferences()).To(HaveLen(1))
-		g.Expect(infraConfig.GetLabels()[clusterv1.ClusterLabelName]).To(BeEquivalentTo(clusterName))
+		g.Expect(infraConfig.GetLabels()[clusterv1.ClusterNameLabel]).To(BeEquivalentTo(clusterName))
 	})
 
 	t.Run("Should set `Pending` with a new MachinePool", func(t *testing.T) {
@@ -479,7 +479,7 @@ func TestReconcileMachinePoolBootstrap(t *testing.T) {
 			Name:      "machinepool-test",
 			Namespace: metav1.NamespaceDefault,
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: clusterName,
+				clusterv1.ClusterNameLabel: clusterName,
 			},
 		},
 		Spec: expv1.MachinePoolSpec{
@@ -725,7 +725,7 @@ func TestReconcileMachinePoolInfrastructure(t *testing.T) {
 			Name:      "machinepool-test",
 			Namespace: metav1.NamespaceDefault,
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: clusterName,
+				clusterv1.ClusterNameLabel: clusterName,
 			},
 		},
 		Spec: expv1.MachinePoolSpec{
diff --git a/exp/internal/controllers/machinepool_controller_test.go b/exp/internal/controllers/machinepool_controller_test.go
index 3298f3806..4f2d2ff9a 100644
--- a/exp/internal/controllers/machinepool_controller_test.go
+++ b/exp/internal/controllers/machinepool_controller_test.go
@@ -174,7 +174,7 @@ func TestMachinePoolOwnerReference(t *testing.T) {
 			Name:      "machinePool3",
 			Namespace: metav1.NamespaceDefault,
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: "valid-cluster",
+				clusterv1.ClusterNameLabel: "valid-cluster",
 			},
 		},
 		Spec: expv1.MachinePoolSpec{
@@ -379,7 +379,7 @@ func TestReconcileMachinePoolRequest(t *testing.T) {
 					Name:      "deleted",
 					Namespace: metav1.NamespaceDefault,
 					Labels: map[string]string{
-						clusterv1.MachineControlPlaneLabelName: "",
+						clusterv1.MachineControlPlaneLabel: "",
 					},
 					Finalizers:        []string{expv1.MachinePoolFinalizer},
 					DeletionTimestamp: &time,
diff --git a/internal/controllers/cluster/cluster_controller_test.go b/internal/controllers/cluster/cluster_controller_test.go
index 242c37227..2b5721693 100644
--- a/internal/controllers/cluster/cluster_controller_test.go
+++ b/internal/controllers/cluster/cluster_controller_test.go
@@ -310,7 +310,7 @@ func TestClusterReconciler(t *testing.T) {
 				GenerateName: "test6-",
 				Namespace:    ns.Name,
 				Labels: map[string]string{
-					clusterv1.MachineControlPlaneLabelName: "",
+					clusterv1.MachineControlPlaneLabel: "",
 				},
 			},
 			Spec: clusterv1.MachineSpec{
@@ -423,8 +423,8 @@ func TestClusterReconcilerNodeRef(t *testing.T) {
 				Name:      "controlPlaneWithNoderef",
 				Namespace: "test",
 				Labels: map[string]string{
-					clusterv1.ClusterLabelName:             cluster.Name,
-					clusterv1.MachineControlPlaneLabelName: "",
+					clusterv1.ClusterNameLabel:         cluster.Name,
+					clusterv1.MachineControlPlaneLabel: "",
 				},
 			},
 			Spec: clusterv1.MachineSpec{
@@ -445,8 +445,8 @@ func TestClusterReconcilerNodeRef(t *testing.T) {
 				Name:      "controlPlaneWithoutNoderef",
 				Namespace: "test",
 				Labels: map[string]string{
-					clusterv1.ClusterLabelName:             cluster.Name,
-					clusterv1.MachineControlPlaneLabelName: "",
+					clusterv1.ClusterNameLabel:         cluster.Name,
+					clusterv1.MachineControlPlaneLabel: "",
 				},
 			},
 			Spec: clusterv1.MachineSpec{
@@ -461,7 +461,7 @@ func TestClusterReconcilerNodeRef(t *testing.T) {
 				Name:      "nonControlPlaneWitNoderef",
 				Namespace: "test",
 				Labels: map[string]string{
-					clusterv1.ClusterLabelName: cluster.Name,
+					clusterv1.ClusterNameLabel: cluster.Name,
 				},
 			},
 			Spec: clusterv1.MachineSpec{
@@ -482,7 +482,7 @@ func TestClusterReconcilerNodeRef(t *testing.T) {
 				Name:      "nonControlPlaneWithoutNoderef",
 				Namespace: "test",
 				Labels: map[string]string{
-					clusterv1.ClusterLabelName: cluster.Name,
+					clusterv1.ClusterNameLabel: cluster.Name,
 				},
 			},
 			Spec: clusterv1.MachineSpec{
@@ -609,7 +609,7 @@ func (b *machineBuilder) ownedBy(c *clusterv1.Cluster) *machineBuilder {
 }
 
 func (b *machineBuilder) controlPlane() *machineBuilder {
-	b.m.Labels = map[string]string{clusterv1.MachineControlPlaneLabelName: ""}
+	b.m.Labels = map[string]string{clusterv1.MachineControlPlaneLabel: ""}
 	return b
 }
 
diff --git a/internal/controllers/machine/machine_controller_phases_test.go b/internal/controllers/machine/machine_controller_phases_test.go
index bb07f4cd5..8294c7316 100644
--- a/internal/controllers/machine/machine_controller_phases_test.go
+++ b/internal/controllers/machine/machine_controller_phases_test.go
@@ -62,7 +62,7 @@ func TestReconcileMachinePhases(t *testing.T) {
 			Name:      "machine-test",
 			Namespace: metav1.NamespaceDefault,
 			Labels: map[string]string{
-				clusterv1.MachineControlPlaneLabelName: "",
+				clusterv1.MachineControlPlaneLabel: "",
 			},
 		},
 		Spec: clusterv1.MachineSpec{
@@ -138,12 +138,12 @@ func TestReconcileMachinePhases(t *testing.T) {
 		g.Expect(r.Client.Get(ctx, types.NamespacedName{Name: bootstrapConfig.GetName(), Namespace: bootstrapConfig.GetNamespace()}, bootstrapConfig)).To(Succeed())
 
 		g.Expect(bootstrapConfig.GetOwnerReferences()).To(HaveLen(1))
-		g.Expect(bootstrapConfig.GetLabels()[clusterv1.ClusterLabelName]).To(BeEquivalentTo("test-cluster"))
+		g.Expect(bootstrapConfig.GetLabels()[clusterv1.ClusterNameLabel]).To(BeEquivalentTo("test-cluster"))
 
 		g.Expect(r.Client.Get(ctx, types.NamespacedName{Name: infraConfig.GetName(), Namespace: infraConfig.GetNamespace()}, infraConfig)).To(Succeed())
 
 		g.Expect(infraConfig.GetOwnerReferences()).To(HaveLen(1))
-		g.Expect(infraConfig.GetLabels()[clusterv1.ClusterLabelName]).To(BeEquivalentTo("test-cluster"))
+		g.Expect(infraConfig.GetLabels()[clusterv1.ClusterNameLabel]).To(BeEquivalentTo("test-cluster"))
 	})
 
 	t.Run("Should set `Pending` with a new Machine", func(t *testing.T) {
@@ -541,9 +541,9 @@ func TestReconcileMachinePhases(t *testing.T) {
 		g.Expect(err).NotTo(HaveOccurred())
 
 		// Set Cluster label.
-		machine.Labels[clusterv1.ClusterLabelName] = machine.Spec.ClusterName
+		machine.Labels[clusterv1.ClusterNameLabel] = machine.Spec.ClusterName
 		machine.ResourceVersion = "999"
-		machineSecond.Labels[clusterv1.ClusterLabelName] = machine.Spec.ClusterName
+		machineSecond.Labels[clusterv1.ClusterNameLabel] = machine.Spec.ClusterName
 		machineSecond.Name = "SecondMachine"
 		// Set NodeRef.
 		machine.Status.NodeRef = &corev1.ObjectReference{Kind: "Node", Name: "machine-test-node"}
@@ -596,7 +596,7 @@ func TestReconcileBootstrap(t *testing.T) {
 			Name:      "machine-test",
 			Namespace: metav1.NamespaceDefault,
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: "test-cluster",
+				clusterv1.ClusterNameLabel: "test-cluster",
 			},
 		},
 		Spec: clusterv1.MachineSpec{
@@ -896,7 +896,7 @@ func TestReconcileInfrastructure(t *testing.T) {
 			Name:      "machine-test",
 			Namespace: metav1.NamespaceDefault,
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: "test-cluster",
+				clusterv1.ClusterNameLabel: "test-cluster",
 			},
 		},
 		Spec: clusterv1.MachineSpec{
@@ -1171,7 +1171,7 @@ func TestReconcileCertificateExpiry(t *testing.T) {
 					Name:      "bootstrap-test-existing",
 					Namespace: metav1.NamespaceDefault,
 					Labels: map[string]string{
-						clusterv1.MachineControlPlaneLabelName: "",
+						clusterv1.MachineControlPlaneLabel: "",
 					},
 				},
 				Spec: clusterv1.MachineSpec{
@@ -1189,7 +1189,7 @@ func TestReconcileCertificateExpiry(t *testing.T) {
 					Name:      "bootstrap-test-existing",
 					Namespace: metav1.NamespaceDefault,
 					Labels: map[string]string{
-						clusterv1.MachineControlPlaneLabelName: "",
+						clusterv1.MachineControlPlaneLabel: "",
 					},
 				},
 				Spec: clusterv1.MachineSpec{
@@ -1213,7 +1213,7 @@ func TestReconcileCertificateExpiry(t *testing.T) {
 					Name:      "bootstrap-test-existing",
 					Namespace: metav1.NamespaceDefault,
 					Labels: map[string]string{
-						clusterv1.MachineControlPlaneLabelName: "",
+						clusterv1.MachineControlPlaneLabel: "",
 					},
 				},
 				Spec: clusterv1.MachineSpec{
@@ -1237,7 +1237,7 @@ func TestReconcileCertificateExpiry(t *testing.T) {
 					Name:      "bootstrap-test-existing",
 					Namespace: metav1.NamespaceDefault,
 					Labels: map[string]string{
-						clusterv1.MachineControlPlaneLabelName: "",
+						clusterv1.MachineControlPlaneLabel: "",
 					},
 					Annotations: map[string]string{
 						clusterv1.MachineCertificatesExpiryDateAnnotation: fakeTimeString,
@@ -1264,7 +1264,7 @@ func TestReconcileCertificateExpiry(t *testing.T) {
 					Name:      "bootstrap-test-existing",
 					Namespace: metav1.NamespaceDefault,
 					Labels: map[string]string{
-						clusterv1.MachineControlPlaneLabelName: "",
+						clusterv1.MachineControlPlaneLabel: "",
 					},
 					Annotations: map[string]string{
 						clusterv1.MachineCertificatesExpiryDateAnnotation: fakeTimeString2,
@@ -1291,7 +1291,7 @@ func TestReconcileCertificateExpiry(t *testing.T) {
 					Name:      "bootstrap-test-existing",
 					Namespace: metav1.NamespaceDefault,
 					Labels: map[string]string{
-						clusterv1.MachineControlPlaneLabelName: "",
+						clusterv1.MachineControlPlaneLabel: "",
 					},
 				},
 				Spec: clusterv1.MachineSpec{
diff --git a/internal/controllers/machine/machine_controller_test.go b/internal/controllers/machine/machine_controller_test.go
index 0f4ac9b27..6df3a24e1 100644
--- a/internal/controllers/machine/machine_controller_test.go
+++ b/internal/controllers/machine/machine_controller_test.go
@@ -132,7 +132,7 @@ func TestWatches(t *testing.T) {
 			GenerateName: "machine-created-",
 			Namespace:    ns.Name,
 			Labels: map[string]string{
-				clusterv1.MachineControlPlaneLabelName: "",
+				clusterv1.MachineControlPlaneLabel: "",
 			},
 		},
 		Spec: clusterv1.MachineSpec{
@@ -445,7 +445,7 @@ func TestMachineOwnerReference(t *testing.T) {
 			Name:      "machine3",
 			Namespace: metav1.NamespaceDefault,
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: "valid-cluster",
+				clusterv1.ClusterNameLabel: "valid-cluster",
 			},
 			OwnerReferences: []metav1.OwnerReference{
 				{
@@ -469,8 +469,8 @@ func TestMachineOwnerReference(t *testing.T) {
 			Name:      "machine4",
 			Namespace: metav1.NamespaceDefault,
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName:             "valid-cluster",
-				clusterv1.MachineControlPlaneLabelName: "",
+				clusterv1.ClusterNameLabel:         "valid-cluster",
+				clusterv1.MachineControlPlaneLabel: "",
 			},
 			OwnerReferences: []metav1.OwnerReference{
 				{
@@ -691,7 +691,7 @@ func TestReconcileRequest(t *testing.T) {
 					Name:      "deleted",
 					Namespace: metav1.NamespaceDefault,
 					Labels: map[string]string{
-						clusterv1.MachineControlPlaneLabelName: "",
+						clusterv1.MachineControlPlaneLabel: "",
 					},
 					Finalizers:        []string{clusterv1.MachineFinalizer},
 					DeletionTimestamp: &time,
@@ -800,7 +800,7 @@ func TestMachineConditions(t *testing.T) {
 			Name:      "blah",
 			Namespace: metav1.NamespaceDefault,
 			Labels: map[string]string{
-				clusterv1.MachineControlPlaneLabelName: "",
+				clusterv1.MachineControlPlaneLabel: "",
 			},
 			Finalizers: []string{clusterv1.MachineFinalizer},
 		},
@@ -1384,7 +1384,7 @@ func TestIsDeleteNodeAllowed(t *testing.T) {
 					Name:      "created",
 					Namespace: metav1.NamespaceDefault,
 					Labels: map[string]string{
-						clusterv1.ClusterLabelName: "test-cluster",
+						clusterv1.ClusterNameLabel: "test-cluster",
 					},
 					Finalizers: []string{clusterv1.MachineFinalizer},
 				},
@@ -1410,7 +1410,7 @@ func TestIsDeleteNodeAllowed(t *testing.T) {
 					Name:      "created",
 					Namespace: metav1.NamespaceDefault,
 					Labels: map[string]string{
-						clusterv1.ClusterLabelName: "test-cluster",
+						clusterv1.ClusterNameLabel: "test-cluster",
 					},
 					Finalizers: []string{clusterv1.MachineFinalizer},
 				},
@@ -1440,8 +1440,8 @@ func TestIsDeleteNodeAllowed(t *testing.T) {
 					Name:      "created",
 					Namespace: metav1.NamespaceDefault,
 					Labels: map[string]string{
-						clusterv1.ClusterLabelName:             "test-cluster",
-						clusterv1.MachineControlPlaneLabelName: "",
+						clusterv1.ClusterNameLabel:         "test-cluster",
+						clusterv1.MachineControlPlaneLabel: "",
 					},
 					Finalizers:        []string{clusterv1.MachineFinalizer},
 					DeletionTimestamp: &metav1.Time{Time: time.Now().UTC()},
@@ -1472,7 +1472,7 @@ func TestIsDeleteNodeAllowed(t *testing.T) {
 					Name:      "created",
 					Namespace: metav1.NamespaceDefault,
 					Labels: map[string]string{
-						clusterv1.ClusterLabelName: "test-cluster",
+						clusterv1.ClusterNameLabel: "test-cluster",
 					},
 					Finalizers: []string{clusterv1.MachineFinalizer},
 				},
@@ -1522,7 +1522,7 @@ func TestIsDeleteNodeAllowed(t *testing.T) {
 					Name:      "created",
 					Namespace: metav1.NamespaceDefault,
 					Labels: map[string]string{
-						clusterv1.ClusterLabelName: "test-cluster",
+						clusterv1.ClusterNameLabel: "test-cluster",
 					},
 					Finalizers: []string{clusterv1.MachineFinalizer},
 				},
@@ -1560,7 +1560,7 @@ func TestIsDeleteNodeAllowed(t *testing.T) {
 					Name:      "created",
 					Namespace: metav1.NamespaceDefault,
 					Labels: map[string]string{
-						clusterv1.ClusterLabelName: "test-cluster",
+						clusterv1.ClusterNameLabel: "test-cluster",
 					},
 					Finalizers: []string{clusterv1.MachineFinalizer},
 				},
@@ -1598,7 +1598,7 @@ func TestIsDeleteNodeAllowed(t *testing.T) {
 					Name:      "created",
 					Namespace: metav1.NamespaceDefault,
 					Labels: map[string]string{
-						clusterv1.ClusterLabelName: "test-cluster",
+						clusterv1.ClusterNameLabel: "test-cluster",
 					},
 					Finalizers: []string{clusterv1.MachineFinalizer},
 				},
@@ -1660,7 +1660,7 @@ func TestIsDeleteNodeAllowed(t *testing.T) {
 					Name:      "cp1",
 					Namespace: metav1.NamespaceDefault,
 					Labels: map[string]string{
-						clusterv1.ClusterLabelName: "test-cluster",
+						clusterv1.ClusterNameLabel: "test-cluster",
 					},
 					Finalizers: []string{clusterv1.MachineFinalizer},
 				},
@@ -1680,7 +1680,7 @@ func TestIsDeleteNodeAllowed(t *testing.T) {
 					Name:      "cp2",
 					Namespace: metav1.NamespaceDefault,
 					Labels: map[string]string{
-						clusterv1.ClusterLabelName: "test-cluster",
+						clusterv1.ClusterNameLabel: "test-cluster",
 					},
 					Finalizers: []string{clusterv1.MachineFinalizer},
 				},
@@ -1697,8 +1697,8 @@ func TestIsDeleteNodeAllowed(t *testing.T) {
 			}
 			// For isDeleteNodeAllowed to be true we assume a healthy control plane.
 			if tc.expectedError == nil {
-				m1.Labels[clusterv1.MachineControlPlaneLabelName] = ""
-				m2.Labels[clusterv1.MachineControlPlaneLabelName] = ""
+				m1.Labels[clusterv1.MachineControlPlaneLabel] = ""
+				m2.Labels[clusterv1.MachineControlPlaneLabel] = ""
 			}
 
 			mr := &Reconciler{
@@ -1849,7 +1849,7 @@ func TestNodeToMachine(t *testing.T) {
 			GenerateName: "machine-created-",
 			Namespace:    ns.Name,
 			Labels: map[string]string{
-				clusterv1.MachineControlPlaneLabelName: "",
+				clusterv1.MachineControlPlaneLabel: "",
 			},
 		},
 		Spec: clusterv1.MachineSpec{
@@ -1888,7 +1888,7 @@ func TestNodeToMachine(t *testing.T) {
 			GenerateName: "machine-created-",
 			Namespace:    ns.Name,
 			Labels: map[string]string{
-				clusterv1.MachineControlPlaneLabelName: "",
+				clusterv1.MachineControlPlaneLabel: "",
 			},
 		},
 		Spec: clusterv1.MachineSpec{
@@ -2021,7 +2021,7 @@ func TestNodeDeletion(t *testing.T) {
 			Name:      "test",
 			Namespace: metav1.NamespaceDefault,
 			Labels: map[string]string{
-				clusterv1.MachineControlPlaneLabelName: "",
+				clusterv1.MachineControlPlaneLabel: "",
 			},
 			Annotations: map[string]string{
 				"machine.cluster.x-k8s.io/exclude-node-draining": "",
@@ -2050,8 +2050,8 @@ func TestNodeDeletion(t *testing.T) {
 			Name:      "cp1",
 			Namespace: metav1.NamespaceDefault,
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName:             "test-cluster",
-				clusterv1.MachineControlPlaneLabelName: "",
+				clusterv1.ClusterNameLabel:         "test-cluster",
+				clusterv1.MachineControlPlaneLabel: "",
 			},
 			Finalizers: []string{clusterv1.MachineFinalizer},
 		},
diff --git a/internal/controllers/machinedeployment/machinedeployment_controller_test.go b/internal/controllers/machinedeployment/machinedeployment_controller_test.go
index 40df6c3e3..a4597db1e 100644
--- a/internal/controllers/machinedeployment/machinedeployment_controller_test.go
+++ b/internal/controllers/machinedeployment/machinedeployment_controller_test.go
@@ -75,7 +75,7 @@ func TestMachineDeploymentReconciler(t *testing.T) {
 
 		labels := map[string]string{
 			"foo":                      "bar",
-			clusterv1.ClusterLabelName: testCluster.Name,
+			clusterv1.ClusterNameLabel: testCluster.Name,
 		}
 		version := "v1.10.3"
 		deployment := &clusterv1.MachineDeployment{
@@ -83,7 +83,7 @@ func TestMachineDeploymentReconciler(t *testing.T) {
 				GenerateName: "md-",
 				Namespace:    namespace.Name,
 				Labels: map[string]string{
-					clusterv1.ClusterLabelName: testCluster.Name,
+					clusterv1.ClusterNameLabel: testCluster.Name,
 				},
 			},
 			Spec: clusterv1.MachineDeploymentSpec{
@@ -166,7 +166,7 @@ func TestMachineDeploymentReconciler(t *testing.T) {
 			if err := env.Get(ctx, key, deployment); err != nil {
 				return false
 			}
-			if len(deployment.Labels) == 0 || deployment.Labels[clusterv1.ClusterLabelName] != testCluster.Name {
+			if len(deployment.Labels) == 0 || deployment.Labels[clusterv1.ClusterNameLabel] != testCluster.Name {
 				return false
 			}
 			if len(deployment.OwnerReferences) == 0 || deployment.OwnerReferences[0].Name != testCluster.Name {
@@ -208,9 +208,9 @@ func TestMachineDeploymentReconciler(t *testing.T) {
 		g.Expect(*firstMachineSet.Spec.Replicas).To(BeEquivalentTo(2))
 		g.Expect(*firstMachineSet.Spec.Template.Spec.Version).To(BeEquivalentTo("v1.10.3"))
 
-		t.Log("Verify MachineSet has expected ClusterLabelName and MachineDeploymentLabelName")
-		g.Expect(firstMachineSet.Labels[clusterv1.ClusterLabelName]).To(Equal(testCluster.Name))
-		g.Expect(firstMachineSet.Labels[clusterv1.MachineDeploymentLabelName]).To(Equal(deployment.Name))
+		t.Log("Verify MachineSet has expected ClusterNameLabel and MachineDeploymentNameLabel")
+		g.Expect(firstMachineSet.Labels[clusterv1.ClusterNameLabel]).To(Equal(testCluster.Name))
+		g.Expect(firstMachineSet.Labels[clusterv1.MachineDeploymentNameLabel]).To(Equal(deployment.Name))
 
 		t.Log("Verify expected number of Machines are created")
 		machines := &clusterv1.MachineList{}
@@ -221,11 +221,11 @@ func TestMachineDeploymentReconciler(t *testing.T) {
 			return len(machines.Items)
 		}, timeout).Should(BeEquivalentTo(*deployment.Spec.Replicas))
 
-		t.Log("Verify Machines have expected ClusterLabelName, MachineDeploymentLabelName and MachineSetLabelName")
+		t.Log("Verify Machines have expected ClusterNameLabel, MachineDeploymentNameLabel and MachineSetNameLabel")
 		for _, m := range machines.Items {
-			g.Expect(m.Labels[clusterv1.ClusterLabelName]).To(Equal(testCluster.Name))
-			g.Expect(m.Labels[clusterv1.MachineDeploymentLabelName]).To(Equal(deployment.Name))
-			g.Expect(m.Labels[clusterv1.MachineSetLabelName]).To(Equal(firstMachineSet.Name))
+			g.Expect(m.Labels[clusterv1.ClusterNameLabel]).To(Equal(testCluster.Name))
+			g.Expect(m.Labels[clusterv1.MachineDeploymentNameLabel]).To(Equal(deployment.Name))
+			g.Expect(m.Labels[clusterv1.MachineSetNameLabel]).To(Equal(firstMachineSet.Name))
 		}
 
 		//
@@ -350,7 +350,7 @@ func TestMachineDeploymentReconciler(t *testing.T) {
 		// Change labels and selector to a new set of labels which doesn't have any overlap with the previous labels.
 		newLabels := map[string]string{
 			"new-key":                  "new-value",
-			clusterv1.ClusterLabelName: testCluster.Name,
+			clusterv1.ClusterNameLabel: testCluster.Name,
 		}
 
 		t.Log("Updating MachineDeployment labels")
@@ -430,7 +430,7 @@ func TestMachineSetToDeployments(t *testing.T) {
 			Selector: metav1.LabelSelector{
 				MatchLabels: map[string]string{
 					"foo":                      "bar",
-					clusterv1.ClusterLabelName: "test-cluster",
+					clusterv1.ClusterNameLabel: "test-cluster",
 				},
 			},
 		},
@@ -449,7 +449,7 @@ func TestMachineSetToDeployments(t *testing.T) {
 				*metav1.NewControllerRef(machineDeployment, machineDeploymentKind),
 			},
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: "test-cluster",
+				clusterv1.ClusterNameLabel: "test-cluster",
 			},
 		},
 	}
@@ -461,7 +461,7 @@ func TestMachineSetToDeployments(t *testing.T) {
 			Name:      "noOwnerRefNoLabels",
 			Namespace: metav1.NamespaceDefault,
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: "test-cluster",
+				clusterv1.ClusterNameLabel: "test-cluster",
 			},
 		},
 	}
@@ -474,7 +474,7 @@ func TestMachineSetToDeployments(t *testing.T) {
 			Namespace: metav1.NamespaceDefault,
 			Labels: map[string]string{
 				"foo":                      "bar",
-				clusterv1.ClusterLabelName: "test-cluster",
+				clusterv1.ClusterNameLabel: "test-cluster",
 			},
 		},
 	}
diff --git a/internal/controllers/machinehealthcheck/machinehealthcheck_controller_test.go b/internal/controllers/machinehealthcheck/machinehealthcheck_controller_test.go
index 0c4b4303a..1521447c5 100644
--- a/internal/controllers/machinehealthcheck/machinehealthcheck_controller_test.go
+++ b/internal/controllers/machinehealthcheck/machinehealthcheck_controller_test.go
@@ -79,7 +79,7 @@ func TestMachineHealthCheck_Reconcile(t *testing.T) {
 				return nil
 			}
 			return mhc.GetLabels()
-		}).Should(HaveKeyWithValue(clusterv1.ClusterLabelName, cluster.Name))
+		}).Should(HaveKeyWithValue(clusterv1.ClusterNameLabel, cluster.Name))
 	})
 
 	t.Run("it should ensure the correct cluster-name label when the label has the wrong value", func(t *testing.T) {
@@ -88,7 +88,7 @@ func TestMachineHealthCheck_Reconcile(t *testing.T) {
 
 		mhc := newMachineHealthCheck(cluster.Namespace, cluster.Name)
 		mhc.Labels = map[string]string{
-			clusterv1.ClusterLabelName: "wrong-cluster",
+			clusterv1.ClusterNameLabel: "wrong-cluster",
 		}
 
 		g.Expect(env.Create(ctx, mhc)).To(Succeed())
@@ -102,7 +102,7 @@ func TestMachineHealthCheck_Reconcile(t *testing.T) {
 				return nil
 			}
 			return mhc.GetLabels()
-		}).Should(HaveKeyWithValue(clusterv1.ClusterLabelName, cluster.Name))
+		}).Should(HaveKeyWithValue(clusterv1.ClusterNameLabel, cluster.Name))
 	})
 
 	t.Run("it should ensure the correct cluster-name label when other labels are present", func(t *testing.T) {
@@ -126,7 +126,7 @@ func TestMachineHealthCheck_Reconcile(t *testing.T) {
 			}
 			return mhc.GetLabels()
 		}).Should(And(
-			HaveKeyWithValue(clusterv1.ClusterLabelName, cluster.Name),
+			HaveKeyWithValue(clusterv1.ClusterNameLabel, cluster.Name),
 			HaveKeyWithValue("extra-label", "1"),
 			HaveLen(2),
 		))
@@ -2410,7 +2410,7 @@ func createMachinesWithNodes(
 			if machine.Labels == nil {
 				machine.Labels = make(map[string]string)
 			}
-			machine.Labels[clusterv1.MachineControlPlaneLabelName] = ""
+			machine.Labels[clusterv1.MachineControlPlaneLabel] = ""
 		}
 		infraMachine, providerID := newInfraMachine(machine)
 		g.Expect(env.Create(ctx, infraMachine)).To(Succeed())
@@ -2528,7 +2528,7 @@ func newMachineHealthCheckWithLabels(name, namespace, cluster string, labels map
 	for k, v := range labels {
 		l[k] = v
 	}
-	l[clusterv1.ClusterLabelName] = cluster
+	l[clusterv1.ClusterNameLabel] = cluster
 
 	mhc := newMachineHealthCheck(namespace, cluster)
 	mhc.SetName(name)
diff --git a/internal/controllers/machinehealthcheck/machinehealthcheck_targets_test.go b/internal/controllers/machinehealthcheck/machinehealthcheck_targets_test.go
index 17e6de806..e9da82ad7 100644
--- a/internal/controllers/machinehealthcheck/machinehealthcheck_targets_test.go
+++ b/internal/controllers/machinehealthcheck/machinehealthcheck_targets_test.go
@@ -483,7 +483,7 @@ func newTestMachine(name, namespace, clusterName, nodeName string, labels map[st
 	for k, v := range labels {
 		l[k] = v
 	}
-	l[clusterv1.ClusterLabelName] = clusterName
+	l[clusterv1.ClusterNameLabel] = clusterName
 
 	bootstrap := "bootstrap"
 	return &clusterv1.Machine{
diff --git a/internal/controllers/machineset/machineset_controller_test.go b/internal/controllers/machineset/machineset_controller_test.go
index 9dfb4bdff..f9d51e9f8 100644
--- a/internal/controllers/machineset/machineset_controller_test.go
+++ b/internal/controllers/machineset/machineset_controller_test.go
@@ -544,7 +544,7 @@ func TestMachineSetToMachines(t *testing.T) {
 				Selector: metav1.LabelSelector{
 					MatchLabels: map[string]string{
 						"foo":                      "bar",
-						clusterv1.ClusterLabelName: testClusterName,
+						clusterv1.ClusterNameLabel: testClusterName,
 					},
 				},
 			},
@@ -556,7 +556,7 @@ func TestMachineSetToMachines(t *testing.T) {
 			Name:      "withOwnerRef",
 			Namespace: metav1.NamespaceDefault,
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: testClusterName,
+				clusterv1.ClusterNameLabel: testClusterName,
 			},
 			OwnerReferences: []metav1.OwnerReference{
 				{
@@ -572,7 +572,7 @@ func TestMachineSetToMachines(t *testing.T) {
 			Name:      "noOwnerRefNoLabels",
 			Namespace: metav1.NamespaceDefault,
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: testClusterName,
+				clusterv1.ClusterNameLabel: testClusterName,
 			},
 		},
 	}
@@ -582,7 +582,7 @@ func TestMachineSetToMachines(t *testing.T) {
 			Namespace: metav1.NamespaceDefault,
 			Labels: map[string]string{
 				"foo":                      "bar",
-				clusterv1.ClusterLabelName: testClusterName,
+				clusterv1.ClusterNameLabel: testClusterName,
 			},
 		},
 	}
@@ -773,7 +773,7 @@ func newMachineSet(name, cluster string, replicas int32) *clusterv1.MachineSet {
 			Name:      name,
 			Namespace: metav1.NamespaceDefault,
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: cluster,
+				clusterv1.ClusterNameLabel: cluster,
 			},
 		},
 		Spec: clusterv1.MachineSetSpec{
@@ -782,13 +782,13 @@ func newMachineSet(name, cluster string, replicas int32) *clusterv1.MachineSet {
 			Template: clusterv1.MachineTemplateSpec{
 				ObjectMeta: clusterv1.ObjectMeta{
 					Labels: map[string]string{
-						clusterv1.ClusterLabelName: cluster,
+						clusterv1.ClusterNameLabel: cluster,
 					},
 				},
 			},
 			Selector: metav1.LabelSelector{
 				MatchLabels: map[string]string{
-					clusterv1.ClusterLabelName: cluster,
+					clusterv1.ClusterNameLabel: cluster,
 				},
 			},
 		},
@@ -811,7 +811,7 @@ func TestMachineSetReconcile_MachinesCreatedConditionFalseOnBadInfraRef(t *testi
 			Name:      "ms-foo",
 			Namespace: metav1.NamespaceDefault,
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: cluster.Name,
+				clusterv1.ClusterNameLabel: cluster.Name,
 			},
 		},
 		Spec: clusterv1.MachineSetSpec{
@@ -820,7 +820,7 @@ func TestMachineSetReconcile_MachinesCreatedConditionFalseOnBadInfraRef(t *testi
 			Template: clusterv1.MachineTemplateSpec{
 				ObjectMeta: clusterv1.ObjectMeta{
 					Labels: map[string]string{
-						clusterv1.ClusterLabelName: cluster.Name,
+						clusterv1.ClusterNameLabel: cluster.Name,
 					},
 				},
 				Spec: clusterv1.MachineSpec{
@@ -836,7 +836,7 @@ func TestMachineSetReconcile_MachinesCreatedConditionFalseOnBadInfraRef(t *testi
 			},
 			Selector: metav1.LabelSelector{
 				MatchLabels: map[string]string{
-					clusterv1.ClusterLabelName: cluster.Name,
+					clusterv1.ClusterNameLabel: cluster.Name,
 				},
 			},
 		},
@@ -891,7 +891,7 @@ func TestMachineSetReconciler_updateStatusResizedCondition(t *testing.T) {
 					Name:      "machine-a",
 					Namespace: metav1.NamespaceDefault,
 					Labels: map[string]string{
-						clusterv1.ClusterLabelName: cluster.Name,
+						clusterv1.ClusterNameLabel: cluster.Name,
 					},
 				},
 			},
diff --git a/internal/controllers/topology/cluster/cluster_controller_test.go b/internal/controllers/topology/cluster/cluster_controller_test.go
index 6299c578c..e774182f0 100644
--- a/internal/controllers/topology/cluster/cluster_controller_test.go
+++ b/internal/controllers/topology/cluster/cluster_controller_test.go
@@ -924,14 +924,14 @@ func assertMachineDeploymentsReconcile(cluster *clusterv1.Cluster) error {
 	clusterMDs := []clusterv1.MachineDeployment{}
 
 	// Run through all machine deployments and add only those with the TopologyOwnedLabel and the correct
-	// ClusterLabelName to the items for further testing.
+	// ClusterNameLabel to the items for further testing.
 	for _, m := range machineDeployments.Items {
-		// If the machineDeployment doesn't have the ClusterTopologyOwnedLabel and the ClusterLabelName ignore.
+		// If the machineDeployment doesn't have the ClusterTopologyOwnedLabel and the ClusterNameLabel ignore.
 		md := m
 		if err := assertClusterTopologyOwnedLabel(&md); err != nil {
 			continue
 		}
-		if err := assertClusterLabelName(&md, cluster.Name); err != nil {
+		if err := assertClusterNameLabel(&md, cluster.Name); err != nil {
 			continue
 		}
 		clusterMDs = append(clusterMDs, md)
@@ -945,7 +945,7 @@ func assertMachineDeploymentsReconcile(cluster *clusterv1.Cluster) error {
 		for _, topologyMD := range cluster.Spec.Topology.Workers.MachineDeployments {
 			md := m
 			// use the ClusterTopologyMachineDeploymentLabel to get the specific machineDeployment to compare to.
-			if topologyMD.Name != md.GetLabels()[clusterv1.ClusterTopologyMachineDeploymentLabelName] {
+			if topologyMD.Name != md.GetLabels()[clusterv1.ClusterTopologyMachineDeploymentNameLabel] {
 				continue
 			}
 
@@ -954,7 +954,7 @@ func assertMachineDeploymentsReconcile(cluster *clusterv1.Cluster) error {
 				return err
 			}
 
-			if err := assertClusterLabelName(&md, cluster.Name); err != nil {
+			if err := assertClusterNameLabel(&md, cluster.Name); err != nil {
 				return err
 			}
 
@@ -996,7 +996,7 @@ func assertMachineDeploymentsReconcile(cluster *clusterv1.Cluster) error {
 
 // getAndAssertLabelsAndAnnotations pulls the template referenced in the ObjectReference from the API server, checks for:
 // 1) The ClusterTopologyOwnedLabel.
-// 2) The correct ClusterLabelName.
+// 2) The correct ClusterNameLabel.
 // 3) The annotation stating where the template was cloned from.
 // The function returns the unstructured object and a bool indicating if it passed all tests.
 func getAndAssertLabelsAndAnnotations(template corev1.ObjectReference, clusterName string) (*unstructured.Unstructured, error) {
@@ -1020,7 +1020,7 @@ func assertLabelsAndAnnotations(got client.Object, clusterName string) error {
 	if err := assertClusterTopologyOwnedLabel(got); err != nil {
 		return err
 	}
-	if err := assertClusterLabelName(got, clusterName); err != nil {
+	if err := assertClusterNameLabel(got, clusterName); err != nil {
 		return err
 	}
 	if err := assertTemplateClonedFromNameAnnotation(got); err != nil {
@@ -1029,7 +1029,7 @@ func assertLabelsAndAnnotations(got client.Object, clusterName string) error {
 	return nil
 }
 
-// assertClusterTopologyOwnedLabel  asserts the label exists.
+// assertClusterTopologyOwnedLabel asserts the label exists.
 func assertClusterTopologyOwnedLabel(got client.Object) error {
 	_, ok := got.GetLabels()[clusterv1.ClusterTopologyOwnedLabel]
 	if !ok {
@@ -1038,14 +1038,14 @@ func assertClusterTopologyOwnedLabel(got client.Object) error {
 	return nil
 }
 
-// assertClusterTopologyOwnedLabel asserts the label exists and is set to the correct value.
-func assertClusterLabelName(got client.Object, clusterName string) error {
-	v, ok := got.GetLabels()[clusterv1.ClusterLabelName]
+// assertClusterNameLabel asserts the label exists and is set to the correct value.
+func assertClusterNameLabel(got client.Object, clusterName string) error {
+	v, ok := got.GetLabels()[clusterv1.ClusterNameLabel]
 	if !ok {
-		return fmt.Errorf("%v not found in %v: %v", clusterv1.ClusterLabelName, got.GetObjectKind().GroupVersionKind().Kind, got.GetName())
+		return fmt.Errorf("%v not found in %v: %v", clusterv1.ClusterNameLabel, got.GetObjectKind().GroupVersionKind().Kind, got.GetName())
 	}
 	if v != clusterName {
-		return fmt.Errorf("%v %v does not match expected %v", clusterv1.ClusterLabelName, v, clusterName)
+		return fmt.Errorf("%v %v does not match expected %v", clusterv1.ClusterNameLabel, v, clusterName)
 	}
 	return nil
 }
diff --git a/internal/controllers/topology/cluster/current_state_test.go b/internal/controllers/topology/cluster/current_state_test.go
index 09c9e582b..d30c3ef42 100644
--- a/internal/controllers/topology/cluster/current_state_test.go
+++ b/internal/controllers/topology/cluster/current_state_test.go
@@ -105,18 +105,18 @@ func TestGetCurrentState(t *testing.T) {
 
 	machineDeployment := builder.MachineDeployment(metav1.NamespaceDefault, "md1").
 		WithLabels(map[string]string{
-			clusterv1.ClusterLabelName:                          "cluster1",
+			clusterv1.ClusterNameLabel:                          "cluster1",
 			clusterv1.ClusterTopologyOwnedLabel:                 "",
-			clusterv1.ClusterTopologyMachineDeploymentLabelName: "md1",
+			clusterv1.ClusterTopologyMachineDeploymentNameLabel: "md1",
 		}).
 		WithBootstrapTemplate(machineDeploymentBootstrap).
 		WithInfrastructureTemplate(machineDeploymentInfrastructure).
 		Build()
 	machineDeployment2 := builder.MachineDeployment(metav1.NamespaceDefault, "md2").
 		WithLabels(map[string]string{
-			clusterv1.ClusterLabelName:                          "cluster1",
+			clusterv1.ClusterNameLabel:                          "cluster1",
 			clusterv1.ClusterTopologyOwnedLabel:                 "",
-			clusterv1.ClusterTopologyMachineDeploymentLabelName: "md2",
+			clusterv1.ClusterTopologyMachineDeploymentNameLabel: "md2",
 		}).
 		WithBootstrapTemplate(machineDeploymentBootstrap).
 		WithInfrastructureTemplate(machineDeploymentInfrastructure).
@@ -451,7 +451,7 @@ func TestGetCurrentState(t *testing.T) {
 				clusterClassWithControlPlaneInfra,
 				builder.MachineDeployment(metav1.NamespaceDefault, "no-managed-label").
 					WithLabels(map[string]string{
-						clusterv1.ClusterLabelName: "cluster1",
+						clusterv1.ClusterNameLabel: "cluster1",
 						// topology.cluster.x-k8s.io/owned label is missing (unmanaged)!
 					}).
 					WithBootstrapTemplate(machineDeploymentBootstrap).
@@ -459,9 +459,9 @@ func TestGetCurrentState(t *testing.T) {
 					Build(),
 				builder.MachineDeployment(metav1.NamespaceDefault, "wrong-cluster-label").
 					WithLabels(map[string]string{
-						clusterv1.ClusterLabelName:                          "another-cluster",
+						clusterv1.ClusterNameLabel:                          "another-cluster",
 						clusterv1.ClusterTopologyOwnedLabel:                 "",
-						clusterv1.ClusterTopologyMachineDeploymentLabelName: "md1",
+						clusterv1.ClusterTopologyMachineDeploymentNameLabel: "md1",
 					}).
 					WithBootstrapTemplate(machineDeploymentBootstrap).
 					WithInfrastructureTemplate(machineDeploymentInfrastructure).
@@ -485,7 +485,7 @@ func TestGetCurrentState(t *testing.T) {
 				clusterClassWithControlPlaneInfra,
 				builder.MachineDeployment(metav1.NamespaceDefault, "missing-topology-md-labelName").
 					WithLabels(map[string]string{
-						clusterv1.ClusterLabelName:          "cluster1",
+						clusterv1.ClusterNameLabel:          "cluster1",
 						clusterv1.ClusterTopologyOwnedLabel: "",
 						// topology.cluster.x-k8s.io/deployment-name label is missing!
 					}).
@@ -493,7 +493,7 @@ func TestGetCurrentState(t *testing.T) {
 					WithInfrastructureTemplate(machineDeploymentInfrastructure).
 					Build(),
 			},
-			// Expect error to be thrown as no managed MachineDeployment is reconcilable unless it has a ClusterTopologyMachineDeploymentLabelName.
+			// Expect error to be thrown as no managed MachineDeployment is reconcilable unless it has a ClusterTopologyMachineDeploymentNameLabel.
 			wantErr: true,
 		},
 		{
diff --git a/internal/controllers/topology/cluster/desired_state_test.go b/internal/controllers/topology/cluster/desired_state_test.go
index 32414d752..8e66bd85c 100644
--- a/internal/controllers/topology/cluster/desired_state_test.go
+++ b/internal/controllers/topology/cluster/desired_state_test.go
@@ -454,7 +454,7 @@ func TestComputeControlPlane(t *testing.T) {
 		g.Expect(err).ToNot(HaveOccurred())
 
 		expectedLabels := mergeMap(s.Current.Cluster.Spec.Topology.ControlPlane.Metadata.Labels, blueprint.ClusterClass.Spec.ControlPlane.Metadata.Labels)
-		expectedLabels[clusterv1.ClusterLabelName] = cluster.Name
+		expectedLabels[clusterv1.ClusterNameLabel] = cluster.Name
 		expectedLabels[clusterv1.ClusterTopologyOwnedLabel] = ""
 		g.Expect(gotMetadata).To(Equal(&clusterv1.ObjectMeta{
 			Labels:      expectedLabels,
@@ -1294,7 +1294,7 @@ func TestComputeCluster(t *testing.T) {
 	// ObjectMeta
 	g.Expect(obj.Name).To(Equal(cluster.Name))
 	g.Expect(obj.Namespace).To(Equal(cluster.Namespace))
-	g.Expect(obj.GetLabels()).To(HaveKeyWithValue(clusterv1.ClusterLabelName, cluster.Name))
+	g.Expect(obj.GetLabels()).To(HaveKeyWithValue(clusterv1.ClusterNameLabel, cluster.Name))
 	g.Expect(obj.GetLabels()).To(HaveKeyWithValue(clusterv1.ClusterTopologyOwnedLabel, ""))
 
 	// Spec
@@ -1414,14 +1414,14 @@ func TestComputeMachineDeployment(t *testing.T) {
 		actual, err := computeMachineDeployment(ctx, scope, nil, mdTopology)
 		g.Expect(err).ToNot(HaveOccurred())
 
-		g.Expect(actual.BootstrapTemplate.GetLabels()).To(HaveKeyWithValue(clusterv1.ClusterTopologyMachineDeploymentLabelName, "big-pool-of-machines"))
+		g.Expect(actual.BootstrapTemplate.GetLabels()).To(HaveKeyWithValue(clusterv1.ClusterTopologyMachineDeploymentNameLabel, "big-pool-of-machines"))
 
 		// Ensure Cluster ownership is added to generated BootstrapTemplate.
 		g.Expect(actual.BootstrapTemplate.GetOwnerReferences()).To(HaveLen(1))
 		g.Expect(actual.BootstrapTemplate.GetOwnerReferences()[0].Kind).To(Equal("Cluster"))
 		g.Expect(actual.BootstrapTemplate.GetOwnerReferences()[0].Name).To(Equal(cluster.Name))
 
-		g.Expect(actual.InfrastructureMachineTemplate.GetLabels()).To(HaveKeyWithValue(clusterv1.ClusterTopologyMachineDeploymentLabelName, "big-pool-of-machines"))
+		g.Expect(actual.InfrastructureMachineTemplate.GetLabels()).To(HaveKeyWithValue(clusterv1.ClusterTopologyMachineDeploymentNameLabel, "big-pool-of-machines"))
 
 		// Ensure Cluster ownership is added to generated InfrastructureMachineTemplate.
 		g.Expect(actual.InfrastructureMachineTemplate.GetOwnerReferences()).To(HaveLen(1))
@@ -1440,11 +1440,11 @@ func TestComputeMachineDeployment(t *testing.T) {
 		g.Expect(actualMd.Name).To(ContainSubstring("cluster1"))
 		g.Expect(actualMd.Name).To(ContainSubstring("big-pool-of-machines"))
 
-		g.Expect(actualMd.Labels).To(HaveKeyWithValue(clusterv1.ClusterTopologyMachineDeploymentLabelName, "big-pool-of-machines"))
+		g.Expect(actualMd.Labels).To(HaveKeyWithValue(clusterv1.ClusterTopologyMachineDeploymentNameLabel, "big-pool-of-machines"))
 		g.Expect(actualMd.Labels).To(HaveKey(clusterv1.ClusterTopologyOwnedLabel))
 
 		g.Expect(actualMd.Spec.Selector.MatchLabels).To(HaveKey(clusterv1.ClusterTopologyOwnedLabel))
-		g.Expect(actualMd.Spec.Selector.MatchLabels).To(HaveKeyWithValue(clusterv1.ClusterTopologyMachineDeploymentLabelName, "big-pool-of-machines"))
+		g.Expect(actualMd.Spec.Selector.MatchLabels).To(HaveKeyWithValue(clusterv1.ClusterTopologyMachineDeploymentNameLabel, "big-pool-of-machines"))
 
 		g.Expect(actualMd.Spec.Template.ObjectMeta.Labels).To(HaveKeyWithValue("foo", "baz"))
 		g.Expect(actualMd.Spec.Template.ObjectMeta.Labels).To(HaveKeyWithValue("fizz", "buzz"))
@@ -1520,7 +1520,7 @@ func TestComputeMachineDeployment(t *testing.T) {
 		g.Expect(*actualMd.Spec.Template.Spec.FailureDomain).To(Equal(topologyFailureDomain))
 		g.Expect(actualMd.Name).To(Equal("existing-deployment-1"))
 
-		g.Expect(actualMd.Labels).To(HaveKeyWithValue(clusterv1.ClusterTopologyMachineDeploymentLabelName, "big-pool-of-machines"))
+		g.Expect(actualMd.Labels).To(HaveKeyWithValue(clusterv1.ClusterTopologyMachineDeploymentNameLabel, "big-pool-of-machines"))
 		g.Expect(actualMd.Labels).To(HaveKey(clusterv1.ClusterTopologyOwnedLabel))
 
 		g.Expect(actualMd.Spec.Template.ObjectMeta.Labels).To(HaveKeyWithValue("foo", "baz"))
@@ -1679,7 +1679,7 @@ func TestComputeMachineDeployment(t *testing.T) {
 		g.Expect(actual.MachineHealthCheck.Spec.ClusterName).To(Equal(cluster.Name))
 		g.Expect(actual.MachineHealthCheck.Spec.Selector).To(Equal(metav1.LabelSelector{MatchLabels: map[string]string{
 			clusterv1.ClusterTopologyOwnedLabel:                 actual.Object.Spec.Selector.MatchLabels[clusterv1.ClusterTopologyOwnedLabel],
-			clusterv1.ClusterTopologyMachineDeploymentLabelName: actual.Object.Spec.Selector.MatchLabels[clusterv1.ClusterTopologyMachineDeploymentLabelName],
+			clusterv1.ClusterTopologyMachineDeploymentNameLabel: actual.Object.Spec.Selector.MatchLabels[clusterv1.ClusterTopologyMachineDeploymentNameLabel],
 		}}))
 
 		// Check that the NodeStartupTime is set as expected.
@@ -2001,7 +2001,7 @@ func assertTemplateToObject(g *WithT, in assertTemplateInput) {
 		g.Expect(in.obj.GetName()).To(HavePrefix(in.cluster.Name))
 	}
 	g.Expect(in.obj.GetNamespace()).To(Equal(in.cluster.Namespace))
-	g.Expect(in.obj.GetLabels()).To(HaveKeyWithValue(clusterv1.ClusterLabelName, in.cluster.Name))
+	g.Expect(in.obj.GetLabels()).To(HaveKeyWithValue(clusterv1.ClusterNameLabel, in.cluster.Name))
 	g.Expect(in.obj.GetLabels()).To(HaveKeyWithValue(clusterv1.ClusterTopologyOwnedLabel, ""))
 	for k, v := range in.labels {
 		g.Expect(in.obj.GetLabels()).To(HaveKeyWithValue(k, v))
@@ -2036,7 +2036,7 @@ func assertTemplateToTemplate(g *WithT, in assertTemplateInput) {
 		g.Expect(in.obj.GetName()).To(HavePrefix(in.cluster.Name))
 	}
 	g.Expect(in.obj.GetNamespace()).To(Equal(in.cluster.Namespace))
-	g.Expect(in.obj.GetLabels()).To(HaveKeyWithValue(clusterv1.ClusterLabelName, in.cluster.Name))
+	g.Expect(in.obj.GetLabels()).To(HaveKeyWithValue(clusterv1.ClusterNameLabel, in.cluster.Name))
 	g.Expect(in.obj.GetLabels()).To(HaveKeyWithValue(clusterv1.ClusterTopologyOwnedLabel, ""))
 	for k, v := range in.labels {
 		g.Expect(in.obj.GetLabels()).To(HaveKeyWithValue(k, v))
diff --git a/internal/controllers/topology/cluster/reconcile_state_test.go b/internal/controllers/topology/cluster/reconcile_state_test.go
index c9ea07512..33d6ff499 100644
--- a/internal/controllers/topology/cluster/reconcile_state_test.go
+++ b/internal/controllers/topology/cluster/reconcile_state_test.go
@@ -1672,8 +1672,8 @@ func TestReconcileMachineDeployments(t *testing.T) {
 	infrastructureMachineTemplate9m := builder.TestInfrastructureMachineTemplate(metav1.NamespaceDefault, "infrastructure-machine-9m").Build()
 	bootstrapTemplate9m := builder.TestBootstrapTemplate(metav1.NamespaceDefault, "bootstrap-config-9m").Build()
 	md9 := newFakeMachineDeploymentTopologyState("md-9m", infrastructureMachineTemplate9m, bootstrapTemplate9m, nil)
-	md9.Object.Spec.Template.ObjectMeta.Labels = map[string]string{clusterv1.ClusterLabelName: "cluster-1", "foo": "bar"}
-	md9.Object.Spec.Selector.MatchLabels = map[string]string{clusterv1.ClusterLabelName: "cluster-1", "foo": "bar"}
+	md9.Object.Spec.Template.ObjectMeta.Labels = map[string]string{clusterv1.ClusterNameLabel: "cluster-1", "foo": "bar"}
+	md9.Object.Spec.Selector.MatchLabels = map[string]string{clusterv1.ClusterNameLabel: "cluster-1", "foo": "bar"}
 	md9WithInstanceSpecificTemplateMetadataAndSelector := newFakeMachineDeploymentTopologyState("md-9m", infrastructureMachineTemplate9m, bootstrapTemplate9m, nil)
 	md9WithInstanceSpecificTemplateMetadataAndSelector.Object.Spec.Template.ObjectMeta.Labels = map[string]string{"foo": "bar"}
 	md9WithInstanceSpecificTemplateMetadataAndSelector.Object.Spec.Selector.MatchLabels = map[string]string{"foo": "bar"}
@@ -1827,7 +1827,7 @@ func TestReconcileMachineDeployments(t *testing.T) {
 					if wantMachineDeploymentState.Object.Name != gotMachineDeployment.Name {
 						continue
 					}
-					currentMachineDeploymentTopologyName := wantMachineDeploymentState.Object.ObjectMeta.Labels[clusterv1.ClusterTopologyMachineDeploymentLabelName]
+					currentMachineDeploymentTopologyName := wantMachineDeploymentState.Object.ObjectMeta.Labels[clusterv1.ClusterTopologyMachineDeploymentNameLabel]
 					currentMachineDeploymentState := currentMachineDeploymentStates[currentMachineDeploymentTopologyName]
 
 					// Copy over the name of the newly created InfrastructureRef and Bootsrap.ConfigRef because they get a generated name
@@ -2402,7 +2402,7 @@ func TestReconcileReferencedObjectSequences(t *testing.T) {
 func TestReconcileMachineDeploymentMachineHealthCheck(t *testing.T) {
 	md := builder.MachineDeployment(metav1.NamespaceDefault, "md-1").WithLabels(
 		map[string]string{
-			clusterv1.ClusterTopologyMachineDeploymentLabelName: "machine-deployment-one",
+			clusterv1.ClusterTopologyMachineDeploymentNameLabel: "machine-deployment-one",
 		}).
 		Build()
 
@@ -2588,7 +2588,7 @@ func newFakeMachineDeploymentTopologyState(name string, infrastructureMachineTem
 		Object: builder.MachineDeployment(metav1.NamespaceDefault, name).
 			WithInfrastructureTemplate(infrastructureMachineTemplate).
 			WithBootstrapTemplate(bootstrapTemplate).
-			WithLabels(map[string]string{clusterv1.ClusterTopologyMachineDeploymentLabelName: name + "-topology"}).
+			WithLabels(map[string]string{clusterv1.ClusterTopologyMachineDeploymentNameLabel: name + "-topology"}).
 			WithClusterName("cluster-1").
 			WithReplicas(1).
 			WithDefaulter(true).
@@ -2602,7 +2602,7 @@ func newFakeMachineDeploymentTopologyState(name string, infrastructureMachineTem
 func toMachineDeploymentTopologyStateMap(states []*scope.MachineDeploymentState) map[string]*scope.MachineDeploymentState {
 	ret := map[string]*scope.MachineDeploymentState{}
 	for _, state := range states {
-		ret[state.Object.Labels[clusterv1.ClusterTopologyMachineDeploymentLabelName]] = state
+		ret[state.Object.Labels[clusterv1.ClusterTopologyMachineDeploymentNameLabel]] = state
 	}
 	return ret
 }
diff --git a/internal/controllers/topology/machinedeployment/machinedeployment_controller_test.go b/internal/controllers/topology/machinedeployment/machinedeployment_controller_test.go
index fbe00497a..1dea7d7e0 100644
--- a/internal/controllers/topology/machinedeployment/machinedeployment_controller_test.go
+++ b/internal/controllers/topology/machinedeployment/machinedeployment_controller_test.go
@@ -176,7 +176,7 @@ func TestMachineDeploymentReconciler_ReconcileDelete(t *testing.T) {
 			WithBootstrapTemplate(mdBT).
 			WithInfrastructureTemplate(mdIMT).
 			WithLabels(map[string]string{
-				clusterv1.MachineDeploymentLabelName: md.Name,
+				clusterv1.MachineDeploymentNameLabel: md.Name,
 			}).
 			Build()
 
diff --git a/internal/controllers/topology/machineset/machineset_controller_test.go b/internal/controllers/topology/machineset/machineset_controller_test.go
index 166241931..bd790eb49 100644
--- a/internal/controllers/topology/machineset/machineset_controller_test.go
+++ b/internal/controllers/topology/machineset/machineset_controller_test.go
@@ -53,7 +53,7 @@ func TestMachineSetTopologyFinalizer(t *testing.T) {
 			},
 		}).
 		WithLabels(map[string]string{
-			clusterv1.MachineDeploymentLabelName: mdName,
+			clusterv1.MachineDeploymentNameLabel: mdName,
 			clusterv1.ClusterTopologyOwnedLabel:  "",
 		})
 
@@ -131,7 +131,7 @@ func TestMachineSetReconciler_ReconcileDelete(t *testing.T) {
 		WithBootstrapTemplate(msBT).
 		WithInfrastructureTemplate(msIMT).
 		WithLabels(map[string]string{
-			clusterv1.MachineDeploymentLabelName: mdName,
+			clusterv1.MachineDeploymentNameLabel: mdName,
 		}).
 		Build()
 	ms.SetDeletionTimestamp(&deletionTimeStamp)
@@ -173,7 +173,7 @@ func TestMachineSetReconciler_ReconcileDelete(t *testing.T) {
 		msWithoutBootstrapTemplate := builder.MachineSet(metav1.NamespaceDefault, "msWithoutBootstrapTemplate").
 			WithInfrastructureTemplate(msWithoutBootstrapTemplateIMT).
 			WithLabels(map[string]string{
-				clusterv1.MachineDeploymentLabelName: mdName,
+				clusterv1.MachineDeploymentNameLabel: mdName,
 			}).
 			Build()
 		msWithoutBootstrapTemplate.SetDeletionTimestamp(&deletionTimeStamp)
@@ -247,7 +247,7 @@ func TestMachineSetReconciler_ReconcileDelete(t *testing.T) {
 			WithBootstrapTemplate(msBT).
 			WithInfrastructureTemplate(msIMT).
 			WithLabels(map[string]string{
-				clusterv1.MachineDeploymentLabelName: mdName,
+				clusterv1.MachineDeploymentNameLabel: mdName,
 			}).
 			Build()
 		anotherMS.SetOwnerReferences([]metav1.OwnerReference{
diff --git a/internal/test/builder/builders.go b/internal/test/builder/builders.go
index 4c6ac4370..fbf0afa3f 100644
--- a/internal/test/builder/builders.go
+++ b/internal/test/builder/builders.go
@@ -1237,10 +1237,10 @@ func (m *MachineDeploymentBuilder) Build() *clusterv1.MachineDeployment {
 		obj.Spec.Template.Spec.ClusterName = m.clusterName
 		obj.Spec.ClusterName = m.clusterName
 		obj.Spec.Selector.MatchLabels = map[string]string{
-			clusterv1.ClusterLabelName: m.clusterName,
+			clusterv1.ClusterNameLabel: m.clusterName,
 		}
 		obj.Spec.Template.Labels = map[string]string{
-			clusterv1.ClusterLabelName: m.clusterName,
+			clusterv1.ClusterNameLabel: m.clusterName,
 		}
 	}
 	if m.defaulter {
@@ -1396,7 +1396,7 @@ func (m *MachineBuilder) Build() *clusterv1.Machine {
 		if len(m.labels) == 0 {
 			machine.Labels = map[string]string{}
 		}
-		machine.ObjectMeta.Labels[clusterv1.ClusterLabelName] = m.clusterName
+		machine.ObjectMeta.Labels[clusterv1.ClusterNameLabel] = m.clusterName
 	}
 	return machine
 }
@@ -1532,7 +1532,7 @@ func (m *MachineHealthCheckBuilder) Build() *clusterv1.MachineHealthCheck {
 		},
 	}
 	if m.clusterName != "" {
-		mhc.Labels = map[string]string{clusterv1.ClusterLabelName: m.clusterName}
+		mhc.Labels = map[string]string{clusterv1.ClusterNameLabel: m.clusterName}
 	}
 	if m.defaulter {
 		mhc.Default()
diff --git a/test/e2e/clusterclass_changes.go b/test/e2e/clusterclass_changes.go
index 85f782928..662376b2a 100644
--- a/test/e2e/clusterclass_changes.go
+++ b/test/e2e/clusterclass_changes.go
@@ -338,7 +338,7 @@ func modifyMachineDeploymentViaClusterClassAndWait(ctx context.Context, input mo
 				// Get MachineDeployment for the current MachineDeploymentTopology.
 				mdList := &clusterv1.MachineDeploymentList{}
 				Expect(mgmtClient.List(ctx, mdList, client.InNamespace(input.Cluster.Namespace), client.MatchingLabels{
-					clusterv1.ClusterTopologyMachineDeploymentLabelName: mdTopology.Name,
+					clusterv1.ClusterTopologyMachineDeploymentNameLabel: mdTopology.Name,
 				})).To(Succeed())
 				if len(mdList.Items) != 1 {
 					return errors.Errorf("expected one MachineDeployment for topology %q, but got %d", mdTopology.Name, len(mdList.Items))
@@ -442,7 +442,7 @@ func rebaseClusterClassAndWait(ctx context.Context, input rebaseClusterClassAndW
 			// Get MachineDeployment for the current MachineDeploymentTopology.
 			mdList := &clusterv1.MachineDeploymentList{}
 			Expect(mgmtClient.List(ctx, mdList, client.InNamespace(input.Cluster.Namespace), client.MatchingLabels{
-				clusterv1.ClusterTopologyMachineDeploymentLabelName: mdTopology.Name,
+				clusterv1.ClusterTopologyMachineDeploymentNameLabel: mdTopology.Name,
 			})).To(Succeed())
 			if len(mdList.Items) != 1 {
 				return errors.Errorf("expected one MachineDeployment for topology %q, but got %d", mdTopology.Name, len(mdList.Items))
@@ -501,7 +501,7 @@ func deleteMachineDeploymentTopologyAndWait(ctx context.Context, input deleteMac
 		// Get MachineDeployment for the current MachineDeploymentTopology.
 		mdList := &clusterv1.MachineDeploymentList{}
 		Expect(input.ClusterProxy.GetClient().List(ctx, mdList, client.InNamespace(input.Cluster.Namespace), client.MatchingLabels{
-			clusterv1.ClusterTopologyMachineDeploymentLabelName: mdTopologyToDelete.Name,
+			clusterv1.ClusterTopologyMachineDeploymentNameLabel: mdTopologyToDelete.Name,
 		})).To(Succeed())
 		if len(mdList.Items) != 0 {
 			return errors.Errorf("expected no MachineDeployment for topology %q, but got %d", mdTopologyToDelete.Name, len(mdList.Items))
diff --git a/test/e2e/clusterctl_upgrade.go b/test/e2e/clusterctl_upgrade.go
index 483884539..64b571d13 100644
--- a/test/e2e/clusterctl_upgrade.go
+++ b/test/e2e/clusterctl_upgrade.go
@@ -324,7 +324,7 @@ func ClusterctlUpgradeSpec(ctx context.Context, inputGetter func() ClusterctlUpg
 		Eventually(func() (int64, error) {
 			var n int64
 			machineList := &clusterv1alpha3.MachineList{}
-			if err := managementClusterProxy.GetClient().List(ctx, machineList, client.InNamespace(testNamespace.Name), client.MatchingLabels{clusterv1.ClusterLabelName: workLoadClusterName}); err == nil {
+			if err := managementClusterProxy.GetClient().List(ctx, machineList, client.InNamespace(testNamespace.Name), client.MatchingLabels{clusterv1.ClusterNameLabel: workLoadClusterName}); err == nil {
 				for _, machine := range machineList.Items {
 					if machine.Status.NodeRef != nil {
 						n++
@@ -349,7 +349,7 @@ func ClusterctlUpgradeSpec(ctx context.Context, inputGetter func() ClusterctlUpg
 			ctx,
 			preUpgradeMachineList,
 			client.InNamespace(testNamespace.Name),
-			client.MatchingLabels{clusterv1.ClusterLabelName: workLoadClusterName},
+			client.MatchingLabels{clusterv1.ClusterNameLabel: workLoadClusterName},
 		)
 		Expect(err).NotTo(HaveOccurred())
 		// Check if the user want a custom upgrade
@@ -400,7 +400,7 @@ func ClusterctlUpgradeSpec(ctx context.Context, inputGetter func() ClusterctlUpg
 				ctx,
 				postUpgradeMachineList,
 				client.InNamespace(testNamespace.Name),
-				client.MatchingLabels{clusterv1.ClusterLabelName: workLoadClusterName},
+				client.MatchingLabels{clusterv1.ClusterNameLabel: workLoadClusterName},
 			)
 			Expect(err).NotTo(HaveOccurred())
 			return matchUnstructuredLists(preUpgradeMachineList, postUpgradeMachineList)
diff --git a/test/e2e/kcp_adoption.go b/test/e2e/kcp_adoption.go
index e47cfe9a3..e71af9114 100644
--- a/test/e2e/kcp_adoption.go
+++ b/test/e2e/kcp_adoption.go
@@ -172,8 +172,8 @@ func KCPAdoptionSpec(ctx context.Context, inputGetter func() KCPAdoptionSpecInpu
 			ctrlclient.InNamespace(namespace.Name),
 			ctrlclient.MatchingLabelsSelector{
 				Selector: labels.NewSelector().
-					Add(must(labels.NewRequirement(clusterv1.MachineControlPlaneLabelName, selection.Exists, []string{}))).
-					Add(must(labels.NewRequirement(clusterv1.ClusterLabelName, selection.Equals, []string{clusterName}))),
+					Add(must(labels.NewRequirement(clusterv1.MachineControlPlaneLabel, selection.Exists, []string{}))).
+					Add(must(labels.NewRequirement(clusterv1.ClusterNameLabel, selection.Equals, []string{clusterName}))),
 			},
 		)).To(Succeed())
 
@@ -196,13 +196,13 @@ func KCPAdoptionSpec(ctx context.Context, inputGetter func() KCPAdoptionSpecInpu
 		Expect(client.List(ctx, &bootstrap,
 			ctrlclient.InNamespace(namespace.Name),
 			ctrlclient.MatchingLabels{
-				clusterv1.ClusterLabelName: clusterName,
+				clusterv1.ClusterNameLabel: clusterName,
 			})).To(Succeed())
 
 		By("Taking ownership of the cluster's PKI material")
 		secrets := corev1.SecretList{}
 		Expect(client.List(ctx, &secrets, ctrlclient.InNamespace(namespace.Name), ctrlclient.MatchingLabels{
-			clusterv1.ClusterLabelName: cluster.Name,
+			clusterv1.ClusterNameLabel: cluster.Name,
 		})).To(Succeed())
 
 		bootstrapSecrets := map[string]bootstrapv1.KubeadmConfig{}
diff --git a/test/e2e/self_hosted.go b/test/e2e/self_hosted.go
index 5079d1505..beec7415a 100644
--- a/test/e2e/self_hosted.go
+++ b/test/e2e/self_hosted.go
@@ -213,7 +213,7 @@ func SelfHostedSpec(ctx context.Context, inputGetter func() SelfHostedSpecInput)
 			ctx,
 			preMoveMachineList,
 			client.InNamespace(namespace.Name),
-			client.MatchingLabels{clusterv1.ClusterLabelName: workloadClusterName},
+			client.MatchingLabels{clusterv1.ClusterNameLabel: workloadClusterName},
 		)
 		Expect(err).NotTo(HaveOccurred(), "Failed to list machines before move")
 
@@ -268,7 +268,7 @@ func SelfHostedSpec(ctx context.Context, inputGetter func() SelfHostedSpecInput)
 				ctx,
 				postMoveMachineList,
 				client.InNamespace(namespace.Name),
-				client.MatchingLabels{clusterv1.ClusterLabelName: workloadClusterName},
+				client.MatchingLabels{clusterv1.ClusterNameLabel: workloadClusterName},
 			)
 			Expect(err).NotTo(HaveOccurred(), "Failed to list machines after move")
 			return matchUnstructuredLists(preMoveMachineList, postMoveMachineList)
diff --git a/test/framework/alltypes_helpers.go b/test/framework/alltypes_helpers.go
index fa6ff095f..6d1bf2dc7 100644
--- a/test/framework/alltypes_helpers.go
+++ b/test/framework/alltypes_helpers.go
@@ -153,7 +153,7 @@ func dumpObject(resource runtime.Object, logPath string) {
 // capiProviderOptions returns a set of ListOptions that allows to identify all the objects belonging to Cluster API providers.
 func capiProviderOptions() []client.ListOption {
 	return []client.ListOption{
-		client.HasLabels{clusterv1.ProviderLabelName},
+		client.HasLabels{clusterv1.ProviderNameLabel},
 	}
 }
 
diff --git a/test/framework/cluster_helpers.go b/test/framework/cluster_helpers.go
index bdd628b2a..0024274ec 100644
--- a/test/framework/cluster_helpers.go
+++ b/test/framework/cluster_helpers.go
@@ -281,7 +281,7 @@ func byClusterOptions(name, namespace string) []client.ListOption {
 	return []client.ListOption{
 		client.InNamespace(namespace),
 		client.MatchingLabels{
-			clusterv1.ClusterLabelName: name,
+			clusterv1.ClusterNameLabel: name,
 		},
 	}
 }
diff --git a/test/framework/cluster_proxy.go b/test/framework/cluster_proxy.go
index 40f1777f2..ec677fa92 100644
--- a/test/framework/cluster_proxy.go
+++ b/test/framework/cluster_proxy.go
@@ -292,7 +292,7 @@ func getMachinesInCluster(ctx context.Context, c client.Client, namespace, name
 	}
 
 	machineList := &clusterv1.MachineList{}
-	labels := map[string]string{clusterv1.ClusterLabelName: name}
+	labels := map[string]string{clusterv1.ClusterNameLabel: name}
 	if err := c.List(ctx, machineList, client.InNamespace(namespace), client.MatchingLabels(labels)); err != nil {
 		return nil, err
 	}
@@ -306,7 +306,7 @@ func getMachinePoolsInCluster(ctx context.Context, c client.Client, namespace, n
 	}
 
 	machinePoolList := &expv1.MachinePoolList{}
-	labels := map[string]string{clusterv1.ClusterLabelName: name}
+	labels := map[string]string{clusterv1.ClusterNameLabel: name}
 	if err := c.List(ctx, machinePoolList, client.InNamespace(namespace), client.MatchingLabels(labels)); err != nil {
 		return nil, err
 	}
diff --git a/test/framework/controlplane_helpers.go b/test/framework/controlplane_helpers.go
index 60b724e23..d5545c6c9 100644
--- a/test/framework/controlplane_helpers.go
+++ b/test/framework/controlplane_helpers.go
@@ -97,8 +97,8 @@ func WaitForKubeadmControlPlaneMachinesToExist(ctx context.Context, input WaitFo
 	inClustersNamespaceListOption := client.InNamespace(input.Cluster.Namespace)
 	// ControlPlane labels
 	matchClusterListOption := client.MatchingLabels{
-		clusterv1.MachineControlPlaneLabelName: "",
-		clusterv1.ClusterLabelName:             input.Cluster.Name,
+		clusterv1.MachineControlPlaneLabel: "",
+		clusterv1.ClusterNameLabel:         input.Cluster.Name,
 	}
 
 	Eventually(func() (int, error) {
@@ -134,8 +134,8 @@ func WaitForOneKubeadmControlPlaneMachineToExist(ctx context.Context, input Wait
 	inClustersNamespaceListOption := client.InNamespace(input.Cluster.Namespace)
 	// ControlPlane labels
 	matchClusterListOption := client.MatchingLabels{
-		clusterv1.MachineControlPlaneLabelName: "",
-		clusterv1.ClusterLabelName:             input.Cluster.Name,
+		clusterv1.MachineControlPlaneLabel: "",
+		clusterv1.ClusterNameLabel:         input.Cluster.Name,
 	}
 
 	Eventually(func() (bool, error) {
@@ -204,8 +204,8 @@ func AssertControlPlaneFailureDomains(ctx context.Context, input AssertControlPl
 	// Look up all the control plane machines.
 	inClustersNamespaceListOption := client.InNamespace(input.Cluster.Namespace)
 	matchClusterListOption := client.MatchingLabels{
-		clusterv1.ClusterLabelName:             input.Cluster.Name,
-		clusterv1.MachineControlPlaneLabelName: "",
+		clusterv1.ClusterNameLabel:         input.Cluster.Name,
+		clusterv1.MachineControlPlaneLabel: "",
 	}
 
 	machineList := &clusterv1.MachineList{}
@@ -377,7 +377,7 @@ func UpgradeControlPlaneAndWaitForUpgrade(ctx context.Context, input UpgradeCont
 // controlPlaneMachineOptions returns a set of ListOptions that allows to get all machine objects belonging to control plane.
 func controlPlaneMachineOptions() []client.ListOption {
 	return []client.ListOption{
-		client.HasLabels{clusterv1.MachineControlPlaneLabelName},
+		client.HasLabels{clusterv1.MachineControlPlaneLabel},
 	}
 }
 
diff --git a/test/framework/machinedeployment_helpers.go b/test/framework/machinedeployment_helpers.go
index 82d51aec5..c728a18b9 100644
--- a/test/framework/machinedeployment_helpers.go
+++ b/test/framework/machinedeployment_helpers.go
@@ -454,8 +454,8 @@ func ScaleAndWaitMachineDeploymentTopology(ctx context.Context, input ScaleAndWa
 		return input.ClusterProxy.GetClient().List(ctx, deploymentList,
 			client.InNamespace(input.Cluster.Namespace),
 			client.MatchingLabels{
-				clusterv1.ClusterLabelName:                          input.Cluster.Name,
-				clusterv1.ClusterTopologyMachineDeploymentLabelName: mdTopology.Name,
+				clusterv1.ClusterNameLabel:                          input.Cluster.Name,
+				clusterv1.ClusterTopologyMachineDeploymentNameLabel: mdTopology.Name,
 			},
 		)
 	}, retryableOperationTimeout, retryableOperationInterval).Should(Succeed(), "Failed to list MachineDeployments object for Cluster %s", klog.KRef(input.Cluster.Namespace, input.Cluster.Name))
diff --git a/test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go b/test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go
index 749cb1333..9c59ccd53 100644
--- a/test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go
+++ b/test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go
@@ -93,7 +93,7 @@ func (r *DockerMachinePoolReconciler) Reconcile(ctx context.Context, req ctrl.Re
 	}
 
 	if cluster == nil {
-		log.Info(fmt.Sprintf("Please associate this machine pool with a cluster using the label %s: <name of cluster>", clusterv1.ClusterLabelName))
+		log.Info(fmt.Sprintf("Please associate this machine pool with a cluster using the label %s: <name of cluster>", clusterv1.ClusterNameLabel))
 		return ctrl.Result{}, nil
 	}
 
diff --git a/test/infrastructure/docker/internal/controllers/dockermachine_controller.go b/test/infrastructure/docker/internal/controllers/dockermachine_controller.go
index e36e9f2e5..2724a81dd 100644
--- a/test/infrastructure/docker/internal/controllers/dockermachine_controller.go
+++ b/test/infrastructure/docker/internal/controllers/dockermachine_controller.go
@@ -101,7 +101,7 @@ func (r *DockerMachineReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		return ctrl.Result{}, err
 	}
 	if cluster == nil {
-		log.Info(fmt.Sprintf("Please associate this machine with a cluster using the label %s: <name of cluster>", clusterv1.ClusterLabelName))
+		log.Info(fmt.Sprintf("Please associate this machine with a cluster using the label %s: <name of cluster>", clusterv1.ClusterNameLabel))
 		return ctrl.Result{}, nil
 	}
 
@@ -432,7 +432,7 @@ func (r *DockerMachineReconciler) DockerClusterToDockerMachines(o client.Object)
 		return result
 	}
 
-	labels := map[string]string{clusterv1.ClusterLabelName: cluster.Name}
+	labels := map[string]string{clusterv1.ClusterNameLabel: cluster.Name}
 	machineList := &clusterv1.MachineList{}
 	if err := r.Client.List(context.TODO(), machineList, client.InNamespace(c.Namespace), client.MatchingLabels(labels)); err != nil {
 		return nil
diff --git a/test/infrastructure/docker/internal/controllers/dockermachine_controller_test.go b/test/infrastructure/docker/internal/controllers/dockermachine_controller_test.go
index 20e4572f6..d828618f7 100644
--- a/test/infrastructure/docker/internal/controllers/dockermachine_controller_test.go
+++ b/test/infrastructure/docker/internal/controllers/dockermachine_controller_test.go
@@ -104,7 +104,7 @@ func newMachine(clusterName, machineName string, dockerMachine *infrav1.DockerMa
 		ObjectMeta: metav1.ObjectMeta{
 			Name: machineName,
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: clusterName,
+				clusterv1.ClusterNameLabel: clusterName,
 			},
 		},
 	}
diff --git a/util/collections/machine_filters_test.go b/util/collections/machine_filters_test.go
index 09f228ffb..c0be1949b 100644
--- a/util/collections/machine_filters_test.go
+++ b/util/collections/machine_filters_test.go
@@ -442,7 +442,7 @@ func testControlPlaneMachine(name string) *clusterv1.Machine {
 		},
 	}
 	controlPlaneMachine := testMachine(name)
-	controlPlaneMachine.ObjectMeta.Labels[clusterv1.MachineControlPlaneLabelName] = ""
+	controlPlaneMachine.ObjectMeta.Labels[clusterv1.MachineControlPlaneLabel] = ""
 	controlPlaneMachine.OwnerReferences = ownedRef
 
 	return controlPlaneMachine
@@ -455,7 +455,7 @@ func testMachine(name string) *clusterv1.Machine {
 			Name:      name,
 			Namespace: "my-namespace",
 			Labels: map[string]string{
-				clusterv1.ClusterLabelName: "my-cluster",
+				clusterv1.ClusterNameLabel: "my-cluster",
 			},
 		},
 	}
diff --git a/util/kubeconfig/kubeconfig_test.go b/util/kubeconfig/kubeconfig_test.go
index 8da369854..01028a7fb 100644
--- a/util/kubeconfig/kubeconfig_test.go
+++ b/util/kubeconfig/kubeconfig_test.go
@@ -68,7 +68,7 @@ users:
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "test1-kubeconfig",
 			Namespace: "test",
-			Labels:    map[string]string{clusterv1.ClusterLabelName: "test1"},
+			Labels:    map[string]string{clusterv1.ClusterNameLabel: "test1"},
 		},
 		Data: map[string][]byte{
 			secret.KubeconfigDataName: []byte(validKubeConfig),
diff --git a/util/util_test.go b/util/util_test.go
index c649773a2..a6664a0c3 100644
--- a/util/util_test.go
+++ b/util/util_test.go
@@ -666,7 +666,7 @@ func TestClusterToObjectsMapper(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name: "machine1",
 						Labels: map[string]string{
-							clusterv1.ClusterLabelName: "test1",
+							clusterv1.ClusterNameLabel: "test1",
 						},
 					},
 				},
@@ -674,7 +674,7 @@ func TestClusterToObjectsMapper(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name: "machine2",
 						Labels: map[string]string{
-							clusterv1.ClusterLabelName: "test1",
+							clusterv1.ClusterNameLabel: "test1",
 						},
 					},
 				},
@@ -692,7 +692,7 @@ func TestClusterToObjectsMapper(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name: "md1",
 						Labels: map[string]string{
-							clusterv1.ClusterLabelName: "test1",
+							clusterv1.ClusterNameLabel: "test1",
 						},
 					},
 				},
@@ -700,7 +700,7 @@ func TestClusterToObjectsMapper(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name: "md2",
 						Labels: map[string]string{
-							clusterv1.ClusterLabelName: "test2",
+							clusterv1.ClusterNameLabel: "test2",
 						},
 					},
 				},
@@ -708,7 +708,7 @@ func TestClusterToObjectsMapper(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name: "md3",
 						Labels: map[string]string{
-							clusterv1.ClusterLabelName: "test1",
+							clusterv1.ClusterNameLabel: "test1",
 						},
 					},
 				},