diff --git a/include/Nazara/Audio/Audio.hpp b/include/Nazara/Audio/Audio.hpp
index cd5fcdff0..5ed861d74 100644
--- a/include/Nazara/Audio/Audio.hpp
+++ b/include/Nazara/Audio/Audio.hpp
@@ -16,9 +16,9 @@
 
 namespace Nz
 {
-	class NAZARA_AUDIO_API Audio : public Module<Audio>
+	class NAZARA_AUDIO_API Audio : public ModuleBase<Audio>
 	{
-		friend Module;
+		friend ModuleBase;
 
 		using Dependencies = TypeList<Core>;
 
diff --git a/include/Nazara/Core/Core.hpp b/include/Nazara/Core/Core.hpp
index f0dec3fe7..e30dad53d 100644
--- a/include/Nazara/Core/Core.hpp
+++ b/include/Nazara/Core/Core.hpp
@@ -8,14 +8,14 @@
 #define NAZARA_CORE_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Core/Module.hpp>
+#include <Nazara/Core/ModuleBase.hpp>
 #include <Nazara/Core/TypeList.hpp>
 
 namespace Nz
 {
-	class NAZARA_CORE_API Core : public Module<Core>
+	class NAZARA_CORE_API Core : public ModuleBase<Core>
 	{
-		friend Module;
+		friend ModuleBase;
 
 		public:
 			using Dependencies = TypeList<>;
diff --git a/include/Nazara/Core/Module.hpp b/include/Nazara/Core/ModuleBase.hpp
similarity index 74%
rename from include/Nazara/Core/Module.hpp
rename to include/Nazara/Core/ModuleBase.hpp
index 01803c698..8d484f209 100644
--- a/include/Nazara/Core/Module.hpp
+++ b/include/Nazara/Core/ModuleBase.hpp
@@ -13,7 +13,7 @@
 namespace Nz
 {
 	template<typename T>
-	class Module
+	class ModuleBase
 	{
 		friend class Core;
 
@@ -21,13 +21,13 @@ namespace Nz
 			static T* Instance();
 
 		protected:
-			Module(std::string moduleName, T* pointer);
-			~Module();
+			ModuleBase(std::string moduleName, T* pointer);
+			~ModuleBase();
 
 		private:
 			struct NoLog {};
 
-			Module(std::string moduleName, T* pointer, NoLog);
+			ModuleBase(std::string moduleName, T* pointer, NoLog);
 
 			void LogInit();
 
@@ -35,6 +35,6 @@ namespace Nz
 	};
 }
 
-#include <Nazara/Core/Module.inl>
+#include <Nazara/Core/ModuleBase.inl>
 
 #endif // NAZARA_MODULE_HPP
diff --git a/include/Nazara/Core/Module.inl b/include/Nazara/Core/ModuleBase.inl
similarity index 71%
rename from include/Nazara/Core/Module.inl
rename to include/Nazara/Core/ModuleBase.inl
index e452a7476..0ec21b215 100644
--- a/include/Nazara/Core/Module.inl
+++ b/include/Nazara/Core/ModuleBase.inl
@@ -2,21 +2,21 @@
 // This file is part of the "Nazara Engine - Core module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Core/Module.hpp>
+#include <Nazara/Core/ModuleBase.hpp>
 #include <Nazara/Core/Log.hpp>
 #include <Nazara/Core/Debug.hpp>
 
 namespace Nz
 {
 	template<typename T>
-	Module<T>::Module(std::string moduleName, T* pointer) :
-	Module(std::move(moduleName), pointer, NoLog{})
+	ModuleBase<T>::ModuleBase(std::string moduleName, T* pointer) :
+	ModuleBase(std::move(moduleName), pointer, NoLog{})
 	{
 		LogInit();
 	}
 
 	template<typename T>
-	Module<T>::Module(std::string moduleName, T* pointer, NoLog) :
+	ModuleBase<T>::ModuleBase(std::string moduleName, T* pointer, NoLog) :
 	m_moduleName(std::move(moduleName))
 	{
 		NazaraAssert(T::s_instance == nullptr, "only one instance of " + m_moduleName + " must exist at a given time");
@@ -24,20 +24,20 @@ namespace Nz
 	}
 
 	template<typename T>
-	Module<T>::~Module()
+	ModuleBase<T>::~ModuleBase()
 	{
 		NazaraNotice("Uninitializing " + m_moduleName + "...");
 		T::s_instance = nullptr;
 	}
 
 	template<typename T>
-	T* Module<T>::Instance()
+	T* ModuleBase<T>::Instance()
 	{
 		return T::s_instance;
 	}
 
 	template<typename T>
-	void Module<T>::LogInit()
+	void ModuleBase<T>::LogInit()
 	{
 		NazaraNotice("Initializing " + m_moduleName + "...");
 	}
diff --git a/include/Nazara/Network/Network.hpp b/include/Nazara/Network/Network.hpp
index 5f590c46a..edaf344b5 100644
--- a/include/Nazara/Network/Network.hpp
+++ b/include/Nazara/Network/Network.hpp
@@ -13,9 +13,9 @@
 
 namespace Nz
 {
-	class NAZARA_NETWORK_API Network : public Module<Network>
+	class NAZARA_NETWORK_API Network : public ModuleBase<Network>
 	{
-		friend Module;
+		friend ModuleBase;
 
 		public:
 			using Dependencies = TypeList<Core>;
diff --git a/include/Nazara/Physics2D/Physics2D.hpp b/include/Nazara/Physics2D/Physics2D.hpp
index de379ee25..cc8e3471d 100644
--- a/include/Nazara/Physics2D/Physics2D.hpp
+++ b/include/Nazara/Physics2D/Physics2D.hpp
@@ -13,9 +13,9 @@
 
 namespace Nz
 {
-	class NAZARA_PHYSICS2D_API Physics2D : public Module<Physics2D>
+	class NAZARA_PHYSICS2D_API Physics2D : public ModuleBase<Physics2D>
 	{
-		friend Module;
+		friend ModuleBase;
 
 		public:
 			using Dependencies = TypeList<Core>;
diff --git a/include/Nazara/Physics3D/Physics3D.hpp b/include/Nazara/Physics3D/Physics3D.hpp
index 3c750b2e4..9dd119a82 100644
--- a/include/Nazara/Physics3D/Physics3D.hpp
+++ b/include/Nazara/Physics3D/Physics3D.hpp
@@ -13,9 +13,9 @@
 
 namespace Nz
 {
-	class NAZARA_PHYSICS3D_API Physics3D : public Module<Physics3D>
+	class NAZARA_PHYSICS3D_API Physics3D : public ModuleBase<Physics3D>
 	{
-		friend Module;
+		friend ModuleBase;
 
 		public:
 			using Dependencies = TypeList<Core>;
diff --git a/include/Nazara/Platform/Platform.hpp b/include/Nazara/Platform/Platform.hpp
index f99dbd755..46bac08c5 100644
--- a/include/Nazara/Platform/Platform.hpp
+++ b/include/Nazara/Platform/Platform.hpp
@@ -13,9 +13,9 @@
 
 namespace Nz
 {
-	class NAZARA_PLATFORM_API Platform : public Module<Platform>
+	class NAZARA_PLATFORM_API Platform : public ModuleBase<Platform>
 	{
-		friend Module;
+		friend ModuleBase;
 
 		public:
 			using Dependencies = TypeList<Utility>;
diff --git a/include/Nazara/Renderer/Renderer.hpp b/include/Nazara/Renderer/Renderer.hpp
index 268bd7f03..fe6a2c202 100644
--- a/include/Nazara/Renderer/Renderer.hpp
+++ b/include/Nazara/Renderer/Renderer.hpp
@@ -18,9 +18,9 @@ namespace Nz
 	class AbstractBuffer;
 	class Buffer;
 
-	class NAZARA_RENDERER_API Renderer : public Module<Renderer>
+	class NAZARA_RENDERER_API Renderer : public ModuleBase<Renderer>
 	{
-		friend Module;
+		friend ModuleBase;
 
 		public:
 			using Dependencies = TypeList<Platform>;
diff --git a/include/Nazara/Shader/Shader.hpp b/include/Nazara/Shader/Shader.hpp
index 5380a5f7a..4d465552a 100644
--- a/include/Nazara/Shader/Shader.hpp
+++ b/include/Nazara/Shader/Shader.hpp
@@ -13,9 +13,9 @@
 
 namespace Nz
 {
-	class NAZARA_SHADER_API Shader : public Module<Shader>
+	class NAZARA_SHADER_API Shader : public ModuleBase<Shader>
 	{
-		friend Module;
+		friend ModuleBase;
 
 		public:
 			using Dependencies = TypeList<Core>;
diff --git a/include/Nazara/Utility/Utility.hpp b/include/Nazara/Utility/Utility.hpp
index 5bb413cfa..a5eb94a95 100644
--- a/include/Nazara/Utility/Utility.hpp
+++ b/include/Nazara/Utility/Utility.hpp
@@ -13,9 +13,9 @@
 
 namespace Nz
 {
-	class NAZARA_UTILITY_API Utility : public Module<Utility>
+	class NAZARA_UTILITY_API Utility : public ModuleBase<Utility>
 	{
-		friend Module;
+		friend ModuleBase;
 
 		public:
 			using Dependencies = TypeList<Core>;
diff --git a/src/Nazara/Audio/Audio.cpp b/src/Nazara/Audio/Audio.cpp
index f4450aa40..e5d0f9091 100644
--- a/src/Nazara/Audio/Audio.cpp
+++ b/src/Nazara/Audio/Audio.cpp
@@ -24,7 +24,7 @@ namespace Nz
 	*/
 
 	Audio::Audio() :
-	Module("Audio", this)
+	ModuleBase("Audio", this)
 	{
 		// Initialisation of OpenAL
 		if (!OpenAL::Initialize())
diff --git a/src/Nazara/Core/Core.cpp b/src/Nazara/Core/Core.cpp
index 6782f33ee..d6604c0c4 100644
--- a/src/Nazara/Core/Core.cpp
+++ b/src/Nazara/Core/Core.cpp
@@ -20,7 +20,7 @@ namespace Nz
 	*/
 
 	Core::Core() :
-	Module("Core", this, Module::NoLog{})
+	ModuleBase("Core", this, ModuleBase::NoLog{})
 	{
 		Log::Initialize();
 
diff --git a/src/Nazara/Network/Network.cpp b/src/Nazara/Network/Network.cpp
index 27b644de7..d555fa9d0 100644
--- a/src/Nazara/Network/Network.cpp
+++ b/src/Nazara/Network/Network.cpp
@@ -32,7 +32,7 @@ namespace Nz
 	*/
 
 	Network::Network() :
-	Module("Network", this)
+	ModuleBase("Network", this)
 	{
 		// Initialize module here
 		if (!SocketImpl::Initialize())
diff --git a/src/Nazara/Physics2D/Physics2D.cpp b/src/Nazara/Physics2D/Physics2D.cpp
index 84fb69f49..398c03b91 100644
--- a/src/Nazara/Physics2D/Physics2D.cpp
+++ b/src/Nazara/Physics2D/Physics2D.cpp
@@ -8,7 +8,7 @@
 namespace Nz
 {
 	Physics2D::Physics2D() :
-	Module("Physics2D", this)
+	ModuleBase("Physics2D", this)
 	{
 	}
 
diff --git a/src/Nazara/Physics3D/Physics3D.cpp b/src/Nazara/Physics3D/Physics3D.cpp
index 726c07613..b9e8df451 100644
--- a/src/Nazara/Physics3D/Physics3D.cpp
+++ b/src/Nazara/Physics3D/Physics3D.cpp
@@ -14,7 +14,7 @@
 namespace Nz
 {
 	Physics3D::Physics3D() :
-	Module("Physics3D", this)
+	ModuleBase("Physics3D", this)
 	{
 		if (!Collider3D::Initialize())
 			throw std::runtime_error("failed to initialize colliders");
diff --git a/src/Nazara/Platform/Platform.cpp b/src/Nazara/Platform/Platform.cpp
index 0e30ff99b..fcd9f2d61 100644
--- a/src/Nazara/Platform/Platform.cpp
+++ b/src/Nazara/Platform/Platform.cpp
@@ -18,7 +18,7 @@ namespace Nz
 	*/
 
 	Platform::Platform() :
-	Module("Platform", this)
+	ModuleBase("Platform", this)
 	{
 		if (!Window::Initialize())
 			throw std::runtime_error("failed to initialize window system");
diff --git a/src/Nazara/Renderer/Renderer.cpp b/src/Nazara/Renderer/Renderer.cpp
index 9cceef12f..91e3ff853 100644
--- a/src/Nazara/Renderer/Renderer.cpp
+++ b/src/Nazara/Renderer/Renderer.cpp
@@ -31,7 +31,7 @@
 namespace Nz
 {
 	Renderer::Renderer() :
-	Module("Renderer", this)
+	ModuleBase("Renderer", this)
 	{
 		struct RendererImplementations
 		{
diff --git a/src/Nazara/Shader/Shader.cpp b/src/Nazara/Shader/Shader.cpp
index ca5d1d095..76c9653aa 100644
--- a/src/Nazara/Shader/Shader.cpp
+++ b/src/Nazara/Shader/Shader.cpp
@@ -8,7 +8,7 @@
 namespace Nz
 {
 	Shader::Shader() :
-	Module("Shader", this)
+	ModuleBase("Shader", this)
 	{
 	}
 
diff --git a/src/Nazara/Utility/Utility.cpp b/src/Nazara/Utility/Utility.cpp
index 905cf45ac..e83778c60 100644
--- a/src/Nazara/Utility/Utility.cpp
+++ b/src/Nazara/Utility/Utility.cpp
@@ -37,7 +37,7 @@ namespace Nz
 	*/
 
 	Utility::Utility() :
-	Module("Utility", this)
+	ModuleBase("Utility", this)
 	{
 		if (!Animation::Initialize())
 			throw std::runtime_error("failed to initialize animations");