diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
index e4cfccb4..fd790b5c 100644
--- a/.github/codeql/codeql-config.yml
+++ b/.github/codeql/codeql-config.yml
@@ -1,4 +1,4 @@
-name: "Rust UDS Client Workspace Analysis"
+name: "Rust UDS Launcher Workspace Analysis"
 paths:
   - crates
 paths-ignore:
diff --git a/building/windows/build.ps1 b/building/windows/build.ps1
index a17efa51..3a7d5bc6 100644
--- a/building/windows/build.ps1
+++ b/building/windows/build.ps1
@@ -1,9 +1,9 @@
-# Ensure udsclient-builder is up up date
+# Ensure udslauncher-builder is up up date
 # To be executed on building/windows/ directory
-docker build -t udsclient-builder .
+docker build -t udslauncher-builder .
 # Get full path of the ../.. directory (i.e., the root of the project)
 $projectDir = Convert-Path ../..
 
 # Run the container with the current directory mounted
-docker run --rm -v ${projectDir}:c:\crate -w /crate udsclient-builder cargo build --release
+docker run --rm -v ${projectDir}:c:\crate -w /crate udslauncher-builder cargo build --release
 # Note: the target/release/launcher.exe binary will be created
\ No newline at end of file
diff --git a/crates/crypt/src/verify.rs b/crates/crypt/src/verify.rs
index 2145556a..3be1877c 100644
--- a/crates/crypt/src/verify.rs
+++ b/crates/crypt/src/verify.rs
@@ -8,7 +8,7 @@ use base64::engine::{Engine as _, general_purpose::STANDARD};
 
 use libcrux_ml_dsa::ml_dsa_65;
 
-// UDS Client ML-DSA Public Key
+// UDS Launcher ML-DSA Public Key
 static PUBLIC_KEY: &[u8] = include_bytes!("../public-key.bin");
 
 pub fn verify_signature(message: &[u8], signature_b64: &str) -> Result<()> {
diff --git a/crates/gui/src/windows/about.rs b/crates/gui/src/windows/about.rs
index 226de156..2eede7ae 100644
--- a/crates/gui/src/windows/about.rs
+++ b/crates/gui/src/windows/about.rs
@@ -19,7 +19,7 @@ use crate::wgpu_render::{OverlayParams, WgpuRenderer};
 const ABOUT_LINES: &[&str] = &[
     "UDS Launcher",
     "Version: 5.0.0",
-    "UDS Client Launcher",
+    "UDS Connection Launcher",
     "",
     "Developed by Virtual Cable S.L.",
     "https://www.udsenterprise.com",
diff --git a/doc/environment.md b/doc/environment.md
index 7cecdd5e..65930b50 100644
--- a/doc/environment.md
+++ b/doc/environment.md
@@ -1,6 +1,6 @@
-# UDS Client Environment Variables
+# UDS Launcher Environment Variables
 
-This document details the environment variables supported by the UDS client, classified by their functionality.
+This document details the environment variables supported by the UDS launcher, classified by their functionality.
 
 ---