diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4ba0182b12265a04ae89d1c18961e3b535e021b5..f90675fba568d029608ee016b95a6ecf62ce1d6f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing
 
-The GitOps Toolkit is [Apache 2.0 licensed](https://github.com/fluxcd/toolkit/blob/master/LICENSE)
+The GitOps Toolkit is [Apache 2.0 licensed](https://github.com/fluxcd/flux2/blob/master/LICENSE)
 and accepts contributions via GitHub pull requests. This document outlines
 some of the conventions on to make it easier to get your contribution accepted.
 
@@ -23,7 +23,7 @@ join the [CNCF](https://slack.cncf.io/) Slack workspace and use the
 [#flux-dev](https://cloud-native.slack.com/messages/flux-dev/) channel.
 
 To discuss ideas and specifications we use [Github
-Discussions](https://github.com/fluxcd/toolkit/discussions).
+Discussions](https://github.com/fluxcd/flux2/discussions).
 
 For announcements we use a mailing list as well. Simply subscribe to
 [flux-dev on cncf.io](https://lists.cncf.io/g/cncf-flux-dev)
@@ -38,7 +38,7 @@ you might want to take a look at the [introductory talk and demo](https://www.yo
 
 This project is composed of:
 
-- [/f/toolkit](https://github.com/fluxcd/toolkit): The GitOps Toolkit CLI
+- [/f/flux2](https://github.com/fluxcd/flux2): The Flux CLI
 - [/f/source-manager](https://github.com/fluxcd/source-controller): Kubernetes operator for managing sources
 - [/f/kustomize-controller](https://github.com/fluxcd/kustomize-controller): Kubernetes operator for building GitOps pipelines with Kustomize
 - [/f/helm-controller](https://github.com/fluxcd/helm-controller): Kubernetes operator for building GitOps pipelines with Helm
diff --git a/README.md b/README.md
index 232ca9756309764546900725bf2c777f7200e9e2..d63ef82c42f531ac5fdc840f8df5725810aa6fa4 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # Flux version 2
 
-[![e2e](https://github.com/fluxcd/toolkit/workflows/e2e/badge.svg)](https://github.com/fluxcd/toolkit/actions)
-[![report](https://goreportcard.com/badge/github.com/fluxcd/toolkit)](https://goreportcard.com/report/github.com/fluxcd/toolkit)
-[![license](https://img.shields.io/github/license/fluxcd/toolkit.svg)](https://github.com/fluxcd/toolkit/blob/main/LICENSE)
-[![release](https://img.shields.io/github/release/fluxcd/toolkit/all.svg)](https://github.com/fluxcd/toolkit/releases)
+[![e2e](https://github.com/fluxcd/flux2/workflows/e2e/badge.svg)](https://github.com/fluxcd/flux2/actions)
+[![report](https://goreportcard.com/badge/github.com/fluxcd/flux2)](https://goreportcard.com/report/github.com/fluxcd/flux2)
+[![license](https://img.shields.io/github/license/fluxcd/flux2.svg)](https://github.com/fluxcd/flux2/blob/main/LICENSE)
+[![release](https://img.shields.io/github/release/fluxcd/flux2/all.svg)](https://github.com/fluxcd/flux2/releases)
 ![overview](docs/diagrams/gitops-toolkit.png)
 
 Flux is a tool for keeping Kubernetes clusters in sync with sources of
@@ -39,7 +39,7 @@ curl -s https://toolkit.fluxcd.io/install.sh | sudo bash
 ```
 
 Binaries for macOS, Windows and Linux AMD64/ARM are available to download on the
-[release page](https://github.com/fluxcd/toolkit/releases).
+[release page](https://github.com/fluxcd/flux2/releases).
 
 Verify that your cluster satisfies the prerequisites with:
 
@@ -93,7 +93,7 @@ The GitOps Toolkit is always looking for new contributors and there are a multit
 
 - Join our upcoming dev meetings ([meeting access and agenda](https://docs.google.com/document/d/1l_M0om0qUEN_NNiGgpqJ2tvsF2iioHkaARDeh6b70B0/view))
 - Talk to us in the #flux channel on [CNCF Slack](https://slack.cncf.io/)
-- Join the [planning discussions](https://github.com/fluxcd/toolkit/discussions)
+- Join the [planning discussions](https://github.com/fluxcd/flux2/discussions)
 - And if you are completely new to the GitOps Toolkit, take a look at our [Get Started guide](https://toolkit.fluxcd.io/get-started/) and give us feedback
 - To be part of the conversation about Flux's development, [join the flux-dev mailing list](https://lists.cncf.io/g/cncf-flux-dev).
 - Check out [how to contribute](CONTRIBUTING.md) to the project
diff --git a/cmd/flux/bootstrap.go b/cmd/flux/bootstrap.go
index e4e512480b0414bc045e7c3490ebdc3c1fc3d5a9..47b01127eebba156bab78be17524adcd617fe89c 100644
--- a/cmd/flux/bootstrap.go
+++ b/cmd/flux/bootstrap.go
@@ -33,10 +33,10 @@ import (
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
 
-	"github.com/fluxcd/toolkit/internal/flags"
-	"github.com/fluxcd/toolkit/internal/utils"
-	"github.com/fluxcd/toolkit/pkg/manifestgen/install"
-	"github.com/fluxcd/toolkit/pkg/manifestgen/sync"
+	"github.com/fluxcd/flux2/internal/flags"
+	"github.com/fluxcd/flux2/internal/utils"
+	"github.com/fluxcd/flux2/pkg/manifestgen/install"
+	"github.com/fluxcd/flux2/pkg/manifestgen/sync"
 )
 
 var bootstrapCmd = &cobra.Command{
diff --git a/cmd/flux/bootstrap_github.go b/cmd/flux/bootstrap_github.go
index f4ae1a2a2b8d9ee8844b6f686ccf40add734dd04..08bfeedc192029e96f10967769053271b57cda6d 100644
--- a/cmd/flux/bootstrap_github.go
+++ b/cmd/flux/bootstrap_github.go
@@ -27,8 +27,8 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/git"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var bootstrapGitHubCmd = &cobra.Command{
diff --git a/cmd/flux/bootstrap_gitlab.go b/cmd/flux/bootstrap_gitlab.go
index d183318d74bf2cc3a8628aa26a389304ab308cd6..5c1364ff92fa468d2a589f5cc7fa2f59fb00be2b 100644
--- a/cmd/flux/bootstrap_gitlab.go
+++ b/cmd/flux/bootstrap_gitlab.go
@@ -29,8 +29,8 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/git"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var bootstrapGitLabCmd = &cobra.Command{
diff --git a/cmd/flux/check.go b/cmd/flux/check.go
index b1bc62339eff8b5b287ffad2107d05f229a566b3..11bdb30b07f57687068a424db15f344b4c8a18f6 100644
--- a/cmd/flux/check.go
+++ b/cmd/flux/check.go
@@ -24,7 +24,7 @@ import (
 	"strings"
 
 	"github.com/blang/semver/v4"
-	"github.com/fluxcd/toolkit/internal/utils"
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/spf13/cobra"
 	apimachineryversion "k8s.io/apimachinery/pkg/version"
 	"k8s.io/client-go/kubernetes"
diff --git a/cmd/flux/create_alert.go b/cmd/flux/create_alert.go
index d35c3cc5e8b783832bd5e75dab71fbecb4530ba9..1a570c002258aa00139a3fbbdc35abba25a90869 100644
--- a/cmd/flux/create_alert.go
+++ b/cmd/flux/create_alert.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
diff --git a/cmd/flux/create_alertprovider.go b/cmd/flux/create_alertprovider.go
index 44582570ffbc28914187944fb9e9a03f8f7e060c..b1efbb2f32d0620e5bf7833bec3f1c2b49cfa884 100644
--- a/cmd/flux/create_alertprovider.go
+++ b/cmd/flux/create_alertprovider.go
@@ -28,9 +28,9 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var createAlertProviderCmd = &cobra.Command{
diff --git a/cmd/flux/create_helmrelease.go b/cmd/flux/create_helmrelease.go
index e1d9207404eb34b9639275fc92e0d13811b6305c..99a198eace5445d9b0aa39d8e6ab8094e56ff842 100644
--- a/cmd/flux/create_helmrelease.go
+++ b/cmd/flux/create_helmrelease.go
@@ -21,9 +21,9 @@ import (
 	"fmt"
 	"io/ioutil"
 
+	"github.com/fluxcd/flux2/internal/flags"
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/flags"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
diff --git a/cmd/flux/create_kustomization.go b/cmd/flux/create_kustomization.go
index 1151d1f5599b2dd062509f814d13c08499475c4d..cf579aac9959f24b65079316b1314f09ad060219 100644
--- a/cmd/flux/create_kustomization.go
+++ b/cmd/flux/create_kustomization.go
@@ -30,11 +30,11 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/flags"
+	"github.com/fluxcd/flux2/internal/utils"
 	helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/flags"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var createKsCmd = &cobra.Command{
diff --git a/cmd/flux/create_receiver.go b/cmd/flux/create_receiver.go
index 6027579b598a9128be9f96f7d0f00c11efac78e4..233f36cb4a8df08cdbb960611ba06053f1cefa97 100644
--- a/cmd/flux/create_receiver.go
+++ b/cmd/flux/create_receiver.go
@@ -28,9 +28,9 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var createReceiverCmd = &cobra.Command{
diff --git a/cmd/flux/create_source_bucket.go b/cmd/flux/create_source_bucket.go
index 6068ec1e345c7f23a4e1371ba8d5de3b9e5a1452..9bc9144c693c9c2dd3c4fd591efbfec649f44ea8 100644
--- a/cmd/flux/create_source_bucket.go
+++ b/cmd/flux/create_source_bucket.go
@@ -30,9 +30,9 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/flags"
+	"github.com/fluxcd/flux2/internal/utils"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/flags"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var createSourceBucketCmd = &cobra.Command{
diff --git a/cmd/flux/create_source_git.go b/cmd/flux/create_source_git.go
index ddd4fd8eebd2ecff5bc24f7bf107531419cc33d8..7714c5c7cbc5bccce8d90c81f549a855e58d326d 100644
--- a/cmd/flux/create_source_git.go
+++ b/cmd/flux/create_source_git.go
@@ -25,9 +25,9 @@ import (
 	"os"
 	"time"
 
+	"github.com/fluxcd/flux2/internal/flags"
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/flags"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
 	"github.com/manifoldco/promptui"
diff --git a/cmd/flux/create_source_helm.go b/cmd/flux/create_source_helm.go
index b0520becbf17a49c98f7fe4f4f44bbf2199d7595..4a21c4e665693727f9d5fa1d071992e3269fff95 100644
--- a/cmd/flux/create_source_helm.go
+++ b/cmd/flux/create_source_helm.go
@@ -31,8 +31,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var createSourceHelmCmd = &cobra.Command{
diff --git a/cmd/flux/create_tenant.go b/cmd/flux/create_tenant.go
index 4eadc2f21f8fd59d789b8d2eae2af1bcad557167..b8a539bf16312a8bd8b1b67e5584b4670c68f997 100644
--- a/cmd/flux/create_tenant.go
+++ b/cmd/flux/create_tenant.go
@@ -21,7 +21,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/fluxcd/toolkit/internal/utils"
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
diff --git a/cmd/flux/delete_alert.go b/cmd/flux/delete_alert.go
index fca194ca2523a64acc18972b529e1ac77f15474f..ce48ef894a3b8c2bb2ef3a7e79762cc7013ab374 100644
--- a/cmd/flux/delete_alert.go
+++ b/cmd/flux/delete_alert.go
@@ -24,8 +24,8 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var deleteAlertCmd = &cobra.Command{
diff --git a/cmd/flux/delete_alertprovider.go b/cmd/flux/delete_alertprovider.go
index 2f5ca41bb8f7d769ca23eee348cd36aafc18d316..7487e0892b8bc71c910e5efa3dbabbc2a23b0e44 100644
--- a/cmd/flux/delete_alertprovider.go
+++ b/cmd/flux/delete_alertprovider.go
@@ -24,8 +24,8 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var deleteAlertProviderCmd = &cobra.Command{
diff --git a/cmd/flux/delete_helmrelease.go b/cmd/flux/delete_helmrelease.go
index 6ab6477a6dbe306a92348aff2e67f6b42a996c33..d14227a9e077ae5b50c3becbd8370079f5ab51c4 100644
--- a/cmd/flux/delete_helmrelease.go
+++ b/cmd/flux/delete_helmrelease.go
@@ -24,8 +24,8 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var deleteHelmReleaseCmd = &cobra.Command{
diff --git a/cmd/flux/delete_kustomization.go b/cmd/flux/delete_kustomization.go
index a71d60c969a15abd03bad5e2447d418f6094c68c..aa89929602ecf6ea973add3ae0d76c1b77279bf9 100644
--- a/cmd/flux/delete_kustomization.go
+++ b/cmd/flux/delete_kustomization.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/cmd/flux/delete_receiver.go b/cmd/flux/delete_receiver.go
index 66603678852b069ff378cc3ba613a1e5b88d3228..618fa30754e31c74b9778e95ac2d324e4f076963 100644
--- a/cmd/flux/delete_receiver.go
+++ b/cmd/flux/delete_receiver.go
@@ -24,8 +24,8 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var deleteReceiverCmd = &cobra.Command{
diff --git a/cmd/flux/delete_source_bucket.go b/cmd/flux/delete_source_bucket.go
index ffb628f23d5254cd04b183694b9943b6687ad978..812defd708808da63f4dced638641f174a4dd95e 100644
--- a/cmd/flux/delete_source_bucket.go
+++ b/cmd/flux/delete_source_bucket.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/cmd/flux/delete_source_git.go b/cmd/flux/delete_source_git.go
index 7433713950480032f25b3fe3d341098139199a29..7b350ff4849c6b0f263fd38443b85c45df225a80 100644
--- a/cmd/flux/delete_source_git.go
+++ b/cmd/flux/delete_source_git.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/cmd/flux/delete_source_helm.go b/cmd/flux/delete_source_helm.go
index 11b3e7cac06646835a47afde88f51d9ca748ba42..0cc83e876dad9913a105d14a0c8c62d9f381ff08 100644
--- a/cmd/flux/delete_source_helm.go
+++ b/cmd/flux/delete_source_helm.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/cmd/flux/export_alert.go b/cmd/flux/export_alert.go
index a3eab1d464f3478b404d52f6aa7f20e65987595b..43bf7373f0d03a3584d3274cbaca2b5f90c2ec6b 100644
--- a/cmd/flux/export_alert.go
+++ b/cmd/flux/export_alert.go
@@ -26,8 +26,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var exportAlertCmd = &cobra.Command{
diff --git a/cmd/flux/export_alertprovider.go b/cmd/flux/export_alertprovider.go
index ea26eeab486b5fc94cb842fe64ec61f9c2e3f214..0bc3747f94ebae3de784cc5fe53a348dfa9dfacd 100644
--- a/cmd/flux/export_alertprovider.go
+++ b/cmd/flux/export_alertprovider.go
@@ -26,8 +26,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var exportAlertProviderCmd = &cobra.Command{
diff --git a/cmd/flux/export_helmrelease.go b/cmd/flux/export_helmrelease.go
index 8f50a795af2bed4ed9332a44b2e79bcbed76fcff..e533ae23fc9334dd4830358cc92c789fe72624e2 100644
--- a/cmd/flux/export_helmrelease.go
+++ b/cmd/flux/export_helmrelease.go
@@ -26,8 +26,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var exportHelmReleaseCmd = &cobra.Command{
diff --git a/cmd/flux/export_kustomization.go b/cmd/flux/export_kustomization.go
index 517f976f8ba8619616787353a2a40c6386ed30c3..4a28e91e34df5abfd98635048c87cddd601633f2 100644
--- a/cmd/flux/export_kustomization.go
+++ b/cmd/flux/export_kustomization.go
@@ -26,8 +26,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var exportKsCmd = &cobra.Command{
diff --git a/cmd/flux/export_receiver.go b/cmd/flux/export_receiver.go
index 03bae3a2c4cf9b695c6e5790627858dfcc3ef86e..654c82ec473af36eaa6d94e94015063abd28bf44 100644
--- a/cmd/flux/export_receiver.go
+++ b/cmd/flux/export_receiver.go
@@ -26,8 +26,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var exportReceiverCmd = &cobra.Command{
diff --git a/cmd/flux/export_source_bucket.go b/cmd/flux/export_source_bucket.go
index 09ab940255c1eeec1eeab9edf08f7903f1ab712d..c7acd500dc2c4365547b1e30c3b95d8d0a93136f 100644
--- a/cmd/flux/export_source_bucket.go
+++ b/cmd/flux/export_source_bucket.go
@@ -27,8 +27,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var exportSourceBucketCmd = &cobra.Command{
diff --git a/cmd/flux/export_source_git.go b/cmd/flux/export_source_git.go
index dc5520e70901c90605d9eefb206d52249dd413e4..038a877277a6eec4541204c98093b6bf27952367 100644
--- a/cmd/flux/export_source_git.go
+++ b/cmd/flux/export_source_git.go
@@ -27,8 +27,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var exportSourceGitCmd = &cobra.Command{
diff --git a/cmd/flux/export_source_helm.go b/cmd/flux/export_source_helm.go
index 9900230a2fb803dd2f7b02e186099dee42c26edb..879af6c543908e995f1186d6367b029b60ede80a 100644
--- a/cmd/flux/export_source_helm.go
+++ b/cmd/flux/export_source_helm.go
@@ -27,8 +27,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var exportSourceHelmCmd = &cobra.Command{
diff --git a/cmd/flux/get_alert.go b/cmd/flux/get_alert.go
index 957629660094c84706650857a2dec58d066a14a5..9bf17c53f42fc8ecb7324796038a3024e22753e6 100644
--- a/cmd/flux/get_alert.go
+++ b/cmd/flux/get_alert.go
@@ -26,9 +26,9 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var getAlertCmd = &cobra.Command{
diff --git a/cmd/flux/get_alertprovider.go b/cmd/flux/get_alertprovider.go
index b8e8846e860c3ad5e33b78500ea4b6d964848417..1342057a0aff02ca89c83de5b8adc4f68daf50d8 100644
--- a/cmd/flux/get_alertprovider.go
+++ b/cmd/flux/get_alertprovider.go
@@ -24,9 +24,9 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var getAlertProviderCmd = &cobra.Command{
diff --git a/cmd/flux/get_helmrelease.go b/cmd/flux/get_helmrelease.go
index 4304cfffa8182a2ae6f49ef8db985be29526503e..6d97024435839ef9a920661512c3c0cb115346ad 100644
--- a/cmd/flux/get_helmrelease.go
+++ b/cmd/flux/get_helmrelease.go
@@ -22,8 +22,8 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
diff --git a/cmd/flux/get_kustomization.go b/cmd/flux/get_kustomization.go
index 8c92833b1682172fa015691cae44fba6fbc56881..d56ea34cde153ed18e2d7b2f8e3c8e0ac32debc5 100644
--- a/cmd/flux/get_kustomization.go
+++ b/cmd/flux/get_kustomization.go
@@ -22,8 +22,8 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1"
 	"github.com/spf13/cobra"
diff --git a/cmd/flux/get_receiver.go b/cmd/flux/get_receiver.go
index aeb3a21866d0b9cc253bd2c9b3bed4f9da683254..6ae69c602e840d438d7f70a2a305d8014dc241ab 100644
--- a/cmd/flux/get_receiver.go
+++ b/cmd/flux/get_receiver.go
@@ -26,9 +26,9 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var getReceiverCmd = &cobra.Command{
diff --git a/cmd/flux/get_source_bucket.go b/cmd/flux/get_source_bucket.go
index 03d992fac8b7d0601bf4563f92e5dd1f3c648728..e8026b83c3be11a99197b3d2ef1c7d6f2a5f2c57 100644
--- a/cmd/flux/get_source_bucket.go
+++ b/cmd/flux/get_source_bucket.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"os"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
 	"github.com/spf13/cobra"
diff --git a/cmd/flux/get_source_git.go b/cmd/flux/get_source_git.go
index 0385e01e7665cfd31e44651bb76b26a9c69320b1..04f0526c99d2b706f9886e8ab3e7674afd973103 100644
--- a/cmd/flux/get_source_git.go
+++ b/cmd/flux/get_source_git.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"os"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
 	"github.com/spf13/cobra"
diff --git a/cmd/flux/get_source_helm.go b/cmd/flux/get_source_helm.go
index edc5c67a9d275f320a25efb9610146dd7bfa9ceb..639fd0e65c8dc07d3dda26d17a9e6db687c6f56d 100644
--- a/cmd/flux/get_source_helm.go
+++ b/cmd/flux/get_source_helm.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"os"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
 	"github.com/spf13/cobra"
diff --git a/cmd/flux/install.go b/cmd/flux/install.go
index b939222cd33c59704ad34a3c93ddf7d9e96ed5e3..e7a520dbaff0178618e5dda7c34fa996997884c3 100644
--- a/cmd/flux/install.go
+++ b/cmd/flux/install.go
@@ -26,9 +26,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/fluxcd/toolkit/internal/flags"
-	"github.com/fluxcd/toolkit/internal/utils"
-	"github.com/fluxcd/toolkit/pkg/manifestgen/install"
+	"github.com/fluxcd/flux2/internal/flags"
+	"github.com/fluxcd/flux2/internal/utils"
+	"github.com/fluxcd/flux2/pkg/manifestgen/install"
 )
 
 var installCmd = &cobra.Command{
diff --git a/cmd/flux/main.go b/cmd/flux/main.go
index fe43d5c77e48e122267ba23d9fd92533474e7180..4205b0826218602b712a2d580a323fb76304851c 100644
--- a/cmd/flux/main.go
+++ b/cmd/flux/main.go
@@ -26,8 +26,8 @@ import (
 	"github.com/spf13/cobra/doc"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
-	fluxlog "github.com/fluxcd/toolkit/pkg/log"
-	"github.com/fluxcd/toolkit/pkg/manifestgen/install"
+	fluxlog "github.com/fluxcd/flux2/pkg/log"
+	"github.com/fluxcd/flux2/pkg/manifestgen/install"
 )
 
 var VERSION = "0.0.0-dev.0"
diff --git a/cmd/flux/reconcile_alert.go b/cmd/flux/reconcile_alert.go
index 6f8eac95ee086721be8a7a10828be1e2db03b44c..f895a6080175d4818cc9cb8d1b04bc3529bf4368 100644
--- a/cmd/flux/reconcile_alert.go
+++ b/cmd/flux/reconcile_alert.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/cmd/flux/reconcile_alertprovider.go b/cmd/flux/reconcile_alertprovider.go
index f842531c0f9eace6d96606c633871ac5fdf60b3b..5c5b829d93c120f2b9c1c2dcadb506c29e1bf3c7 100644
--- a/cmd/flux/reconcile_alertprovider.go
+++ b/cmd/flux/reconcile_alertprovider.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/cmd/flux/reconcile_helmrelease.go b/cmd/flux/reconcile_helmrelease.go
index d93e16aab1421874b228a0610d9033c15aafb038..3371d184e812a6eb78662f85d61fdb44a45bb230 100644
--- a/cmd/flux/reconcile_helmrelease.go
+++ b/cmd/flux/reconcile_helmrelease.go
@@ -28,8 +28,8 @@ import (
 	"k8s.io/client-go/util/retry"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
diff --git a/cmd/flux/reconcile_kustomization.go b/cmd/flux/reconcile_kustomization.go
index 8bf75a37aa8c516daa9952043712259538895c87..09e7ff67c4f831510e592560b89c885a69085c02 100644
--- a/cmd/flux/reconcile_kustomization.go
+++ b/cmd/flux/reconcile_kustomization.go
@@ -25,8 +25,8 @@ import (
 	"k8s.io/client-go/util/retry"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
diff --git a/cmd/flux/reconcile_receiver.go b/cmd/flux/reconcile_receiver.go
index ac1493a83e96bd2809bc7937512139db69ff2d7e..a874b3912d9a798dcb578f179988a8dc25e0a93d 100644
--- a/cmd/flux/reconcile_receiver.go
+++ b/cmd/flux/reconcile_receiver.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/cmd/flux/reconcile_source_bucket.go b/cmd/flux/reconcile_source_bucket.go
index eaefdd35be38c5f40ef59507e9ab957cf8c14260..40c237f3c764c20809b6e8fdee09494b95333680 100644
--- a/cmd/flux/reconcile_source_bucket.go
+++ b/cmd/flux/reconcile_source_bucket.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
diff --git a/cmd/flux/reconcile_source_git.go b/cmd/flux/reconcile_source_git.go
index 5d6fddaa2d8a45b03a17bc18ea6532a7caeb9817..2a6032856842fdfcdaf6c59f95bd9036409b078b 100644
--- a/cmd/flux/reconcile_source_git.go
+++ b/cmd/flux/reconcile_source_git.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/cmd/flux/reconcile_source_helm.go b/cmd/flux/reconcile_source_helm.go
index 3fc4a1ac06ddee38eaa6d9230858079e8de11d91..ae50c6120b489963c044e414a4e5c547827690f2 100644
--- a/cmd/flux/reconcile_source_helm.go
+++ b/cmd/flux/reconcile_source_helm.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
diff --git a/cmd/flux/resume_alert.go b/cmd/flux/resume_alert.go
index 98176eb54a0e32b7ed10c4cef33059cbef0d2fb1..5186392e1f1db735ba8c168218277634eeb20d2d 100644
--- a/cmd/flux/resume_alert.go
+++ b/cmd/flux/resume_alert.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
diff --git a/cmd/flux/resume_helmrelease.go b/cmd/flux/resume_helmrelease.go
index cc3a015af704b101227bb4fed4e8d461fc3cddd0..0558d3a90e423bd9bcc83137584b3d969cf42445 100644
--- a/cmd/flux/resume_helmrelease.go
+++ b/cmd/flux/resume_helmrelease.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
diff --git a/cmd/flux/resume_kustomization.go b/cmd/flux/resume_kustomization.go
index 58c65c355c222a229d2c3eaf584ae0c8cc40cd7c..9de37bb770696cf754235f3b39fc0de64916f3f5 100644
--- a/cmd/flux/resume_kustomization.go
+++ b/cmd/flux/resume_kustomization.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1"
 	"github.com/spf13/cobra"
diff --git a/cmd/flux/resume_receiver.go b/cmd/flux/resume_receiver.go
index 54d5e634d243e9d4af70f69d919fafa4a937be88..7e51477f644cda0d47140f62e3874444330cf874 100644
--- a/cmd/flux/resume_receiver.go
+++ b/cmd/flux/resume_receiver.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
diff --git a/cmd/flux/suspend_alert.go b/cmd/flux/suspend_alert.go
index 2da27a362f13837b2c3f387f79533c5c91e36644..e9f589434eecd9840e19e969318e29451fe24d85 100644
--- a/cmd/flux/suspend_alert.go
+++ b/cmd/flux/suspend_alert.go
@@ -23,8 +23,8 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var suspendAlertCmd = &cobra.Command{
diff --git a/cmd/flux/suspend_helmrelease.go b/cmd/flux/suspend_helmrelease.go
index a0d456dfc20feb4c202ca41f56f07a9e25ca80ff..32029b36f53c3e71432e415a9434b72f54e69a1c 100644
--- a/cmd/flux/suspend_helmrelease.go
+++ b/cmd/flux/suspend_helmrelease.go
@@ -23,8 +23,8 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var suspendHrCmd = &cobra.Command{
diff --git a/cmd/flux/suspend_kustomization.go b/cmd/flux/suspend_kustomization.go
index 2117731e71e4fbf37225a08eb6b52ea38cf653f8..c9723bc00a30a6424b90c929f1b513eabd2b0065 100644
--- a/cmd/flux/suspend_kustomization.go
+++ b/cmd/flux/suspend_kustomization.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
 )
diff --git a/cmd/flux/suspend_receiver.go b/cmd/flux/suspend_receiver.go
index d58a28b0e6041f5e511073f9cf09bd9b4fc702b2..0dbb763e3c9c694d4034e7abc7534c3489efbbcb 100644
--- a/cmd/flux/suspend_receiver.go
+++ b/cmd/flux/suspend_receiver.go
@@ -23,8 +23,8 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var suspendReceiverCmd = &cobra.Command{
diff --git a/cmd/flux/uninstall.go b/cmd/flux/uninstall.go
index cff200145c309a1596cc9a21ca6fac71ab46745a..eed2f4931872f6ad970b625a6b739c3bc6053e5a 100644
--- a/cmd/flux/uninstall.go
+++ b/cmd/flux/uninstall.go
@@ -26,10 +26,10 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var uninstallCmd = &cobra.Command{
diff --git a/docs/faq/index.md b/docs/faq/index.md
index 2c586574b6f6ca2d2357f3ae219dba107b77f8df..3554e5057bfe743b1b4c08185fdce75f95bf7e9f 100644
--- a/docs/faq/index.md
+++ b/docs/faq/index.md
@@ -77,7 +77,7 @@ Custom Prometheus metrics | Generic / common `controller-runtime` Prometheus met
 
 There are a variety of ways and we look forward to having you on board building the future of GitOps together:
 
-- [Discuss the direction](https://github.com/fluxcd/toolkit/discussions) of the GitOps Toolkit with us
+- [Discuss the direction](https://github.com/fluxcd/flux2/discussions) of the GitOps Toolkit with us
 - Join us in #flux-dev on the [CNCF Slack](https://slack.cncf.io)
 - Check out our [contributor docs](https://toolkit.fluxcd.io/contributing/)
 - Take a look at the [roadmap of the GitOps Toolkit](https://toolkit.fluxcd.io/roadmap/)
diff --git a/docs/get-started/index.md b/docs/get-started/index.md
index 906c813c1581336e7c8bfbb823b56f0929d853cc..cef397f17b29fe422c4bfbb918a9633030d707e4 100644
--- a/docs/get-started/index.md
+++ b/docs/get-started/index.md
@@ -36,7 +36,7 @@ curl -s https://toolkit.fluxcd.io/install.sh | sudo bash
 The install script downloads the flux binary to `/usr/local/bin`.
 
 Binaries for **macOS**, **Windows** and **Linux** AMD64/ARM are available for download on the 
-[release page](https://github.com/fluxcd/toolkit/releases).
+[release page](https://github.com/fluxcd/flux2/releases).
 
 To configure your shell to load flux completions add to your Bash profile:
 
@@ -139,7 +139,7 @@ If you prefer GitLab, export `GITLAB_TOKEN` env var and use the command [flux bo
     It is safe to run the bootstrap command as many times as you want.
     If the toolkit components are present on the cluster,
     the bootstrap command will perform an upgrade if needed.
-    You can target a specific toolkit [version](https://github.com/fluxcd/toolkit/releases)
+    You can target a specific toolkit [version](https://github.com/fluxcd/flux2/releases)
     with `flux bootstrap --version=<semver>`.
 
 ## Staging workflow
diff --git a/docs/guides/installation.md b/docs/guides/installation.md
index 7f04a42e171727b79e89bf52a1621335fa3d575b..96733b9a64a41ca4640ef67c1a297538e44b2c9d 100644
--- a/docs/guides/installation.md
+++ b/docs/guides/installation.md
@@ -30,7 +30,7 @@ Command-line completion for `zsh`, `fish`, and `powershell`
 are also supported with their own sub-commands.
 
 Binaries for macOS, Windows and Linux AMD64/ARM are available for download on the 
-[release page](https://github.com/fluxcd/toolkit/releases).
+[release page](https://github.com/fluxcd/flux2/releases).
 
 Verify that your cluster satisfies the prerequisites with:
 
@@ -67,7 +67,7 @@ flux bootstrap <GIT-PROVIDER> \
     and `--arch=arm64` for ARMv8 64-bit container images.
 
 If you wish to install a specific version, use the toolkit 
-[release tag](https://github.com/fluxcd/toolkit/releases) e.g. `--version=v0.0.14`.
+[release tag](https://github.com/fluxcd/flux2/releases) e.g. `--version=v0.0.14`.
 
 With `--path` you can configure the directory which will be used to reconcile the target cluster.
 To control multiple clusters from the same Git repository, you have to set a unique path per
diff --git a/docs/guides/monitoring.md b/docs/guides/monitoring.md
index bc78b72c172b941621e3132d53e344d059f62ca4..029acac2026c5da1e042d162298d25b69177b9e1 100644
--- a/docs/guides/monitoring.md
+++ b/docs/guides/monitoring.md
@@ -14,11 +14,11 @@ To install the monitoring stack with `flux`, first register the toolkit Git repo
 ```sh
 flux create source git monitoring \
   --interval=30m \
-  --url=https://github.com/fluxcd/toolkit \
+  --url=https://github.com/fluxcd/flux2 \
   --branch=main
 ```
 
-Then apply the [manifests/monitoring](https://github.com/fluxcd/toolkit/tree/main/manifests/monitoring)
+Then apply the [manifests/monitoring](https://github.com/fluxcd/flux2/tree/main/manifests/monitoring)
 kustomization:
 
 ```sh
@@ -50,7 +50,7 @@ Cluster reconciliation dashboard [http://localhost:3000/d/gitops-toolkit-cluster
 ![](../_files/cluster-dashboard.png)
 
 If you wish to use your own Prometheus and Grafana instances, then you can import the dashboards from
-[GitHub](https://github.com/fluxcd/toolkit/tree/main/manifests/monitoring/grafana/dashboards).
+[GitHub](https://github.com/fluxcd/flux2/tree/main/manifests/monitoring/grafana/dashboards).
 
 !!! hint
     Note that the toolkit controllers expose the `/metrics` endpoint on port `8080`.
diff --git a/docs/index.md b/docs/index.md
index cd325172b1ad7f62f9001d14f467c5099d69d8ce..6e4f73f078d7a1d7f766415d70d1b2cc66b211fd 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -35,7 +35,7 @@ Target features:
 
 Components:
 
-- [Toolkit CLI](https://github.com/fluxcd/toolkit)
+- [Toolkit CLI](https://github.com/fluxcd/flux2)
 - [Source Controller](components/source/controller.md)
     - [GitRepository CRD](components/source/gitrepositories.md)
     - [HelmRepository CRD](components/source/helmrepositories.md)
@@ -61,7 +61,7 @@ The GitOps Toolkit is always looking for new contributors and there are a multit
 
 - Join our upcoming dev meetings ([meeting access and agenda](https://docs.google.com/document/d/1l_M0om0qUEN_NNiGgpqJ2tvsF2iioHkaARDeh6b70B0/view))
 - Talk to us in the #flux channel on [CNCF Slack](https://slack.cncf.io/)
-- Join the [planning discussions](https://github.com/fluxcd/toolkit/discussions)
+- Join the [planning discussions](https://github.com/fluxcd/flux2/discussions)
 - And if you are completely new to the GitOps Toolkit, take a look at our [Get Started guide](get-started/index.md) and give us feedback
 - Check out [how to contribute](contributing/index.md) to the project
 
diff --git a/docs/roadmap/index.md b/docs/roadmap/index.md
index ab00597839c7b0a9bcd7936f18b28f1bcf67b72f..bc06e7cd973ffb84f6daeda901ad62fae0bc8ebe 100644
--- a/docs/roadmap/index.md
+++ b/docs/roadmap/index.md
@@ -55,7 +55,7 @@ Non-Goals
 
 Tasks
 
-- [x]  <span style="color:grey">[Design the image scanning and automation API](https://github.com/fluxcd/toolkit/discussions/107)</span>
+- [x]  <span style="color:grey">[Design the image scanning and automation API](https://github.com/fluxcd/flux2/discussions/107)</span>
 - [ ]  Implement an image scanning controller
 - [x]  <span style="color:grey">Design the automation component</span>
 - [ ]  Implement the image scan/patch/push workflow
diff --git a/go.mod b/go.mod
index 3ebed003d17690a5c3e68cbd1f47f890caf02dfa..d4fefe66495e9fe9d3e5e35a2721e46058b6d3e8 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/fluxcd/toolkit
+module github.com/fluxcd/flux2
 
 go 1.15
 
diff --git a/install/README.md b/install/README.md
index ae152d1ead02f251dcc9b522f5adff23548ccca3..fd04a4f186f7b5428e1503df0087c0052e2682c8 100644
--- a/install/README.md
+++ b/install/README.md
@@ -1,12 +1,12 @@
 # flux CLI Installation
 
 Binaries for macOS and Linux AMD64 are available for download on the 
-[release page](https://github.com/fluxcd/toolkit/releases).
+[release page](https://github.com/fluxcd/flux2/releases).
 
 To install the latest release run:
 
 ```bash
-curl -s https://raw.githubusercontent.com/fluxcd/toolkit/master/install/flux.sh | sudo bash
+curl -s https://raw.githubusercontent.com/fluxcd/flux2/master/install/flux.sh | sudo bash
 ```
 
 The install script does the following:
@@ -26,7 +26,7 @@ mv /usr/local/bin/flux /usr/local/bin/kubectl-flux
 Clone the repository:
 
 ```bash
-git clone https://github.com/fluxcd/toolkit
+git clone https://github.com/fluxcd/flux2
 cd toolkit
 ```
 
diff --git a/install/flux.sh b/install/flux.sh
index 103a10c010d4ae6d6cbac505ac0d8f789aa9fe92..a744187ee561dd0eb9897e503681dc21dc3f2e39 100755
--- a/install/flux.sh
+++ b/install/flux.sh
@@ -3,7 +3,7 @@ set -e
 
 DEFAULT_BIN_DIR="/usr/local/bin"
 BIN_DIR=${1:-"${DEFAULT_BIN_DIR}"}
-GITHUB_REPO="fluxcd/toolkit"
+GITHUB_REPO="fluxcd/flux2"
 
 # Helper functions for logs
 info() {
diff --git a/internal/flags/arch.go b/internal/flags/arch.go
index be34a0d66b5bb9d3b512c100d5e14c922a85f871..7d39a4ea95f5347542ee3a091fa1f4817e651c22 100644
--- a/internal/flags/arch.go
+++ b/internal/flags/arch.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/fluxcd/toolkit/internal/utils"
+	"github.com/fluxcd/flux2/internal/utils"
 )
 
 var supportedArchs = []string{"amd64", "arm", "arm64"}
diff --git a/internal/flags/decryption_provider.go b/internal/flags/decryption_provider.go
index a8972b36156833f1eb654a0e6fa97fd7e38b71a1..c836c8493b2a1d9ec957718a3308a294b984eaef 100644
--- a/internal/flags/decryption_provider.go
+++ b/internal/flags/decryption_provider.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/fluxcd/toolkit/internal/utils"
+	"github.com/fluxcd/flux2/internal/utils"
 )
 
 var supportedDecryptionProviders = []string{"sops"}
diff --git a/internal/flags/helm_chart_source.go b/internal/flags/helm_chart_source.go
index 32880c7c2f58877df28b448ca19c5f6477a0452a..ed1898df8f54ff7ff840176520ef9848baa1c50f 100644
--- a/internal/flags/helm_chart_source.go
+++ b/internal/flags/helm_chart_source.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var supportedHelmChartSourceKinds = []string{sourcev1.HelmRepositoryKind, sourcev1.GitRepositoryKind, sourcev1.BucketKind}
diff --git a/internal/flags/kustomization_source.go b/internal/flags/kustomization_source.go
index 59d2d1bb6db3eb9b593f42a5a51c4528eff4c6a5..f696defaeb15f00e54204a9bab57b60e3084837d 100644
--- a/internal/flags/kustomization_source.go
+++ b/internal/flags/kustomization_source.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var supportedKustomizationSourceKinds = []string{sourcev1.GitRepositoryKind, sourcev1.BucketKind}
diff --git a/internal/flags/log_level.go b/internal/flags/log_level.go
index 390157ec5416df71cc2620c15953c7d27031a239..bd880ffffb866cc39a0ab081a0e558186aec4e4a 100644
--- a/internal/flags/log_level.go
+++ b/internal/flags/log_level.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/fluxcd/toolkit/internal/utils"
+	"github.com/fluxcd/flux2/internal/utils"
 )
 
 var supportedLogLevels = []string{"debug", "info", "error"}
diff --git a/internal/flags/source_bucket_provider.go b/internal/flags/source_bucket_provider.go
index e6e6152cf43a7261e0c8591599c8cc5bf725eddf..e314fd9d538f072f0aaad49a7158ba43c8c99d60 100644
--- a/internal/flags/source_bucket_provider.go
+++ b/internal/flags/source_bucket_provider.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var supportedSourceBucketProviders = []string{sourcev1.GenericBucketProvider, sourcev1.AmazonBucketProvider}
diff --git a/mkdocs.yml b/mkdocs.yml
index 42154a1fd3d5d88f1f31f2ad4e26d7ad8ca443d4..710ba26e2be8ad517f0b7491239ef5f4211516c2 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -3,8 +3,8 @@ site_description: A toolkit for assembling GitOps pipelines on Kubernetes
 site_author: The Flux CD contributors
 site_url: https://toolkit.fluxcd.io
 
-repo_name: fluxcd/toolkit
-repo_url: https://github.com/fluxcd/toolkit
+repo_name: fluxcd/flux2
+repo_url: https://github.com/fluxcd/flux2
 edit_uri: ""
 
 theme:
diff --git a/pkg/manifestgen/install/install.go b/pkg/manifestgen/install/install.go
index e9d08abab688bfde48539ee31af7e0e521ce0dda..4438219fdf686b2f36ee9cd20a023d250d08c39d 100644
--- a/pkg/manifestgen/install/install.go
+++ b/pkg/manifestgen/install/install.go
@@ -24,7 +24,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/fluxcd/toolkit/pkg/manifestgen"
+	"github.com/fluxcd/flux2/pkg/manifestgen"
 )
 
 // Generate returns the install manifests as a multi-doc YAML.
diff --git a/pkg/manifestgen/install/options.go b/pkg/manifestgen/install/options.go
index e5bd060296e4ac2541412948bcecd6ae4751f9dc..23057525d16be2bdc68fadae1b9d913ccc749b39 100644
--- a/pkg/manifestgen/install/options.go
+++ b/pkg/manifestgen/install/options.go
@@ -48,7 +48,7 @@ func MakeDefaultOptions() Options {
 		WatchAllNamespaces:     true,
 		NetworkPolicy:          true,
 		LogLevel:               "info",
-		BaseURL:                "https://github.com/fluxcd/toolkit/releases",
+		BaseURL:                "https://github.com/fluxcd/flux2/releases",
 		NotificationController: "notification-controller",
 		ManifestFile:           "gotk-components.yaml",
 		Timeout:                time.Minute,
diff --git a/pkg/manifestgen/sync/sync.go b/pkg/manifestgen/sync/sync.go
index 0e25e52e06eec37abd514362729077e74a66ce54..e2d3c11623844e2395e8f94d254dbee02db91fad 100644
--- a/pkg/manifestgen/sync/sync.go
+++ b/pkg/manifestgen/sync/sync.go
@@ -30,7 +30,7 @@ import (
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
 
-	"github.com/fluxcd/toolkit/pkg/manifestgen"
+	"github.com/fluxcd/flux2/pkg/manifestgen"
 )
 
 func Generate(options Options) (*manifestgen.Manifest, error) {