diff --git a/SHADE_Engine/src/Scripting/SHDotNetRuntime.h b/SHADE_Engine/src/Scripting/SHDotNetRuntime.h
index 22f8d9c7..2eb69788 100644
--- a/SHADE_Engine/src/Scripting/SHDotNetRuntime.h
+++ b/SHADE_Engine/src/Scripting/SHDotNetRuntime.h
@@ -144,6 +144,6 @@ namespace SHADE
     static std::string buildTpaList(const std::string& directory);
     static void throwIfFailed(const std::string& errMsg, int resultCode);
   };
-} // namespace PlushieEngine::Scripts
+} 
 
 #include "SHDotNetRuntime.hpp"
diff --git a/SHADE_Engine/src/Scripting/SHScriptEngine.cpp b/SHADE_Engine/src/Scripting/SHScriptEngine.cpp
index 6653284d..682841cd 100644
--- a/SHADE_Engine/src/Scripting/SHScriptEngine.cpp
+++ b/SHADE_Engine/src/Scripting/SHScriptEngine.cpp
@@ -25,7 +25,7 @@ namespace SHADE
   /*--------------------------------------------------------------------------------*/
   /* Static Definitions                                                             */
   /*--------------------------------------------------------------------------------*/
-  const std::string SHScriptEngine::DEFAULT_CSHARP_NAMESPACE = std::string(DEFAULT_CSHARP_LIB_NAME);
+  const std::string SHScriptEngine::DEFAULT_CSHARP_NAMESPACE = std::string("SHADE");
   SHDotNetRuntime                              SHScriptEngine::dotNet                        { false };
   SHScriptEngine::CsFuncPtr                    SHScriptEngine::csEngineInit                  = nullptr;
   SHScriptEngine::CsFuncPtr                    SHScriptEngine::csEngineLoadScripts           = nullptr;
@@ -185,7 +185,7 @@ namespace SHADE
     // Prepare directory (delete useless files)
     deleteFolder("net5.0");
     deleteFolder("ref");
-    deleteFolder("../PlushieGameManaged");
+    deleteFolder("../SHADE_Scripting");
     deleteFolder("../obj");
 
     // Attempt to build the assembly
