diff --git a/SDK/include/NDK/Components/CollisionComponent.hpp b/SDK/include/NDK/Components/CollisionComponent.hpp
index e0af0d09b..fa42b88f7 100644
--- a/SDK/include/NDK/Components/CollisionComponent.hpp
+++ b/SDK/include/NDK/Components/CollisionComponent.hpp
@@ -7,7 +7,7 @@
 #ifndef NDK_COMPONENTS_COLLISIONCOMPONENT_HPP
 #define NDK_COMPONENTS_COLLISIONCOMPONENT_HPP
 
-#include <Nazara/Physics/Geom.hpp>
+#include <Nazara/Physics3D/Geom.hpp>
 #include <NDK/Component.hpp>
 #include <memory>
 
diff --git a/SDK/include/NDK/Components/PhysicsComponent.hpp b/SDK/include/NDK/Components/PhysicsComponent.hpp
index 9c5618785..97d2c62f6 100644
--- a/SDK/include/NDK/Components/PhysicsComponent.hpp
+++ b/SDK/include/NDK/Components/PhysicsComponent.hpp
@@ -7,7 +7,7 @@
 #ifndef NDK_COMPONENTS_PHYSICSCOMPONENT_HPP
 #define NDK_COMPONENTS_PHYSICSCOMPONENT_HPP
 
-#include <Nazara/Physics/PhysObject.hpp>
+#include <Nazara/Physics3D/PhysObject.hpp>
 #include <NDK/Component.hpp>
 #include <memory>
 
diff --git a/SDK/include/NDK/Systems/PhysicsSystem.hpp b/SDK/include/NDK/Systems/PhysicsSystem.hpp
index 5c24c2b8a..3eb4f8f2e 100644
--- a/SDK/include/NDK/Systems/PhysicsSystem.hpp
+++ b/SDK/include/NDK/Systems/PhysicsSystem.hpp
@@ -7,7 +7,7 @@
 #ifndef NDK_SYSTEMS_PHYSICSSYSTEM_HPP
 #define NDK_SYSTEMS_PHYSICSSYSTEM_HPP
 
-#include <Nazara/Physics/PhysWorld.hpp>
+#include <Nazara/Physics3D/PhysWorld.hpp>
 #include <NDK/EntityList.hpp>
 #include <NDK/System.hpp>
 #include <memory>
diff --git a/SDK/src/NDK/Components/CollisionComponent.cpp b/SDK/src/NDK/Components/CollisionComponent.cpp
index 0f812e73b..7e8f9481a 100644
--- a/SDK/src/NDK/Components/CollisionComponent.cpp
+++ b/SDK/src/NDK/Components/CollisionComponent.cpp
@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Prerequesites.hpp
 
 #include <NDK/Components/CollisionComponent.hpp>
-#include <Nazara/Physics/PhysObject.hpp>
+#include <Nazara/Physics3D/PhysObject.hpp>
 #include <NDK/Algorithm.hpp>
 #include <NDK/World.hpp>
 #include <NDK/Components/PhysicsComponent.hpp>
diff --git a/SDK/src/NDK/Components/PhysicsComponent.cpp b/SDK/src/NDK/Components/PhysicsComponent.cpp
index 6cfd1077d..91be73792 100644
--- a/SDK/src/NDK/Components/PhysicsComponent.cpp
+++ b/SDK/src/NDK/Components/PhysicsComponent.cpp
@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Prerequesites.hpp
 
 #include <NDK/Components/PhysicsComponent.hpp>
-#include <Nazara/Physics/PhysObject.hpp>
+#include <Nazara/Physics3D/PhysObject.hpp>
 #include <NDK/Algorithm.hpp>
 #include <NDK/World.hpp>
 #include <NDK/Components/CollisionComponent.hpp>
diff --git a/SDK/src/NDK/Sdk.cpp b/SDK/src/NDK/Sdk.cpp
index 326eec502..bf6c9abbb 100644
--- a/SDK/src/NDK/Sdk.cpp
+++ b/SDK/src/NDK/Sdk.cpp
@@ -9,7 +9,7 @@
 #include <Nazara/Graphics/Graphics.hpp>
 #include <Nazara/Lua/Lua.hpp>
 #include <Nazara/Noise/Noise.hpp>
