diff --git a/scripts/Launch.cmd b/scripts/Launch.cmd
index ade2f35a..42c8dd76 100644
--- a/scripts/Launch.cmd
+++ b/scripts/Launch.cmd
@@ -1,4 +1,4 @@
-:: Wizard Kit: Wrapper for launching programs and scripts.
+:: WizardKit: Wrapper for launching programs and scripts.
 ::
 :: Some features:
 ::   * If the OS is 64-bit then the WorkingDir is scanned for a 64-bit version of the programs
@@ -10,7 +10,7 @@ if defined DEBUG (@echo on)
 
 :Init
 setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
+title WizardKit: Launcher
 pushd "%~dp0"
 call :FindBin
 call :DeQuote L_ITEM
diff --git a/scripts/Launcher_Template.cmd b/scripts/Launcher_Template.cmd
index 86ddd9be..dd200542 100644
--- a/scripts/Launcher_Template.cmd
+++ b/scripts/Launcher_Template.cmd
@@ -1,4 +1,4 @@
-:: Wizard Kit: Launcher Script ::
+:: WizardKit: Launcher Script ::
 ::
 :: This script works by setting env variables and then calling Launch.cmd
 :: which inherits the variables. This bypasses batch file argument parsing
@@ -7,7 +7,7 @@
 
 :Init
 setlocal EnableDelayedExpansion
-title Wizard Kit: Launcher
+title WizardKit: Launcher
 call :CheckFlags %*
 call :FindBin
 call :SetTitle Launcher
diff --git a/scripts/apple-fans b/scripts/apple-fans
index de8e56e6..9f58557a 100755
--- a/scripts/apple-fans
+++ b/scripts/apple-fans
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-## Wizard Kit: Apple fan speed tool
+## WizardKit: Apple fan speed tool
 
 SMCPATH="/sys/devices/platform/applesmc.768"
 SET_MAX="True"
diff --git a/scripts/auto_repairs.py b/scripts/auto_repairs.py
index c4cdb339..66db3732 100644
--- a/scripts/auto_repairs.py
+++ b/scripts/auto_repairs.py
@@ -1,4 +1,4 @@
-"""Wizard Kit: Auto Repair Tool"""
+"""WizardKit: Auto Repair Tool"""
 # vim: sts=2 sw=2 ts=2
 
 import os
diff --git a/scripts/auto_setup.py b/scripts/auto_setup.py
index b8118bc0..7a676f94 100644
--- a/scripts/auto_setup.py
+++ b/scripts/auto_setup.py
@@ -1,4 +1,4 @@
-"""Wizard Kit: Auto System Setup Tool"""
+"""WizardKit: Auto System Setup Tool"""
 # vim: sts=2 sw=2 ts=2
 
 import os
diff --git a/scripts/build-ufd b/scripts/build-ufd
index 237c6691..0159a3be 100755
--- a/scripts/build-ufd
+++ b/scripts/build-ufd
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-"""Wizard Kit: Build UFD Tool"""
+"""WizardKit: Build UFD Tool"""
 # vim: sts=2 sw=2 ts=2
 
 import wk
diff --git a/scripts/build_kit_windows.py b/scripts/build_kit_windows.py
index 42eafc38..e726dfef 100644
--- a/scripts/build_kit_windows.py
+++ b/scripts/build_kit_windows.py
@@ -1,4 +1,4 @@
-"""Wizard Kit: Build Kit (Windows)."""
+"""WizardKit: Build Kit (Windows)."""
 # vim: sts=2 sw=2 ts=2
 
 import os
diff --git a/scripts/ddrescue-tui b/scripts/ddrescue-tui
index c5fbbc4b..5232cf0a 100755
--- a/scripts/ddrescue-tui
+++ b/scripts/ddrescue-tui
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-## Wizard Kit: ddrescue TUI Launcher
+## WizardKit: ddrescue TUI Launcher
 
 __OS_NAME="$(uname -s)"
 if [[ "$__OS_NAME" == "Darwin" ]]; then
diff --git a/scripts/ddrescue-tui.py b/scripts/ddrescue-tui.py
index 413e81e6..2857053c 100755
--- a/scripts/ddrescue-tui.py
+++ b/scripts/ddrescue-tui.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-"""Wizard Kit: ddrescue TUI"""
+"""WizardKit: ddrescue TUI"""
 # pylint: disable=invalid-name
 # vim: sts=2 sw=2 ts=2
 
