diff --git a/SHADE_Managed/src/Components/Component.hxx b/SHADE_Managed/src/Components/Component.hxx
index 5ffa3952..e52ab3a7 100644
--- a/SHADE_Managed/src/Components/Component.hxx
+++ b/SHADE_Managed/src/Components/Component.hxx
@@ -97,7 +97,7 @@ namespace SHADE
         /// <summary>
         /// Removes all Scripts of the specified type from this GameObject.
         /// </summary>
-        /// <typeparam name="T">Type of PLushieScripts to remove.</typeparam>
+        /// <typeparam name="T">Type of Scripts to remove.</typeparam>
         generic<typename T> where T : ref class, Script
         void RemoveScript();
 
diff --git a/SHADE_Managed/src/Editor/Editor.hxx b/SHADE_Managed/src/Editor/Editor.hxx
index 6b59589a..109842b5 100644
--- a/SHADE_Managed/src/Editor/Editor.hxx
+++ b/SHADE_Managed/src/Editor/Editor.hxx
@@ -39,10 +39,10 @@ namespace SHADE
         /// <param name="entity">The Entity to render the Scripts of.</param>
         static void RenderScriptsInInspector(Entity entity);
         /// <summary>
-        /// Renders a dropdown button that allows for the addition of PlushieScripts
-        /// onto the specified Entity.
+        /// Renders a dropdown button that allows for the addition of Scripts onto the 
+        /// specified Entity.
         /// </summary>
-        /// <param name="entity">The Entity to add PlushieScripts to.</param>
+        /// <param name="entity">The Entity to add Scripts to.</param>
         static void RenderScriptAddButton(Entity entity);
 
         /*-----------------------------------------------------------------------------*/
diff --git a/SHADE_Managed/src/Engine/EngineInterface.hxx b/SHADE_Managed/src/Engine/EngineInterface.hxx
index 4fd8f7b3..37ded4eb 100644
--- a/SHADE_Managed/src/Engine/EngineInterface.hxx
+++ b/SHADE_Managed/src/Engine/EngineInterface.hxx
@@ -20,7 +20,7 @@ namespace SHADE
 {
     /// <summary>
     /// Static class that contains the functions for interfacing with the core
-    /// PlushieEngine written in C++ for managing the lifecycle of managed code.
+    /// SHADE Engine written in C++ for managing the lifecycle of managed code.
     /// </summary>
     private ref class EngineInterface abstract sealed
     {
diff --git a/SHADE_Managed/src/Engine/GameObject.hxx b/SHADE_Managed/src/Engine/GameObject.hxx
index 030b917c..02a0ed4f 100644
--- a/SHADE_Managed/src/Engine/GameObject.hxx
+++ b/SHADE_Managed/src/Engine/GameObject.hxx
@@ -210,7 +210,7 @@ namespace SHADE
         /// <summary>
         /// Removes all Scripts of the specified type from this GameObject.
         /// </summary>
-        /// <typeparam name="T">Type of PLushieScripts to remove.</typeparam>
+        /// <typeparam name="T">Type of Scripts to remove.</typeparam>
         generic<typename T> where T : ref class, Script
         void RemoveScript();
 
diff --git a/SHADE_Managed/src/Math/Vector2.cxx b/SHADE_Managed/src/Math/Vector2.cxx
index 42080d60..8242a11c 100644
--- a/SHADE_Managed/src/Math/Vector2.cxx
+++ b/SHADE_Managed/src/Math/Vector2.cxx
@@ -276,4 +276,4 @@ namespace SHADE
     {
         return !(lhs == rhs);
     }
-} // namespace PlushieAPI::Mathematics
\ No newline at end of file
+}
diff --git a/SHADE_Managed/src/Math/Vector3.cxx b/SHADE_Managed/src/Math/Vector3.cxx
index 83adbb38..f2286aa7 100644
--- a/SHADE_Managed/src/Math/Vector3.cxx
+++ b/SHADE_Managed/src/Math/Vector3.cxx
@@ -294,4 +294,4 @@ namespace SHADE
     {
         return Vector3(vec);
     }
-} // namespace PlushieAPI::Mathematics
\ No newline at end of file
+} 
diff --git a/SHADE_Managed/src/Math/Vector3.hxx b/SHADE_Managed/src/Math/Vector3.hxx
index 4cdf653e..189f2930 100644
--- a/SHADE_Managed/src/Math/Vector3.hxx
+++ b/SHADE_Managed/src/Math/Vector3.hxx
@@ -439,4 +439,5 @@ namespace SHADE
         /// <param name="vec">Vector2 to convert from.</param>
         static explicit operator Vector3(Vector2 vec);
     };
-} // namespace PlushieAPI::Mathematics
+} 
+
diff --git a/SHADE_Managed/src/Scripts/Script.cxx b/SHADE_Managed/src/Scripts/Script.cxx
index bd6d7bef..9d6cadb8 100644
--- a/SHADE_Managed/src/Scripts/Script.cxx
+++ b/SHADE_Managed/src/Scripts/Script.cxx
@@ -3,8 +3,7 @@
 \author         Tng Kah Wei, kahwei.tng, 390009620
 \par            email: kahwei.tng\@digipen.edu
 \date           Oct 28, 2021
-\brief          Contains the definition of the functions for the PlushieScript managed
-                class.
+\brief          Contains the definition of the functions for the Script managed class.
 
                 Note: This file is written in C++17/CLI.
  
diff --git a/SHADE_Managed/src/Scripts/ScriptStore.hxx b/SHADE_Managed/src/Scripts/ScriptStore.hxx
index c151392f..23440f3d 100644
--- a/SHADE_Managed/src/Scripts/ScriptStore.hxx
+++ b/SHADE_Managed/src/Scripts/ScriptStore.hxx
@@ -36,7 +36,7 @@ namespace SHADE
         /// </summary>
         /// <typeparam name="T">
         /// Type of script to add.
-        /// This needs to be a default constructable PlushieScript.
+        /// This needs to be a default constructable Script.
         /// </typeparam>
         /// <param name="entity">The entity to add a script to.</param>
         /// <returns>Reference to the script added.</returns>
diff --git a/SHADE_Managed/src/Utility/DisposableAssemblyLoadContext.cxx b/SHADE_Managed/src/Utility/DisposableAssemblyLoadContext.cxx
index ebf2e987..e19c4d06 100644
--- a/SHADE_Managed/src/Utility/DisposableAssemblyLoadContext.cxx
+++ b/SHADE_Managed/src/Utility/DisposableAssemblyLoadContext.cxx
@@ -33,4 +33,4 @@ namespace SHADE
     {
         return nullptr;
     }
-} // namespace PlushieAPI
\ No newline at end of file
+} 
diff --git a/SHADE_Managed/src/Utility/DisposableAssemblyLoadContext.hxx b/SHADE_Managed/src/Utility/DisposableAssemblyLoadContext.hxx
index 433dd85e..14d612b3 100644
--- a/SHADE_Managed/src/Utility/DisposableAssemblyLoadContext.hxx
+++ b/SHADE_Managed/src/Utility/DisposableAssemblyLoadContext.hxx
@@ -36,4 +36,4 @@ namespace SHADE
         /*-----------------------------------------------------------------------------*/
         System::Reflection::Assembly^ Load(System::Reflection::AssemblyName^ assemblyName) override;
     };
-} // namespace PlushieAPI
\ No newline at end of file
+}