@@ -196,12 +196,12 @@ namespace SHADE
     const bool BUILD_SUCCESS = execProcess
     (
       L"C:\\Windows\\system32\\cmd.exe", 
-      L"/K \"dotnet build \"../PlushieGameManaged.csproj\" -c Debug -o \"./tmp/\" -fl -flp:LogFile=build.log;Verbosity=quiet & exit\""
+      L"/K \"dotnet build \"../SHADE_Scripting.csproj\" -c Debug -o \"./tmp/\" -fl -flp:LogFile=build.log;Verbosity=quiet & exit\""
     ) == 0;
     if (BUILD_SUCCESS)
     {
       // Copy to built dll to the working directory and replace
-      std::filesystem::copy_file("./tmp/PlushieGameManaged.dll", "PlushieGameManaged.dll", std::filesystem::copy_options::overwrite_existing);
+      std::filesystem::copy_file("./tmp/SHADE_Managed.dll", "SHADE_Managed.dll", std::filesystem::copy_options::overwrite_existing);
 
       oss << "[ScriptEngine] Successfully built Managed Script Assembly (" << MANAGED_SCRIPT_LIB_NAME << ")!";
       SHLOG_INFO(oss.str());
@@ -256,8 +256,8 @@ namespace SHADE
     <None Remove=\".gitmodules\" />\n\
   </ItemGroup>\n\
   <ItemGroup>\n\
-    <Reference Include=\"PlushieAPI\">\n\
-      <HintPath>.\\bin\\PlushieAPI.dll</HintPath>\n\
+    <Reference Include=\"SHADE_Managed\">\n\
+      <HintPath>.\\bin\\SHADE_Managed.dll</HintPath>\n\
     </Reference>\n\
   </ItemGroup>\n\
 </Project>";
diff --git a/SHADE_Engine/src/Scripting/SHScriptEngine.h b/SHADE_Engine/src/Scripting/SHScriptEngine.h
index 5114125c..442c0053 100644
--- a/SHADE_Engine/src/Scripting/SHScriptEngine.h
+++ b/SHADE_Engine/src/Scripting/SHScriptEngine.h
@@ -60,7 +60,7 @@ namespace SHADE
     /// </summary>
     static void ReloadScriptAssembly();
     /// <summary>
-    /// Executes the FixedUpdate()s of the PlushieScripts that are attached to
+    /// Executes the FixedUpdate()s of the Scripts that are attached to
     /// Entities.
     /// </summary>
     static void ExecuteFixedUpdates();
@@ -76,7 +76,7 @@ namespace SHADE
     /// Adds a Script to a specified Entity. Note that while you can call this
     /// multiple times on a specified Entity, it will work for all intents and
     /// purposes but GetScript&lt;T&gt;() (C# only) currently only
-    /// gives you the first PlushieScript added of the specified type.
+    /// gives you the first Script added of the specified type.
     /// </summary>
     /// <param name="entity">The entity to add a script to.</param>
     /// <param name="scriptName">Type name of the script to add.</param>
@@ -87,7 +87,7 @@ namespace SHADE
     static bool AddScript(const SHEntity& entity, const std::string_view& scriptName);
     /// <summary>
     /// Removes all Scripts attached to the specified Entity. Does not do anything
-    /// if the specified Entity is invalid or does not have any PlushieScripts
+    /// if the specified Entity is invalid or does not have any Scripts
     /// attached.
     /// </summary>
     /// <param name="entity">The entity to remove the scripts from.</param>
@@ -96,7 +96,7 @@ namespace SHADE
     /// Removes all Scripts attached to the specified Entity. Unlike
     /// RemoveAllScripts(), this removes all the scripts immediately.
     /// Does not do anything if the specified Entity is invalid or does not have any
-    /// PlushieScripts attached.
+    /// Scripts attached.
     /// </summary>
     /// <param name="entity">The entity to remove the scripts from.</param>
     /// <param name="callOnDestroy">
@@ -131,13 +131,13 @@ namespace SHADE
     /* Script Editor Functions                                                     */
     /*-----------------------------------------------------------------------------*/
     /// <summary>
-    /// Renders the set of attached PlushieScripts for the specified Entity into the
+    /// Renders the set of attached Scripts for the specified Entity into the
     /// inspector. 
     /// <br/>
     /// This function is meant for consumption from native code in the inspector
     /// rendering code.
     /// </summary>
-    /// <param name="entity">The Entity to render the PlushieScripts of.</param>
+    /// <param name="entity">The Entity to render the Scripts of.</param>
     static void RenderScriptsInInspector(const SHEntity& entity);
     
     /*-----------------------------------------------------------------------------*/
@@ -145,7 +145,7 @@ namespace SHADE
     /*-----------------------------------------------------------------------------*/
     /// <summary>
     /// Utilises execution of a external batch file for invoking the dotnet build
-    /// tool to compile C# scripts in the Assets folder into the PlushieGameManaged
+    /// tool to compile C# scripts in the Assets folder into the SHADE_Scripting
     /// C# assembly DLL.
     /// </summary>
     /// <param name="debug">
diff --git a/SHADE_Engine/src/Tools/SHStringUtils.cpp b/SHADE_Engine/src/Tools/SHStringUtils.cpp
index a8dc4a0c..a2594888 100644
--- a/SHADE_Engine/src/Tools/SHStringUtils.cpp
+++ b/SHADE_Engine/src/Tools/SHStringUtils.cpp
@@ -49,4 +49,4 @@ namespace SHADE
 		return std::system_category().message(errorCode);
 	}
     
-} // namespace PlushieEngine
\ No newline at end of file
+} 
\ No newline at end of file
diff --git a/SHADE_Engine/src/Tools/SHStringUtils.h b/SHADE_Engine/src/Tools/SHStringUtils.h
index abfe9146..1c895b99 100644
--- a/SHADE_Engine/src/Tools/SHStringUtils.h
+++ b/SHADE_Engine/src/Tools/SHStringUtils.h
@@ -76,6 +76,6 @@ namespace SHADE
       /*-------------------------------------------------------------------------------*/
         SHStringUtils() = delete;
     };
-} // namespace PlushieEngine
+}
 
 #include "SHStringUtils.hpp"
diff --git a/SHADE_Engine/src/Tools/SHStringUtils.hpp b/SHADE_Engine/src/Tools/SHStringUtils.hpp
index 5b4caecb..8b83187a 100644
--- a/SHADE_Engine/src/Tools/SHStringUtils.hpp
+++ b/SHADE_Engine/src/Tools/SHStringUtils.hpp
@@ -43,4 +43,4 @@ namespace SHADE
 
         return results;
     }
-} // namespace PlushieEngine
\ No newline at end of file
+}
\ No newline at end of file