diff --git a/scripts/echo-and-hold b/scripts/echo-and-hold
index 97c69830..5abd7a53 100755
--- a/scripts/echo-and-hold
+++ b/scripts/echo-and-hold
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-## Wizard Kit: "echo" text to screen and "hold" by waiting for user input
+## WizardKit: "echo" text to screen and "hold" by waiting for user input
 
 function usage {
     echo "Usage: $(basename "$0") \"text\""
diff --git a/scripts/get_raw_disks.ps1 b/scripts/get_raw_disks.ps1
index afdb9300..3e415197 100644
--- a/scripts/get_raw_disks.ps1
+++ b/scripts/get_raw_disks.ps1
@@ -1,3 +1,3 @@
-# Wizard Kit: Get RAW disks
+# WizardKit: Get RAW disks
 
 Get-Disk | Where-Object {$_.PartitionStyle -eq "RAW"} | Select FriendlyName,Size,PartitionStyle | ConvertTo-JSON
\ No newline at end of file
diff --git a/scripts/hw-diags b/scripts/hw-diags
index 16684630..cf5436da 100755
--- a/scripts/hw-diags
+++ b/scripts/hw-diags
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-## Wizard Kit: HW Diagnostics Launcher
+## WizardKit: HW Diagnostics Launcher
 
 source launch-in-tmux
 
diff --git a/scripts/hw-diags.py b/scripts/hw-diags.py
index c72fd91f..858477fb 100755
--- a/scripts/hw-diags.py
+++ b/scripts/hw-diags.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-"""Wizard Kit: Hardware Diagnostics"""
+"""WizardKit: Hardware Diagnostics"""
 # pylint: disable=invalid-name
 # vim: sts=2 sw=2 ts=2
 
diff --git a/scripts/hw-sensors b/scripts/hw-sensors
index d4665466..3879cf2a 100755
--- a/scripts/hw-sensors
+++ b/scripts/hw-sensors
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-"""Wizard Kit: Hardware Sensors"""
+"""WizardKit: Hardware Sensors"""
 # vim: sts=2 sw=2 ts=2
 
 import platform
diff --git a/scripts/init_client_dir.cmd b/scripts/init_client_dir.cmd
index 5e94469b..6bf297b0 100644
--- a/scripts/init_client_dir.cmd
+++ b/scripts/init_client_dir.cmd
@@ -1,4 +1,4 @@
-:: Wizard Kit: Create client_dir folder(s)
+:: WizardKit: Create client_dir folder(s)
 
 @echo off
 if defined DEBUG (@echo on)
diff --git a/scripts/launch-in-tmux b/scripts/launch-in-tmux
index de9483a8..65628d8a 100755
--- a/scripts/launch-in-tmux
+++ b/scripts/launch-in-tmux
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-## Wizard Kit: TMUX Launcher
+## WizardKit: TMUX Launcher
 
 # Live macOS env workaround
 tmux_args=()
diff --git a/scripts/mount-all-volumes b/scripts/mount-all-volumes
index 1e8b3353..89f3edb8 100755
--- a/scripts/mount-all-volumes
+++ b/scripts/mount-all-volumes
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-"""Wizard Kit: Mount all volumes"""
+"""WizardKit: Mount all volumes"""
 # vim: sts=2 sw=2 ts=2
 
 import sys
diff --git a/scripts/mount-backup-shares b/scripts/mount-backup-shares
index 69ae4a58..c88312a6 100755
--- a/scripts/mount-backup-shares
+++ b/scripts/mount-backup-shares
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-"""Wizard Kit: Mount Backup Shares"""
+"""WizardKit: Mount Backup Shares"""
 # pylint: disable=invalid-name
 # vim: sts=2 sw=2 ts=2
 
diff --git a/scripts/mount-raw-image b/scripts/mount-raw-image
index 6a183859..13bdaed1 100755
--- a/scripts/mount-raw-image
+++ b/scripts/mount-raw-image
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-## Wizard Kit: RAW image mounting tool
+## WizardKit: RAW image mounting tool
 
 set -o errexit
 set -o errtrace
diff --git a/scripts/msword-search b/scripts/msword-search
index 879e6b8d..33e1a7c7 100755
--- a/scripts/msword-search
+++ b/scripts/msword-search
@@ -1,6 +1,6 @@
 #!/bin/python3
 #
-## Wizard Kit: MS Word content search tool
+## WizardKit: MS Word content search tool
 
 import os
 import re
diff --git a/scripts/pacinit b/scripts/pacinit
index 63797ab9..aaf52459 100755
--- a/scripts/pacinit
+++ b/scripts/pacinit
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-## Wizard Kit: Update pacman settings to usage in live sessions
+## WizardKit: Update pacman settings to usage in live sessions
 
 # Disable custom repo (used at build-time)
 sudo sed -i -r "s/^(\[custom\])/#\1/" /etc/pacman.conf
diff --git a/scripts/remount-rw b/scripts/remount-rw
index 1ba4b41d..2c275635 100755
--- a/scripts/remount-rw
+++ b/scripts/remount-rw
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-## Wizard Kit: Volume remount tool
+## WizardKit: Volume remount tool
 
 if ! mount | grep -q "$1"; then
     echo "ERROR: Can't remount $1"
diff --git a/scripts/unmount-backup-shares b/scripts/unmount-backup-shares
index a71a5c7b..44ad5f71 100755
--- a/scripts/unmount-backup-shares
+++ b/scripts/unmount-backup-shares
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-"""Wizard Kit: Unmount Backup Shares"""
+"""WizardKit: Unmount Backup Shares"""
 # pylint: disable=invalid-name
 # vim: sts=2 sw=2 ts=2
 
diff --git a/scripts/upload-logs b/scripts/upload-logs
index c31b6014..6921c5bc 100755
--- a/scripts/upload-logs
+++ b/scripts/upload-logs
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # vim: sts=2 sw=2 ts=2
-"""Wizard Kit: Upload Logs"""
+"""WizardKit: Upload Logs"""
 
 import datetime
 import os
diff --git a/setup/build_linux b/setup/build_linux
index 5c9b6432..83e4ca33 100755
--- a/setup/build_linux
+++ b/setup/build_linux
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-## Wizard Kit: Live Linux Build Tool
+## WizardKit: Live Linux Build Tool
 
 set -o errexit
 set -o errtrace
diff --git a/setup/build_pe.cmd b/setup/build_pe.cmd
index 60de9829..ab3d4da4 100644
--- a/setup/build_pe.cmd
+++ b/setup/build_pe.cmd
@@ -1,10 +1,10 @@
-:: Wizard Kit: Windows PE Build Tool Launcher ::
+:: WizardKit: Windows PE Build Tool ::
 
 @echo off
 
 :Init
 setlocal EnableDelayedExpansion
-title Wizard Kit: Windows PE Build Tool
+title WizardKit: Windows PE Build Tool
 call :CheckFlags %*
 call :CheckElevation || goto Exit
 call :FindKitsRoot || goto ErrorKitNotFound
diff --git a/setup/build_windows.cmd b/setup/build_windows.cmd
index 15fad071..536474af 100644
--- a/setup/build_windows.cmd
+++ b/setup/build_windows.cmd
@@ -1,11 +1,11 @@
-:: Wizard Kit: Build Tool Launcher ::
+:: WizardKit: Windows Kit Build Tool ::
 
 @echo off
 
 :Init
 setlocal EnableDelayedExpansion
 pushd "%~dp0"
-title Wizard Kit: Build Tool
+title WizardKit: Build Tool
 call :CheckFlags %*
 
 :SetVariables
diff --git a/setup/linux/profile_base/airootfs/etc/skel/.zshrc b/setup/linux/profile_base/airootfs/etc/skel/.zshrc
index a5a2298b..e20852c7 100644
--- a/setup/linux/profile_base/airootfs/etc/skel/.zshrc
+++ b/setup/linux/profile_base/airootfs/etc/skel/.zshrc
@@ -6,7 +6,7 @@ HIST_STAMPS="yyyy-mm-dd"
 plugins=(archlinux git sudo systemd tmux)
 source $ZSH/oh-my-zsh.sh
 
-# Wizard Kit
+# WizardKit
 . $HOME/.aliases
 eval $(dircolors ~/.dircolors)
 export PYTHONPATH="/usr/local/bin"
diff --git a/setup/windows/build.ps1 b/setup/windows/build.ps1
index 1d7492d5..11a06069 100644
--- a/setup/windows/build.ps1
+++ b/setup/windows/build.ps1
@@ -1,4 +1,4 @@
-# Wizard Kit: Build base kit
+# WizardKit: Build base kit
 
 ## Init ##
 #Requires -Version 3.0
@@ -10,7 +10,7 @@ Param(
 if (Test-Path Env:\DEBUG) {
   Set-PSDebug -Trace 1
 }
-$Host.UI.RawUI.WindowTitle = "Wizard Kit: Build Tool"
+$Host.UI.RawUI.WindowTitle = "WizardKit: Build Tool"
 $WD = Split-Path $MyInvocation.MyCommand.Path | Get-Item
 $Root = Get-Item "$KitPath"
 $Bin = Get-Item "$($Root.FullName)\.bin" -Force
@@ -77,7 +77,7 @@ if ($PSVersionTable.PSVersion.Major -eq 6 -and $PSVersionTable.OS -imatch "Windo
 # Answer by:    https://stackoverflow.com/users/696808/bacon-bits
 if ($MyInvocation.InvocationName -ne ".") {
   Clear-Host
-  Write-Host "Wizard Kit: Build Tool`n`n`n`n`n"
+  Write-Host "WizardKit: Build Tool`n`n`n`n`n"
 
   ## Sources ##
   $Sources = Get-Content -Path "$WD\sources.json" | ConvertFrom-JSON