diff --git a/README.md b/README.md
index 5eefdd51c5..c950d8baab 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,8 @@ with pre- and post-deployment evaluations and tasks.
 It is an incubating project, under the umbrella of the
 [Keptn Application Lifecycle working group](https://github.com/keptn/wg-app-lifecycle).
 
-> **Note:** Keptn was developed under the code name of
-  "Keptn Lifecycle Controller" or "KLT" for short.
+> **Note** Keptn was developed under the code name of
+  "Keptn Lifecycle Toolkit" or "KLT" for short.
   The source code contains many vestiges of these names.
 
 ## Goals
diff --git a/assets/logo/README.md b/assets/logo/README.md
index 8f7da127c4..1da7992c6f 100644
--- a/assets/logo/README.md
+++ b/assets/logo/README.md
@@ -1,6 +1,6 @@
-# Keptn Lifecycle Controller Logos
+# Keptn Logos
 
-This directory contains the Keptn Lifecycle Controller logos in different formats and colors.
+This directory contains the Keptn logos in different formats and colors.
 
 ## Logos
 
diff --git a/docs/content/en/contribute/docs/contrib-guidelines-docs/_index.md b/docs/content/en/contribute/docs/contrib-guidelines-docs/_index.md
index 73659cacbc..2ff534451b 100644
--- a/docs/content/en/contribute/docs/contrib-guidelines-docs/_index.md
+++ b/docs/content/en/contribute/docs/contrib-guidelines-docs/_index.md
@@ -44,7 +44,7 @@ that are relevant only to documentation
 
   For usability considerations, we make the following exceptions:
 
-  * The main `README.md` file for the lifecycle-controller repository
+  * The main `README.md` file for the lifecycle-toolkit repository
     includes this basic information as well as a link
     to the full installation documentation which has more details.
   * The Getting Started Guide also includes this information
diff --git a/docs/content/en/contribute/general/contrib-guidelines-gen/_index.md b/docs/content/en/contribute/general/contrib-guidelines-gen/_index.md
index 8075e174fb..27b611a44a 100644
--- a/docs/content/en/contribute/general/contrib-guidelines-gen/_index.md
+++ b/docs/content/en/contribute/general/contrib-guidelines-gen/_index.md
@@ -5,7 +5,7 @@ weight: 300
 ---
 
 Before using Keptn
-as a contributor to the Keptn `lifecycle-controller` repository,
+as a contributor to the Keptn `lifecycle-toolkit` repository,
 it is expected that you comply with the guidelines while
 making contributions towards the repository.
 
diff --git a/docs/content/en/docs/concepts/architecture/components/lifecycle-operator/_index.md b/docs/content/en/docs/concepts/architecture/components/lifecycle-operator/_index.md
index 3592bb1c21..07c26f10d4 100644
--- a/docs/content/en/docs/concepts/architecture/components/lifecycle-operator/_index.md
+++ b/docs/content/en/docs/concepts/architecture/components/lifecycle-operator/_index.md
@@ -10,7 +10,7 @@ cascade:
 **Keptn's Lifecycle Operator** is
 a Kubernetes [operator](https://kubernetes.io/docs/concepts/extend-kubernetes/operator/)
 that automates the deployment and management
-of the Keptn Lifecycle Controller components in a Kubernetes cluster.
+of the Keptn components in a Kubernetes cluster.
 The Keptn Lifecycle Operator contains several controllers for **Keptn CRDs**
 and a **Mutating Webhook**.
 
diff --git a/docs/content/en/docs/install/install.md b/docs/content/en/docs/install/install.md
index eb7a0111a1..2a1037c373 100644
--- a/docs/content/en/docs/install/install.md
+++ b/docs/content/en/docs/install/install.md
@@ -139,7 +139,7 @@ Keptn and its dependencies are now installed and ready to use.
 
 ## Enable Keptn for your cluster
 
-To enable the Keptn Lifecycle Controller in your cluster,
+To enable the Keptn in your cluster,
 annotate the Kubernetes
 [Namespace](https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/)
 resource for each namespace in the cluster.
diff --git a/examples/sample-app/base/python-task.yaml b/examples/sample-app/base/python-task.yaml
index 334f2ec393..a611df4db3 100644
--- a/examples/sample-app/base/python-task.yaml
+++ b/examples/sample-app/base/python-task.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   python:
     httpRef:
-      url: https://raw.githubusercontent.com/keptn/lifecycle-controller/main/runtimes/python-runtime/samples/secrets.py
+      url: https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/runtimes/python-runtime/samples/secrets.py
     parameters:
       map:
         user: "myuser"
diff --git a/examples/sample-app/version-2/app-pre-deploy.yaml b/examples/sample-app/version-2/app-pre-deploy.yaml
index 36a243ec2e..b5ad3c760a 100644
--- a/examples/sample-app/version-2/app-pre-deploy.yaml
+++ b/examples/sample-app/version-2/app-pre-deploy.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   function:
     httpRef:
-      url: https://raw.githubusercontent.com/keptn-sandbox/lifecycle-controller/main/runtimes/deno-runtime/samples/ts/http.ts
+      url: https://raw.githubusercontent.com/keptn-sandbox/lifecycle-toolkit/main/runtimes/deno-runtime/samples/ts/http.ts
     parameters:
       map:
         url: http://podtato-head-frontend.podtato-kubectl.svc.cluster.local:8080
diff --git a/examples/sample-app/version-3/app-pre-deploy.yaml b/examples/sample-app/version-3/app-pre-deploy.yaml
index 36a243ec2e..b5ad3c760a 100644
--- a/examples/sample-app/version-3/app-pre-deploy.yaml
+++ b/examples/sample-app/version-3/app-pre-deploy.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   function:
     httpRef:
-      url: https://raw.githubusercontent.com/keptn-sandbox/lifecycle-controller/main/runtimes/deno-runtime/samples/ts/http.ts
+      url: https://raw.githubusercontent.com/keptn-sandbox/lifecycle-toolkit/main/runtimes/deno-runtime/samples/ts/http.ts
     parameters:
       map:
         url: http://podtato-head-frontend.podtato-kubectl.svc.cluster.local:8080
diff --git a/examples/support/argo/README.md b/examples/support/argo/README.md
index bd07bd3a93..6e2d84f50e 100644
--- a/examples/support/argo/README.md
+++ b/examples/support/argo/README.md
@@ -1,4 +1,4 @@
-# Deploying an application using the Keptn Lifecycle Controller and ArgoCD
+# Deploying an application using Keptn and ArgoCD
 
 In this example, we will show you how to install our sample application *podtatohead*
 using Keptn and [ArgoCD](https://argo-cd.readthedocs.io/en/stable/).
diff --git a/examples/support/observability/README.md b/examples/support/observability/README.md
index 50909f010b..947a3e7f5d 100644
--- a/examples/support/observability/README.md
+++ b/examples/support/observability/README.md
@@ -47,7 +47,7 @@ kubectl port-forward -n keptn-lifecycle-toolkit-system svc/jaeger-query 16686
 
 Afterwards, you can view the Jaeger UI in the browser at
 [localhost:16686](http://localhost:16686).
-There you should see the traces generated by the lifecycle controller,
+There you should see the traces generated by the lifecycle operator,
 which should look like this:
 
 ### Traces overview
diff --git a/examples/support/observability/assets/grafana_dasboard_import_ui.json b/examples/support/observability/assets/grafana_dasboard_import_ui.json
index 5bdb13b3a6..8e62923b93 100644
--- a/examples/support/observability/assets/grafana_dasboard_import_ui.json
+++ b/examples/support/observability/assets/grafana_dasboard_import_ui.json
@@ -879,7 +879,7 @@
   },
   "timepicker": {},
   "timezone": "",
-  "title": "Keptn Lifecycle Controller Metrics",
+  "title": "Keptn Metrics",
   "uid": "wlo2MpIVk",
   "version": 13,
   "weekStart": ""
diff --git a/examples/support/observability/assets/grafana_dashboard.json b/examples/support/observability/assets/grafana_dashboard.json
index 817eef75b4..1f5222a16a 100644
--- a/examples/support/observability/assets/grafana_dashboard.json
+++ b/examples/support/observability/assets/grafana_dashboard.json
@@ -880,7 +880,7 @@
     },
     "timepicker": {},
     "timezone": "",
-    "title": "Keptn Lifecycle Controller Metrics",
+    "title": "Keptn Metrics",
     "uid": "wlo2MpIVk",
     "version": 13,
     "weekStart": ""
diff --git a/lifecycle-operator/webhooks/pod_mutator/pod_mutating_webhook.go b/lifecycle-operator/webhooks/pod_mutator/pod_mutating_webhook.go
index c291fe5616..b43a3deae4 100644
--- a/lifecycle-operator/webhooks/pod_mutator/pod_mutating_webhook.go
+++ b/lifecycle-operator/webhooks/pod_mutator/pod_mutating_webhook.go
@@ -69,7 +69,7 @@ func (a *PodMutatingWebhook) Handle(ctx context.Context, req admission.Request)
 		return admission.Errored(http.StatusBadRequest, err)
 	}
 
-	// check if Lifecycle Controller is enabled for this namespace
+	// check if Lifecycle Operator is enabled for this namespace
 	namespace := &corev1.Namespace{}
 	if err = a.Client.Get(ctx, types.NamespacedName{Name: req.Namespace}, namespace); err != nil {
 		logger.Error(err, "could not get namespace", "namespace", req.Namespace)
@@ -77,15 +77,15 @@ func (a *PodMutatingWebhook) Handle(ctx context.Context, req admission.Request)
 	}
 
 	if namespace.GetAnnotations()[apicommon.NamespaceEnabledAnnotation] != "enabled" {
-		logger.Info("namespace is not enabled for lifecycle controller", "namespace", req.Namespace)
-		return admission.Allowed("namespace is not enabled for lifecycle controller")
+		logger.Info("namespace is not enabled for lifecycle operator", "namespace", req.Namespace)
+		return admission.Allowed("namespace is not enabled for lifecycle operator")
 	}
 
 	// check the OwnerReference of the pod to see if it is supported and intended to be managed by KLT
 	ownerRef := a.getOwnerReference(pod.ObjectMeta)
 
 	if ownerRef.Kind == "" {
-		msg := "owner of pod is not supported by lifecycle controller"
+		msg := "owner of pod is not supported by lifecycle operator"
 		logger.Info(msg, "namespace", req.Namespace, "pod", req.Name)
 		return admission.Allowed(msg)
 	}
diff --git a/runtimes/deno-runtime/README.md b/runtimes/deno-runtime/README.md
index a861c7acbf..3dec2525e4 100644
--- a/runtimes/deno-runtime/README.md
+++ b/runtimes/deno-runtime/README.md
@@ -1,4 +1,4 @@
-# Keptn Lifecycle Controller - Deno Runtime
+# Keptn - Deno Runtime
 
 ## Build