-#include <Nazara/Physics/Physics.hpp>
+#include <Nazara/Physics3D/Physics.hpp>
 #include <Nazara/Utility/Utility.hpp>
 #include <NDK/Algorithm.hpp>
 #include <NDK/BaseSystem.hpp>
diff --git a/SDK/src/NDK/Systems/PhysicsSystem.cpp b/SDK/src/NDK/Systems/PhysicsSystem.cpp
index 793b0f1dc..f6621261a 100644
--- a/SDK/src/NDK/Systems/PhysicsSystem.cpp
+++ b/SDK/src/NDK/Systems/PhysicsSystem.cpp
@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Prerequesites.hpp
 
 #include <NDK/Systems/PhysicsSystem.hpp>
-#include <Nazara/Physics/PhysObject.hpp>
+#include <Nazara/Physics3D/PhysObject.hpp>
 #include <NDK/Components/CollisionComponent.hpp>
 #include <NDK/Components/NodeComponent.hpp>
 #include <NDK/Components/PhysicsComponent.hpp>
diff --git a/include/Nazara/Physics3D/Config.hpp b/include/Nazara/Physics3D/Config.hpp
index b57e39378..23669240a 100644
--- a/include/Nazara/Physics3D/Config.hpp
+++ b/include/Nazara/Physics3D/Config.hpp
@@ -24,28 +24,28 @@
 
 #pragma once
 
-#ifndef NAZARA_CONFIG_PHYSICS_HPP
-#define NAZARA_CONFIG_PHYSICS_HPP
+#ifndef NAZARA_CONFIG_PHYSICS3D_HPP
+#define NAZARA_CONFIG_PHYSICS3D_HPP
 
 /// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci
 
 // Utilise un manager de mémoire pour gérer les allocations dynamiques (détecte les leaks au prix d'allocations/libérations dynamiques plus lentes)
-#define NAZARA_PHYSICS_MANAGE_MEMORY 0
+#define NAZARA_PHYSICS3D_MANAGE_MEMORY 0
 
 // Active les tests de sécurité basés sur le code (Conseillé pour le développement)
-#define NAZARA_PHYSICS_SAFE 1
+#define NAZARA_PHYSICS3D_SAFE 1
 
 /// Vérification des valeurs et types de certaines constantes
-#include <Nazara/Physics/ConfigCheck.hpp>
+#include <Nazara/Physics3D/ConfigCheck.hpp>
 
 #if defined(NAZARA_STATIC)
-	#define NAZARA_PHYSICS_API
+	#define NAZARA_PHYSICS3D_API
 #else
 	#ifdef NAZARA_PHYSICS_BUILD
-		#define NAZARA_PHYSICS_API NAZARA_EXPORT
+		#define NAZARA_PHYSICS3D_API NAZARA_EXPORT
 	#else
-		#define NAZARA_PHYSICS_API NAZARA_IMPORT
+		#define NAZARA_PHYSICS3D_API NAZARA_IMPORT
 	#endif
 #endif
 
-#endif // NAZARA_CONFIG_PHYSICS_HPP
+#endif // NAZARA_CONFIG_PHYSICS3D_HPP
diff --git a/include/Nazara/Physics3D/ConfigCheck.hpp b/include/Nazara/Physics3D/ConfigCheck.hpp
index 5721e2660..937712b0e 100644
--- a/include/Nazara/Physics3D/ConfigCheck.hpp
+++ b/include/Nazara/Physics3D/ConfigCheck.hpp
@@ -12,7 +12,7 @@
 // On force la valeur de MANAGE_MEMORY en mode debug
 #if defined(NAZARA_DEBUG) && !NAZARA_PHYSICS_MANAGE_MEMORY
 	#undef NAZARA_PHYSICS_MANAGE_MEMORY
-	#define NAZARA_PHYSICS_MANAGE_MEMORY 0
+	#define NAZARA_PHYSICS3D_MANAGE_MEMORY 0
 #endif
 
 #endif // NAZARA_CONFIG_CHECK_PHYSICS_HPP
diff --git a/include/Nazara/Physics3D/Debug.hpp b/include/Nazara/Physics3D/Debug.hpp
index 3f3d8fe41..d8b47e454 100644
--- a/include/Nazara/Physics3D/Debug.hpp
+++ b/include/Nazara/Physics3D/Debug.hpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Physics module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Physics/Config.hpp>
+#include <Nazara/Physics3D/Config.hpp>
 #if NAZARA_PHYSICS_MANAGE_MEMORY
 	#include <Nazara/Core/Debug/NewRedefinition.hpp>
 #endif
