diff --git a/SDK/include/NDK/Components.hpp b/SDK/include/NDK/Components.hpp
deleted file mode 100644
index cc8c37d93..000000000
--- a/SDK/include/NDK/Components.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// This file was automatically generated
-
-#pragma once
-
-#ifndef NDK_COMPONENTS_GLOBAL_HPP
-#define NDK_COMPONENTS_GLOBAL_HPP
-
-#include <NDK/Components/CameraComponent.hpp>
-#include <NDK/Components/CollisionComponent2D.hpp>
-#include <NDK/Components/CollisionComponent3D.hpp>
-#include <NDK/Components/ConstraintComponent2D.hpp>
-#include <NDK/Components/DebugComponent.hpp>
-#include <NDK/Components/GraphicsComponent.hpp>
-#include <NDK/Components/LifetimeComponent.hpp>
-#include <NDK/Components/LightComponent.hpp>
-#include <NDK/Components/ListenerComponent.hpp>
-#include <NDK/Components/NodeComponent.hpp>
-#include <NDK/Components/ParticleEmitterComponent.hpp>
-#include <NDK/Components/ParticleGroupComponent.hpp>
-#include <NDK/Components/PhysicsComponent2D.hpp>
-#include <NDK/Components/PhysicsComponent3D.hpp>
-#include <NDK/Components/VelocityComponent.hpp>
-
-#endif // NDK_COMPONENTS_GLOBAL_HPP
diff --git a/SDK/include/NDK/Systems.hpp b/SDK/include/NDK/Systems.hpp
deleted file mode 100644
index e9a60f0c3..000000000
--- a/SDK/include/NDK/Systems.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// This file was automatically generated
-
-#pragma once
-
-#ifndef NDK_SYSTEMS_GLOBAL_HPP
-#define NDK_SYSTEMS_GLOBAL_HPP
-
-#include <NDK/Systems/DebugSystem.hpp>
-#include <NDK/Systems/LifetimeSystem.hpp>
-#include <NDK/Systems/ListenerSystem.hpp>
-#include <NDK/Systems/ParticleSystem.hpp>
-#include <NDK/Systems/PhysicsSystem2D.hpp>
-#include <NDK/Systems/PhysicsSystem3D.hpp>
-#include <NDK/Systems/RenderSystem.hpp>
-#include <NDK/Systems/VelocitySystem.hpp>
-
-#endif // NDK_SYSTEMS_GLOBAL_HPP
diff --git a/SDK/include/NDK/Widgets.hpp b/SDK/include/NDK/Widgets.hpp
deleted file mode 100644
index 9a36e37a2..000000000
--- a/SDK/include/NDK/Widgets.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// This file was automatically generated
-
-#pragma once
-
-#ifndef NDK_WIDGETS_GLOBAL_HPP
-#define NDK_WIDGETS_GLOBAL_HPP
-
-#include <NDK/Widgets/AbstractTextAreaWidget.hpp>
-#include <NDK/Widgets/BoxLayout.hpp>
-#include <NDK/Widgets/ButtonWidget.hpp>
-#include <NDK/Widgets/CheckboxWidget.hpp>
-#include <NDK/Widgets/Enums.hpp>
-#include <NDK/Widgets/ImageWidget.hpp>
-#include <NDK/Widgets/LabelWidget.hpp>
-#include <NDK/Widgets/ProgressBarWidget.hpp>
-#include <NDK/Widgets/RichTextAreaWidget.hpp>
-#include <NDK/Widgets/ScrollAreaWidget.hpp>
-#include <NDK/Widgets/TextAreaWidget.hpp>
-
-#endif // NDK_WIDGETS_GLOBAL_HPP
diff --git a/SDK/include/NDK/Algorithm.hpp b/SDK/include/NazaraSDK/Algorithm.hpp
similarity index 91%
rename from SDK/include/NDK/Algorithm.hpp
rename to SDK/include/NazaraSDK/Algorithm.hpp
index 21eefd68a..9496c4d21 100644
--- a/SDK/include/NDK/Algorithm.hpp
+++ b/SDK/include/NazaraSDK/Algorithm.hpp
@@ -7,7 +7,7 @@
 #ifndef NDK_ALGORITHM_HPP
 #define NDK_ALGORITHM_HPP
 
-#include <NDK/Prerequisites.hpp>
+#include <NazaraSDK/Prerequisites.hpp>
 
 namespace Ndk
 {
@@ -20,6 +20,6 @@ namespace Ndk
 	template<typename SystemType, typename S> bool IsSystem(S& system);
 }
 
-#include <NDK/Algorithm.inl>
+#include <NazaraSDK/Algorithm.inl>
 
 #endif // NDK_ALGORITHM_HPP
diff --git a/SDK/include/NDK/Algorithm.inl b/SDK/include/NazaraSDK/Algorithm.inl
similarity index 100%
rename from SDK/include/NDK/Algorithm.inl
rename to SDK/include/NazaraSDK/Algorithm.inl
diff --git a/SDK/include/NDK/Application.hpp b/SDK/include/NazaraSDK/Application.hpp
similarity index 95%
rename from SDK/include/NDK/Application.hpp
rename to SDK/include/NazaraSDK/Application.hpp
index 23417bcd8..5302d68a0 100644
--- a/SDK/include/NDK/Application.hpp
+++ b/SDK/include/NazaraSDK/Application.hpp
@@ -7,16 +7,16 @@
 #ifndef NDK_APPLICATION_HPP
 #define NDK_APPLICATION_HPP
 
-#include <NDK/Prerequisites.hpp>
-#include <NDK/World.hpp>
+#include <NazaraSDK/Prerequisites.hpp>
+#include <NazaraSDK/World.hpp>
 #include <Nazara/Core/Clock.hpp>
 #include <map>
 #include <list>
 #include <set>
 
 #ifndef NDK_SERVER
-#include <NDK/Canvas.hpp>
-#include <NDK/Console.hpp>
+#include <NazaraSDK/Canvas.hpp>
+#include <NazaraSDK/Console.hpp>
 #include <Nazara/Core/Log.hpp>
 #include <Nazara/Graphics/TextSprite.hpp>
 #include <Nazara/Renderer/RenderTarget.hpp>
@@ -144,6 +144,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Application.inl>
+#include <NazaraSDK/Application.inl>
 
 #endif // NDK_APPLICATION_HPP
diff --git a/SDK/include/NDK/Application.inl b/SDK/include/NazaraSDK/Application.inl
similarity index 99%
rename from SDK/include/NDK/Application.inl
rename to SDK/include/NazaraSDK/Application.inl
index 42139db0c..df690d038 100644
--- a/SDK/include/NDK/Application.inl
+++ b/SDK/include/NazaraSDK/Application.inl
@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
 #include <Nazara/Core/ErrorFlags.hpp>
-#include <NDK/Sdk.hpp>
+#include <NazaraSDK/Sdk.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/include/NDK/BaseComponent.hpp b/SDK/include/NazaraSDK/BaseComponent.hpp
similarity index 96%
rename from SDK/include/NDK/BaseComponent.hpp
rename to SDK/include/NazaraSDK/BaseComponent.hpp
index 3dd90bb75..c00260b09 100644
--- a/SDK/include/NDK/BaseComponent.hpp
+++ b/SDK/include/NazaraSDK/BaseComponent.hpp
@@ -7,7 +7,7 @@
 #ifndef NDK_BASECOMPONENT_HPP
 #define NDK_BASECOMPONENT_HPP
 
-#include <NDK/Entity.hpp>
+#include <NazaraSDK/Entity.hpp>
 #include <functional>
 #include <unordered_map>
 #include <vector>
@@ -69,6 +69,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/BaseComponent.inl>
+#include <NazaraSDK/BaseComponent.inl>
 
 #endif // NDK_BASECOMPONENT_HPP
diff --git a/SDK/include/NDK/BaseComponent.inl b/SDK/include/NazaraSDK/BaseComponent.inl
similarity index 100%
rename from SDK/include/NDK/BaseComponent.inl
rename to SDK/include/NazaraSDK/BaseComponent.inl
diff --git a/SDK/include/NDK/BaseSystem.hpp b/SDK/include/NazaraSDK/BaseSystem.hpp
similarity index 97%
rename from SDK/include/NDK/BaseSystem.hpp
rename to SDK/include/NazaraSDK/BaseSystem.hpp
index a3d967a9c..87967764d 100644
--- a/SDK/include/NDK/BaseSystem.hpp
+++ b/SDK/include/NazaraSDK/BaseSystem.hpp
@@ -8,7 +8,7 @@
 #define NDK_BASESYSTEM_HPP
 
 #include <Nazara/Core/Bitset.hpp>
