diff --git a/README.md b/README.md
index 273f1bb..ce7f13e 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
-# **Windows XP / Server 2003 Keygen**
+# **Universal MS Key Toolkit (UMSKT)**
 
-[![Zulip chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://umskt.zulipchat.com) 
+[![Zulip chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://umskt.zulipchat.com)
 [![libera.chat - #mspid](https://img.shields.io/badge/libera.chat-%23mspid-brightgreen)](https://web.libera.chat/gamja/?nick=Guest?#mspid)
 
 ### **Plan of Action / ToDo List**
 
 In light of the recent exponential interest in this project I've decided to put updates of this project here:
 
-* [Please see ticket #8 for more information](https://github.com/Neo-Desktop/WindowsXPKg/issues/8)
+* [Please see ticket #8 for more information](../../issues/3)
 
 
 ------
@@ -31,23 +31,23 @@ In light of the recent exponential interest in this project I've decided to put
 ### **Usage**
 #### 1. Download the latest version of WindowsXPKg
 
-   * *(GitHub account required)*
-     * Download the latest experimental version using the Actions tab ([Windows](https://github.com/Neo-Desktop/WindowsXPKg/actions/workflows/windows.yml), [Linux](https://github.com/Neo-Desktop/WindowsXPKg/actions/workflows/linux.yml)).
+* *(GitHub account required)*
+    * Download the latest experimental version using the Actions tab ([Windows](../../actions/workflows/windows.yml), [Linux](../../actions/workflows/linux.yml)).
 
 
-   * *(GitHub account \*not\* required)*
-     * Download the latest release for your operating system and architecture from [the releases page](https://github.com/Neo-Desktop/WindowsXPKg/releases)
+* *(GitHub account \*not\* required)*
+    * Download the latest release for your operating system and architecture from [the releases page](../../releases)
 
 
-   * **Note:** Before continuing, please ensure you have both the `xpkey` program and the `keys.json` datum extracted and in the same directory
+* **Note:** Before continuing, please ensure you have both the `xpkey` program and the `keys.json` datum extracted and in the same directory
 
 #### 2. Run `xpkey` to generate a key, or add `--help` to see more options.
 
 #### 3. *(Activation step for `Retail` and `OEM` only)*
-  * After installation, you will be prompted to activate Windows.
+* After installation, you will be prompted to activate Windows.
 
 
-  * Select the **telephone activation** method, then, run `xpkey -i <Installation ID>` using the `Installation ID` the activation Wizard provides for you
+* Select the **telephone activation** method, then, run `xpkey -i <Installation ID>` using the `Installation ID` the activation Wizard provides for you
 
 #### 4. Profit!
 
diff --git a/src/BINK1998.cpp b/src/BINK1998.cpp
index 4806563..c19f5cb 100644
--- a/src/BINK1998.cpp
+++ b/src/BINK1998.cpp
@@ -1,7 +1,7 @@
 /**
- * This file is a part of the WindowsXPKg Project
+ * This file is a part of the UMSKT Project
  *
- * Copyleft (C) 2019-2023 WindowsXPKg Contributors (et.al.)
+ * Copyleft (C) 2019-2023 UMSKT Contributors (et.al.)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/src/BINK1998.h b/src/BINK1998.h
index 0d5bc07..f1a30b8 100644
--- a/src/BINK1998.h
+++ b/src/BINK1998.h
@@ -1,7 +1,7 @@
 /**
- * This file is a part of the WindowsXPKg Project
+ * This file is a part of the UMSKT Project
  *
- * Copyleft (C) 2019-2023 WindowsXPKg Contributors (et.al.)
+ * Copyleft (C) 2019-2023 UMSKT Contributors (et.al.)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -20,8 +20,8 @@
  * @Maintainer Neo
  */
 
-#ifndef WINDOWSXPKG_BINK1998_H
-#define WINDOWSXPKG_BINK1998_H
+#ifndef UMSKT_BINK1998_H
+#define UMSKT_BINK1998_H
 
 #include "header.h"
 
@@ -59,4 +59,4 @@ public:
     );
 };
 
-#endif //WINDOWSXPKG_BINK1998_H
+#endif //UMSKT_BINK1998_H
diff --git a/src/BINK2002.cpp b/src/BINK2002.cpp
index f4c9e11..80124ad 100644
--- a/src/BINK2002.cpp
+++ b/src/BINK2002.cpp
@@ -1,7 +1,7 @@
 /**
- * This file is a part of the WindowsXPKg Project
+ * This file is a part of the UMSKT Project
  *
- * Copyleft (C) 2019-2023 WindowsXPKg Contributors (et.al.)
+ * Copyleft (C) 2019-2023 UMSKT Contributors (et.al.)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/src/BINK2002.h b/src/BINK2002.h
index b7ee9e0..6183d06 100644
--- a/src/BINK2002.h
+++ b/src/BINK2002.h
@@ -1,7 +1,7 @@
 /**
- * This file is a part of the WindowsXPKg Project
+ * This file is a part of the UMSKT Project
  *
- * Copyleft (C) 2019-2023 WindowsXPKg Contributors (et.al.)
+ * Copyleft (C) 2019-2023 UMSKT Contributors (et.al.)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -20,8 +20,8 @@
  * @Maintainer Neo
  */
 
-#ifndef WINDOWSXPKG_BINK2002_H
-#define WINDOWSXPKG_BINK2002_H
+#ifndef UMSKT_BINK2002_H
+#define UMSKT_BINK2002_H
 
 #include "header.h"
 
@@ -62,4 +62,4 @@ public:
     );
 };
 
-#endif //WINDOWSXPKG_BINK2002_H
+#endif //UMSKT_BINK2002_H
diff --git a/src/cli.cpp b/src/cli.cpp
index ccda0c6..61789cd 100644
--- a/src/cli.cpp
+++ b/src/cli.cpp
@@ -1,7 +1,7 @@
 /**
- * This file is a part of the WindowsXPKg Project
+ * This file is a part of the UMSKT Project
  *
- * Copyleft (C) 2019-2023 WindowsXPKg Contributors (et.al.)
+ * Copyleft (C) 2019-2023 UMSKT Contributors (et.al.)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/src/cli.h b/src/cli.h
index a72ac51..d5d4ed4 100644
--- a/src/cli.h
+++ b/src/cli.h
@@ -1,7 +1,7 @@
 /**
- * This file is a part of the WindowsXPKg Project
+ * This file is a part of the UMSKT Project
  *
- * Copyleft (C) 2019-2023 WindowsXPKg Contributors (et.al.)
+ * Copyleft (C) 2019-2023 UMSKT Contributors (et.al.)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -20,8 +20,8 @@
  * @Maintainer Neo
  */
 
-#ifndef WINDOWSXPKG_CLI_H
-#define WINDOWSXPKG_CLI_H
+#ifndef UMSKT_CLI_H
+#define UMSKT_CLI_H
 
 #include "header.h"
 
@@ -50,4 +50,4 @@ public:
     int ConfirmationID();
 };
 
-#endif //WINDOWSXPKG_CLI_H
+#endif //UMSKT_CLI_H
diff --git a/src/confid.cpp b/src/confid.cpp
index 1c26d4a..13acae9 100644
--- a/src/confid.cpp
+++ b/src/confid.cpp
@@ -1,7 +1,7 @@
 /**
- * This file is a part of the WindowsXPKg Project
+ * This file is a part of the UMSKT Project
  *
- * Copyleft (C) 2019-2023 WindowsXPKg Contributors (et.al.)
+ * Copyleft (C) 2019-2023 UMSKT Contributors (et.al.)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -20,7 +20,7 @@
  * @Maintainer WitherOrNot
  *
  * @History {
- *  This algorithm was provided to the WindowsXPKg project by diamondggg
+ *  This algorithm was provided to the UMSKT project by diamondggg
  *  the history provided by diamondggg is that they are the originator of the code
  *  and was created in tandem with an acquaintance who knows number theory.
  *  The file dates suggest this code was written sometime in 2017/2018
diff --git a/src/confid.h b/src/confid.h
index 8f7004b..310adae 100644
--- a/src/confid.h
+++ b/src/confid.h
@@ -1,7 +1,7 @@
 /**
- * This file is a part of the WindowsXPKg Project
+ * This file is a part of the UMSKT Project
  *
- * Copyleft (C) 2019-2023 WindowsXPKg Contributors (et.al.)
+ * Copyleft (C) 2019-2023 UMSKT Contributors (et.al.)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -20,8 +20,8 @@
  * @Maintainer Neo
  */
 
-#ifndef WINDOWSXPKG_CONFID_H
-#define WINDOWSXPKG_CONFID_H
+#ifndef UMSKT_CONFID_H
+#define UMSKT_CONFID_H
 
 #include "header.h"
 
@@ -68,4 +68,4 @@ public:
     static int CLIRun();
 };
 
-#endif //WINDOWSXPKG_CONFID_H
+#endif //UMSKT_CONFID_H
diff --git a/src/header.h b/src/header.h
index 8eebed9..1ec94cc 100644
--- a/src/header.h
+++ b/src/header.h
@@ -1,7 +1,7 @@
 /**
- * This file is a part of the WindowsXPKg Project
+ * This file is a part of the UMSKT Project
  *
- * Copyleft (C) 2019-2023 WindowsXPKg Contributors (et.al.)
+ * Copyleft (C) 2019-2023 UMSKT Contributors (et.al.)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -20,8 +20,8 @@
  * @Maintainer Neo
  */
 
-#ifndef WINDOWSXPKG_HEADER_H
-#define WINDOWSXPKG_HEADER_H
+#ifndef UMSKT_HEADER_H
+#define UMSKT_HEADER_H
 
 #ifdef DEBUG
 #include <cassert>
@@ -130,4 +130,4 @@ void unbase24(BYTE *byteSeq, const char *cdKey);
 void base24(char *cdKey, BYTE *byteSeq);
 
 
-#endif //WINDOWSXPKG_HEADER_H
+#endif //UMSKT_HEADER_H
diff --git a/src/key.cpp b/src/key.cpp
index 363dbc3..d95acf4 100644
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -1,7 +1,7 @@
 /**
- * This file is a part of the WindowsXPKg Project
+ * This file is a part of the UMSKT Project
  *
- * Copyleft (C) 2019-2023 WindowsXPKg Contributors (et.al.)
+ * Copyleft (C) 2019-2023 UMSKT Contributors (et.al.)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/src/main.cpp b/src/main.cpp
index 38d9dd2..86dce15 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,7 @@
 /**
- * This file is a part of the WindowsXPKg Project
+ * This file is a part of the UMSKT Project
  *
- * Copyleft (C) 2019-2023 WindowsXPKg Contributors (et.al.)
+ * Copyleft (C) 2019-2023 UMSKT Contributors (et.al.)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/src/util.cpp b/src/util.cpp
index 94467ff..dd36ead 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,7 +1,7 @@
 /**
- * This file is a part of the WindowsXPKg Project
+ * This file is a part of the UMSKT Project
  *
- * Copyleft (C) 2019-2023 WindowsXPKg Contributors (et.al.)
+ * Copyleft (C) 2019-2023 UMSKT Contributors (et.al.)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by