diff --git a/include/Nazara/Physics3D/Geom.hpp b/include/Nazara/Physics3D/Geom.hpp
index e228c3d07..b15c4ca9b 100644
--- a/include/Nazara/Physics3D/Geom.hpp
+++ b/include/Nazara/Physics3D/Geom.hpp
@@ -16,8 +16,8 @@
 #include <Nazara/Math/Box.hpp>
 #include <Nazara/Math/Quaternion.hpp>
 #include <Nazara/Math/Vector3.hpp>
-#include <Nazara/Physics/Config.hpp>
-#include <Nazara/Physics/Enums.hpp>
+#include <Nazara/Physics3D/Config.hpp>
+#include <Nazara/Physics3D/Enums.hpp>
 #include <unordered_map>
 
 class NewtonCollision;
@@ -37,7 +37,7 @@ namespace Nz
 	using PhysGeomLibrary = ObjectLibrary<PhysGeom>;
 	using PhysGeomRef = ObjectRef<PhysGeom>;
 
-	class NAZARA_PHYSICS_API PhysGeom : public RefCounted
+	class NAZARA_PHYSICS3D_API PhysGeom : public RefCounted
 	{
 		friend PhysGeomLibrary;
 		friend class Physics;
@@ -80,7 +80,7 @@ namespace Nz
 	using BoxGeomConstRef = ObjectRef<const BoxGeom>;
 	using BoxGeomRef = ObjectRef<BoxGeom>;
 
-	class NAZARA_PHYSICS_API BoxGeom : public PhysGeom
+	class NAZARA_PHYSICS3D_API BoxGeom : public PhysGeom
 	{
 		public:
 			BoxGeom(const Vector3f& lengths, const Matrix4f& transformMatrix = Matrix4f::Identity());
@@ -106,7 +106,7 @@ namespace Nz
 	using CapsuleGeomConstRef = ObjectRef<const CapsuleGeom>;
 	using CapsuleGeomRef = ObjectRef<CapsuleGeom>;
 
-	class NAZARA_PHYSICS_API CapsuleGeom : public PhysGeom
+	class NAZARA_PHYSICS3D_API CapsuleGeom : public PhysGeom
 	{
 		public:
 			CapsuleGeom(float length, float radius, const Matrix4f& transformMatrix = Matrix4f::Identity());
@@ -131,7 +131,7 @@ namespace Nz
 	using CompoundGeomConstRef = ObjectRef<const CompoundGeom>;
 	using CompoundGeomRef = ObjectRef<CompoundGeom>;
 
-	class NAZARA_PHYSICS_API CompoundGeom : public PhysGeom
+	class NAZARA_PHYSICS3D_API CompoundGeom : public PhysGeom
 	{
 		public:
 			CompoundGeom(PhysGeom** geoms, std::size_t geomCount);
@@ -152,7 +152,7 @@ namespace Nz
 	using ConeGeomConstRef = ObjectRef<const ConeGeom>;
 	using ConeGeomRef = ObjectRef<ConeGeom>;
 
-	class NAZARA_PHYSICS_API ConeGeom : public PhysGeom
+	class NAZARA_PHYSICS3D_API ConeGeom : public PhysGeom
 	{
 		public:
 			ConeGeom(float length, float radius, const Matrix4f& transformMatrix = Matrix4f::Identity());
@@ -177,7 +177,7 @@ namespace Nz
 	using ConvexHullGeomConstRef = ObjectRef<const ConvexHullGeom>;
 	using ConvexHullGeomRef = ObjectRef<ConvexHullGeom>;
 
-	class NAZARA_PHYSICS_API ConvexHullGeom : public PhysGeom
+	class NAZARA_PHYSICS3D_API ConvexHullGeom : public PhysGeom
 	{
 		public:
 			ConvexHullGeom(const void* vertices, unsigned int vertexCount, unsigned int stride = sizeof(Vector3f), float tolerance = 0.002f, const Matrix4f& transformMatrix = Matrix4f::Identity());
@@ -201,7 +201,7 @@ namespace Nz
 	using CylinderGeomConstRef = ObjectRef<const CylinderGeom>;
 	using CylinderGeomRef = ObjectRef<CylinderGeom>;
 
-	class NAZARA_PHYSICS_API CylinderGeom : public PhysGeom
+	class NAZARA_PHYSICS3D_API CylinderGeom : public PhysGeom
 	{
 		public:
 			CylinderGeom(float length, float radius, const Matrix4f& transformMatrix = Matrix4f::Identity());
@@ -226,7 +226,7 @@ namespace Nz
 	using NullGeomConstRef = ObjectRef<const NullGeom>;
 	using NullGeomRef = ObjectRef<NullGeom>;
 
-	class NAZARA_PHYSICS_API NullGeom : public PhysGeom
+	class NAZARA_PHYSICS3D_API NullGeom : public PhysGeom
 	{
 		public:
 			NullGeom();
@@ -246,7 +246,7 @@ namespace Nz
 	using SphereGeomConstRef = ObjectRef<const SphereGeom>;
 	using SphereGeomRef = ObjectRef<SphereGeom>;
 
-	class NAZARA_PHYSICS_API SphereGeom : public PhysGeom
+	class NAZARA_PHYSICS3D_API SphereGeom : public PhysGeom
 	{
 		public:
 			SphereGeom(float radius, const Matrix4f& transformMatrix = Matrix4f::Identity());
@@ -268,6 +268,6 @@ namespace Nz
 	};
 }
 
-#include <Nazara/Physics/Geom.inl>
+#include <Nazara/Physics3D/Geom.inl>
 
 #endif // NAZARA_PHYSWORLD_HPP
diff --git a/include/Nazara/Physics3D/Geom.inl b/include/Nazara/Physics3D/Geom.inl
index 9699cac96..9caf824aa 100644
--- a/include/Nazara/Physics3D/Geom.inl
+++ b/include/Nazara/Physics3D/Geom.inl
@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <memory>
-#include <Nazara/Physics/Debug.hpp>
+#include <Nazara/Physics3D/Debug.hpp>
 
 namespace Nz
 {
@@ -80,4 +80,4 @@ namespace Nz
 	}
 }
 
-#include <Nazara/Physics/DebugOff.hpp>
+#include <Nazara/Physics3D/DebugOff.hpp>
diff --git a/include/Nazara/Physics3D/PhysObject.hpp b/include/Nazara/Physics3D/PhysObject.hpp
index d4d9c61b7..fac27e940 100644
--- a/include/Nazara/Physics3D/PhysObject.hpp
+++ b/include/Nazara/Physics3D/PhysObject.hpp
@@ -12,8 +12,8 @@
 #include <Nazara/Math/Matrix4.hpp>
 #include <Nazara/Math/Quaternion.hpp>
 #include <Nazara/Math/Vector3.hpp>
-#include <Nazara/Physics/Config.hpp>
-#include <Nazara/Physics/Geom.hpp>
+#include <Nazara/Physics3D/Config.hpp>
+#include <Nazara/Physics3D/Geom.hpp>
 
 class NewtonBody;
 
@@ -21,7 +21,7 @@ namespace Nz
 {
 	class PhysWorld;
 
-	class NAZARA_PHYSICS_API PhysObject
+	class NAZARA_PHYSICS3D_API PhysObject
 	{
 		public:
 			PhysObject(PhysWorld* world, const Matrix4f& mat = Matrix4f::Identity());
diff --git a/include/Nazara/Physics3D/PhysWorld.hpp b/include/Nazara/Physics3D/PhysWorld.hpp
index 0300048b5..1bd072bf2 100644
--- a/include/Nazara/Physics3D/PhysWorld.hpp
+++ b/include/Nazara/Physics3D/PhysWorld.hpp
@@ -10,13 +10,13 @@
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Math/Box.hpp>
 #include <Nazara/Math/Vector3.hpp>
-#include <Nazara/Physics/Config.hpp>
+#include <Nazara/Physics3D/Config.hpp>
 
 class NewtonWorld;
 
 namespace Nz
 {
-	class NAZARA_PHYSICS_API PhysWorld
+	class NAZARA_PHYSICS3D_API PhysWorld
 	{
 		public:
 			PhysWorld();
diff --git a/include/Nazara/Physics3D/Physics.hpp b/include/Nazara/Physics3D/Physics.hpp
index 3bb6ebde3..4efaa5cb4 100644
--- a/include/Nazara/Physics3D/Physics.hpp
+++ b/include/Nazara/Physics3D/Physics.hpp
@@ -9,11 +9,11 @@
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/Initializer.hpp>
-#include <Nazara/Physics/Config.hpp>
+#include <Nazara/Physics3D/Config.hpp>
 
 namespace Nz
 {
-	class NAZARA_PHYSICS_API Physics
+	class NAZARA_PHYSICS3D_API Physics
 	{
 		public:
 			Physics() = delete;
diff --git a/src/Nazara/Physics3D/Debug/NewOverload.cpp b/src/Nazara/Physics3D/Debug/NewOverload.cpp
index b7ca2c243..f6c7b64de 100644
--- a/src/Nazara/Physics3D/Debug/NewOverload.cpp
+++ b/src/Nazara/Physics3D/Debug/NewOverload.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Physics module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Physics/Config.hpp>
+#include <Nazara/Physics3D/Config.hpp>
 #if NAZARA_PHYSICS_MANAGE_MEMORY
 
 #include <Nazara/Core/MemoryManager.hpp>
diff --git a/src/Nazara/Physics3D/Geom.cpp b/src/Nazara/Physics3D/Geom.cpp
index 48d6f0090..452098c63 100644
--- a/src/Nazara/Physics3D/Geom.cpp
+++ b/src/Nazara/Physics3D/Geom.cpp
@@ -2,11 +2,11 @@
 // This file is part of the "Nazara Engine - Physics module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Physics/Geom.hpp>
-#include <Nazara/Physics/PhysWorld.hpp>
+#include <Nazara/Physics3D/Geom.hpp>
+#include <Nazara/Physics3D/PhysWorld.hpp>
 #include <Newton/Newton.h>
 #include <memory>
-#include <Nazara/Physics/Debug.hpp>
+#include <Nazara/Physics3D/Debug.hpp>
 
 namespace Nz
 {
diff --git a/src/Nazara/Physics3D/PhysObject.cpp b/src/Nazara/Physics3D/PhysObject.cpp
index 1ee4a44d5..7fa02789b 100644
--- a/src/Nazara/Physics3D/PhysObject.cpp
+++ b/src/Nazara/Physics3D/PhysObject.cpp
@@ -2,13 +2,13 @@
 // This file is part of the "Nazara Engine - Physics module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Physics/PhysObject.hpp>
+#include <Nazara/Physics3D/PhysObject.hpp>
 #include <Nazara/Math/Algorithm.hpp>
-#include <Nazara/Physics/Config.hpp>
-#include <Nazara/Physics/PhysWorld.hpp>
+#include <Nazara/Physics3D/Config.hpp>
+#include <Nazara/Physics3D/PhysWorld.hpp>
 #include <Newton/Newton.h>
 #include <algorithm>
-#include <Nazara/Physics/Debug.hpp>
+#include <Nazara/Physics3D/Debug.hpp>
 
 namespace Nz
 {
diff --git a/src/Nazara/Physics3D/PhysWorld.cpp b/src/Nazara/Physics3D/PhysWorld.cpp
index a3d76429b..5d2170aad 100644
--- a/src/Nazara/Physics3D/PhysWorld.cpp
+++ b/src/Nazara/Physics3D/PhysWorld.cpp
@@ -2,9 +2,9 @@
 // This file is part of the "Nazara Engine - Physics module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Physics/PhysWorld.hpp>
+#include <Nazara/Physics3D/PhysWorld.hpp>
 #include <Newton/Newton.h>
-#include <Nazara/Physics/Debug.hpp>
+#include <Nazara/Physics3D/Debug.hpp>
 
 namespace Nz
 {
diff --git a/src/Nazara/Physics3D/Physics.cpp b/src/Nazara/Physics3D/Physics.cpp
index 584c334ab..7deef9f10 100644
--- a/src/Nazara/Physics3D/Physics.cpp
+++ b/src/Nazara/Physics3D/Physics.cpp
@@ -2,14 +2,14 @@
 // This file is part of the "Nazara Engine - Physics module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Physics/Physics.hpp>
+#include <Nazara/Physics3D/Physics.hpp>
 #include <Nazara/Core/Core.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/Log.hpp>
-#include <Nazara/Physics/Config.hpp>
-#include <Nazara/Physics/Geom.hpp>
+#include <Nazara/Physics3D/Config.hpp>
+#include <Nazara/Physics3D/Geom.hpp>
 #include <Newton/Newton.h>
-#include <Nazara/Physics/Debug.hpp>
+#include <Nazara/Physics3D/Debug.hpp>
 
 namespace Nz
 {