-#include <NDK/EntityList.hpp>
+#include <NazaraSDK/EntityList.hpp>
 
 namespace Ndk
 {
@@ -100,6 +100,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/BaseSystem.inl>
+#include <NazaraSDK/BaseSystem.inl>
 
 #endif // NDK_BASESYSTEM_HPP
diff --git a/SDK/include/NDK/BaseSystem.inl b/SDK/include/NazaraSDK/BaseSystem.inl
similarity index 100%
rename from SDK/include/NDK/BaseSystem.inl
rename to SDK/include/NazaraSDK/BaseSystem.inl
diff --git a/SDK/include/NDK/BaseWidget.hpp b/SDK/include/NazaraSDK/BaseWidget.hpp
similarity index 96%
rename from SDK/include/NDK/BaseWidget.hpp
rename to SDK/include/NazaraSDK/BaseWidget.hpp
index 8bdd15584..62ace6eba 100644
--- a/SDK/include/NDK/BaseWidget.hpp
+++ b/SDK/include/NazaraSDK/BaseWidget.hpp
@@ -7,10 +7,10 @@
 #ifndef NDK_BASEWIDGET_HPP
 #define NDK_BASEWIDGET_HPP
 
-#include <NDK/Prerequisites.hpp>
-#include <NDK/Entity.hpp>
-#include <NDK/EntityOwner.hpp>
-#include <NDK/World.hpp>
+#include <NazaraSDK/Prerequisites.hpp>
+#include <NazaraSDK/Entity.hpp>
+#include <NazaraSDK/EntityOwner.hpp>
+#include <NazaraSDK/World.hpp>
 #include <Nazara/Graphics/Sprite.hpp>
 #include <Nazara/Platform/Event.hpp>
 #include <Nazara/Platform/Mouse.hpp>
@@ -170,6 +170,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/BaseWidget.inl>
+#include <NazaraSDK/BaseWidget.inl>
 
 #endif // NDK_BASEWIDGET_HPP
diff --git a/SDK/include/NDK/BaseWidget.inl b/SDK/include/NazaraSDK/BaseWidget.inl
similarity index 99%
rename from SDK/include/NDK/BaseWidget.inl
rename to SDK/include/NazaraSDK/BaseWidget.inl
index edff81436..7115b5ad5 100644
--- a/SDK/include/NDK/BaseWidget.inl
+++ b/SDK/include/NazaraSDK/BaseWidget.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/BaseWidget.hpp>
+#include <NazaraSDK/BaseWidget.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Math/Algorithm.hpp>
 #include <limits>
diff --git a/SDK/include/NDK/Canvas.hpp b/SDK/include/NazaraSDK/Canvas.hpp
similarity index 96%
rename from SDK/include/NDK/Canvas.hpp
rename to SDK/include/NazaraSDK/Canvas.hpp
index 26cc36cbd..1cff05828 100644
--- a/SDK/include/NDK/Canvas.hpp
+++ b/SDK/include/NazaraSDK/Canvas.hpp
@@ -7,8 +7,8 @@
 #ifndef NDK_CANVAS_HPP
 #define NDK_CANVAS_HPP
 
-#include <NDK/Prerequisites.hpp>
-#include <NDK/BaseWidget.hpp>
+#include <NazaraSDK/Prerequisites.hpp>
+#include <NazaraSDK/BaseWidget.hpp>
 #include <Nazara/Platform/CursorController.hpp>
 #include <Nazara/Platform/EventHandler.hpp>
 
@@ -82,6 +82,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Canvas.inl>
+#include <NazaraSDK/Canvas.inl>
 
 #endif // NDK_CANVAS_HPP
diff --git a/SDK/include/NDK/Canvas.inl b/SDK/include/NazaraSDK/Canvas.inl
similarity index 98%
rename from SDK/include/NDK/Canvas.inl
rename to SDK/include/NazaraSDK/Canvas.inl
index 0e1cb38f5..4e308631e 100644
--- a/SDK/include/NDK/Canvas.inl
+++ b/SDK/include/NazaraSDK/Canvas.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Canvas.hpp>
+#include <NazaraSDK/Canvas.hpp>
 #include <Nazara/Platform/Cursor.hpp>
 
 namespace Ndk
diff --git a/SDK/include/NDK/Component.hpp b/SDK/include/NazaraSDK/Component.hpp
similarity index 90%
rename from SDK/include/NDK/Component.hpp
rename to SDK/include/NazaraSDK/Component.hpp
index 6b32c5fd2..d2ccaaf5d 100644
--- a/SDK/include/NDK/Component.hpp
+++ b/SDK/include/NazaraSDK/Component.hpp
@@ -7,7 +7,7 @@
 #ifndef NDK_COMPONENT_HPP
 #define NDK_COMPONENT_HPP
 
-#include <NDK/BaseComponent.hpp>
+#include <NazaraSDK/BaseComponent.hpp>
 
 namespace Ndk
 {
@@ -27,6 +27,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Component.inl>
+#include <NazaraSDK/Component.inl>
 
 #endif // NDK_COMPONENT_HPP
diff --git a/SDK/include/NDK/Component.inl b/SDK/include/NazaraSDK/Component.inl
similarity index 98%
rename from SDK/include/NDK/Component.inl
rename to SDK/include/NazaraSDK/Component.inl
index e90cada8a..459cd4789 100644
--- a/SDK/include/NDK/Component.inl
+++ b/SDK/include/NazaraSDK/Component.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Algorithm.hpp>
+#include <NazaraSDK/Algorithm.hpp>
 #include <type_traits>
 
 namespace Ndk
diff --git a/SDK/include/NazaraSDK/Components.hpp b/SDK/include/NazaraSDK/Components.hpp
new file mode 100644
index 000000000..a937e07e9
--- /dev/null
+++ b/SDK/include/NazaraSDK/Components.hpp
@@ -0,0 +1,24 @@
+// This file was automatically generated
+
+#pragma once
+
+#ifndef NDK_COMPONENTS_GLOBAL_HPP
+#define NDK_COMPONENTS_GLOBAL_HPP
+
+#include <NazaraSDK/Components/CameraComponent.hpp>
+#include <NazaraSDK/Components/CollisionComponent2D.hpp>
+#include <NazaraSDK/Components/CollisionComponent3D.hpp>
+#include <NazaraSDK/Components/ConstraintComponent2D.hpp>
+#include <NazaraSDK/Components/DebugComponent.hpp>
+#include <NazaraSDK/Components/GraphicsComponent.hpp>
+#include <NazaraSDK/Components/LifetimeComponent.hpp>
+#include <NazaraSDK/Components/LightComponent.hpp>
+#include <NazaraSDK/Components/ListenerComponent.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Components/ParticleEmitterComponent.hpp>
+#include <NazaraSDK/Components/ParticleGroupComponent.hpp>
+#include <NazaraSDK/Components/PhysicsComponent2D.hpp>
+#include <NazaraSDK/Components/PhysicsComponent3D.hpp>
+#include <NazaraSDK/Components/VelocityComponent.hpp>
+
+#endif // NDK_COMPONENTS_GLOBAL_HPP
diff --git a/SDK/include/NDK/Components/CameraComponent.hpp b/SDK/include/NazaraSDK/Components/CameraComponent.hpp
similarity index 97%
rename from SDK/include/NDK/Components/CameraComponent.hpp
rename to SDK/include/NazaraSDK/Components/CameraComponent.hpp
index cf835704a..a4faaf7fa 100644
--- a/SDK/include/NDK/Components/CameraComponent.hpp
+++ b/SDK/include/NazaraSDK/Components/CameraComponent.hpp
@@ -14,7 +14,7 @@
 #include <Nazara/Graphics/AbstractViewer.hpp>
 #include <Nazara/Renderer/RenderTarget.hpp>
 #include <Nazara/Utility/Node.hpp>
-#include <NDK/Component.hpp>
+#include <NazaraSDK/Component.hpp>
 
 namespace Ndk
 {
@@ -114,7 +114,7 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Components/CameraComponent.inl>
+#include <NazaraSDK/Components/CameraComponent.inl>
 
 #endif // NDK_COMPONENTS_CAMERACOMPONENT_HPP
 #endif // NDK_SERVER
diff --git a/SDK/include/NDK/Components/CameraComponent.inl b/SDK/include/NazaraSDK/Components/CameraComponent.inl
similarity index 100%
rename from SDK/include/NDK/Components/CameraComponent.inl
rename to SDK/include/NazaraSDK/Components/CameraComponent.inl
diff --git a/SDK/include/NDK/Components/CollisionComponent2D.hpp b/SDK/include/NazaraSDK/Components/CollisionComponent2D.hpp
similarity index 95%
rename from SDK/include/NDK/Components/CollisionComponent2D.hpp
rename to SDK/include/NazaraSDK/Components/CollisionComponent2D.hpp
index a5da3b8c2..4bd47e6ae 100644
--- a/SDK/include/NDK/Components/CollisionComponent2D.hpp
+++ b/SDK/include/NazaraSDK/Components/CollisionComponent2D.hpp
@@ -9,7 +9,7 @@
 
 #include <Nazara/Physics2D/Collider2D.hpp>
 #include <Nazara/Physics2D/RigidBody2D.hpp>
-#include <NDK/Component.hpp>
+#include <NazaraSDK/Component.hpp>
 #include <memory>
 
 namespace Ndk
@@ -61,6 +61,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Components/CollisionComponent2D.inl>
+#include <NazaraSDK/Components/CollisionComponent2D.inl>
 
 #endif // NDK_COMPONENTS_COLLISIONCOMPONENT2D_HPP
diff --git a/SDK/include/NDK/Components/CollisionComponent2D.inl b/SDK/include/NazaraSDK/Components/CollisionComponent2D.inl
similarity index 100%
rename from SDK/include/NDK/Components/CollisionComponent2D.inl
rename to SDK/include/NazaraSDK/Components/CollisionComponent2D.inl
diff --git a/SDK/include/NDK/Components/CollisionComponent3D.hpp b/SDK/include/NazaraSDK/Components/CollisionComponent3D.hpp
similarity index 94%
rename from SDK/include/NDK/Components/CollisionComponent3D.hpp
rename to SDK/include/NazaraSDK/Components/CollisionComponent3D.hpp
index 65e48576b..846985cf4 100644
--- a/SDK/include/NDK/Components/CollisionComponent3D.hpp
+++ b/SDK/include/NazaraSDK/Components/CollisionComponent3D.hpp
@@ -9,7 +9,7 @@
 
 #include <Nazara/Physics3D/Collider3D.hpp>
 #include <Nazara/Physics3D/RigidBody3D.hpp>
-#include <NDK/Component.hpp>
+#include <NazaraSDK/Component.hpp>
 #include <memory>
 
 namespace Ndk
@@ -53,6 +53,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Components/CollisionComponent3D.inl>
+#include <NazaraSDK/Components/CollisionComponent3D.inl>
 
 #endif // NDK_COMPONENTS_COLLISIONCOMPONENT3D_HPP
diff --git a/SDK/include/NDK/Components/CollisionComponent3D.inl b/SDK/include/NazaraSDK/Components/CollisionComponent3D.inl
similarity index 100%
rename from SDK/include/NDK/Components/CollisionComponent3D.inl
rename to SDK/include/NazaraSDK/Components/CollisionComponent3D.inl
diff --git a/SDK/include/NDK/Components/ConstraintComponent2D.hpp b/SDK/include/NazaraSDK/Components/ConstraintComponent2D.hpp
similarity index 91%
rename from SDK/include/NDK/Components/ConstraintComponent2D.hpp
rename to SDK/include/NazaraSDK/Components/ConstraintComponent2D.hpp
index 652559481..97c201570 100644
--- a/SDK/include/NDK/Components/ConstraintComponent2D.hpp
+++ b/SDK/include/NazaraSDK/Components/ConstraintComponent2D.hpp
@@ -9,8 +9,8 @@
 
 #include <Nazara/Physics2D/Constraint2D.hpp>
 #include <Nazara/Math/Vector3.hpp>
-#include <NDK/Component.hpp>
-#include <NDK/Entity.hpp>
+#include <NazaraSDK/Component.hpp>
+#include <NazaraSDK/Entity.hpp>
 #include <memory>
 #include <vector>
 
@@ -46,6 +46,6 @@ namespace Ndk
 
 }
 
-#include <NDK/Components/ConstraintComponent2D.inl>
+#include <NazaraSDK/Components/ConstraintComponent2D.inl>
 
 #endif// NDK_COMPONENTS_CONSTRAINTCOMPONENT2D_HPP
diff --git a/SDK/include/NDK/Components/ConstraintComponent2D.inl b/SDK/include/NazaraSDK/Components/ConstraintComponent2D.inl
similarity index 90%
rename from SDK/include/NDK/Components/ConstraintComponent2D.inl
rename to SDK/include/NazaraSDK/Components/ConstraintComponent2D.inl
index 5db943439..4d4d2e81a 100644
--- a/SDK/include/NDK/Components/ConstraintComponent2D.inl
+++ b/SDK/include/NazaraSDK/Components/ConstraintComponent2D.inl
@@ -2,9 +2,9 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Components/ConstraintComponent2D.hpp>
-#include <NDK/Components/PhysicsComponent2D.hpp>
-#include <NDK/Components/CollisionComponent2D.hpp>
+#include <NazaraSDK/Components/ConstraintComponent2D.hpp>
+#include <NazaraSDK/Components/PhysicsComponent2D.hpp>
+#include <NazaraSDK/Components/CollisionComponent2D.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/include/NDK/Components/DebugComponent.hpp b/SDK/include/NazaraSDK/Components/DebugComponent.hpp
similarity index 96%
rename from SDK/include/NDK/Components/DebugComponent.hpp
rename to SDK/include/NazaraSDK/Components/DebugComponent.hpp
index e0993d26d..9dcf762d5 100644
--- a/SDK/include/NDK/Components/DebugComponent.hpp
+++ b/SDK/include/NazaraSDK/Components/DebugComponent.hpp
@@ -10,7 +10,7 @@
 
 #include <Nazara/Core/Flags.hpp>
 #include <Nazara/Graphics/InstancedRenderable.hpp>
-#include <NDK/Component.hpp>
+#include <NazaraSDK/Component.hpp>
 
 namespace Ndk
 {
@@ -85,7 +85,7 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Components/DebugComponent.inl>
+#include <NazaraSDK/Components/DebugComponent.inl>
 
 #endif // NDK_COMPONENTS_DEBUGCOMPONENT_HPP
 #endif // NDK_SERVER
diff --git a/SDK/include/NDK/Components/DebugComponent.inl b/SDK/include/NazaraSDK/Components/DebugComponent.inl
similarity index 96%
rename from SDK/include/NDK/Components/DebugComponent.inl
rename to SDK/include/NazaraSDK/Components/DebugComponent.inl
index e0f42a560..0aff21089 100644
--- a/SDK/include/NDK/Components/DebugComponent.inl
+++ b/SDK/include/NazaraSDK/Components/DebugComponent.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Components/DebugComponent.hpp>
+#include <NazaraSDK/Components/DebugComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/include/NDK/Components/GraphicsComponent.hpp b/SDK/include/NazaraSDK/Components/GraphicsComponent.hpp
similarity index 98%
rename from SDK/include/NDK/Components/GraphicsComponent.hpp
rename to SDK/include/NazaraSDK/Components/GraphicsComponent.hpp
index e7780f3e0..fca142554 100644
--- a/SDK/include/NDK/Components/GraphicsComponent.hpp
+++ b/SDK/include/NazaraSDK/Components/GraphicsComponent.hpp
@@ -12,7 +12,7 @@
 #include <Nazara/Graphics/InstancedRenderable.hpp>
 #include <Nazara/Math/Frustum.hpp>
 #include <Nazara/Utility/Node.hpp>
-#include <NDK/Component.hpp>
+#include <NazaraSDK/Component.hpp>
 #include <unordered_map>
 
 namespace Ndk
@@ -164,7 +164,7 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Components/GraphicsComponent.inl>
+#include <NazaraSDK/Components/GraphicsComponent.inl>
 
 #endif // NDK_COMPONENTS_GRAPHICSCOMPONENT_HPP
 #endif // NDK_SERVER
diff --git a/SDK/include/NDK/Components/GraphicsComponent.inl b/SDK/include/NazaraSDK/Components/GraphicsComponent.inl
similarity index 98%
rename from SDK/include/NDK/Components/GraphicsComponent.inl
rename to SDK/include/NazaraSDK/Components/GraphicsComponent.inl
index 37bbd1049..05c878df7 100644
--- a/SDK/include/NDK/Components/GraphicsComponent.inl
+++ b/SDK/include/NazaraSDK/Components/GraphicsComponent.inl
@@ -2,9 +2,9 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Components/GraphicsComponent.hpp>
-#include <NDK/World.hpp>
-#include <NDK/Systems/RenderSystem.hpp>
+#include <NazaraSDK/Components/GraphicsComponent.hpp>
+#include <NazaraSDK/World.hpp>
+#include <NazaraSDK/Systems/RenderSystem.hpp>
 #include <algorithm>
 
 namespace Ndk
diff --git a/SDK/include/NDK/Components/LifetimeComponent.hpp b/SDK/include/NazaraSDK/Components/LifetimeComponent.hpp
similarity index 90%
rename from SDK/include/NDK/Components/LifetimeComponent.hpp
rename to SDK/include/NazaraSDK/Components/LifetimeComponent.hpp
index 72004a90d..cb2044605 100644
--- a/SDK/include/NDK/Components/LifetimeComponent.hpp
+++ b/SDK/include/NazaraSDK/Components/LifetimeComponent.hpp
@@ -7,7 +7,7 @@
 #ifndef NDK_COMPONENTS_LIFETIMECOMPONENT_HPP
 #define NDK_COMPONENTS_LIFETIMECOMPONENT_HPP
 
-#include <NDK/Component.hpp>
+#include <NazaraSDK/Component.hpp>
 
 namespace Ndk
 {
@@ -35,6 +35,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Components/LifetimeComponent.inl>
+#include <NazaraSDK/Components/LifetimeComponent.inl>
 
 #endif // NDK_COMPONENTS_LIFETIMECOMPONENT_HPP
diff --git a/SDK/include/NDK/Components/LifetimeComponent.inl b/SDK/include/NazaraSDK/Components/LifetimeComponent.inl
similarity index 90%
rename from SDK/include/NDK/Components/LifetimeComponent.inl
rename to SDK/include/NazaraSDK/Components/LifetimeComponent.inl
index 145e160ba..6635bc0d8 100644
--- a/SDK/include/NDK/Components/LifetimeComponent.inl
+++ b/SDK/include/NazaraSDK/Components/LifetimeComponent.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Components/LifetimeComponent.hpp>
+#include <NazaraSDK/Components/LifetimeComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/include/NDK/Components/LightComponent.hpp b/SDK/include/NazaraSDK/Components/LightComponent.hpp
similarity index 91%
rename from SDK/include/NDK/Components/LightComponent.hpp
rename to SDK/include/NazaraSDK/Components/LightComponent.hpp
index a7f72d0eb..33eec59a1 100644
--- a/SDK/include/NDK/Components/LightComponent.hpp
+++ b/SDK/include/NazaraSDK/Components/LightComponent.hpp
@@ -9,7 +9,7 @@
 #define NDK_COMPONENTS_LIGHTCOMPONENT_HPP
 
 #include <Nazara/Graphics/Light.hpp>
-#include <NDK/Component.hpp>
+#include <NazaraSDK/Component.hpp>
 
 namespace Ndk
 {
@@ -30,7 +30,7 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Components/LightComponent.inl>
+#include <NazaraSDK/Components/LightComponent.inl>
 
 #endif // NDK_COMPONENTS_LIGHTCOMPONENT_HPP
 #endif // NDK_SERVER
diff --git a/SDK/include/NDK/Components/LightComponent.inl b/SDK/include/NazaraSDK/Components/LightComponent.inl
similarity index 100%
rename from SDK/include/NDK/Components/LightComponent.inl
rename to SDK/include/NazaraSDK/Components/LightComponent.inl
diff --git a/SDK/include/NDK/Components/ListenerComponent.hpp b/SDK/include/NazaraSDK/Components/ListenerComponent.hpp
similarity index 87%
rename from SDK/include/NDK/Components/ListenerComponent.hpp
rename to SDK/include/NazaraSDK/Components/ListenerComponent.hpp
index d5debdd36..4a8490d6a 100644
--- a/SDK/include/NDK/Components/ListenerComponent.hpp
+++ b/SDK/include/NazaraSDK/Components/ListenerComponent.hpp
@@ -8,7 +8,7 @@
 #ifndef NDK_COMPONENTS_LISTENERCOMPONENT_HPP
 #define NDK_COMPONENTS_LISTENERCOMPONENT_HPP
 
-#include <NDK/Component.hpp>
+#include <NazaraSDK/Component.hpp>
 
 namespace Ndk
 {
@@ -32,7 +32,7 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Components/ListenerComponent.inl>
+#include <NazaraSDK/Components/ListenerComponent.inl>
 
 #endif // NDK_COMPONENTS_LISTENERCOMPONENT_HPP
 #endif // NDK_SERVER
\ No newline at end of file
diff --git a/SDK/include/NDK/Components/ListenerComponent.inl b/SDK/include/NazaraSDK/Components/ListenerComponent.inl
similarity index 100%
rename from SDK/include/NDK/Components/ListenerComponent.inl
rename to SDK/include/NazaraSDK/Components/ListenerComponent.inl
diff --git a/SDK/include/NDK/Components/NodeComponent.hpp b/SDK/include/NazaraSDK/Components/NodeComponent.hpp
similarity index 90%
rename from SDK/include/NDK/Components/NodeComponent.hpp
rename to SDK/include/NazaraSDK/Components/NodeComponent.hpp
index bccba1233..2a5dd2289 100644
--- a/SDK/include/NDK/Components/NodeComponent.hpp
+++ b/SDK/include/NazaraSDK/Components/NodeComponent.hpp
@@ -8,7 +8,7 @@
 #define NDK_COMPONENTS_NODECOMPONENT_HPP
 
 #include <Nazara/Utility/Node.hpp>
-#include <NDK/Component.hpp>
+#include <NazaraSDK/Component.hpp>
 
 namespace Ndk
 {
@@ -30,6 +30,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Components/NodeComponent.inl>
+#include <NazaraSDK/Components/NodeComponent.inl>
 
 #endif // NDK_COMPONENTS_NODECOMPONENT_HPP
diff --git a/SDK/include/NDK/Components/NodeComponent.inl b/SDK/include/NazaraSDK/Components/NodeComponent.inl
similarity index 96%
rename from SDK/include/NDK/Components/NodeComponent.inl
rename to SDK/include/NazaraSDK/Components/NodeComponent.inl
index a7eb1f9bc..6a6770d66 100644
--- a/SDK/include/NDK/Components/NodeComponent.inl
+++ b/SDK/include/NazaraSDK/Components/NodeComponent.inl
@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
 #include <Nazara/Core/Error.hpp>
-#include <NDK/Entity.hpp>
+#include <NazaraSDK/Entity.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/include/NDK/Components/ParticleEmitterComponent.hpp b/SDK/include/NazaraSDK/Components/ParticleEmitterComponent.hpp
similarity index 92%
rename from SDK/include/NDK/Components/ParticleEmitterComponent.hpp
rename to SDK/include/NazaraSDK/Components/ParticleEmitterComponent.hpp
index 0c7497a3b..65833003f 100644
--- a/SDK/include/NDK/Components/ParticleEmitterComponent.hpp
+++ b/SDK/include/NazaraSDK/Components/ParticleEmitterComponent.hpp
@@ -9,7 +9,7 @@
 #define NDK_COMPONENTS_PARTICLEEMITTERCOMPONENT_HPP
 
 #include <Nazara/Graphics/ParticleEmitter.hpp>
-#include <NDK/Component.hpp>
+#include <NazaraSDK/Component.hpp>
 
 namespace Ndk
 {
@@ -43,7 +43,7 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Components/ParticleEmitterComponent.inl>
+#include <NazaraSDK/Components/ParticleEmitterComponent.inl>
 
 #endif // NDK_COMPONENTS_PARTICLEEMITTERCOMPONENT_HPP
 #endif // NDK_SERVER
\ No newline at end of file
diff --git a/SDK/include/NDK/Components/ParticleEmitterComponent.inl b/SDK/include/NazaraSDK/Components/ParticleEmitterComponent.inl
similarity index 100%
rename from SDK/include/NDK/Components/ParticleEmitterComponent.inl
rename to SDK/include/NazaraSDK/Components/ParticleEmitterComponent.inl
diff --git a/SDK/include/NDK/Components/ParticleGroupComponent.hpp b/SDK/include/NazaraSDK/Components/ParticleGroupComponent.hpp
similarity index 92%
rename from SDK/include/NDK/Components/ParticleGroupComponent.hpp
rename to SDK/include/NazaraSDK/Components/ParticleGroupComponent.hpp
index 9415b8547..8471ecc03 100644
--- a/SDK/include/NDK/Components/ParticleGroupComponent.hpp
+++ b/SDK/include/NazaraSDK/Components/ParticleGroupComponent.hpp
@@ -9,7 +9,7 @@
 #define NDK_COMPONENTS_PARTICLEGROUPCOMPONENT_HPP
 
 #include <Nazara/Graphics/ParticleGroup.hpp>
-#include <NDK/Component.hpp>
+#include <NazaraSDK/Component.hpp>
 
 namespace Ndk
 {
@@ -35,7 +35,7 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Components/ParticleGroupComponent.inl>
+#include <NazaraSDK/Components/ParticleGroupComponent.inl>
 
 #endif // NDK_COMPONENTS_PARTICLEGROUPCOMPONENT_HPP
 #endif // NDK_SERVER
diff --git a/SDK/include/NDK/Components/ParticleGroupComponent.inl b/SDK/include/NazaraSDK/Components/ParticleGroupComponent.inl
similarity index 97%
rename from SDK/include/NDK/Components/ParticleGroupComponent.inl
rename to SDK/include/NazaraSDK/Components/ParticleGroupComponent.inl
index d6225df3b..1e0d75cac 100644
--- a/SDK/include/NDK/Components/ParticleGroupComponent.inl
+++ b/SDK/include/NazaraSDK/Components/ParticleGroupComponent.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Components/ParticleEmitterComponent.hpp>
+#include <NazaraSDK/Components/ParticleEmitterComponent.hpp>
 #include <Nazara/Core/Error.hpp>
 
 namespace Ndk
diff --git a/SDK/include/NDK/Components/PhysicsComponent2D.hpp b/SDK/include/NazaraSDK/Components/PhysicsComponent2D.hpp
similarity index 98%
rename from SDK/include/NDK/Components/PhysicsComponent2D.hpp
rename to SDK/include/NazaraSDK/Components/PhysicsComponent2D.hpp
index 3983c26a5..15159709d 100644
--- a/SDK/include/NDK/Components/PhysicsComponent2D.hpp
+++ b/SDK/include/NazaraSDK/Components/PhysicsComponent2D.hpp
@@ -8,7 +8,7 @@
 #define NDK_COMPONENTS_PHYSICSCOMPONENT2D_HPP
 
 #include <Nazara/Physics2D/RigidBody2D.hpp>
-#include <NDK/Component.hpp>
+#include <NazaraSDK/Component.hpp>
 #include <memory>
 
 namespace Ndk
@@ -125,6 +125,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Components/PhysicsComponent2D.inl>
+#include <NazaraSDK/Components/PhysicsComponent2D.inl>
 
 #endif // NDK_COMPONENTS_PHYSICSCOMPONENT2D_HPP
diff --git a/SDK/include/NDK/Components/PhysicsComponent2D.inl b/SDK/include/NazaraSDK/Components/PhysicsComponent2D.inl
similarity index 99%
rename from SDK/include/NDK/Components/PhysicsComponent2D.inl
rename to SDK/include/NazaraSDK/Components/PhysicsComponent2D.inl
index 6e0b0b10f..f42b95c85 100644
--- a/SDK/include/NDK/Components/PhysicsComponent2D.inl
+++ b/SDK/include/NazaraSDK/Components/PhysicsComponent2D.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Components/PhysicsComponent2D.hpp>
+#include <NazaraSDK/Components/PhysicsComponent2D.hpp>
 #include <Nazara/Core/Error.hpp>
 
 namespace Ndk
diff --git a/SDK/include/NDK/Components/PhysicsComponent3D.hpp b/SDK/include/NazaraSDK/Components/PhysicsComponent3D.hpp
similarity index 97%
rename from SDK/include/NDK/Components/PhysicsComponent3D.hpp
rename to SDK/include/NazaraSDK/Components/PhysicsComponent3D.hpp
index 08cc64081..538860cde 100644
--- a/SDK/include/NDK/Components/PhysicsComponent3D.hpp
+++ b/SDK/include/NazaraSDK/Components/PhysicsComponent3D.hpp
@@ -8,7 +8,7 @@
 #define NDK_COMPONENTS_PHYSICSCOMPONENT3D_HPP
 
 #include <Nazara/Physics3D/RigidBody3D.hpp>
-#include <NDK/Component.hpp>
+#include <NazaraSDK/Component.hpp>
 #include <memory>
 
 namespace Ndk
@@ -96,6 +96,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Components/PhysicsComponent3D.inl>
+#include <NazaraSDK/Components/PhysicsComponent3D.inl>
 
 #endif // NDK_COMPONENTS_PHYSICSCOMPONENT3D_HPP
diff --git a/SDK/include/NDK/Components/PhysicsComponent3D.inl b/SDK/include/NazaraSDK/Components/PhysicsComponent3D.inl
similarity index 100%
rename from SDK/include/NDK/Components/PhysicsComponent3D.inl
rename to SDK/include/NazaraSDK/Components/PhysicsComponent3D.inl
diff --git a/SDK/include/NDK/Components/VelocityComponent.hpp b/SDK/include/NazaraSDK/Components/VelocityComponent.hpp
similarity index 90%
rename from SDK/include/NDK/Components/VelocityComponent.hpp
rename to SDK/include/NazaraSDK/Components/VelocityComponent.hpp
index 2c619da76..b2f82a556 100644
--- a/SDK/include/NDK/Components/VelocityComponent.hpp
+++ b/SDK/include/NazaraSDK/Components/VelocityComponent.hpp
@@ -8,7 +8,7 @@
 #define NDK_COMPONENTS_VELOCITYCOMPONENT_HPP
 
 #include <Nazara/Math/Vector3.hpp>
-#include <NDK/Component.hpp>
+#include <NazaraSDK/Component.hpp>
 
 namespace Ndk
 {
@@ -31,6 +31,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Components/VelocityComponent.inl>
+#include <NazaraSDK/Components/VelocityComponent.inl>
 
 #endif // NDK_COMPONENTS_VELOCITYCOMPONENT_HPP
diff --git a/SDK/include/NDK/Components/VelocityComponent.inl b/SDK/include/NazaraSDK/Components/VelocityComponent.inl
similarity index 100%
rename from SDK/include/NDK/Components/VelocityComponent.inl
rename to SDK/include/NazaraSDK/Components/VelocityComponent.inl
diff --git a/SDK/include/NDK/Console.hpp b/SDK/include/NazaraSDK/Console.hpp
similarity index 95%
rename from SDK/include/NDK/Console.hpp
rename to SDK/include/NazaraSDK/Console.hpp
index 3b4dbbe39..67aece140 100644
--- a/SDK/include/NDK/Console.hpp
+++ b/SDK/include/NazaraSDK/Console.hpp
@@ -14,8 +14,8 @@
 #include <Nazara/Graphics/TextSprite.hpp>
 #include <Nazara/Utility/Node.hpp>
 #include <Nazara/Utility/SimpleTextDrawer.hpp>
-#include <NDK/BaseWidget.hpp>
-#include <NDK/EntityOwner.hpp>
+#include <NazaraSDK/BaseWidget.hpp>
+#include <NazaraSDK/EntityOwner.hpp>
 
 namespace Nz
 {
@@ -82,7 +82,7 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Console.inl>
+#include <NazaraSDK/Console.inl>
 
 #endif // NDK_CONSOLE_HPP
 #endif // NDK_SERVER
diff --git a/SDK/include/NDK/Console.inl b/SDK/include/NazaraSDK/Console.inl
similarity index 100%
rename from SDK/include/NDK/Console.inl
rename to SDK/include/NazaraSDK/Console.inl
diff --git a/SDK/include/NDK/Entity.hpp b/SDK/include/NazaraSDK/Entity.hpp
similarity index 96%
rename from SDK/include/NDK/Entity.hpp
rename to SDK/include/NazaraSDK/Entity.hpp
index 85e43da19..f05a5c432 100644
--- a/SDK/include/NDK/Entity.hpp
+++ b/SDK/include/NazaraSDK/Entity.hpp
@@ -11,8 +11,8 @@
 #include <Nazara/Core/MovablePtr.hpp>
 #include <Nazara/Core/ObjectHandle.hpp>
 #include <Nazara/Core/Signal.hpp>
-#include <NDK/Algorithm.hpp>
-#include <NDK/Prerequisites.hpp>
+#include <NazaraSDK/Algorithm.hpp>
+#include <NazaraSDK/Prerequisites.hpp>
 #include <memory>
 #include <vector>
 
@@ -109,6 +109,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Entity.inl>
+#include <NazaraSDK/Entity.inl>
 
 #endif // NDK_ENTITY_HPP
diff --git a/SDK/include/NDK/Entity.inl b/SDK/include/NazaraSDK/Entity.inl
similarity index 99%
rename from SDK/include/NDK/Entity.inl
rename to SDK/include/NazaraSDK/Entity.inl
index 799384182..f17ff92fa 100644
--- a/SDK/include/NDK/Entity.inl
+++ b/SDK/include/NazaraSDK/Entity.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Entity.hpp>
+#include <NazaraSDK/Entity.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/StringStream.hpp>
 #include <algorithm>
diff --git a/SDK/include/NDK/EntityList.hpp b/SDK/include/NazaraSDK/EntityList.hpp
similarity index 95%
rename from SDK/include/NDK/EntityList.hpp
rename to SDK/include/NazaraSDK/EntityList.hpp
index 0f89d0cad..0950cae2f 100644
--- a/SDK/include/NDK/EntityList.hpp
+++ b/SDK/include/NazaraSDK/EntityList.hpp
@@ -8,8 +8,8 @@
 #define NDK_ENTITYLIST_HPP
 
 #include <Nazara/Core/Bitset.hpp>
-#include <NDK/Prerequisites.hpp>
-#include <NDK/Entity.hpp>
+#include <NazaraSDK/Prerequisites.hpp>
+#include <NazaraSDK/Entity.hpp>
 
 namespace Ndk
 {
@@ -81,6 +81,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/EntityList.inl>
+#include <NazaraSDK/EntityList.inl>
 
 #endif // NDK_ENTITYLIST_HPP
diff --git a/SDK/include/NDK/EntityList.inl b/SDK/include/NazaraSDK/EntityList.inl
similarity index 100%
rename from SDK/include/NDK/EntityList.inl
rename to SDK/include/NazaraSDK/EntityList.inl
diff --git a/SDK/include/NDK/EntityOwner.hpp b/SDK/include/NazaraSDK/EntityOwner.hpp
similarity index 92%
rename from SDK/include/NDK/EntityOwner.hpp
rename to SDK/include/NazaraSDK/EntityOwner.hpp
index 84eb95feb..2fec8f6dc 100644
--- a/SDK/include/NDK/EntityOwner.hpp
+++ b/SDK/include/NazaraSDK/EntityOwner.hpp
@@ -7,7 +7,7 @@
 #ifndef NDK_ENTITYOWNER_HPP
 #define NDK_ENTITYOWNER_HPP
 
-#include <NDK/Entity.hpp>
+#include <NazaraSDK/Entity.hpp>
 
 namespace Ndk
 {
@@ -30,6 +30,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/EntityOwner.inl>
+#include <NazaraSDK/EntityOwner.inl>
 
 #endif // NDK_ENTITYOWNER_HPP
diff --git a/SDK/include/NDK/EntityOwner.inl b/SDK/include/NazaraSDK/EntityOwner.inl
similarity index 98%
rename from SDK/include/NDK/EntityOwner.inl
rename to SDK/include/NazaraSDK/EntityOwner.inl
index 4ee9530f7..13f1e8cad 100644
--- a/SDK/include/NDK/EntityOwner.inl
+++ b/SDK/include/NazaraSDK/EntityOwner.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/EntityOwner.hpp>
+#include <NazaraSDK/EntityOwner.hpp>
 #include <Nazara/Core/StringStream.hpp>
 #include <functional>
 #include <limits>
diff --git a/SDK/include/NDK/Prerequisites.hpp b/SDK/include/NazaraSDK/Prerequisites.hpp
similarity index 100%
rename from SDK/include/NDK/Prerequisites.hpp
rename to SDK/include/NazaraSDK/Prerequisites.hpp
diff --git a/SDK/include/NDK/Sdk.hpp b/SDK/include/NazaraSDK/Sdk.hpp
similarity index 88%
rename from SDK/include/NDK/Sdk.hpp
rename to SDK/include/NazaraSDK/Sdk.hpp
index 7b096c583..9e42e3ac6 100644
--- a/SDK/include/NDK/Sdk.hpp
+++ b/SDK/include/NazaraSDK/Sdk.hpp
@@ -7,7 +7,7 @@
 #ifndef NDK_SDK_HPP
 #define NDK_SDK_HPP
 
-#include <NDK/Prerequisites.hpp>
+#include <NazaraSDK/Prerequisites.hpp>
 
 namespace Ndk
 {
@@ -26,6 +26,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Sdk.inl>
+#include <NazaraSDK/Sdk.inl>
 
 #endif // NDK_SDK_HPP
diff --git a/SDK/include/NDK/Sdk.inl b/SDK/include/NazaraSDK/Sdk.inl
similarity index 100%
rename from SDK/include/NDK/Sdk.inl
rename to SDK/include/NazaraSDK/Sdk.inl
diff --git a/SDK/include/NDK/State.hpp b/SDK/include/NazaraSDK/State.hpp
similarity index 89%
rename from SDK/include/NDK/State.hpp
rename to SDK/include/NazaraSDK/State.hpp
index 3b3664218..506cd6476 100644
--- a/SDK/include/NDK/State.hpp
+++ b/SDK/include/NazaraSDK/State.hpp
@@ -7,7 +7,7 @@
 #ifndef NDK_STATE_HPP
 #define NDK_STATE_HPP
 
-#include <NDK/Prerequisites.hpp>
+#include <NazaraSDK/Prerequisites.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/include/NDK/StateMachine.hpp b/SDK/include/NazaraSDK/StateMachine.hpp
similarity index 90%
rename from SDK/include/NDK/StateMachine.hpp
rename to SDK/include/NazaraSDK/StateMachine.hpp
index 57398a619..54db4877b 100644
--- a/SDK/include/NDK/StateMachine.hpp
+++ b/SDK/include/NazaraSDK/StateMachine.hpp
@@ -7,8 +7,8 @@
 #ifndef NDK_STATEMACHINE_HPP
 #define NDK_STATEMACHINE_HPP
 
-#include <NDK/Prerequisites.hpp>
-#include <NDK/State.hpp>
+#include <NazaraSDK/Prerequisites.hpp>
+#include <NazaraSDK/State.hpp>
 #include <memory>
 #include <vector>
 
@@ -56,6 +56,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/StateMachine.inl>
+#include <NazaraSDK/StateMachine.inl>
 
 #endif // NDK_STATEMACHINE_HPP
\ No newline at end of file
diff --git a/SDK/include/NDK/StateMachine.inl b/SDK/include/NazaraSDK/StateMachine.inl
similarity index 99%
rename from SDK/include/NDK/StateMachine.inl
rename to SDK/include/NazaraSDK/StateMachine.inl
index ba2a74928..95df4e82b 100644
--- a/SDK/include/NDK/StateMachine.inl
+++ b/SDK/include/NazaraSDK/StateMachine.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/StateMachine.hpp>
+#include <NazaraSDK/StateMachine.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <utility>
 
diff --git a/SDK/include/NDK/System.hpp b/SDK/include/NazaraSDK/System.hpp
similarity index 90%
rename from SDK/include/NDK/System.hpp
rename to SDK/include/NazaraSDK/System.hpp
index 538fe097c..5276a2251 100644
--- a/SDK/include/NDK/System.hpp
+++ b/SDK/include/NazaraSDK/System.hpp
@@ -7,7 +7,7 @@
 #ifndef NDK_SYSTEM_HPP
 #define NDK_SYSTEM_HPP
 
-#include <NDK/BaseSystem.hpp>
+#include <NazaraSDK/BaseSystem.hpp>
 
 namespace Ndk
 {
@@ -27,6 +27,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/System.inl>
+#include <NazaraSDK/System.inl>
 
 #endif // NDK_SYSTEM_HPP
diff --git a/SDK/include/NDK/System.inl b/SDK/include/NazaraSDK/System.inl
similarity index 96%
rename from SDK/include/NDK/System.inl
rename to SDK/include/NazaraSDK/System.inl
index 3902205c0..0110da45a 100644
--- a/SDK/include/NDK/System.inl
+++ b/SDK/include/NazaraSDK/System.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Algorithm.hpp>
+#include <NazaraSDK/Algorithm.hpp>
 #include <type_traits>
 
 namespace Ndk
diff --git a/SDK/include/NazaraSDK/Systems.hpp b/SDK/include/NazaraSDK/Systems.hpp
new file mode 100644
index 000000000..b2b1a123e
--- /dev/null
+++ b/SDK/include/NazaraSDK/Systems.hpp
@@ -0,0 +1,17 @@
+// This file was automatically generated
+
+#pragma once
+
+#ifndef NDK_SYSTEMS_GLOBAL_HPP
+#define NDK_SYSTEMS_GLOBAL_HPP
+
+#include <NazaraSDK/Systems/DebugSystem.hpp>
+#include <NazaraSDK/Systems/LifetimeSystem.hpp>
+#include <NazaraSDK/Systems/ListenerSystem.hpp>
+#include <NazaraSDK/Systems/ParticleSystem.hpp>
+#include <NazaraSDK/Systems/PhysicsSystem2D.hpp>
+#include <NazaraSDK/Systems/PhysicsSystem3D.hpp>
+#include <NazaraSDK/Systems/RenderSystem.hpp>
+#include <NazaraSDK/Systems/VelocitySystem.hpp>
+
+#endif // NDK_SYSTEMS_GLOBAL_HPP
diff --git a/SDK/include/NDK/Systems/DebugSystem.hpp b/SDK/include/NazaraSDK/Systems/DebugSystem.hpp
similarity index 95%
rename from SDK/include/NDK/Systems/DebugSystem.hpp
rename to SDK/include/NazaraSDK/Systems/DebugSystem.hpp
index 1d468ea41..d8c7ccfd7 100644
--- a/SDK/include/NDK/Systems/DebugSystem.hpp
+++ b/SDK/include/NazaraSDK/Systems/DebugSystem.hpp
@@ -12,7 +12,7 @@
 #include <Nazara/Utility/IndexBuffer.hpp>
 #include <Nazara/Utility/Mesh.hpp>
 #include <Nazara/Utility/VertexBuffer.hpp>
-#include <NDK/System.hpp>
+#include <NazaraSDK/System.hpp>
 
 namespace Ndk
 {
@@ -52,7 +52,7 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Systems/DebugSystem.inl>
+#include <NazaraSDK/Systems/DebugSystem.inl>
 
 #endif // NDK_SYSTEMS_DEBUGSYSTEM_HPP
 #endif // NDK_SERVER
diff --git a/SDK/include/NDK/Systems/DebugSystem.inl b/SDK/include/NazaraSDK/Systems/DebugSystem.inl
similarity index 86%
rename from SDK/include/NDK/Systems/DebugSystem.inl
rename to SDK/include/NazaraSDK/Systems/DebugSystem.inl
index b72b87f3f..46d425afa 100644
--- a/SDK/include/NDK/Systems/DebugSystem.inl
+++ b/SDK/include/NazaraSDK/Systems/DebugSystem.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Systems/DebugSystem.hpp>
+#include <NazaraSDK/Systems/DebugSystem.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/include/NDK/Systems/LifetimeSystem.hpp b/SDK/include/NazaraSDK/Systems/LifetimeSystem.hpp
similarity index 87%
rename from SDK/include/NDK/Systems/LifetimeSystem.hpp
rename to SDK/include/NazaraSDK/Systems/LifetimeSystem.hpp
index 9957c1b53..ff095580d 100644
--- a/SDK/include/NDK/Systems/LifetimeSystem.hpp
+++ b/SDK/include/NazaraSDK/Systems/LifetimeSystem.hpp
@@ -7,7 +7,7 @@
 #ifndef NDK_SYSTEMS_LIFETIMESYSTEM_HPP
 #define NDK_SYSTEMS_LIFETIMESYSTEM_HPP
 
-#include <NDK/System.hpp>
+#include <NazaraSDK/System.hpp>
 
 namespace Ndk
 {
@@ -24,6 +24,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Systems/LifetimeSystem.inl>
+#include <NazaraSDK/Systems/LifetimeSystem.inl>
 
 #endif // NDK_SYSTEMS_LIFETIMESYSTEM_HPP
diff --git a/SDK/include/NDK/Systems/LifetimeSystem.inl b/SDK/include/NazaraSDK/Systems/LifetimeSystem.inl
similarity index 100%
rename from SDK/include/NDK/Systems/LifetimeSystem.inl
rename to SDK/include/NazaraSDK/Systems/LifetimeSystem.inl
diff --git a/SDK/include/NDK/Systems/ListenerSystem.hpp b/SDK/include/NazaraSDK/Systems/ListenerSystem.hpp
similarity index 88%
rename from SDK/include/NDK/Systems/ListenerSystem.hpp
rename to SDK/include/NazaraSDK/Systems/ListenerSystem.hpp
index fce5e8cae..7f203c35a 100644
--- a/SDK/include/NDK/Systems/ListenerSystem.hpp
+++ b/SDK/include/NazaraSDK/Systems/ListenerSystem.hpp
@@ -8,7 +8,7 @@
 #ifndef NDK_SYSTEMS_LISTENERSYSTEM_HPP
 #define NDK_SYSTEMS_LISTENERSYSTEM_HPP
 
-#include <NDK/System.hpp>
+#include <NazaraSDK/System.hpp>
 
 namespace Ndk
 {
@@ -25,7 +25,7 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Systems/ListenerSystem.inl>
+#include <NazaraSDK/Systems/ListenerSystem.inl>
 
 #endif // NDK_SYSTEMS_LISTENERSYSTEM_HPP
 #endif // NDK_SERVER
diff --git a/SDK/include/NDK/Systems/ListenerSystem.inl b/SDK/include/NazaraSDK/Systems/ListenerSystem.inl
similarity index 100%
rename from SDK/include/NDK/Systems/ListenerSystem.inl
rename to SDK/include/NazaraSDK/Systems/ListenerSystem.inl
diff --git a/SDK/include/NDK/Systems/ParticleSystem.hpp b/SDK/include/NazaraSDK/Systems/ParticleSystem.hpp
similarity index 88%
rename from SDK/include/NDK/Systems/ParticleSystem.hpp
rename to SDK/include/NazaraSDK/Systems/ParticleSystem.hpp
index adbfc7e39..cb57a41d7 100644
--- a/SDK/include/NDK/Systems/ParticleSystem.hpp
+++ b/SDK/include/NazaraSDK/Systems/ParticleSystem.hpp
@@ -8,7 +8,7 @@
 #ifndef NDK_SYSTEMS_PARTICLESYSTEM_HPP
 #define NDK_SYSTEMS_PARTICLESYSTEM_HPP
 
-#include <NDK/System.hpp>
+#include <NazaraSDK/System.hpp>
 
 namespace Ndk
 {
@@ -25,7 +25,7 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Systems/ParticleSystem.inl>
+#include <NazaraSDK/Systems/ParticleSystem.inl>
 
 #endif // NDK_SYSTEMS_PARTICLESYSTEM_HPP
 #endif // NDK_SERVER
diff --git a/SDK/include/NDK/Systems/ParticleSystem.inl b/SDK/include/NazaraSDK/Systems/ParticleSystem.inl
similarity index 100%
rename from SDK/include/NDK/Systems/ParticleSystem.inl
rename to SDK/include/NazaraSDK/Systems/ParticleSystem.inl
diff --git a/SDK/include/NDK/Systems/PhysicsSystem2D.hpp b/SDK/include/NazaraSDK/Systems/PhysicsSystem2D.hpp
similarity index 98%
rename from SDK/include/NDK/Systems/PhysicsSystem2D.hpp
rename to SDK/include/NazaraSDK/Systems/PhysicsSystem2D.hpp
index dd10fcd57..faff327a2 100644
--- a/SDK/include/NDK/Systems/PhysicsSystem2D.hpp
+++ b/SDK/include/NazaraSDK/Systems/PhysicsSystem2D.hpp
@@ -8,8 +8,8 @@
 #define NDK_SYSTEMS_PHYSICSSYSTEM2D_HPP
 
 #include <Nazara/Physics2D/PhysWorld2D.hpp>
-#include <NDK/EntityList.hpp>
-#include <NDK/System.hpp>
+#include <NazaraSDK/EntityList.hpp>
+#include <NazaraSDK/System.hpp>
 #include <memory>
 
 namespace Ndk
@@ -127,6 +127,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Systems/PhysicsSystem2D.inl>
+#include <NazaraSDK/Systems/PhysicsSystem2D.inl>
 
 #endif // NDK_SYSTEMS_PHYSICSSYSTEM2D_HPP
diff --git a/SDK/include/NDK/Systems/PhysicsSystem2D.inl b/SDK/include/NazaraSDK/Systems/PhysicsSystem2D.inl
similarity index 97%
rename from SDK/include/NDK/Systems/PhysicsSystem2D.inl
rename to SDK/include/NazaraSDK/Systems/PhysicsSystem2D.inl
index 64870c092..1a490b4dd 100644
--- a/SDK/include/NDK/Systems/PhysicsSystem2D.inl
+++ b/SDK/include/NazaraSDK/Systems/PhysicsSystem2D.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Systems/PhysicsSystem2D.hpp>
+#include <NazaraSDK/Systems/PhysicsSystem2D.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/include/NDK/Systems/PhysicsSystem3D.hpp b/SDK/include/NazaraSDK/Systems/PhysicsSystem3D.hpp
similarity index 89%
rename from SDK/include/NDK/Systems/PhysicsSystem3D.hpp
rename to SDK/include/NazaraSDK/Systems/PhysicsSystem3D.hpp
index 07e4c7220..0e70e21f6 100644
--- a/SDK/include/NDK/Systems/PhysicsSystem3D.hpp
+++ b/SDK/include/NazaraSDK/Systems/PhysicsSystem3D.hpp
@@ -8,8 +8,8 @@
 #define NDK_SYSTEMS_PHYSICSSYSTEM3D_HPP
 
 #include <Nazara/Physics3D/PhysWorld3D.hpp>
-#include <NDK/EntityList.hpp>
-#include <NDK/System.hpp>
+#include <NazaraSDK/EntityList.hpp>
+#include <NazaraSDK/System.hpp>
 #include <memory>
 
 namespace Ndk
@@ -36,6 +36,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Systems/PhysicsSystem3D.inl>
+#include <NazaraSDK/Systems/PhysicsSystem3D.inl>
 
 #endif // NDK_SYSTEMS_PHYSICSSYSTEM3D_HPP
diff --git a/SDK/include/NDK/Systems/PhysicsSystem3D.inl b/SDK/include/NazaraSDK/Systems/PhysicsSystem3D.inl
similarity index 100%
rename from SDK/include/NDK/Systems/PhysicsSystem3D.inl
rename to SDK/include/NazaraSDK/Systems/PhysicsSystem3D.inl
diff --git a/SDK/include/NDK/Systems/RenderSystem.hpp b/SDK/include/NazaraSDK/Systems/RenderSystem.hpp
similarity index 94%
rename from SDK/include/NDK/Systems/RenderSystem.hpp
rename to SDK/include/NazaraSDK/Systems/RenderSystem.hpp
index 3b9d3f239..52758bc6d 100644
--- a/SDK/include/NDK/Systems/RenderSystem.hpp
+++ b/SDK/include/NazaraSDK/Systems/RenderSystem.hpp
@@ -12,9 +12,9 @@
 #include <Nazara/Graphics/CullingList.hpp>
 #include <Nazara/Graphics/DepthRenderTechnique.hpp>
 #include <Nazara/Renderer/RenderTexture.hpp>
-#include <NDK/EntityList.hpp>
-#include <NDK/System.hpp>
-#include <NDK/Components/GraphicsComponent.hpp>
+#include <NazaraSDK/EntityList.hpp>
+#include <NazaraSDK/System.hpp>
+#include <NazaraSDK/Components/GraphicsComponent.hpp>
 #include <vector>
 
 namespace Ndk
@@ -79,7 +79,7 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Systems/RenderSystem.inl>
+#include <NazaraSDK/Systems/RenderSystem.inl>
 
 #endif // NDK_SYSTEMS_RENDERSYSTEM_HPP
 #endif // NDK_SERVER
diff --git a/SDK/include/NDK/Systems/RenderSystem.inl b/SDK/include/NazaraSDK/Systems/RenderSystem.inl
similarity index 99%
rename from SDK/include/NDK/Systems/RenderSystem.inl
rename to SDK/include/NazaraSDK/Systems/RenderSystem.inl
index 335026f17..ab9d03839 100644
--- a/SDK/include/NDK/Systems/RenderSystem.inl
+++ b/SDK/include/NazaraSDK/Systems/RenderSystem.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Systems/RenderSystem.hpp>
+#include <NazaraSDK/Systems/RenderSystem.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/include/NDK/Systems/VelocitySystem.hpp b/SDK/include/NazaraSDK/Systems/VelocitySystem.hpp
similarity index 87%
rename from SDK/include/NDK/Systems/VelocitySystem.hpp
rename to SDK/include/NazaraSDK/Systems/VelocitySystem.hpp
index 7bc836d90..46ef02862 100644
--- a/SDK/include/NDK/Systems/VelocitySystem.hpp
+++ b/SDK/include/NazaraSDK/Systems/VelocitySystem.hpp
@@ -7,7 +7,7 @@
 #ifndef NDK_SYSTEMS_VELOCITYSYSTEM_HPP
 #define NDK_SYSTEMS_VELOCITYSYSTEM_HPP
 
-#include <NDK/System.hpp>
+#include <NazaraSDK/System.hpp>
 
 namespace Ndk
 {
@@ -24,6 +24,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Systems/VelocitySystem.inl>
+#include <NazaraSDK/Systems/VelocitySystem.inl>
 
 #endif // NDK_SYSTEMS_VELOCITYSYSTEM_HPP
diff --git a/SDK/include/NDK/Systems/VelocitySystem.inl b/SDK/include/NazaraSDK/Systems/VelocitySystem.inl
similarity index 100%
rename from SDK/include/NDK/Systems/VelocitySystem.inl
rename to SDK/include/NazaraSDK/Systems/VelocitySystem.inl
diff --git a/SDK/include/NazaraSDK/Widgets.hpp b/SDK/include/NazaraSDK/Widgets.hpp
new file mode 100644
index 000000000..e2225bf68
--- /dev/null
+++ b/SDK/include/NazaraSDK/Widgets.hpp
@@ -0,0 +1,20 @@
+// This file was automatically generated
+
+#pragma once
+
+#ifndef NDK_WIDGETS_GLOBAL_HPP
+#define NDK_WIDGETS_GLOBAL_HPP
+
+#include <NazaraSDK/Widgets/AbstractTextAreaWidget.hpp>
+#include <NazaraSDK/Widgets/BoxLayout.hpp>
+#include <NazaraSDK/Widgets/ButtonWidget.hpp>
+#include <NazaraSDK/Widgets/CheckboxWidget.hpp>
+#include <NazaraSDK/Widgets/Enums.hpp>
+#include <NazaraSDK/Widgets/ImageWidget.hpp>
+#include <NazaraSDK/Widgets/LabelWidget.hpp>
+#include <NazaraSDK/Widgets/ProgressBarWidget.hpp>
+#include <NazaraSDK/Widgets/RichTextAreaWidget.hpp>
+#include <NazaraSDK/Widgets/ScrollAreaWidget.hpp>
+#include <NazaraSDK/Widgets/TextAreaWidget.hpp>
+
+#endif // NDK_WIDGETS_GLOBAL_HPP
diff --git a/SDK/include/NDK/Widgets/AbstractTextAreaWidget.hpp b/SDK/include/NazaraSDK/Widgets/AbstractTextAreaWidget.hpp
similarity index 97%
rename from SDK/include/NDK/Widgets/AbstractTextAreaWidget.hpp
rename to SDK/include/NazaraSDK/Widgets/AbstractTextAreaWidget.hpp
index b05f65bce..1a23bfa8e 100644
--- a/SDK/include/NDK/Widgets/AbstractTextAreaWidget.hpp
+++ b/SDK/include/NazaraSDK/Widgets/AbstractTextAreaWidget.hpp
@@ -9,8 +9,8 @@
 
 #include <Nazara/Graphics/TextSprite.hpp>
 #include <Nazara/Utility/AbstractTextDrawer.hpp>
-#include <NDK/BaseWidget.hpp>
-#include <NDK/Widgets/Enums.hpp>
+#include <NazaraSDK/BaseWidget.hpp>
+#include <NazaraSDK/Widgets/Enums.hpp>
 #include <functional>
 #include <vector>
 
@@ -130,6 +130,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Widgets/AbstractTextAreaWidget.inl>
+#include <NazaraSDK/Widgets/AbstractTextAreaWidget.inl>
 
 #endif // NDK_WIDGETS_ABSTRACTTEXTAREAWIDGET_HPP
diff --git a/SDK/include/NDK/Widgets/AbstractTextAreaWidget.inl b/SDK/include/NazaraSDK/Widgets/AbstractTextAreaWidget.inl
similarity index 99%
rename from SDK/include/NDK/Widgets/AbstractTextAreaWidget.inl
rename to SDK/include/NazaraSDK/Widgets/AbstractTextAreaWidget.inl
index ca40d278b..0af05d76e 100644
--- a/SDK/include/NDK/Widgets/AbstractTextAreaWidget.inl
+++ b/SDK/include/NazaraSDK/Widgets/AbstractTextAreaWidget.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Widgets/AbstractTextAreaWidget.hpp>
+#include <NazaraSDK/Widgets/AbstractTextAreaWidget.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/include/NDK/Widgets/BoxLayout.hpp b/SDK/include/NazaraSDK/Widgets/BoxLayout.hpp
similarity index 85%
rename from SDK/include/NDK/Widgets/BoxLayout.hpp
rename to SDK/include/NazaraSDK/Widgets/BoxLayout.hpp
index d27616814..5c2ad0a9f 100644
--- a/SDK/include/NDK/Widgets/BoxLayout.hpp
+++ b/SDK/include/NazaraSDK/Widgets/BoxLayout.hpp
@@ -7,9 +7,9 @@
 #ifndef NDK_WIDGETS_BOXLAYOUT_HPP
 #define NDK_WIDGETS_BOXLAYOUT_HPP
 
-#include <NDK/Prerequisites.hpp>
-#include <NDK/BaseWidget.hpp>
-#include <NDK/Widgets/Enums.hpp>
+#include <NazaraSDK/Prerequisites.hpp>
+#include <NazaraSDK/BaseWidget.hpp>
+#include <NazaraSDK/Widgets/Enums.hpp>
 #include <vector>
 
 namespace Ndk
@@ -43,6 +43,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Widgets/BoxLayout.inl>
+#include <NazaraSDK/Widgets/BoxLayout.inl>
 
 #endif // NDK_WIDGETS_BOXLAYOUT_HPP
diff --git a/SDK/include/NDK/Widgets/BoxLayout.inl b/SDK/include/NazaraSDK/Widgets/BoxLayout.inl
similarity index 89%
rename from SDK/include/NDK/Widgets/BoxLayout.inl
rename to SDK/include/NazaraSDK/Widgets/BoxLayout.inl
index 72dfaaf5f..aceb4cc9d 100644
--- a/SDK/include/NDK/Widgets/BoxLayout.inl
+++ b/SDK/include/NazaraSDK/Widgets/BoxLayout.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Widgets/BoxLayout.hpp>
+#include <NazaraSDK/Widgets/BoxLayout.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/include/NDK/Widgets/ButtonWidget.hpp b/SDK/include/NazaraSDK/Widgets/ButtonWidget.hpp
similarity index 96%
rename from SDK/include/NDK/Widgets/ButtonWidget.hpp
rename to SDK/include/NazaraSDK/Widgets/ButtonWidget.hpp
index a65429290..3e3b6f16f 100644
--- a/SDK/include/NDK/Widgets/ButtonWidget.hpp
+++ b/SDK/include/NazaraSDK/Widgets/ButtonWidget.hpp
@@ -7,8 +7,8 @@
 #ifndef NDK_WIDGETS_BUTTONWIDGET_HPP
 #define NDK_WIDGETS_BUTTONWIDGET_HPP
 
-#include <NDK/Prerequisites.hpp>
-#include <NDK/BaseWidget.hpp>
+#include <NazaraSDK/Prerequisites.hpp>
+#include <NazaraSDK/BaseWidget.hpp>
 #include <Nazara/Core/Color.hpp>
 #include <Nazara/Graphics/Sprite.hpp>
 #include <Nazara/Graphics/TextSprite.hpp>
@@ -94,6 +94,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Widgets/ButtonWidget.inl>
+#include <NazaraSDK/Widgets/ButtonWidget.inl>
 
 #endif // NDK_WIDGETS_BUTTONWIDGET_HPP
diff --git a/SDK/include/NDK/Widgets/ButtonWidget.inl b/SDK/include/NazaraSDK/Widgets/ButtonWidget.inl
similarity index 98%
rename from SDK/include/NDK/Widgets/ButtonWidget.inl
rename to SDK/include/NazaraSDK/Widgets/ButtonWidget.inl
index 11cf202cf..0924ab882 100644
--- a/SDK/include/NDK/Widgets/ButtonWidget.inl
+++ b/SDK/include/NazaraSDK/Widgets/ButtonWidget.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Widgets/ButtonWidget.hpp>
+#include <NazaraSDK/Widgets/ButtonWidget.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/include/NDK/Widgets/CheckboxWidget.hpp b/SDK/include/NazaraSDK/Widgets/CheckboxWidget.hpp
similarity index 92%
rename from SDK/include/NDK/Widgets/CheckboxWidget.hpp
rename to SDK/include/NazaraSDK/Widgets/CheckboxWidget.hpp
index a9723c20b..d9057a248 100644
--- a/SDK/include/NDK/Widgets/CheckboxWidget.hpp
+++ b/SDK/include/NazaraSDK/Widgets/CheckboxWidget.hpp
@@ -7,10 +7,10 @@
 #ifndef NDK_WIDGETS_CHECKBOXWIDGET_HPP
 #define NDK_WIDGETS_CHECKBOXWIDGET_HPP
 
-#include <NDK/Prerequisites.hpp>
-#include <NDK/BaseWidget.hpp>
-#include <NDK/Components/NodeComponent.hpp>
-#include <NDK/Widgets/Enums.hpp>
+#include <NazaraSDK/Prerequisites.hpp>
+#include <NazaraSDK/BaseWidget.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Widgets/Enums.hpp>
 #include <Nazara/Renderer/Texture.hpp>
 #include <Nazara/Graphics/Sprite.hpp>
 #include <Nazara/Graphics/TextSprite.hpp>
@@ -100,6 +100,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Widgets/CheckboxWidget.inl>
+#include <NazaraSDK/Widgets/CheckboxWidget.inl>
 
 #endif // NDK_WIDGETS_CHECKBOXWIDGET_HPP
diff --git a/SDK/include/NDK/Widgets/CheckboxWidget.inl b/SDK/include/NazaraSDK/Widgets/CheckboxWidget.inl
similarity index 100%
rename from SDK/include/NDK/Widgets/CheckboxWidget.inl
rename to SDK/include/NazaraSDK/Widgets/CheckboxWidget.inl
diff --git a/SDK/include/NDK/Widgets/Enums.hpp b/SDK/include/NazaraSDK/Widgets/Enums.hpp
similarity index 100%
rename from SDK/include/NDK/Widgets/Enums.hpp
rename to SDK/include/NazaraSDK/Widgets/Enums.hpp
diff --git a/SDK/include/NDK/Widgets/ImageWidget.hpp b/SDK/include/NazaraSDK/Widgets/ImageWidget.hpp
similarity index 89%
rename from SDK/include/NDK/Widgets/ImageWidget.hpp
rename to SDK/include/NazaraSDK/Widgets/ImageWidget.hpp
index d95af8623..4435a7058 100644
--- a/SDK/include/NDK/Widgets/ImageWidget.hpp
+++ b/SDK/include/NazaraSDK/Widgets/ImageWidget.hpp
@@ -7,9 +7,9 @@
 #ifndef NDK_WIDGETS_IMAGEWIDGET_HPP
 #define NDK_WIDGETS_IMAGEWIDGET_HPP
 
-#include <NDK/Prerequisites.hpp>
-#include <NDK/BaseWidget.hpp>
-#include <NDK/Entity.hpp>
+#include <NazaraSDK/Prerequisites.hpp>
+#include <NazaraSDK/BaseWidget.hpp>
+#include <NazaraSDK/Entity.hpp>
 #include <Nazara/Graphics/Sprite.hpp>
 #include <Nazara/Renderer/Texture.hpp>
 #include <Nazara/Math/Vector2.hpp>
@@ -46,6 +46,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Widgets/ImageWidget.inl>
+#include <NazaraSDK/Widgets/ImageWidget.inl>
 
 #endif // NDK_WIDGETS_IMAGEWIDGET_HPP
diff --git a/SDK/include/NDK/Widgets/ImageWidget.inl b/SDK/include/NazaraSDK/Widgets/ImageWidget.inl
similarity index 96%
rename from SDK/include/NDK/Widgets/ImageWidget.inl
rename to SDK/include/NazaraSDK/Widgets/ImageWidget.inl
index b1835941b..666adf12e 100644
--- a/SDK/include/NDK/Widgets/ImageWidget.inl
+++ b/SDK/include/NazaraSDK/Widgets/ImageWidget.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Widgets/ImageWidget.hpp>
+#include <NazaraSDK/Widgets/ImageWidget.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/include/NDK/Widgets/LabelWidget.hpp b/SDK/include/NazaraSDK/Widgets/LabelWidget.hpp
similarity index 87%
rename from SDK/include/NDK/Widgets/LabelWidget.hpp
rename to SDK/include/NazaraSDK/Widgets/LabelWidget.hpp
index 6e3b89ee8..a446262fb 100644
--- a/SDK/include/NDK/Widgets/LabelWidget.hpp
+++ b/SDK/include/NazaraSDK/Widgets/LabelWidget.hpp
@@ -7,8 +7,8 @@
 #ifndef NDK_WIDGETS_LABELWIDGET_HPP
 #define NDK_WIDGETS_LABELWIDGET_HPP
 
-#include <NDK/Prerequisites.hpp>
-#include <NDK/BaseWidget.hpp>
+#include <NazaraSDK/Prerequisites.hpp>
+#include <NazaraSDK/BaseWidget.hpp>
 #include <Nazara/Graphics/TextSprite.hpp>
 
 namespace Nz
@@ -37,6 +37,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Widgets/LabelWidget.inl>
+#include <NazaraSDK/Widgets/LabelWidget.inl>
 
 #endif // NDK_WIDGETS_LABELWIDGET_HPP
diff --git a/SDK/include/NDK/Widgets/LabelWidget.inl b/SDK/include/NazaraSDK/Widgets/LabelWidget.inl
similarity index 91%
rename from SDK/include/NDK/Widgets/LabelWidget.inl
rename to SDK/include/NazaraSDK/Widgets/LabelWidget.inl
index cf14ea7d0..de1b6d19e 100644
--- a/SDK/include/NDK/Widgets/LabelWidget.inl
+++ b/SDK/include/NazaraSDK/Widgets/LabelWidget.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Widgets/LabelWidget.hpp>
+#include <NazaraSDK/Widgets/LabelWidget.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/include/NDK/Widgets/ProgressBarWidget.hpp b/SDK/include/NazaraSDK/Widgets/ProgressBarWidget.hpp
similarity index 96%
rename from SDK/include/NDK/Widgets/ProgressBarWidget.hpp
rename to SDK/include/NazaraSDK/Widgets/ProgressBarWidget.hpp
index 2ae334b8c..7d2d5d7d4 100644
--- a/SDK/include/NDK/Widgets/ProgressBarWidget.hpp
+++ b/SDK/include/NazaraSDK/Widgets/ProgressBarWidget.hpp
@@ -7,8 +7,8 @@
 #ifndef NDK_WIDGETS_PROGRESSBARWIDGET_HPP
 #define NDK_WIDGETS_PROGRESSBARWIDGET_HPP
 
-#include <NDK/Prerequisites.hpp>
-#include <NDK/BaseWidget.hpp>
+#include <NazaraSDK/Prerequisites.hpp>
+#include <NazaraSDK/BaseWidget.hpp>
 #include <Nazara/Core/Color.hpp>
 #include <Nazara/Graphics/Sprite.hpp>
 #include <Nazara/Graphics/TextSprite.hpp>
@@ -96,6 +96,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Widgets/ProgressBarWidget.inl>
+#include <NazaraSDK/Widgets/ProgressBarWidget.inl>
 
 #endif // NDK_WIDGETS_PROGRESSBARWIDGET_HPP
diff --git a/SDK/include/NDK/Widgets/ProgressBarWidget.inl b/SDK/include/NazaraSDK/Widgets/ProgressBarWidget.inl
similarity index 100%
rename from SDK/include/NDK/Widgets/ProgressBarWidget.inl
rename to SDK/include/NazaraSDK/Widgets/ProgressBarWidget.inl
diff --git a/SDK/include/NDK/Widgets/RichTextAreaWidget.hpp b/SDK/include/NazaraSDK/Widgets/RichTextAreaWidget.hpp
similarity index 95%
rename from SDK/include/NDK/Widgets/RichTextAreaWidget.hpp
rename to SDK/include/NazaraSDK/Widgets/RichTextAreaWidget.hpp
index a21a233d2..24cf26f7c 100644
--- a/SDK/include/NDK/Widgets/RichTextAreaWidget.hpp
+++ b/SDK/include/NazaraSDK/Widgets/RichTextAreaWidget.hpp
@@ -8,7 +8,7 @@
 #define NDK_WIDGETS_RICHTEXTAREAWIDGET_HPP
 
 #include <Nazara/Utility/RichTextDrawer.hpp>
-#include <NDK/Widgets/AbstractTextAreaWidget.hpp>
+#include <NazaraSDK/Widgets/AbstractTextAreaWidget.hpp>
 
 namespace Ndk
 {
@@ -63,6 +63,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Widgets/RichTextAreaWidget.inl>
+#include <NazaraSDK/Widgets/RichTextAreaWidget.inl>
 
 #endif // NDK_WIDGETS_TEXTAREAWIDGET_HPP
diff --git a/SDK/include/NDK/Widgets/RichTextAreaWidget.inl b/SDK/include/NazaraSDK/Widgets/RichTextAreaWidget.inl
similarity index 97%
rename from SDK/include/NDK/Widgets/RichTextAreaWidget.inl
rename to SDK/include/NazaraSDK/Widgets/RichTextAreaWidget.inl
index 4fd7faa10..82d84c3be 100644
--- a/SDK/include/NDK/Widgets/RichTextAreaWidget.inl
+++ b/SDK/include/NazaraSDK/Widgets/RichTextAreaWidget.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Widgets/RichTextAreaWidget.hpp>
+#include <NazaraSDK/Widgets/RichTextAreaWidget.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/include/NDK/Widgets/ScrollAreaWidget.hpp b/SDK/include/NazaraSDK/Widgets/ScrollAreaWidget.hpp
similarity index 94%
rename from SDK/include/NDK/Widgets/ScrollAreaWidget.hpp
rename to SDK/include/NazaraSDK/Widgets/ScrollAreaWidget.hpp
index 17ada16ef..bc4e01a93 100644
--- a/SDK/include/NDK/Widgets/ScrollAreaWidget.hpp
+++ b/SDK/include/NazaraSDK/Widgets/ScrollAreaWidget.hpp
@@ -7,8 +7,8 @@
 #ifndef NDK_WIDGETS_SCROLLAREAWIDGET_HPP
 #define NDK_WIDGETS_SCROLLAREAWIDGET_HPP
 
-#include <NDK/Prerequisites.hpp>
-#include <NDK/BaseWidget.hpp>
+#include <NazaraSDK/Prerequisites.hpp>
+#include <NazaraSDK/BaseWidget.hpp>
 #include <Nazara/Graphics/TextSprite.hpp>
 
 namespace Ndk
@@ -69,6 +69,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Widgets/ScrollAreaWidget.inl>
+#include <NazaraSDK/Widgets/ScrollAreaWidget.inl>
 
 #endif // NDK_WIDGETS_SCROLLAREAWIDGET_HPP
diff --git a/SDK/include/NDK/Widgets/ScrollAreaWidget.inl b/SDK/include/NazaraSDK/Widgets/ScrollAreaWidget.inl
similarity index 94%
rename from SDK/include/NDK/Widgets/ScrollAreaWidget.inl
rename to SDK/include/NazaraSDK/Widgets/ScrollAreaWidget.inl
index 89bea6d47..64ee3b1df 100644
--- a/SDK/include/NDK/Widgets/ScrollAreaWidget.inl
+++ b/SDK/include/NazaraSDK/Widgets/ScrollAreaWidget.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Widgets/ScrollAreaWidget.hpp>
+#include <NazaraSDK/Widgets/ScrollAreaWidget.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/include/NDK/Widgets/TextAreaWidget.hpp b/SDK/include/NazaraSDK/Widgets/TextAreaWidget.hpp
similarity index 96%
rename from SDK/include/NDK/Widgets/TextAreaWidget.hpp
rename to SDK/include/NazaraSDK/Widgets/TextAreaWidget.hpp
index 8b06e7579..c2fe9822c 100644
--- a/SDK/include/NDK/Widgets/TextAreaWidget.hpp
+++ b/SDK/include/NazaraSDK/Widgets/TextAreaWidget.hpp
@@ -8,7 +8,7 @@
 #define NDK_WIDGETS_TEXTAREAWIDGET_HPP
 
 #include <Nazara/Utility/SimpleTextDrawer.hpp>
-#include <NDK/Widgets/AbstractTextAreaWidget.hpp>
+#include <NazaraSDK/Widgets/AbstractTextAreaWidget.hpp>
 
 namespace Ndk
 {
@@ -72,6 +72,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/Widgets/TextAreaWidget.inl>
+#include <NazaraSDK/Widgets/TextAreaWidget.inl>
 
 #endif // NDK_WIDGETS_TEXTAREAWIDGET_HPP
diff --git a/SDK/include/NDK/Widgets/TextAreaWidget.inl b/SDK/include/NazaraSDK/Widgets/TextAreaWidget.inl
similarity index 98%
rename from SDK/include/NDK/Widgets/TextAreaWidget.inl
rename to SDK/include/NazaraSDK/Widgets/TextAreaWidget.inl
index f63897420..776841979 100644
--- a/SDK/include/NDK/Widgets/TextAreaWidget.inl
+++ b/SDK/include/NazaraSDK/Widgets/TextAreaWidget.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Widgets/TextAreaWidget.hpp>
+#include <NazaraSDK/Widgets/TextAreaWidget.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/include/NDK/World.hpp b/SDK/include/NazaraSDK/World.hpp
similarity index 96%
rename from SDK/include/NDK/World.hpp
rename to SDK/include/NazaraSDK/World.hpp
index ca6e917b7..b0d2f3c92 100644
--- a/SDK/include/NDK/World.hpp
+++ b/SDK/include/NazaraSDK/World.hpp
@@ -9,9 +9,9 @@
 
 #include <Nazara/Core/Bitset.hpp>
 #include <Nazara/Core/HandledObject.hpp>
-#include <NDK/Entity.hpp>
-#include <NDK/EntityList.hpp>
-#include <NDK/System.hpp>
+#include <NazaraSDK/Entity.hpp>
+#include <NazaraSDK/EntityList.hpp>
+#include <NazaraSDK/System.hpp>
 #include <algorithm>
 #include <memory>
 #include <vector>
@@ -134,6 +134,6 @@ namespace Ndk
 	};
 }
 
-#include <NDK/World.inl>
+#include <NazaraSDK/World.inl>
 
 #endif // NDK_WORLD_HPP
diff --git a/SDK/include/NDK/World.inl b/SDK/include/NazaraSDK/World.inl
similarity index 99%
rename from SDK/include/NDK/World.inl
rename to SDK/include/NazaraSDK/World.inl
index 1c3e446e1..00451153b 100644
--- a/SDK/include/NDK/World.inl
+++ b/SDK/include/NazaraSDK/World.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/World.hpp>
+#include <NazaraSDK/World.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <type_traits>
 
diff --git a/SDK/src/NDK/Application.cpp b/SDK/src/NazaraSDK/Application.cpp
similarity index 100%
rename from SDK/src/NDK/Application.cpp
rename to SDK/src/NazaraSDK/Application.cpp
diff --git a/SDK/src/NDK/BaseComponent.cpp b/SDK/src/NazaraSDK/BaseComponent.cpp
similarity index 98%
rename from SDK/src/NDK/BaseComponent.cpp
rename to SDK/src/NazaraSDK/BaseComponent.cpp
index 5092b9b65..9ed65f3be 100644
--- a/SDK/src/NDK/BaseComponent.cpp
+++ b/SDK/src/NazaraSDK/BaseComponent.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/BaseComponent.hpp>
+#include <NazaraSDK/BaseComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/BaseSystem.cpp b/SDK/src/NazaraSDK/BaseSystem.cpp
similarity index 97%
rename from SDK/src/NDK/BaseSystem.cpp
rename to SDK/src/NazaraSDK/BaseSystem.cpp
index 11a8e1926..708a6a9db 100644
--- a/SDK/src/NDK/BaseSystem.cpp
+++ b/SDK/src/NazaraSDK/BaseSystem.cpp
@@ -2,8 +2,8 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/BaseSystem.hpp>
-#include <NDK/World.hpp>
+#include <NazaraSDK/BaseSystem.hpp>
+#include <NazaraSDK/World.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/BaseWidget.cpp b/SDK/src/NazaraSDK/BaseWidget.cpp
similarity index 97%
rename from SDK/src/NDK/BaseWidget.cpp
rename to SDK/src/NazaraSDK/BaseWidget.cpp
index cb643dc0c..463ac0f45 100644
--- a/SDK/src/NDK/BaseWidget.cpp
+++ b/SDK/src/NazaraSDK/BaseWidget.cpp
@@ -2,11 +2,11 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/BaseWidget.hpp>
-#include <NDK/Canvas.hpp>
-#include <NDK/Components/GraphicsComponent.hpp>
-#include <NDK/Components/NodeComponent.hpp>
-#include <NDK/World.hpp>
+#include <NazaraSDK/BaseWidget.hpp>
+#include <NazaraSDK/Canvas.hpp>
+#include <NazaraSDK/Components/GraphicsComponent.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/World.hpp>
 #include <algorithm>
 
 namespace Ndk
diff --git a/SDK/src/NDK/Canvas.cpp b/SDK/src/NazaraSDK/Canvas.cpp
similarity index 99%
rename from SDK/src/NDK/Canvas.cpp
rename to SDK/src/NazaraSDK/Canvas.cpp
index f6d27ad15..2eb09ecac 100644
--- a/SDK/src/NDK/Canvas.cpp
+++ b/SDK/src/NazaraSDK/Canvas.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Canvas.hpp>
+#include <NazaraSDK/Canvas.hpp>
 #include <limits>
 
 namespace Ndk
diff --git a/SDK/src/NDK/Components/CameraComponent.cpp b/SDK/src/NazaraSDK/Components/CameraComponent.cpp
similarity index 98%
rename from SDK/src/NDK/Components/CameraComponent.cpp
rename to SDK/src/NazaraSDK/Components/CameraComponent.cpp
index 4a599ab9e..3a7ddda15 100644
--- a/SDK/src/NDK/Components/CameraComponent.cpp
+++ b/SDK/src/NazaraSDK/Components/CameraComponent.cpp
@@ -2,10 +2,10 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Components/CameraComponent.hpp>
+#include <NazaraSDK/Components/CameraComponent.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
-#include <NDK/Algorithm.hpp>
-#include <NDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Algorithm.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Components/CollisionComponent2D.cpp b/SDK/src/NazaraSDK/Components/CollisionComponent2D.cpp
similarity index 94%
rename from SDK/src/NDK/Components/CollisionComponent2D.cpp
rename to SDK/src/NazaraSDK/Components/CollisionComponent2D.cpp
index fddbe8842..5d6d21eaa 100644
--- a/SDK/src/NDK/Components/CollisionComponent2D.cpp
+++ b/SDK/src/NazaraSDK/Components/CollisionComponent2D.cpp
@@ -2,12 +2,12 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Components/CollisionComponent2D.hpp>
+#include <NazaraSDK/Components/CollisionComponent2D.hpp>
 #include <Nazara/Physics2D/RigidBody2D.hpp>
-#include <NDK/World.hpp>
-#include <NDK/Components/NodeComponent.hpp>
-#include <NDK/Components/PhysicsComponent2D.hpp>
-#include <NDK/Systems/PhysicsSystem2D.hpp>
+#include <NazaraSDK/World.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Components/PhysicsComponent2D.hpp>
+#include <NazaraSDK/Systems/PhysicsSystem2D.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Components/CollisionComponent3D.cpp b/SDK/src/NazaraSDK/Components/CollisionComponent3D.cpp
similarity index 94%
rename from SDK/src/NDK/Components/CollisionComponent3D.cpp
rename to SDK/src/NazaraSDK/Components/CollisionComponent3D.cpp
index a147043d7..dc37cb163 100644
--- a/SDK/src/NDK/Components/CollisionComponent3D.cpp
+++ b/SDK/src/NazaraSDK/Components/CollisionComponent3D.cpp
@@ -2,11 +2,11 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Components/CollisionComponent3D.hpp>
+#include <NazaraSDK/Components/CollisionComponent3D.hpp>
 #include <Nazara/Physics3D/RigidBody3D.hpp>
-#include <NDK/World.hpp>
-#include <NDK/Components/PhysicsComponent3D.hpp>
-#include <NDK/Systems/PhysicsSystem3D.hpp>
+#include <NazaraSDK/World.hpp>
+#include <NazaraSDK/Components/PhysicsComponent3D.hpp>
+#include <NazaraSDK/Systems/PhysicsSystem3D.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Components/ConstraintComponent2D.cpp b/SDK/src/NazaraSDK/Components/ConstraintComponent2D.cpp
similarity index 92%
rename from SDK/src/NDK/Components/ConstraintComponent2D.cpp
rename to SDK/src/NazaraSDK/Components/ConstraintComponent2D.cpp
index 6c75f39ee..5c6e6e091 100644
--- a/SDK/src/NDK/Components/ConstraintComponent2D.cpp
+++ b/SDK/src/NazaraSDK/Components/ConstraintComponent2D.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Components/ConstraintComponent2D.hpp>
+#include <NazaraSDK/Components/ConstraintComponent2D.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Components/DebugComponent.cpp b/SDK/src/NazaraSDK/Components/DebugComponent.cpp
similarity index 88%
rename from SDK/src/NDK/Components/DebugComponent.cpp
rename to SDK/src/NazaraSDK/Components/DebugComponent.cpp
index 604e1d143..f0cccc684 100644
--- a/SDK/src/NDK/Components/DebugComponent.cpp
+++ b/SDK/src/NazaraSDK/Components/DebugComponent.cpp
@@ -2,8 +2,8 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Components/DebugComponent.hpp>
-#include <NDK/Components/GraphicsComponent.hpp>
+#include <NazaraSDK/Components/DebugComponent.hpp>
+#include <NazaraSDK/Components/GraphicsComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Components/GraphicsComponent.cpp b/SDK/src/NazaraSDK/Components/GraphicsComponent.cpp
similarity index 98%
rename from SDK/src/NDK/Components/GraphicsComponent.cpp
rename to SDK/src/NazaraSDK/Components/GraphicsComponent.cpp
index 43bfa3b54..8fa933a73 100644
--- a/SDK/src/NDK/Components/GraphicsComponent.cpp
+++ b/SDK/src/NazaraSDK/Components/GraphicsComponent.cpp
@@ -2,10 +2,10 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Components/GraphicsComponent.hpp>
-#include <NDK/World.hpp>
-#include <NDK/Systems/RenderSystem.hpp>
-#include <NDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Components/GraphicsComponent.hpp>
+#include <NazaraSDK/World.hpp>
+#include <NazaraSDK/Systems/RenderSystem.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Components/LifetimeComponent.cpp b/SDK/src/NazaraSDK/Components/LifetimeComponent.cpp
similarity index 82%
rename from SDK/src/NDK/Components/LifetimeComponent.cpp
rename to SDK/src/NazaraSDK/Components/LifetimeComponent.cpp
index 5ffa6da82..18099c3e7 100644
--- a/SDK/src/NDK/Components/LifetimeComponent.cpp
+++ b/SDK/src/NazaraSDK/Components/LifetimeComponent.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Components/LifetimeComponent.hpp>
+#include <NazaraSDK/Components/LifetimeComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Components/LightComponent.cpp b/SDK/src/NazaraSDK/Components/LightComponent.cpp
similarity index 82%
rename from SDK/src/NDK/Components/LightComponent.cpp
rename to SDK/src/NazaraSDK/Components/LightComponent.cpp
index 8aeb3f8a9..59ee5cfe7 100644
--- a/SDK/src/NDK/Components/LightComponent.cpp
+++ b/SDK/src/NazaraSDK/Components/LightComponent.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Components/LightComponent.hpp>
+#include <NazaraSDK/Components/LightComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Components/ListenerComponent.cpp b/SDK/src/NazaraSDK/Components/ListenerComponent.cpp
similarity index 82%
rename from SDK/src/NDK/Components/ListenerComponent.cpp
rename to SDK/src/NazaraSDK/Components/ListenerComponent.cpp
index 420e685cb..8948ba703 100644
--- a/SDK/src/NDK/Components/ListenerComponent.cpp
+++ b/SDK/src/NazaraSDK/Components/ListenerComponent.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Components/ListenerComponent.hpp>
+#include <NazaraSDK/Components/ListenerComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Components/NodeComponent.cpp b/SDK/src/NazaraSDK/Components/NodeComponent.cpp
similarity index 83%
rename from SDK/src/NDK/Components/NodeComponent.cpp
rename to SDK/src/NazaraSDK/Components/NodeComponent.cpp
index 5a78ae093..d87a6f76e 100644
--- a/SDK/src/NDK/Components/NodeComponent.cpp
+++ b/SDK/src/NazaraSDK/Components/NodeComponent.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Components/ParticleEmitterComponent.cpp b/SDK/src/NazaraSDK/Components/ParticleEmitterComponent.cpp
similarity index 92%
rename from SDK/src/NDK/Components/ParticleEmitterComponent.cpp
rename to SDK/src/NazaraSDK/Components/ParticleEmitterComponent.cpp
index d128f4c16..8268d2b99 100644
--- a/SDK/src/NDK/Components/ParticleEmitterComponent.cpp
+++ b/SDK/src/NazaraSDK/Components/ParticleEmitterComponent.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Components/ParticleEmitterComponent.hpp>
+#include <NazaraSDK/Components/ParticleEmitterComponent.hpp>
 #include <Nazara/Graphics/ParticleGroup.hpp>
 
 namespace Ndk
diff --git a/SDK/src/NDK/Components/ParticleGroupComponent.cpp b/SDK/src/NazaraSDK/Components/ParticleGroupComponent.cpp
similarity index 81%
rename from SDK/src/NDK/Components/ParticleGroupComponent.cpp
rename to SDK/src/NazaraSDK/Components/ParticleGroupComponent.cpp
index 7042eb298..6aef06598 100644
--- a/SDK/src/NDK/Components/ParticleGroupComponent.cpp
+++ b/SDK/src/NazaraSDK/Components/ParticleGroupComponent.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Components/ParticleGroupComponent.hpp>
+#include <NazaraSDK/Components/ParticleGroupComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Components/PhysicsComponent2D.cpp b/SDK/src/NazaraSDK/Components/PhysicsComponent2D.cpp
similarity index 92%
rename from SDK/src/NDK/Components/PhysicsComponent2D.cpp
rename to SDK/src/NazaraSDK/Components/PhysicsComponent2D.cpp
index 871fa762e..579fad093 100644
--- a/SDK/src/NDK/Components/PhysicsComponent2D.cpp
+++ b/SDK/src/NazaraSDK/Components/PhysicsComponent2D.cpp
@@ -2,12 +2,12 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Components/PhysicsComponent2D.hpp>
+#include <NazaraSDK/Components/PhysicsComponent2D.hpp>
 #include <Nazara/Physics2D/RigidBody2D.hpp>
-#include <NDK/World.hpp>
-#include <NDK/Components/CollisionComponent2D.hpp>
-#include <NDK/Components/NodeComponent.hpp>
-#include <NDK/Systems/PhysicsSystem2D.hpp>
+#include <NazaraSDK/World.hpp>
+#include <NazaraSDK/Components/CollisionComponent2D.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Systems/PhysicsSystem2D.hpp>
 #include <memory>
 
 namespace Ndk
diff --git a/SDK/src/NDK/Components/PhysicsComponent3D.cpp b/SDK/src/NazaraSDK/Components/PhysicsComponent3D.cpp
similarity index 92%
rename from SDK/src/NDK/Components/PhysicsComponent3D.cpp
rename to SDK/src/NazaraSDK/Components/PhysicsComponent3D.cpp
index 4615d3c43..c02a6a7f7 100644
--- a/SDK/src/NDK/Components/PhysicsComponent3D.cpp
+++ b/SDK/src/NazaraSDK/Components/PhysicsComponent3D.cpp
@@ -2,12 +2,12 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Components/PhysicsComponent3D.hpp>
+#include <NazaraSDK/Components/PhysicsComponent3D.hpp>
 #include <Nazara/Physics3D/RigidBody3D.hpp>
-#include <NDK/World.hpp>
-#include <NDK/Components/CollisionComponent3D.hpp>
-#include <NDK/Components/NodeComponent.hpp>
-#include <NDK/Systems/PhysicsSystem3D.hpp>
+#include <NazaraSDK/World.hpp>
+#include <NazaraSDK/Components/CollisionComponent3D.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Systems/PhysicsSystem3D.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Components/VelocityComponent.cpp b/SDK/src/NazaraSDK/Components/VelocityComponent.cpp
similarity index 82%
rename from SDK/src/NDK/Components/VelocityComponent.cpp
rename to SDK/src/NazaraSDK/Components/VelocityComponent.cpp
index a457c4483..a41da1baf 100644
--- a/SDK/src/NDK/Components/VelocityComponent.cpp
+++ b/SDK/src/NazaraSDK/Components/VelocityComponent.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Components/VelocityComponent.hpp>
+#include <NazaraSDK/Components/VelocityComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Console.cpp b/SDK/src/NazaraSDK/Console.cpp
similarity index 96%
rename from SDK/src/NDK/Console.cpp
rename to SDK/src/NazaraSDK/Console.cpp
index e98ad90ec..2450b8996 100644
--- a/SDK/src/NDK/Console.cpp
+++ b/SDK/src/NazaraSDK/Console.cpp
@@ -2,13 +2,13 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Console.hpp>
+#include <NazaraSDK/Console.hpp>
 #include <Nazara/Core/Unicode.hpp>
 #include <Nazara/Platform/Event.hpp>
-#include <NDK/Components/GraphicsComponent.hpp>
-#include <NDK/Components/NodeComponent.hpp>
-#include <NDK/Widgets.hpp>
-#include <NDK/World.hpp>
+#include <NazaraSDK/Components/GraphicsComponent.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Widgets.hpp>
+#include <NazaraSDK/World.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Entity.cpp b/SDK/src/NazaraSDK/Entity.cpp
similarity index 98%
rename from SDK/src/NDK/Entity.cpp
rename to SDK/src/NazaraSDK/Entity.cpp
index 8086e5905..0cfb1125d 100644
--- a/SDK/src/NDK/Entity.cpp
+++ b/SDK/src/NazaraSDK/Entity.cpp
@@ -2,9 +2,9 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Entity.hpp>
-#include <NDK/BaseComponent.hpp>
-#include <NDK/World.hpp>
+#include <NazaraSDK/Entity.hpp>
+#include <NazaraSDK/BaseComponent.hpp>
+#include <NazaraSDK/World.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/EntityList.cpp b/SDK/src/NazaraSDK/EntityList.cpp
similarity index 83%
rename from SDK/src/NDK/EntityList.cpp
rename to SDK/src/NazaraSDK/EntityList.cpp
index 49841843d..fe906f84a 100644
--- a/SDK/src/NDK/EntityList.cpp
+++ b/SDK/src/NazaraSDK/EntityList.cpp
@@ -2,8 +2,8 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/EntityList.hpp>
-#include <NDK/World.hpp>
+#include <NazaraSDK/EntityList.hpp>
+#include <NazaraSDK/World.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Resources/checkmark.png.h b/SDK/src/NazaraSDK/Resources/checkmark.png.h
similarity index 100%
rename from SDK/src/NDK/Resources/checkmark.png.h
rename to SDK/src/NazaraSDK/Resources/checkmark.png.h
diff --git a/SDK/src/NDK/Sdk.cpp b/SDK/src/NazaraSDK/Sdk.cpp
similarity index 74%
rename from SDK/src/NDK/Sdk.cpp
rename to SDK/src/NazaraSDK/Sdk.cpp
index c6a6de027..0a7e08ee3 100644
--- a/SDK/src/NDK/Sdk.cpp
+++ b/SDK/src/NazaraSDK/Sdk.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Sdk.hpp>
+#include <NazaraSDK/Sdk.hpp>
 #include <Nazara/Audio/Audio.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Core/Log.hpp>
@@ -11,34 +11,34 @@
 #include <Nazara/Physics3D/Physics3D.hpp>
 #include <Nazara/Platform/Platform.hpp>
 #include <Nazara/Utility/Utility.hpp>
-#include <NDK/Algorithm.hpp>
-#include <NDK/BaseSystem.hpp>
-#include <NDK/Components/CollisionComponent2D.hpp>
-#include <NDK/Components/CollisionComponent3D.hpp>
-#include <NDK/Components/LifetimeComponent.hpp>
-#include <NDK/Components/NodeComponent.hpp>
-#include <NDK/Components/PhysicsComponent2D.hpp>
-#include <NDK/Components/PhysicsComponent3D.hpp>
-#include <NDK/Components/VelocityComponent.hpp>
-#include <NDK/Components/ConstraintComponent2D.hpp>
-#include <NDK/Systems/LifetimeSystem.hpp>
-#include <NDK/Systems/PhysicsSystem2D.hpp>
-#include <NDK/Systems/PhysicsSystem3D.hpp>
-#include <NDK/Systems/VelocitySystem.hpp>
+#include <NazaraSDK/Algorithm.hpp>
+#include <NazaraSDK/BaseSystem.hpp>
+#include <NazaraSDK/Components/CollisionComponent2D.hpp>
+#include <NazaraSDK/Components/CollisionComponent3D.hpp>
+#include <NazaraSDK/Components/LifetimeComponent.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Components/PhysicsComponent2D.hpp>
+#include <NazaraSDK/Components/PhysicsComponent3D.hpp>
+#include <NazaraSDK/Components/VelocityComponent.hpp>
+#include <NazaraSDK/Components/ConstraintComponent2D.hpp>
+#include <NazaraSDK/Systems/LifetimeSystem.hpp>
+#include <NazaraSDK/Systems/PhysicsSystem2D.hpp>
+#include <NazaraSDK/Systems/PhysicsSystem3D.hpp>
+#include <NazaraSDK/Systems/VelocitySystem.hpp>
 
 #ifndef NDK_SERVER
-#include <NDK/Components/CameraComponent.hpp>
-#include <NDK/Components/DebugComponent.hpp>
-#include <NDK/Components/LightComponent.hpp>
-#include <NDK/Components/ListenerComponent.hpp>
-#include <NDK/Components/GraphicsComponent.hpp>
-#include <NDK/Components/ParticleEmitterComponent.hpp>
-#include <NDK/Components/ParticleGroupComponent.hpp>
-#include <NDK/Systems/DebugSystem.hpp>
-#include <NDK/Systems/ParticleSystem.hpp>
-#include <NDK/Systems/ListenerSystem.hpp>
-#include <NDK/Systems/RenderSystem.hpp>
-#include <NDK/Widgets/CheckboxWidget.hpp>
+#include <NazaraSDK/Components/CameraComponent.hpp>
+#include <NazaraSDK/Components/DebugComponent.hpp>
+#include <NazaraSDK/Components/LightComponent.hpp>
+#include <NazaraSDK/Components/ListenerComponent.hpp>
+#include <NazaraSDK/Components/GraphicsComponent.hpp>
+#include <NazaraSDK/Components/ParticleEmitterComponent.hpp>
+#include <NazaraSDK/Components/ParticleGroupComponent.hpp>
+#include <NazaraSDK/Systems/DebugSystem.hpp>
+#include <NazaraSDK/Systems/ParticleSystem.hpp>
+#include <NazaraSDK/Systems/ListenerSystem.hpp>
+#include <NazaraSDK/Systems/RenderSystem.hpp>
+#include <NazaraSDK/Widgets/CheckboxWidget.hpp>
 #endif
 
 namespace Ndk
diff --git a/SDK/src/NDK/State.cpp b/SDK/src/NazaraSDK/State.cpp
similarity index 91%
rename from SDK/src/NDK/State.cpp
rename to SDK/src/NazaraSDK/State.cpp
index dc569c1ac..edc284034 100644
--- a/SDK/src/NDK/State.cpp
+++ b/SDK/src/NazaraSDK/State.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/State.hpp>
+#include <NazaraSDK/State.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Systems/DebugSystem.cpp b/SDK/src/NazaraSDK/Systems/DebugSystem.cpp
similarity index 97%
rename from SDK/src/NDK/Systems/DebugSystem.cpp
rename to SDK/src/NazaraSDK/Systems/DebugSystem.cpp
index 5b8bb7aa6..377d8f936 100644
--- a/SDK/src/NDK/Systems/DebugSystem.cpp
+++ b/SDK/src/NazaraSDK/Systems/DebugSystem.cpp
@@ -2,18 +2,18 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Systems/DebugSystem.hpp>
+#include <NazaraSDK/Systems/DebugSystem.hpp>
 #include <Nazara/Core/Primitive.hpp>
 #include <Nazara/Graphics/Model.hpp>
 #include <Nazara/Utility/IndexIterator.hpp>
 #include <Nazara/Utility/Mesh.hpp>
 #include <Nazara/Utility/StaticMesh.hpp>
-#include <NDK/Components/CollisionComponent2D.hpp>
-#include <NDK/Components/CollisionComponent3D.hpp>
-#include <NDK/Components/DebugComponent.hpp>
-#include <NDK/Components/GraphicsComponent.hpp>
-#include <NDK/Components/NodeComponent.hpp>
-#include <NDK/Components/PhysicsComponent2D.hpp>
+#include <NazaraSDK/Components/CollisionComponent2D.hpp>
+#include <NazaraSDK/Components/CollisionComponent3D.hpp>
+#include <NazaraSDK/Components/DebugComponent.hpp>
+#include <NazaraSDK/Components/GraphicsComponent.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Components/PhysicsComponent2D.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Systems/LifetimeSystem.cpp b/SDK/src/NazaraSDK/Systems/LifetimeSystem.cpp
similarity index 84%
rename from SDK/src/NDK/Systems/LifetimeSystem.cpp
rename to SDK/src/NazaraSDK/Systems/LifetimeSystem.cpp
index d575ebdc4..76fd24721 100644
--- a/SDK/src/NDK/Systems/LifetimeSystem.cpp
+++ b/SDK/src/NazaraSDK/Systems/LifetimeSystem.cpp
@@ -2,8 +2,8 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Systems/LifetimeSystem.hpp>
-#include <NDK/Components/LifetimeComponent.hpp>
+#include <NazaraSDK/Systems/LifetimeSystem.hpp>
+#include <NazaraSDK/Components/LifetimeComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Systems/ListenerSystem.cpp b/SDK/src/NazaraSDK/Systems/ListenerSystem.cpp
similarity index 92%
rename from SDK/src/NDK/Systems/ListenerSystem.cpp
rename to SDK/src/NazaraSDK/Systems/ListenerSystem.cpp
index c725bc368..0139b536b 100644
--- a/SDK/src/NDK/Systems/ListenerSystem.cpp
+++ b/SDK/src/NazaraSDK/Systems/ListenerSystem.cpp
@@ -2,10 +2,10 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Systems/ListenerSystem.hpp>
+#include <NazaraSDK/Systems/ListenerSystem.hpp>
 #include <Nazara/Audio/Audio.hpp>
-#include <NDK/Components/ListenerComponent.hpp>
-#include <NDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Components/ListenerComponent.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Systems/ParticleSystem.cpp b/SDK/src/NazaraSDK/Systems/ParticleSystem.cpp
similarity index 90%
rename from SDK/src/NDK/Systems/ParticleSystem.cpp
rename to SDK/src/NazaraSDK/Systems/ParticleSystem.cpp
index b374bf1e7..0a9ecc3b6 100644
--- a/SDK/src/NDK/Systems/ParticleSystem.cpp
+++ b/SDK/src/NazaraSDK/Systems/ParticleSystem.cpp
@@ -2,8 +2,8 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Systems/ParticleSystem.hpp>
-#include <NDK/Components/ParticleGroupComponent.hpp>
+#include <NazaraSDK/Systems/ParticleSystem.hpp>
+#include <NazaraSDK/Components/ParticleGroupComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Systems/PhysicsSystem2D.cpp b/SDK/src/NazaraSDK/Systems/PhysicsSystem2D.cpp
similarity index 97%
rename from SDK/src/NDK/Systems/PhysicsSystem2D.cpp
rename to SDK/src/NazaraSDK/Systems/PhysicsSystem2D.cpp
index 4b6386c74..23559f4fe 100644
--- a/SDK/src/NDK/Systems/PhysicsSystem2D.cpp
+++ b/SDK/src/NazaraSDK/Systems/PhysicsSystem2D.cpp
@@ -2,13 +2,13 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Systems/PhysicsSystem2D.hpp>
+#include <NazaraSDK/Systems/PhysicsSystem2D.hpp>
 #include <Nazara/Physics2D/RigidBody2D.hpp>
-#include <NDK/World.hpp>
-#include <NDK/Components/CollisionComponent2D.hpp>
-#include <NDK/Components/NodeComponent.hpp>
-#include <NDK/Components/PhysicsComponent2D.hpp>
-#include <NDK/Components/PhysicsComponent3D.hpp>
+#include <NazaraSDK/World.hpp>
+#include <NazaraSDK/Components/CollisionComponent2D.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Components/PhysicsComponent2D.hpp>
+#include <NazaraSDK/Components/PhysicsComponent3D.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Systems/PhysicsSystem3D.cpp b/SDK/src/NazaraSDK/Systems/PhysicsSystem3D.cpp
similarity index 94%
rename from SDK/src/NDK/Systems/PhysicsSystem3D.cpp
rename to SDK/src/NazaraSDK/Systems/PhysicsSystem3D.cpp
index 4e905a64c..39218e13f 100644
--- a/SDK/src/NDK/Systems/PhysicsSystem3D.cpp
+++ b/SDK/src/NazaraSDK/Systems/PhysicsSystem3D.cpp
@@ -2,12 +2,12 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Systems/PhysicsSystem3D.hpp>
+#include <NazaraSDK/Systems/PhysicsSystem3D.hpp>
 #include <Nazara/Physics3D/RigidBody3D.hpp>
-#include <NDK/Components/CollisionComponent3D.hpp>
-#include <NDK/Components/NodeComponent.hpp>
-#include <NDK/Components/PhysicsComponent2D.hpp>
-#include <NDK/Components/PhysicsComponent3D.hpp>
+#include <NazaraSDK/Components/CollisionComponent3D.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Components/PhysicsComponent2D.hpp>
+#include <NazaraSDK/Components/PhysicsComponent3D.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Systems/RenderSystem.cpp b/SDK/src/NazaraSDK/Systems/RenderSystem.cpp
similarity index 97%
rename from SDK/src/NDK/Systems/RenderSystem.cpp
rename to SDK/src/NazaraSDK/Systems/RenderSystem.cpp
index 8b4bfe03f..b2693a041 100644
--- a/SDK/src/NDK/Systems/RenderSystem.cpp
+++ b/SDK/src/NazaraSDK/Systems/RenderSystem.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Systems/RenderSystem.hpp>
+#include <NazaraSDK/Systems/RenderSystem.hpp>
 #include <Nazara/Graphics/ColorBackground.hpp>
 #include <Nazara/Graphics/ForwardRenderTechnique.hpp>
 #include <Nazara/Graphics/SceneData.hpp>
@@ -10,11 +10,11 @@
 #include <Nazara/Graphics/SkyboxBackground.hpp>
 #include <Nazara/Math/Rect.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
-#include <NDK/Components/CameraComponent.hpp>
-#include <NDK/Components/GraphicsComponent.hpp>
-#include <NDK/Components/LightComponent.hpp>
-#include <NDK/Components/NodeComponent.hpp>
-#include <NDK/Components/ParticleGroupComponent.hpp>
+#include <NazaraSDK/Components/CameraComponent.hpp>
+#include <NazaraSDK/Components/GraphicsComponent.hpp>
+#include <NazaraSDK/Components/LightComponent.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Components/ParticleGroupComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Systems/VelocitySystem.cpp b/SDK/src/NazaraSDK/Systems/VelocitySystem.cpp
similarity index 82%
rename from SDK/src/NDK/Systems/VelocitySystem.cpp
rename to SDK/src/NazaraSDK/Systems/VelocitySystem.cpp
index b633d7b68..3ff4b52c1 100644
--- a/SDK/src/NDK/Systems/VelocitySystem.cpp
+++ b/SDK/src/NazaraSDK/Systems/VelocitySystem.cpp
@@ -2,11 +2,11 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Systems/VelocitySystem.hpp>
-#include <NDK/Components/NodeComponent.hpp>
-#include <NDK/Components/PhysicsComponent2D.hpp>
-#include <NDK/Components/PhysicsComponent3D.hpp>
-#include <NDK/Components/VelocityComponent.hpp>
+#include <NazaraSDK/Systems/VelocitySystem.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Components/PhysicsComponent2D.hpp>
+#include <NazaraSDK/Components/PhysicsComponent3D.hpp>
+#include <NazaraSDK/Components/VelocityComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Widgets/AbstractTextAreaWidget.cpp b/SDK/src/NazaraSDK/Widgets/AbstractTextAreaWidget.cpp
similarity index 98%
rename from SDK/src/NDK/Widgets/AbstractTextAreaWidget.cpp
rename to SDK/src/NazaraSDK/Widgets/AbstractTextAreaWidget.cpp
index ddb3467f5..773df6b68 100644
--- a/SDK/src/NDK/Widgets/AbstractTextAreaWidget.cpp
+++ b/SDK/src/NazaraSDK/Widgets/AbstractTextAreaWidget.cpp
@@ -2,11 +2,11 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Widgets/AbstractTextAreaWidget.hpp>
+#include <NazaraSDK/Widgets/AbstractTextAreaWidget.hpp>
 #include <Nazara/Core/Unicode.hpp>
 #include <Nazara/Utility/Font.hpp>
-#include <NDK/Components/GraphicsComponent.hpp>
-#include <NDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Components/GraphicsComponent.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Widgets/BoxLayout.cpp b/SDK/src/NazaraSDK/Widgets/BoxLayout.cpp
similarity index 98%
rename from SDK/src/NDK/Widgets/BoxLayout.cpp
rename to SDK/src/NazaraSDK/Widgets/BoxLayout.cpp
index 89564ed08..2e59bf559 100644
--- a/SDK/src/NDK/Widgets/BoxLayout.cpp
+++ b/SDK/src/NazaraSDK/Widgets/BoxLayout.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Widgets/BoxLayout.hpp>
+#include <NazaraSDK/Widgets/BoxLayout.hpp>
 #include <Nazara/Core/Log.hpp>
 #include <Nazara/Core/MemoryHelper.hpp>
 #include <cassert>
diff --git a/SDK/src/NDK/Widgets/ButtonWidget.cpp b/SDK/src/NazaraSDK/Widgets/ButtonWidget.cpp
similarity index 96%
rename from SDK/src/NDK/Widgets/ButtonWidget.cpp
rename to SDK/src/NazaraSDK/Widgets/ButtonWidget.cpp
index c88645e44..84818e45b 100644
--- a/SDK/src/NDK/Widgets/ButtonWidget.cpp
+++ b/SDK/src/NazaraSDK/Widgets/ButtonWidget.cpp
@@ -2,9 +2,9 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Widgets/ButtonWidget.hpp>
-#include <NDK/Components/GraphicsComponent.hpp>
-#include <NDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Widgets/ButtonWidget.hpp>
+#include <NazaraSDK/Components/GraphicsComponent.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Widgets/CheckboxWidget.cpp b/SDK/src/NazaraSDK/Widgets/CheckboxWidget.cpp
similarity index 97%
rename from SDK/src/NDK/Widgets/CheckboxWidget.cpp
rename to SDK/src/NazaraSDK/Widgets/CheckboxWidget.cpp
index 7d906d8d1..3c16b1219 100644
--- a/SDK/src/NDK/Widgets/CheckboxWidget.cpp
+++ b/SDK/src/NazaraSDK/Widgets/CheckboxWidget.cpp
@@ -2,8 +2,8 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Widgets/CheckboxWidget.hpp>
-#include <NDK/Components/GraphicsComponent.hpp>
+#include <NazaraSDK/Widgets/CheckboxWidget.hpp>
+#include <NazaraSDK/Components/GraphicsComponent.hpp>
 #include <Nazara/Graphics/Material.hpp>
 #include <algorithm>
 
@@ -54,7 +54,7 @@ namespace Ndk
 	{
 		const Nz::UInt8 r_checkmark[] =
 		{
-			#include <NDK/Resources/checkmark.png.h>
+			#include <NazaraSDK/Resources/checkmark.png.h>
 		};
 
 		Nz::TextureRef checkmarkTexture = Nz::Texture::LoadFromMemory(r_checkmark, sizeof(r_checkmark) / sizeof(r_checkmark[0]));
diff --git a/SDK/src/NDK/Widgets/ImageWidget.cpp b/SDK/src/NazaraSDK/Widgets/ImageWidget.cpp
similarity index 79%
rename from SDK/src/NDK/Widgets/ImageWidget.cpp
rename to SDK/src/NazaraSDK/Widgets/ImageWidget.cpp
index 0a1cfdc81..bb8398806 100644
--- a/SDK/src/NDK/Widgets/ImageWidget.cpp
+++ b/SDK/src/NazaraSDK/Widgets/ImageWidget.cpp
@@ -2,9 +2,9 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Widgets/ImageWidget.hpp>
-#include <NDK/Components/NodeComponent.hpp>
-#include <NDK/Components/GraphicsComponent.hpp>
+#include <NazaraSDK/Widgets/ImageWidget.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Components/GraphicsComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Widgets/LabelWidget.cpp b/SDK/src/NazaraSDK/Widgets/LabelWidget.cpp
similarity index 76%
rename from SDK/src/NDK/Widgets/LabelWidget.cpp
rename to SDK/src/NazaraSDK/Widgets/LabelWidget.cpp
index 813295622..6c3c2825b 100644
--- a/SDK/src/NDK/Widgets/LabelWidget.cpp
+++ b/SDK/src/NazaraSDK/Widgets/LabelWidget.cpp
@@ -2,9 +2,9 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Widgets/LabelWidget.hpp>
-#include <NDK/Components/GraphicsComponent.hpp>
-#include <NDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Widgets/LabelWidget.hpp>
+#include <NazaraSDK/Components/GraphicsComponent.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Widgets/ProgressBarWidget.cpp b/SDK/src/NazaraSDK/Widgets/ProgressBarWidget.cpp
similarity index 95%
rename from SDK/src/NDK/Widgets/ProgressBarWidget.cpp
rename to SDK/src/NazaraSDK/Widgets/ProgressBarWidget.cpp
index cc3f4f2d9..0c566b423 100644
--- a/SDK/src/NDK/Widgets/ProgressBarWidget.cpp
+++ b/SDK/src/NazaraSDK/Widgets/ProgressBarWidget.cpp
@@ -2,9 +2,9 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Widgets/ProgressBarWidget.hpp>
-#include <NDK/Components/NodeComponent.hpp>
-#include <NDK/Components/GraphicsComponent.hpp>
+#include <NazaraSDK/Widgets/ProgressBarWidget.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Components/GraphicsComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Widgets/RichTextAreaWidget.cpp b/SDK/src/NazaraSDK/Widgets/RichTextAreaWidget.cpp
similarity index 99%
rename from SDK/src/NDK/Widgets/RichTextAreaWidget.cpp
rename to SDK/src/NazaraSDK/Widgets/RichTextAreaWidget.cpp
index 35abb6e06..dfb32bd98 100644
--- a/SDK/src/NDK/Widgets/RichTextAreaWidget.cpp
+++ b/SDK/src/NazaraSDK/Widgets/RichTextAreaWidget.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Widgets/RichTextAreaWidget.hpp>
+#include <NazaraSDK/Widgets/RichTextAreaWidget.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Widgets/ScrollAreaWidget.cpp b/SDK/src/NazaraSDK/Widgets/ScrollAreaWidget.cpp
similarity index 97%
rename from SDK/src/NDK/Widgets/ScrollAreaWidget.cpp
rename to SDK/src/NazaraSDK/Widgets/ScrollAreaWidget.cpp
index 0d7c1f934..09c33c2a5 100644
--- a/SDK/src/NDK/Widgets/ScrollAreaWidget.cpp
+++ b/SDK/src/NazaraSDK/Widgets/ScrollAreaWidget.cpp
@@ -2,10 +2,10 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Widgets/ScrollAreaWidget.hpp>
+#include <NazaraSDK/Widgets/ScrollAreaWidget.hpp>
 #include <Nazara/Math/Algorithm.hpp>
-#include <NDK/Components/GraphicsComponent.hpp>
-#include <NDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Components/GraphicsComponent.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/Widgets/TextAreaWidget.cpp b/SDK/src/NazaraSDK/Widgets/TextAreaWidget.cpp
similarity index 97%
rename from SDK/src/NDK/Widgets/TextAreaWidget.cpp
rename to SDK/src/NazaraSDK/Widgets/TextAreaWidget.cpp
index 4271f43a1..b6110d781 100644
--- a/SDK/src/NDK/Widgets/TextAreaWidget.cpp
+++ b/SDK/src/NazaraSDK/Widgets/TextAreaWidget.cpp
@@ -2,11 +2,11 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/Widgets/TextAreaWidget.hpp>
+#include <NazaraSDK/Widgets/TextAreaWidget.hpp>
 #include <Nazara/Core/Unicode.hpp>
 #include <Nazara/Utility/Font.hpp>
-#include <NDK/Components/GraphicsComponent.hpp>
-#include <NDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Components/GraphicsComponent.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
 
 namespace Ndk
 {
diff --git a/SDK/src/NDK/World.cpp b/SDK/src/NazaraSDK/World.cpp
similarity index 95%
rename from SDK/src/NDK/World.cpp
rename to SDK/src/NazaraSDK/World.cpp
index ef59463bc..f06f1338f 100644
--- a/SDK/src/NDK/World.cpp
+++ b/SDK/src/NazaraSDK/World.cpp
@@ -2,20 +2,20 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
-#include <NDK/World.hpp>
+#include <NazaraSDK/World.hpp>
 #include <Nazara/Core/Clock.hpp>
 #include <Nazara/Core/Error.hpp>
-#include <NDK/BaseComponent.hpp>
-#include <NDK/Systems/LifetimeSystem.hpp>
-#include <NDK/Systems/PhysicsSystem2D.hpp>
-#include <NDK/Systems/PhysicsSystem3D.hpp>
-#include <NDK/Systems/VelocitySystem.hpp>
+#include <NazaraSDK/BaseComponent.hpp>
+#include <NazaraSDK/Systems/LifetimeSystem.hpp>
+#include <NazaraSDK/Systems/PhysicsSystem2D.hpp>
+#include <NazaraSDK/Systems/PhysicsSystem3D.hpp>
+#include <NazaraSDK/Systems/VelocitySystem.hpp>
 
 #ifndef NDK_SERVER
-#include <NDK/Systems/DebugSystem.hpp>
-#include <NDK/Systems/ListenerSystem.hpp>
-#include <NDK/Systems/ParticleSystem.hpp>
-#include <NDK/Systems/RenderSystem.hpp>
+#include <NazaraSDK/Systems/DebugSystem.hpp>
+#include <NazaraSDK/Systems/ListenerSystem.hpp>
+#include <NazaraSDK/Systems/ParticleSystem.hpp>
+#include <NazaraSDK/Systems/RenderSystem.hpp>
 #endif
 
 namespace Ndk
diff --git a/examples/FirstScene/main.cpp b/examples/FirstScene/main.cpp
index 4952106a8..e3852541e 100644
--- a/examples/FirstScene/main.cpp
+++ b/examples/FirstScene/main.cpp
@@ -17,12 +17,12 @@
 #include <Nazara/Renderer.hpp> // Module de rendu
 #include <Nazara/Network.hpp> // Module utilitaire
 #include <Nazara/Utility.hpp> // Module utilitaire
-#include <NDK/Application.hpp>
-#include <NDK/Components.hpp>
-#include <NDK/Console.hpp>
-#include <NDK/Systems.hpp>
-#include <NDK/Sdk.hpp>
-#include <NDK/World.hpp>
+#include <NazaraSDK/Application.hpp>
+#include <NazaraSDK/Components.hpp>
+#include <NazaraSDK/Console.hpp>
+#include <NazaraSDK/Systems.hpp>
+#include <NazaraSDK/Sdk.hpp>
+#include <NazaraSDK/World.hpp>
 #include <iostream>
 
 // Petite fonction permettant de rendre le déplacement de la caméra moins ridige
diff --git a/examples/Particles/Common.cpp b/examples/Particles/Common.cpp
index 0ed9096ef..690537d0f 100644
--- a/examples/Particles/Common.cpp
+++ b/examples/Particles/Common.cpp
@@ -1,8 +1,8 @@
 #include "Common.hpp"
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Utility/SimpleTextDrawer.hpp>
-#include <NDK/Components/ParticleGroupComponent.hpp>
-#include <NDK/Systems/RenderSystem.hpp>
+#include <NazaraSDK/Components/ParticleGroupComponent.hpp>
+#include <NazaraSDK/Systems/RenderSystem.hpp>
 
 ParticleDemo::ParticleDemo(const Nz::String& name, const ExampleShared& exampleShared) :
 m_shared(exampleShared),
diff --git a/examples/Particles/Common.hpp b/examples/Particles/Common.hpp
index 658b97419..3d672c5b3 100644
--- a/examples/Particles/Common.hpp
+++ b/examples/Particles/Common.hpp
@@ -7,10 +7,10 @@
 #include <Nazara/Graphics/AbstractBackground.hpp>
 #include <Nazara/Graphics/TextSprite.hpp>
 #include <Nazara/Renderer/RenderWindow.hpp>
-#include <NDK/Components/ParticleGroupComponent.hpp>
-#include <NDK/EntityOwner.hpp>
-#include <NDK/StateMachine.hpp>
-#include <NDK/World.hpp>
+#include <NazaraSDK/Components/ParticleGroupComponent.hpp>
+#include <NazaraSDK/EntityOwner.hpp>
+#include <NazaraSDK/StateMachine.hpp>
+#include <NazaraSDK/World.hpp>
 #include <memory>
 #include <random>
 #include <vector>
diff --git a/examples/Particles/LogoDemo.cpp b/examples/Particles/LogoDemo.cpp
index a4d31ef8d..cb2509500 100644
--- a/examples/Particles/LogoDemo.cpp
+++ b/examples/Particles/LogoDemo.cpp
@@ -2,8 +2,8 @@
 #include <Nazara/Core/OffsetOf.hpp>
 #include <Nazara/Graphics.hpp>
 #include <Nazara/Utility.hpp>
-#include <NDK/Components.hpp>
-#include <NDK/Systems.hpp>
+#include <NazaraSDK/Components.hpp>
+#include <NazaraSDK/Systems.hpp>
 #include <iostream>
 
 namespace
diff --git a/examples/Particles/LogoDemo.hpp b/examples/Particles/LogoDemo.hpp
index bd0536edf..bbf14e789 100644
--- a/examples/Particles/LogoDemo.hpp
+++ b/examples/Particles/LogoDemo.hpp
@@ -5,7 +5,7 @@
 
 #include <Nazara/Math/Vector2.hpp>
 #include <Nazara/Graphics/ParticleStruct.hpp>
-#include <NDK/State.hpp>
+#include <NazaraSDK/State.hpp>
 #include <vector>
 #include "Common.hpp"
 
diff --git a/examples/Particles/SpacebattleDemo.cpp b/examples/Particles/SpacebattleDemo.cpp
index 6f3205b87..d0c9e2749 100644
--- a/examples/Particles/SpacebattleDemo.cpp
+++ b/examples/Particles/SpacebattleDemo.cpp
@@ -4,8 +4,8 @@
 #include <Nazara/Graphics.hpp>
 #include <Nazara/Platform.hpp>
 #include <Nazara/Utility.hpp>
-#include <NDK/Components.hpp>
-#include <NDK/Systems.hpp>
+#include <NazaraSDK/Components.hpp>
+#include <NazaraSDK/Systems.hpp>
 
 namespace
 {
diff --git a/examples/Particles/SpacebattleDemo.hpp b/examples/Particles/SpacebattleDemo.hpp
index e0b928e19..b2aaa5c33 100644
--- a/examples/Particles/SpacebattleDemo.hpp
+++ b/examples/Particles/SpacebattleDemo.hpp
@@ -11,8 +11,8 @@
 #include <Nazara/Graphics/SkyboxBackground.hpp>
 #include <Nazara/Math/Vector2.hpp>
 #include <Nazara/Platform/EventHandler.hpp>
-#include <NDK/Entity.hpp>
-#include <NDK/State.hpp>
+#include <NazaraSDK/Entity.hpp>
+#include <NazaraSDK/State.hpp>
 #include <vector>
 #include "Common.hpp"
 
diff --git a/examples/Particles/main.cpp b/examples/Particles/main.cpp
index 2d77811a4..e31bfeb88 100644
--- a/examples/Particles/main.cpp
+++ b/examples/Particles/main.cpp
@@ -5,10 +5,10 @@
 #include <Nazara/Physics3D.hpp>
 #include <Nazara/Renderer.hpp>
 #include <Nazara/Utility.hpp>
-#include <NDK/Application.hpp>
-#include <NDK/Components.hpp>
-#include <NDK/Systems.hpp>
-#include <NDK/StateMachine.hpp>
+#include <NazaraSDK/Application.hpp>
+#include <NazaraSDK/Components.hpp>
+#include <NazaraSDK/Systems.hpp>
+#include <NazaraSDK/StateMachine.hpp>
 #include "LogoDemo.hpp"
 #include "SpacebattleDemo.hpp"
 #include <iostream>
diff --git a/examples/Tut00/main.cpp b/examples/Tut00/main.cpp
index d3018f5e8..5fc95a9c4 100644
--- a/examples/Tut00/main.cpp
+++ b/examples/Tut00/main.cpp
@@ -6,7 +6,7 @@
 #include <Nazara/Physics3D.hpp>
 #include <Nazara/Renderer.hpp>
 #include <Nazara/Utility.hpp>
-#include <NDK/Application.hpp>
+#include <NazaraSDK/Application.hpp>
 #include <iostream>
 
 int main(int argc, char* argv[])
diff --git a/examples/Tut01/main.cpp b/examples/Tut01/main.cpp
index 4570cec08..94834829c 100644
--- a/examples/Tut01/main.cpp
+++ b/examples/Tut01/main.cpp
@@ -3,10 +3,10 @@
 #include <Nazara/Graphics.hpp>
 #include <Nazara/Renderer.hpp>
 #include <Nazara/Utility.hpp>
-#include <NDK/Application.hpp>
-#include <NDK/Components.hpp>
-#include <NDK/Systems.hpp>
-#include <NDK/World.hpp>
+#include <NazaraSDK/Application.hpp>
+#include <NazaraSDK/Components.hpp>
+#include <NazaraSDK/Systems.hpp>
+#include <NazaraSDK/World.hpp>
 #include <iostream>
 
 int main(int argc, char* argv[])
diff --git a/examples/Tut02/main.cpp b/examples/Tut02/main.cpp
index 83de624c6..b86ddcef3 100644
--- a/examples/Tut02/main.cpp
+++ b/examples/Tut02/main.cpp
@@ -3,10 +3,10 @@
 #include <Nazara/Graphics.hpp>
 #include <Nazara/Renderer.hpp>
 #include <Nazara/Utility.hpp>
-#include <NDK/Application.hpp>
-#include <NDK/Components.hpp>
-#include <NDK/Systems.hpp>
-#include <NDK/World.hpp>
+#include <NazaraSDK/Application.hpp>
+#include <NazaraSDK/Components.hpp>
+#include <NazaraSDK/Systems.hpp>
+#include <NazaraSDK/World.hpp>
 #include <iostream>
 
 int main(int argc, char* argv[])
diff --git a/tests/Engine/Platform/EventHandler.cpp b/tests/Engine/Platform/EventHandler.cpp
index a2f64e9f4..c131386af 100644
--- a/tests/Engine/Platform/EventHandler.cpp
+++ b/tests/Engine/Platform/EventHandler.cpp
@@ -1,12 +1,12 @@
 #include <Nazara/Graphics/ColorBackground.hpp>
 #include <Nazara/Renderer/RenderWindow.hpp>
 
-#include <NDK/Application.hpp>
-#include <NDK/StateMachine.hpp>
-#include <NDK/World.hpp>
-#include <NDK/Components/CameraComponent.hpp>
-#include <NDK/Components/NodeComponent.hpp>
-#include <NDK/Systems/RenderSystem.hpp>
+#include <NazaraSDK/Application.hpp>
+#include <NazaraSDK/StateMachine.hpp>
+#include <NazaraSDK/World.hpp>
+#include <NazaraSDK/Components/CameraComponent.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Systems/RenderSystem.hpp>
 
 #include "EventHandler/StateContext.hpp"
 #include "EventHandler/StateFactory.hpp"
diff --git a/tests/Engine/Platform/EventHandler/BaseState.cpp b/tests/Engine/Platform/EventHandler/BaseState.cpp
index 8cb229445..eacd7c221 100644
--- a/tests/Engine/Platform/EventHandler/BaseState.cpp
+++ b/tests/Engine/Platform/EventHandler/BaseState.cpp
@@ -4,7 +4,7 @@
 #include "StateFactory.hpp"
 
 #include <Nazara/Renderer/RenderWindow.hpp>
-#include <NDK/StateMachine.hpp>
+#include <NazaraSDK/StateMachine.hpp>
 
 BaseState::BaseState(StateContext& context) :
 State(),
diff --git a/tests/Engine/Platform/EventHandler/BaseState.hpp b/tests/Engine/Platform/EventHandler/BaseState.hpp
index 2356e39cd..2fc721b9c 100644
--- a/tests/Engine/Platform/EventHandler/BaseState.hpp
+++ b/tests/Engine/Platform/EventHandler/BaseState.hpp
@@ -5,7 +5,7 @@
 
 #include <Nazara/Platform/EventHandler.hpp>
 
-#include <NDK/State.hpp>
+#include <NazaraSDK/State.hpp>
 
 class StateContext;
 
diff --git a/tests/Engine/Platform/EventHandler/EventState.cpp b/tests/Engine/Platform/EventHandler/EventState.cpp
index 1d6a6784a..d45104d23 100644
--- a/tests/Engine/Platform/EventHandler/EventState.cpp
+++ b/tests/Engine/Platform/EventHandler/EventState.cpp
@@ -4,7 +4,7 @@
 #include "StateFactory.hpp"
 
 #include <Nazara/Renderer/RenderWindow.hpp>
-#include <NDK/StateMachine.hpp>
+#include <NazaraSDK/StateMachine.hpp>
 
 EventState::EventState(StateContext& context) :
 BaseState(context),
diff --git a/tests/Engine/Platform/EventHandler/FocusState.cpp b/tests/Engine/Platform/EventHandler/FocusState.cpp
index ee5fd5f7e..a90f79608 100644
--- a/tests/Engine/Platform/EventHandler/FocusState.cpp
+++ b/tests/Engine/Platform/EventHandler/FocusState.cpp
@@ -4,7 +4,7 @@
 #include "StateFactory.hpp"
 
 #include <Nazara/Renderer/RenderWindow.hpp>
-#include <NDK/StateMachine.hpp>
+#include <NazaraSDK/StateMachine.hpp>
 
 FocusState::FocusState(StateContext& context) :
 BaseState(context)
diff --git a/tests/Engine/Platform/EventHandler/KeyState.cpp b/tests/Engine/Platform/EventHandler/KeyState.cpp
index 40bd785f1..82d1d0160 100644
--- a/tests/Engine/Platform/EventHandler/KeyState.cpp
+++ b/tests/Engine/Platform/EventHandler/KeyState.cpp
@@ -4,7 +4,7 @@
 #include "StateFactory.hpp"
 
 #include <Nazara/Renderer/RenderWindow.hpp>
-#include <NDK/StateMachine.hpp>
+#include <NazaraSDK/StateMachine.hpp>
 
 KeyState::KeyState(StateContext& context) :
 BaseState(context),
diff --git a/tests/Engine/Platform/EventHandler/MenuState.cpp b/tests/Engine/Platform/EventHandler/MenuState.cpp
index d1a244369..c967744b4 100644
--- a/tests/Engine/Platform/EventHandler/MenuState.cpp
+++ b/tests/Engine/Platform/EventHandler/MenuState.cpp
@@ -4,7 +4,7 @@
 #include "StateFactory.hpp"
 
 #include <Nazara/Renderer/RenderWindow.hpp>
-#include <NDK/StateMachine.hpp>
+#include <NazaraSDK/StateMachine.hpp>
 
 MenuState::MenuState(StateContext& context) :
 BaseState(context),
diff --git a/tests/Engine/Platform/EventHandler/MouseClickState.cpp b/tests/Engine/Platform/EventHandler/MouseClickState.cpp
index 74cb8ef79..53ae46496 100644
--- a/tests/Engine/Platform/EventHandler/MouseClickState.cpp
+++ b/tests/Engine/Platform/EventHandler/MouseClickState.cpp
@@ -4,7 +4,7 @@
 #include "StateFactory.hpp"
 
 #include <Nazara/Renderer/RenderWindow.hpp>
-#include <NDK/StateMachine.hpp>
+#include <NazaraSDK/StateMachine.hpp>
 
 MouseClickState::MouseClickState(StateContext& context) :
 BaseState(context)
diff --git a/tests/Engine/Platform/EventHandler/MouseEnterState.cpp b/tests/Engine/Platform/EventHandler/MouseEnterState.cpp
index 1eb2ca9e2..fa3ddf51b 100644
--- a/tests/Engine/Platform/EventHandler/MouseEnterState.cpp
+++ b/tests/Engine/Platform/EventHandler/MouseEnterState.cpp
@@ -4,7 +4,7 @@
 #include "StateFactory.hpp"
 
 #include <Nazara/Renderer/RenderWindow.hpp>
-#include <NDK/StateMachine.hpp>
+#include <NazaraSDK/StateMachine.hpp>
 
 MouseEnterState::MouseEnterState(StateContext& context) :
 BaseState(context)
diff --git a/tests/Engine/Platform/EventHandler/MouseMoveState.cpp b/tests/Engine/Platform/EventHandler/MouseMoveState.cpp
index f0fcb3659..9ff4e2ac4 100644
--- a/tests/Engine/Platform/EventHandler/MouseMoveState.cpp
+++ b/tests/Engine/Platform/EventHandler/MouseMoveState.cpp
@@ -4,7 +4,7 @@
 #include "StateFactory.hpp"
 
 #include <Nazara/Renderer/RenderWindow.hpp>
-#include <NDK/StateMachine.hpp>
+#include <NazaraSDK/StateMachine.hpp>
 
 MouseMoveState::MouseMoveState(StateContext& context) :
 BaseState(context)
diff --git a/tests/Engine/Platform/EventHandler/StateFactory.hpp b/tests/Engine/Platform/EventHandler/StateFactory.hpp
index a17965d9d..596934fbb 100644
--- a/tests/Engine/Platform/EventHandler/StateFactory.hpp
+++ b/tests/Engine/Platform/EventHandler/StateFactory.hpp
@@ -1,7 +1,7 @@
 #ifndef __STATEFACTORY_HPP__
 #define __STATEFACTORY_HPP__
 
-#include <NDK/State.hpp>
+#include <NazaraSDK/State.hpp>
 
 #include <map>
 #include <memory>
diff --git a/tests/Engine/Platform/EventHandler/Text.cpp b/tests/Engine/Platform/EventHandler/Text.cpp
index 98637b276..5aef2ceac 100644
--- a/tests/Engine/Platform/EventHandler/Text.cpp
+++ b/tests/Engine/Platform/EventHandler/Text.cpp
@@ -2,10 +2,10 @@
 
 #include <Nazara/Renderer/RenderWindow.hpp>
 #include <Nazara/Utility/SimpleTextDrawer.hpp>
-#include <NDK/StateMachine.hpp>
-#include <NDK/World.hpp>
-#include <NDK/Components/GraphicsComponent.hpp>
-#include <NDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/StateMachine.hpp>
+#include <NazaraSDK/World.hpp>
+#include <NazaraSDK/Components/GraphicsComponent.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
 
 Text::Text(StateContext& stateContext) :
 m_context(stateContext)
diff --git a/tests/Engine/Platform/EventHandler/Text.hpp b/tests/Engine/Platform/EventHandler/Text.hpp
index a804b4baa..7997759aa 100644
--- a/tests/Engine/Platform/EventHandler/Text.hpp
+++ b/tests/Engine/Platform/EventHandler/Text.hpp
@@ -2,7 +2,7 @@
 #define __TEXT_HPP__
 
 #include <Nazara/Graphics/TextSprite.hpp>
-#include <NDK/Entity.hpp>
+#include <NazaraSDK/Entity.hpp>
 #include "StateContext.hpp"
 
 class Text
diff --git a/tests/Engine/Platform/EventHandler/TextEnterState.cpp b/tests/Engine/Platform/EventHandler/TextEnterState.cpp
index 2aa58da69..22a1b34b9 100644
--- a/tests/Engine/Platform/EventHandler/TextEnterState.cpp
+++ b/tests/Engine/Platform/EventHandler/TextEnterState.cpp
@@ -4,7 +4,7 @@
 #include "StateFactory.hpp"
 
 #include <Nazara/Renderer/RenderWindow.hpp>
-#include <NDK/StateMachine.hpp>
+#include <NazaraSDK/StateMachine.hpp>
 
 TextEnterState::TextEnterState(StateContext& context) :
 BaseState(context)
diff --git a/tests/Engine/Platform/EventHandler/WindowModificationState.cpp b/tests/Engine/Platform/EventHandler/WindowModificationState.cpp
index 027185fe6..0ea87c4af 100644
--- a/tests/Engine/Platform/EventHandler/WindowModificationState.cpp
+++ b/tests/Engine/Platform/EventHandler/WindowModificationState.cpp
@@ -4,7 +4,7 @@
 #include "StateFactory.hpp"
 
 #include <Nazara/Renderer/RenderWindow.hpp>
-#include <NDK/StateMachine.hpp>
+#include <NazaraSDK/StateMachine.hpp>
 
 WindowModificationState::WindowModificationState(StateContext& context) :
 BaseState(context)
diff --git a/tests/SDK/NDK/Application.cpp b/tests/SDK/NDK/Application.cpp
index 3eab5645e..a7f471255 100644
--- a/tests/SDK/NDK/Application.cpp
+++ b/tests/SDK/NDK/Application.cpp
@@ -1,4 +1,4 @@
-#include <NDK/Application.hpp>
+#include <NazaraSDK/Application.hpp>
 #include <Catch/catch.hpp>
 
 SCENARIO("Application", "[NDK][APPLICATION]")
diff --git a/tests/SDK/NDK/BaseSystem.cpp b/tests/SDK/NDK/BaseSystem.cpp
index 84649df22..bf86a9011 100644
--- a/tests/SDK/NDK/BaseSystem.cpp
+++ b/tests/SDK/NDK/BaseSystem.cpp
@@ -1,7 +1,7 @@
-#include <NDK/System.hpp>
-#include <NDK/Components/NodeComponent.hpp>
-#include <NDK/Components/VelocityComponent.hpp>
-#include <NDK/World.hpp>
+#include <NazaraSDK/System.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Components/VelocityComponent.hpp>
+#include <NazaraSDK/World.hpp>
 #include <Catch/catch.hpp>
 
 namespace
diff --git a/tests/SDK/NDK/Component.cpp b/tests/SDK/NDK/Component.cpp
index c41f541be..74244fda5 100644
--- a/tests/SDK/NDK/Component.cpp
+++ b/tests/SDK/NDK/Component.cpp
@@ -1,4 +1,4 @@
-#include <NDK/Component.hpp>
+#include <NazaraSDK/Component.hpp>
 #include <Catch/catch.hpp>
 
 namespace
diff --git a/tests/SDK/NDK/Entity.cpp b/tests/SDK/NDK/Entity.cpp
index 7d59cfc20..e17b9114d 100644
--- a/tests/SDK/NDK/Entity.cpp
+++ b/tests/SDK/NDK/Entity.cpp
@@ -1,5 +1,5 @@
-#include <NDK/World.hpp>
-#include <NDK/Component.hpp>
+#include <NazaraSDK/World.hpp>
+#include <NazaraSDK/Component.hpp>
 #include <Catch/catch.hpp>
 
 namespace
diff --git a/tests/SDK/NDK/EntityList.cpp b/tests/SDK/NDK/EntityList.cpp
index 0642b50b7..6b9c85ddf 100644
--- a/tests/SDK/NDK/EntityList.cpp
+++ b/tests/SDK/NDK/EntityList.cpp
@@ -1,5 +1,5 @@
-#include <NDK/EntityList.hpp>
-#include <NDK/World.hpp>
+#include <NazaraSDK/EntityList.hpp>
+#include <NazaraSDK/World.hpp>
 #include <Catch/catch.hpp>
 
 SCENARIO("EntityList", "[NDK][ENTITYLIST]")
diff --git a/tests/SDK/NDK/EntityOwner.cpp b/tests/SDK/NDK/EntityOwner.cpp
index b7ce87e15..1cb6f768c 100644
--- a/tests/SDK/NDK/EntityOwner.cpp
+++ b/tests/SDK/NDK/EntityOwner.cpp
@@ -1,5 +1,5 @@
-#include <NDK/EntityOwner.hpp>
-#include <NDK/World.hpp>
+#include <NazaraSDK/EntityOwner.hpp>
+#include <NazaraSDK/World.hpp>
 #include <Catch/catch.hpp>
 
 SCENARIO("EntityOwner", "[NDK][ENTITYOWNER]")
diff --git a/tests/SDK/NDK/StateMachine.cpp b/tests/SDK/NDK/StateMachine.cpp
index 15502c5cf..29a781e2c 100644
--- a/tests/SDK/NDK/StateMachine.cpp
+++ b/tests/SDK/NDK/StateMachine.cpp
@@ -1,4 +1,4 @@
-#include <NDK/StateMachine.hpp>
+#include <NazaraSDK/StateMachine.hpp>
 #include <Catch/catch.hpp>
 
 class TestState : public Ndk::State
diff --git a/tests/SDK/NDK/System.cpp b/tests/SDK/NDK/System.cpp
index 5f6d74284..a6ef4e590 100644
--- a/tests/SDK/NDK/System.cpp
+++ b/tests/SDK/NDK/System.cpp
@@ -1,4 +1,4 @@
-#include <NDK/System.hpp>
+#include <NazaraSDK/System.hpp>
 #include <Catch/catch.hpp>
 
 namespace
diff --git a/tests/SDK/NDK/Systems/ListenerSystem.cpp b/tests/SDK/NDK/Systems/ListenerSystem.cpp
index b83b24cd1..85a8f8fb1 100644
--- a/tests/SDK/NDK/Systems/ListenerSystem.cpp
+++ b/tests/SDK/NDK/Systems/ListenerSystem.cpp
@@ -1,8 +1,8 @@
-#include <NDK/Systems/ListenerSystem.hpp>
-#include <NDK/World.hpp>
-#include <NDK/Components/ListenerComponent.hpp>
-#include <NDK/Components/NodeComponent.hpp>
-#include <NDK/Components/VelocityComponent.hpp>
+#include <NazaraSDK/Systems/ListenerSystem.hpp>
+#include <NazaraSDK/World.hpp>
+#include <NazaraSDK/Components/ListenerComponent.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Components/VelocityComponent.hpp>
 #include <Nazara/Audio/Audio.hpp>
 #include <Catch/catch.hpp>
 
diff --git a/tests/SDK/NDK/Systems/PhysicsSystem2D.cpp b/tests/SDK/NDK/Systems/PhysicsSystem2D.cpp
index 770f1e190..2081da617 100644
--- a/tests/SDK/NDK/Systems/PhysicsSystem2D.cpp
+++ b/tests/SDK/NDK/Systems/PhysicsSystem2D.cpp
@@ -1,8 +1,8 @@
-#include <NDK/Systems/PhysicsSystem2D.hpp>
-#include <NDK/World.hpp>
-#include <NDK/Components/CollisionComponent2D.hpp>
-#include <NDK/Components/NodeComponent.hpp>
-#include <NDK/Components/PhysicsComponent2D.hpp>
+#include <NazaraSDK/Systems/PhysicsSystem2D.hpp>
+#include <NazaraSDK/World.hpp>
+#include <NazaraSDK/Components/CollisionComponent2D.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Components/PhysicsComponent2D.hpp>
 #include <Catch/catch.hpp>
 #include <limits>
 
diff --git a/tests/SDK/NDK/Systems/PhysicsSystem3D.cpp b/tests/SDK/NDK/Systems/PhysicsSystem3D.cpp
index b66aa89b7..7dc66673c 100644
--- a/tests/SDK/NDK/Systems/PhysicsSystem3D.cpp
+++ b/tests/SDK/NDK/Systems/PhysicsSystem3D.cpp
@@ -1,8 +1,8 @@
-#include <NDK/Systems/PhysicsSystem3D.hpp>
-#include <NDK/World.hpp>
-#include <NDK/Components/CollisionComponent3D.hpp>
-#include <NDK/Components/NodeComponent.hpp>
-#include <NDK/Components/PhysicsComponent3D.hpp>
+#include <NazaraSDK/Systems/PhysicsSystem3D.hpp>
+#include <NazaraSDK/World.hpp>
+#include <NazaraSDK/Components/CollisionComponent3D.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Components/PhysicsComponent3D.hpp>
 #include <Catch/catch.hpp>
 
 SCENARIO("PhysicsSystem3D", "[NDK][PHYSICSSYSTEM3D]")
diff --git a/tests/SDK/NDK/Systems/RenderSystem.cpp b/tests/SDK/NDK/Systems/RenderSystem.cpp
index e30fa3a03..110b98299 100644
--- a/tests/SDK/NDK/Systems/RenderSystem.cpp
+++ b/tests/SDK/NDK/Systems/RenderSystem.cpp
@@ -1,7 +1,7 @@
-#include <NDK/Systems/RenderSystem.hpp>
-#include <NDK/World.hpp>
-#include <NDK/Components.hpp>
-#include <NDK/Systems/PhysicsSystem2D.hpp>
+#include <NazaraSDK/Systems/RenderSystem.hpp>
+#include <NazaraSDK/World.hpp>
+#include <NazaraSDK/Components.hpp>
+#include <NazaraSDK/Systems/PhysicsSystem2D.hpp>
 #include <Nazara/Graphics/ForwardRenderTechnique.hpp>
 #include <Nazara/Graphics/Sprite.hpp>
 #include <Catch/catch.hpp>
diff --git a/tests/SDK/NDK/Systems/VelocitySystem.cpp b/tests/SDK/NDK/Systems/VelocitySystem.cpp
index aff645106..de77de28d 100644
--- a/tests/SDK/NDK/Systems/VelocitySystem.cpp
+++ b/tests/SDK/NDK/Systems/VelocitySystem.cpp
@@ -1,7 +1,7 @@
-#include <NDK/Systems/VelocitySystem.hpp>
-#include <NDK/World.hpp>
-#include <NDK/Components/NodeComponent.hpp>
-#include <NDK/Components/VelocityComponent.hpp>
+#include <NazaraSDK/Systems/VelocitySystem.hpp>
+#include <NazaraSDK/World.hpp>
+#include <NazaraSDK/Components/NodeComponent.hpp>
+#include <NazaraSDK/Components/VelocityComponent.hpp>
 #include <Catch/catch.hpp>
 
 SCENARIO("VelocitySystem", "[NDK][VELOCITYSYSTEM]")
diff --git a/tests/SDK/NDK/World.cpp b/tests/SDK/NDK/World.cpp
index f98a7e2e1..56cb49d92 100644
--- a/tests/SDK/NDK/World.cpp
+++ b/tests/SDK/NDK/World.cpp
@@ -1,5 +1,5 @@
-#include <NDK/World.hpp>
-#include <NDK/Component.hpp>
+#include <NazaraSDK/World.hpp>
+#include <NazaraSDK/Component.hpp>
 #include <Catch/catch.hpp>
 
 namespace
diff --git a/tests/main.cpp b/tests/main.cpp
index 34bb79e5f..0e4581f17 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -1,7 +1,7 @@
 #define CATCH_CONFIG_RUNNER
 #include <Catch/catch.hpp>
 
-#include <NDK/Application.hpp>
+#include <NazaraSDK/Application.hpp>
 #include <Nazara/Core/AbstractLogger.hpp>
 #include <Nazara/Core/Initializer.hpp>
 #include <Nazara/Core/Log.hpp>