diff --git a/examples/DeferredShading/main.cpp b/examples/DeferredShading/main.cpp
index ce7e3580a..ca3132d01 100644
--- a/examples/DeferredShading/main.cpp
+++ b/examples/DeferredShading/main.cpp
@@ -89,7 +89,7 @@ int main(int argc, char* argv[])
 	std::shared_ptr<Nz::RenderDevice> device = Nz::Graphics::Instance()->GetRenderDevice();
 	const Nz::RenderDeviceInfo& deviceInfo = device->GetDeviceInfo();
 
-	auto& windowing = app.AddComponent<Nz::AppWindowingComponent>();
+	auto& windowing = app.AddComponent<Nz::WindowingAppComponent>();
 
 	std::string windowTitle = "Graphics Test";
 	Nz::Window& window = windowing.CreateWindow(Nz::VideoMode(1920, 1080), windowTitle);
diff --git a/examples/PhysicallyBasedRendering/main.cpp b/examples/PhysicallyBasedRendering/main.cpp
index 1423f7329..69bc13dc0 100644
--- a/examples/PhysicallyBasedRendering/main.cpp
+++ b/examples/PhysicallyBasedRendering/main.cpp
@@ -17,7 +17,7 @@ int main(int argc, char* argv[])
 
 	std::shared_ptr<Nz::RenderDevice> device = Nz::Graphics::Instance()->GetRenderDevice();
 
-	auto& windowing = app.AddComponent<Nz::AppWindowingComponent>();
+	auto& windowing = app.AddComponent<Nz::WindowingAppComponent>();
 
 	std::string windowTitle = "Physically Based Rendering Test";
 	Nz::Window& window = windowing.CreateWindow(Nz::VideoMode(1920, 1080), windowTitle);
diff --git a/examples/Physics2DDemo/main.cpp b/examples/Physics2DDemo/main.cpp
index b5f622f2d..2183cef0c 100644
--- a/examples/Physics2DDemo/main.cpp
+++ b/examples/Physics2DDemo/main.cpp
@@ -23,9 +23,9 @@ int main(int argc, char* argv[])
 
 	Nz::Application<Nz::Graphics, Nz::ChipmunkPhysics2D> app(argc, argv);
 
-	auto& windowing = app.AddComponent<Nz::AppWindowingComponent>();
+	auto& windowing = app.AddComponent<Nz::WindowingAppComponent>();
 
-	auto& ecs = app.AddComponent<Nz::AppEntitySystemComponent>();
+	auto& ecs = app.AddComponent<Nz::EntitySystemAppComponent>();
 
 	auto& world = ecs.AddWorld<Nz::EnttWorld>();
 	Nz::ChipmunkPhysics2DSystem& physSytem = world.AddSystem<Nz::ChipmunkPhysics2DSystem>();
diff --git a/examples/PhysicsDemo/main.cpp b/examples/PhysicsDemo/main.cpp
index fd1ba87fb..1861be053 100644
--- a/examples/PhysicsDemo/main.cpp
+++ b/examples/PhysicsDemo/main.cpp
@@ -22,9 +22,9 @@ int main(int argc, char* argv[])
 
 	Nz::Application<Nz::Graphics, Nz::BulletPhysics3D> app(argc, argv);
 
-	auto& windowing = app.AddComponent<Nz::AppWindowingComponent>();
+	auto& windowing = app.AddComponent<Nz::WindowingAppComponent>();
 
-	auto& ecs = app.AddComponent<Nz::AppEntitySystemComponent>();
+	auto& ecs = app.AddComponent<Nz::EntitySystemAppComponent>();
 
 	auto& world = ecs.AddWorld<Nz::EnttWorld>();
 	Nz::BulletPhysics3DSystem& physSytem = world.AddSystem<Nz::BulletPhysics3DSystem>();
diff --git a/examples/PhysicsPlayground/main.cpp b/examples/PhysicsPlayground/main.cpp
index baeda9993..436f114fd 100644
--- a/examples/PhysicsPlayground/main.cpp
+++ b/examples/PhysicsPlayground/main.cpp
@@ -4,7 +4,7 @@
 
 #include <Nazara/Core.hpp>
 #include <Nazara/Graphics.hpp>
-#include <Nazara/Platform/AppWindowingComponent.hpp>
+#include <Nazara/Platform/WindowingAppComponent.hpp>
 #if USE_JOLT
 #include <Nazara/JoltPhysics3D.hpp>
 #else
@@ -30,10 +30,10 @@ int main(int argc, char* argv[])
 	Nz::Application<Nz::Graphics, Nz::BulletPhysics3D> app(argc, argv, renderConfig);
 #endif
 
-	auto& windowing = app.AddComponent<Nz::AppWindowingComponent>();
+	auto& windowing = app.AddComponent<Nz::WindowingAppComponent>();
 	Nz::Window& mainWindow = windowing.CreateWindow(Nz::VideoMode(1280, 720), "Physics playground");
 
-	auto& fs = app.AddComponent<Nz::AppFilesystemComponent>();
+	auto& fs = app.AddComponent<Nz::FilesystemAppComponent>();
 	{
 		std::filesystem::path resourceDir = "assets/examples";
 		if (!std::filesystem::is_directory(resourceDir) && std::filesystem::is_directory("../.." / resourceDir))
@@ -42,7 +42,7 @@ int main(int argc, char* argv[])
 		fs.Mount("assets", resourceDir);
 	}
 
-	auto& ecs = app.AddComponent<Nz::AppEntitySystemComponent>();
+	auto& ecs = app.AddComponent<Nz::EntitySystemAppComponent>();
 	auto& world = ecs.AddWorld<Nz::EnttWorld>();
 
 #if USE_JOLT
diff --git a/examples/Showcase/main.cpp b/examples/Showcase/main.cpp
index 799f700e8..93bedd585 100644
--- a/examples/Showcase/main.cpp
+++ b/examples/Showcase/main.cpp
@@ -26,7 +26,7 @@ int main(int argc, char* argv[])
 
 	std::shared_ptr<Nz::RenderDevice> device = Nz::Graphics::Instance()->GetRenderDevice();
 
-	auto& ecs = app.AddComponent<Nz::AppEntitySystemComponent>();
+	auto& ecs = app.AddComponent<Nz::EntitySystemAppComponent>();
 
 	auto& world = ecs.AddWorld<Nz::EnttWorld>();
 	world.AddSystem<Nz::SkeletonSystem>();
@@ -35,13 +35,13 @@ int main(int argc, char* argv[])
 	physSytem.GetPhysWorld().SetGravity(Nz::Vector3f::Zero());
 	Nz::RenderSystem& renderSystem = world.AddSystem<Nz::RenderSystem>();
 
-	auto& windowing = app.AddComponent<Nz::AppWindowingComponent>();
+	auto& windowing = app.AddComponent<Nz::WindowingAppComponent>();
 
 	std::string windowTitle = "Skinning test";
 	Nz::Window& mainWindow = windowing.CreateWindow(Nz::VideoMode(1280, 720), windowTitle);
 	auto& windowSwapchain = renderSystem.CreateSwapchain(mainWindow);
 
-	auto& fs = app.AddComponent<Nz::AppFilesystemComponent>();
+	auto& fs = app.AddComponent<Nz::FilesystemAppComponent>();
 	{
 		std::filesystem::path resourceDir = "assets/examples";
 		if (!std::filesystem::is_directory(resourceDir) && std::filesystem::is_directory("../.." / resourceDir))
diff --git a/examples/Tut01/main.cpp b/examples/Tut01/main.cpp
index 8e7d5b0c3..9b8266d65 100644
--- a/examples/Tut01/main.cpp
+++ b/examples/Tut01/main.cpp
@@ -2,7 +2,7 @@
 
 #include <Nazara/Core.hpp>
 #include <Nazara/Graphics.hpp>
-#include <Nazara/Platform/AppWindowingComponent.hpp>
+#include <Nazara/Platform/WindowingAppComponent.hpp>
 #include <Nazara/Renderer.hpp>
 #include <Nazara/Utility.hpp>
 #include <iostream>
@@ -12,10 +12,10 @@ int main(int argc, char* argv[])
 	// Mise en place de l'application, de la fenêtre et du monde
 	Nz::Application<Nz::Graphics> app(argc, argv);
 
-	auto& windowing = app.AddComponent<Nz::AppWindowingComponent>();
+	auto& windowing = app.AddComponent<Nz::WindowingAppComponent>();
 	Nz::Window& mainWindow = windowing.CreateWindow(Nz::VideoMode(1280, 720), "Tut01 - Hello world");
 
-	auto& ecs = app.AddComponent<Nz::AppEntitySystemComponent>();
+	auto& ecs = app.AddComponent<Nz::EntitySystemAppComponent>();
 	auto& world = ecs.AddWorld<Nz::EnttWorld>();
 
 	auto& renderSystem = world.AddSystem<Nz::RenderSystem>();
diff --git a/examples/Tut02/main.cpp b/examples/Tut02/main.cpp
index 33ced8195..51d4211f9 100644
--- a/examples/Tut02/main.cpp
+++ b/examples/Tut02/main.cpp
@@ -2,7 +2,7 @@
 
 #include <Nazara/Core.hpp>
 #include <Nazara/Graphics.hpp>
-#include <Nazara/Platform/AppWindowingComponent.hpp>
+#include <Nazara/Platform/WindowingAppComponent.hpp>
 #include <Nazara/Renderer.hpp>
 #include <Nazara/Utility.hpp>
 #include <iostream>
@@ -12,11 +12,11 @@ int main(int argc, char* argv[])
 	Nz::Application<Nz::Graphics> app(argc, argv);
 
 	// Création de la fenêtre
-	auto& windowing = app.AddComponent<Nz::AppWindowingComponent>();
+	auto& windowing = app.AddComponent<Nz::WindowingAppComponent>();
 	Nz::Window& mainWindow = windowing.CreateWindow(Nz::VideoMode(1280, 720), "Tut02 - Events");
 
 	// Ajout d'un monde
-	auto& ecs = app.AddComponent<Nz::AppEntitySystemComponent>();
+	auto& ecs = app.AddComponent<Nz::EntitySystemAppComponent>();
 	auto& world = ecs.AddWorld<Nz::EnttWorld>();
 
 	Nz::RenderSystem& renderSystem = world.AddSystem<Nz::RenderSystem>();
diff --git a/examples/WidgetDemo/main.cpp b/examples/WidgetDemo/main.cpp
index 9707ab5cf..3fb15adc4 100644
--- a/examples/WidgetDemo/main.cpp
+++ b/examples/WidgetDemo/main.cpp
@@ -16,13 +16,13 @@ int main(int argc, char* argv[])
 {
 	Nz::Application<Nz::Graphics, Nz::Widgets> app(argc, argv);
 
-	auto& windowing = app.AddComponent<Nz::AppWindowingComponent>();
+	auto& windowing = app.AddComponent<Nz::WindowingAppComponent>();
 	Nz::Window& mainWindow = windowing.CreateWindow(Nz::VideoMode(1920, 1080), "Widget demo");
 
-	auto& ecs = app.AddComponent<Nz::AppEntitySystemComponent>();
+	auto& ecs = app.AddComponent<Nz::EntitySystemAppComponent>();
 	auto& world = ecs.AddWorld<Nz::EnttWorld>();
 
-	auto& fs = app.AddComponent<Nz::AppFilesystemComponent>();
+	auto& fs = app.AddComponent<Nz::FilesystemAppComponent>();
 	{
 		std::filesystem::path resourceDir = "assets/examples";
 		if (!std::filesystem::is_directory(resourceDir) && std::filesystem::is_directory("../.." / resourceDir))
diff --git a/include/Nazara/Core.hpp b/include/Nazara/Core.hpp
index 9f0836a09..943c3c25a 100644
--- a/include/Nazara/Core.hpp
+++ b/include/Nazara/Core.hpp
@@ -32,7 +32,6 @@
 #include <Nazara/Core/AbstractHash.hpp>
 #include <Nazara/Core/AbstractLogger.hpp>
 #include <Nazara/Core/Algorithm.hpp>
-#include <Nazara/Core/AppFilesystemComponent.hpp>
 #include <Nazara/Core/Application.hpp>
 #include <Nazara/Core/ApplicationBase.hpp>
 #include <Nazara/Core/ApplicationComponent.hpp>
@@ -48,6 +47,7 @@
 #include <Nazara/Core/Core.hpp>
 #include <Nazara/Core/DynLib.hpp>
 #include <Nazara/Core/EmptyStream.hpp>
+#include <Nazara/Core/EntitySystemAppComponent.hpp>
 #include <Nazara/Core/EntityWorld.hpp>
 #include <Nazara/Core/Enums.hpp>
 #include <Nazara/Core/EnvironmentVariables.hpp>
@@ -55,6 +55,7 @@
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Core/File.hpp>
 #include <Nazara/Core/FileLogger.hpp>
+#include <Nazara/Core/FilesystemAppComponent.hpp>
 #include <Nazara/Core/Format.hpp>
 #include <Nazara/Core/Functor.hpp>
 #include <Nazara/Core/GuillotineBinPack.hpp>
@@ -103,7 +104,6 @@
 
 #ifdef NAZARA_ENTT
 
-#include <Nazara/Core/AppEntitySystemComponent.hpp>
 #include <Nazara/Core/Components.hpp>
 #include <Nazara/Core/EnttSystemGraph.hpp>
 #include <Nazara/Core/EnttWorld.hpp>
diff --git a/include/Nazara/Core/AppEntitySystemComponent.hpp b/include/Nazara/Core/EntitySystemAppComponent.hpp
similarity index 55%
rename from include/Nazara/Core/AppEntitySystemComponent.hpp
rename to include/Nazara/Core/EntitySystemAppComponent.hpp
index 83368ca81..a9ebb239f 100644
--- a/include/Nazara/Core/AppEntitySystemComponent.hpp
+++ b/include/Nazara/Core/EntitySystemAppComponent.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#ifndef NAZARA_CORE_APPENTITYSYSTEMCOMPONENT_HPP
-#define NAZARA_CORE_APPENTITYSYSTEMCOMPONENT_HPP
+#ifndef NAZARA_CORE_ENTITYSYSTEMAPPCOMPONENT_HPP
+#define NAZARA_CORE_ENTITYSYSTEMAPPCOMPONENT_HPP
 
 #include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Core/ApplicationComponent.hpp>
@@ -14,26 +14,26 @@
 
 namespace Nz
 {
-	class NAZARA_CORE_API AppEntitySystemComponent : public ApplicationComponent
+	class NAZARA_CORE_API EntitySystemAppComponent : public ApplicationComponent
 	{
 		public:
 			using ApplicationComponent::ApplicationComponent;
-			AppEntitySystemComponent(const AppEntitySystemComponent&) = delete;
-			AppEntitySystemComponent(AppEntitySystemComponent&&) = delete;
-			~AppEntitySystemComponent() = default;
+			EntitySystemAppComponent(const EntitySystemAppComponent&) = delete;
+			EntitySystemAppComponent(EntitySystemAppComponent&&) = delete;
+			~EntitySystemAppComponent() = default;
 
 			template<typename T, typename... Args> T& AddWorld(Args&&... args);
 
 			void Update(Time elapsedTime) override;
 
-			AppEntitySystemComponent& operator=(const AppEntitySystemComponent&) = delete;
-			AppEntitySystemComponent& operator=(AppEntitySystemComponent&&) = delete;
+			EntitySystemAppComponent& operator=(const EntitySystemAppComponent&) = delete;
+			EntitySystemAppComponent& operator=(EntitySystemAppComponent&&) = delete;
 
 		private:
 			std::vector<std::unique_ptr<EntityWorld>> m_worlds;
 	};
 }
 
-#include <Nazara/Core/AppEntitySystemComponent.inl>
+#include <Nazara/Core/EntitySystemAppComponent.inl>
 
-#endif // NAZARA_CORE_APPENTITYSYSTEMCOMPONENT_HPP
+#endif // NAZARA_CORE_ENTITYSYSTEMAPPCOMPONENT_HPP
diff --git a/include/Nazara/Core/AppEntitySystemComponent.inl b/include/Nazara/Core/EntitySystemAppComponent.inl
similarity index 88%
rename from include/Nazara/Core/AppEntitySystemComponent.inl
rename to include/Nazara/Core/EntitySystemAppComponent.inl
index 68c4f2331..39310d2ba 100644
--- a/include/Nazara/Core/AppEntitySystemComponent.inl
+++ b/include/Nazara/Core/EntitySystemAppComponent.inl
@@ -7,7 +7,7 @@
 namespace Nz
 {
 	template<typename T, typename... Args>
-	T& AppEntitySystemComponent::AddWorld(Args&&... args)
+	T& EntitySystemAppComponent::AddWorld(Args&&... args)
 	{
 		return static_cast<T&>(*m_worlds.emplace_back(std::make_unique<T>(std::forward<Args>(args)...)));
 	}
diff --git a/include/Nazara/Core/AppFilesystemComponent.hpp b/include/Nazara/Core/FilesystemAppComponent.hpp
similarity index 77%
rename from include/Nazara/Core/AppFilesystemComponent.hpp
rename to include/Nazara/Core/FilesystemAppComponent.hpp
index d8dfb2625..d96c760bc 100644
--- a/include/Nazara/Core/AppFilesystemComponent.hpp
+++ b/include/Nazara/Core/FilesystemAppComponent.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#ifndef NAZARA_CORE_APPFILESYSTEMCOMPONENT_HPP
-#define NAZARA_CORE_APPFILESYSTEMCOMPONENT_HPP
+#ifndef NAZARA_CORE_FILESYSTEMAPPCOMPONENT_HPP
+#define NAZARA_CORE_FILESYSTEMAPPCOMPONENT_HPP
 
 #include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Core/ApplicationComponent.hpp>
@@ -17,13 +17,13 @@
 
 namespace Nz
 {
-	class NAZARA_CORE_API AppFilesystemComponent : public ApplicationComponent
+	class NAZARA_CORE_API FilesystemAppComponent : public ApplicationComponent
 	{
 		public:
-			inline AppFilesystemComponent(ApplicationBase& app);
-			AppFilesystemComponent(const AppFilesystemComponent&) = delete;
-			AppFilesystemComponent(AppFilesystemComponent&&) = delete;
-			~AppFilesystemComponent() = default;
+			inline FilesystemAppComponent(ApplicationBase& app);
+			FilesystemAppComponent(const FilesystemAppComponent&) = delete;
+			FilesystemAppComponent(FilesystemAppComponent&&) = delete;
+			~FilesystemAppComponent() = default;
 
 			template<typename T> const typename T::Params* GetDefaultResourceParameters() const;
 			inline VirtualDirectoryPtr GetDirectory(std::string_view assetPath);
@@ -41,8 +41,8 @@ namespace Nz
 
 			template<typename T> void SetDefaultResourceParameters(typename T::Params params);
 
-			AppFilesystemComponent& operator=(const AppFilesystemComponent&) = delete;
-			AppFilesystemComponent& operator=(AppFilesystemComponent&&) = delete;
+			FilesystemAppComponent& operator=(const FilesystemAppComponent&) = delete;
+			FilesystemAppComponent& operator=(FilesystemAppComponent&&) = delete;
 
 		private:
 			template<typename T, typename... ExtraArgs> std::shared_ptr<T> LoadImpl(std::string_view assetPath, const typename T::Params& params, ExtraArgs&&... args);
@@ -53,6 +53,6 @@ namespace Nz
 	};
 }
 
-#include <Nazara/Core/AppFilesystemComponent.inl>
+#include <Nazara/Core/FilesystemAppComponent.inl>
 
-#endif // NAZARA_CORE_APPFILESYSTEMCOMPONENT_HPP
+#endif // NAZARA_CORE_FILESYSTEMAPPCOMPONENT_HPP
diff --git a/include/Nazara/Core/AppFilesystemComponent.inl b/include/Nazara/Core/FilesystemAppComponent.inl
similarity index 87%
rename from include/Nazara/Core/AppFilesystemComponent.inl
rename to include/Nazara/Core/FilesystemAppComponent.inl
index 8a1ac54c3..fcef60281 100644
--- a/include/Nazara/Core/AppFilesystemComponent.inl
+++ b/include/Nazara/Core/FilesystemAppComponent.inl
@@ -19,13 +19,13 @@ namespace Nz
 		struct ResourceParameterHasMerge<T, std::void_t<decltype(std::declval<T>().Merge(std::declval<T>()))>> : std::true_type {};
 	}
 
-	inline AppFilesystemComponent::AppFilesystemComponent(ApplicationBase& app) :
+	inline FilesystemAppComponent::FilesystemAppComponent(ApplicationBase& app) :
 	ApplicationComponent(app)
 	{
 	}
 
 	template<typename T>
-	const typename T::Params* AppFilesystemComponent::GetDefaultResourceParameters() const
+	const typename T::Params* FilesystemAppComponent::GetDefaultResourceParameters() const
 	{
 		constexpr UInt64 typeHash = FNV1a64(TypeName<T>());
 
@@ -36,7 +36,7 @@ namespace Nz
 		return static_cast<const typename T::Params*>(it->second.get());
 	}
 
-	VirtualDirectoryPtr AppFilesystemComponent::GetDirectory(std::string_view assetPath)
+	VirtualDirectoryPtr FilesystemAppComponent::GetDirectory(std::string_view assetPath)
 	{
 		VirtualDirectoryPtr dir;
 		m_rootDirectory->GetDirectoryEntry(assetPath, [&](const Nz::VirtualDirectory::DirectoryEntry& dirEntry)
@@ -48,13 +48,13 @@ namespace Nz
 	}
 
 	template<typename T, typename... ExtraArgs>
-	std::shared_ptr<T> AppFilesystemComponent::Load(std::string_view assetPath, ExtraArgs&&... args)
+	std::shared_ptr<T> FilesystemAppComponent::Load(std::string_view assetPath, ExtraArgs&&... args)
 	{
 		return Load<T>(assetPath, typename T::Params{}, std::forward<ExtraArgs>(args)...);
 	}
 
 	template<typename T, typename... ExtraArgs>
-	std::shared_ptr<T> AppFilesystemComponent::Load(std::string_view assetPath, typename T::Params params, ExtraArgs&&... args)
+	std::shared_ptr<T> FilesystemAppComponent::Load(std::string_view assetPath, typename T::Params params, ExtraArgs&&... args)
 	{
 		if constexpr (Detail::ResourceParameterHasMerge<typename T::Params>::value)
 		{
@@ -66,13 +66,13 @@ namespace Nz
 	}
 
 	template<typename T, typename... ExtraArgs>
-	std::shared_ptr<T> AppFilesystemComponent::Open(std::string_view assetPath, ExtraArgs&&... args)
+	std::shared_ptr<T> FilesystemAppComponent::Open(std::string_view assetPath, ExtraArgs&&... args)
 	{
 		return Open<T>(assetPath, typename T::Params{}, std::forward<ExtraArgs>(args)...);
 	}
 
 	template<typename T, typename... ExtraArgs>
-	std::shared_ptr<T> AppFilesystemComponent::Open(std::string_view assetPath, typename T::Params params, ExtraArgs&&... args)
+	std::shared_ptr<T> FilesystemAppComponent::Open(std::string_view assetPath, typename T::Params params, ExtraArgs&&... args)
 	{
 		if constexpr (Detail::ResourceParameterHasMerge<typename T::Params>::value)
 		{
@@ -84,7 +84,7 @@ namespace Nz
 	}
 
 	template<typename T>
-	void AppFilesystemComponent::SetDefaultResourceParameters(typename T::Params params)
+	void FilesystemAppComponent::SetDefaultResourceParameters(typename T::Params params)
 	{
 		constexpr UInt64 typeHash = FNV1a64(TypeName<T>());
 
@@ -92,7 +92,7 @@ namespace Nz
 	}
 
 	template<typename T, typename... ExtraArgs>
-	std::shared_ptr<T> AppFilesystemComponent::LoadImpl(std::string_view assetPath, const typename T::Params& params, ExtraArgs&&... args)
+	std::shared_ptr<T> FilesystemAppComponent::LoadImpl(std::string_view assetPath, const typename T::Params& params, ExtraArgs&&... args)
 	{
 		std::shared_ptr<T> resource;
 		if (!m_rootDirectory)
@@ -123,7 +123,7 @@ namespace Nz
 	}
 
 	template<typename T, typename... ExtraArgs>
-	std::shared_ptr<T> AppFilesystemComponent::OpenImpl(std::string_view assetPath, const typename T::Params& params, ExtraArgs&&... args)
+	std::shared_ptr<T> FilesystemAppComponent::OpenImpl(std::string_view assetPath, const typename T::Params& params, ExtraArgs&&... args)
 	{
 		std::shared_ptr<T> resource;
 		if (!m_rootDirectory)
diff --git a/include/Nazara/Graphics/Graphics.hpp b/include/Nazara/Graphics/Graphics.hpp
index 93f31776a..0aee6edd8 100644
--- a/include/Nazara/Graphics/Graphics.hpp
+++ b/include/Nazara/Graphics/Graphics.hpp
@@ -25,8 +25,8 @@
 
 namespace Nz
 {
-	class AppFilesystemComponent;
 	class CommandLineParameters;
+	class FilesystemAppComponent;
 	class RenderBuffer;
 
 	class NAZARA_GRAPHICS_API Graphics : public ModuleBase<Graphics>
@@ -68,7 +68,7 @@ namespace Nz
 			inline std::shared_ptr<nzsl::FilesystemModuleResolver>& GetShaderModuleResolver();
 			inline const std::shared_ptr<nzsl::FilesystemModuleResolver>& GetShaderModuleResolver() const;
 
-			void RegisterComponent(AppFilesystemComponent& component);
+			void RegisterComponent(FilesystemAppComponent& component);
 
 			struct NAZARA_GRAPHICS_API Config
 			{
diff --git a/include/Nazara/Platform.hpp b/include/Nazara/Platform.hpp
index 46d6db54d..e505498b6 100644
--- a/include/Nazara/Platform.hpp
+++ b/include/Nazara/Platform.hpp
@@ -29,7 +29,6 @@
 #ifndef NAZARA_GLOBAL_PLATFORM_HPP
 #define NAZARA_GLOBAL_PLATFORM_HPP
 
-#include <Nazara/Platform/AppWindowingComponent.hpp>
 #include <Nazara/Platform/Clipboard.hpp>
 #include <Nazara/Platform/Config.hpp>
 #include <Nazara/Platform/Cursor.hpp>
@@ -45,5 +44,6 @@
 #include <Nazara/Platform/WindowEvent.hpp>
 #include <Nazara/Platform/WindowEventHandler.hpp>
 #include <Nazara/Platform/WindowHandle.hpp>
+#include <Nazara/Platform/WindowingAppComponent.hpp>
 
 #endif // NAZARA_GLOBAL_PLATFORM_HPP
diff --git a/include/Nazara/Platform/AppWindowingComponent.hpp b/include/Nazara/Platform/WindowingAppComponent.hpp
similarity index 57%
rename from include/Nazara/Platform/AppWindowingComponent.hpp
rename to include/Nazara/Platform/WindowingAppComponent.hpp
index 2e4693519..66270f725 100644
--- a/include/Nazara/Platform/AppWindowingComponent.hpp
+++ b/include/Nazara/Platform/WindowingAppComponent.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#ifndef NAZARA_PLATFORM_APPWINDOWINGCOMPONENT_HPP
-#define NAZARA_PLATFORM_APPWINDOWINGCOMPONENT_HPP
+#ifndef NAZARA_PLATFORM_WINDOWINGAPPCOMPONENT_HPP
+#define NAZARA_PLATFORM_WINDOWINGAPPCOMPONENT_HPP
 
 #include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Core/ApplicationComponent.hpp>
@@ -14,13 +14,13 @@
 
 namespace Nz
 {
-	class NAZARA_PLATFORM_API AppWindowingComponent : public ApplicationComponent
+	class NAZARA_PLATFORM_API WindowingAppComponent : public ApplicationComponent
 	{
 		public:
-			inline AppWindowingComponent(ApplicationBase& app);
-			AppWindowingComponent(const AppWindowingComponent&) = delete;
-			AppWindowingComponent(AppWindowingComponent&&) = delete;
-			~AppWindowingComponent() = default;
+			inline WindowingAppComponent(ApplicationBase& app);
+			WindowingAppComponent(const WindowingAppComponent&) = delete;
+			WindowingAppComponent(WindowingAppComponent&&) = delete;
+			~WindowingAppComponent() = default;
 
 			template<typename... Args> Window& CreateWindow(Args&&... args);
 
@@ -31,8 +31,8 @@ namespace Nz
 
 			void Update(Time elapsedTime) override;
 
-			AppWindowingComponent& operator=(const AppWindowingComponent&) = delete;
-			AppWindowingComponent& operator=(AppWindowingComponent&&) = delete;
+			WindowingAppComponent& operator=(const WindowingAppComponent&) = delete;
+			WindowingAppComponent& operator=(WindowingAppComponent&&) = delete;
 
 		private:
 			std::vector<std::unique_ptr<Window>> m_windows;
@@ -40,6 +40,6 @@ namespace Nz
 	};
 }
 
-#include <Nazara/Platform/AppWindowingComponent.inl>
+#include <Nazara/Platform/WindowingAppComponent.inl>
 
-#endif // NAZARA_PLATFORM_APPWINDOWINGCOMPONENT_HPP
+#endif // NAZARA_PLATFORM_WINDOWINGAPPCOMPONENT_HPP
diff --git a/include/Nazara/Platform/AppWindowingComponent.inl b/include/Nazara/Platform/WindowingAppComponent.inl
similarity index 68%
rename from include/Nazara/Platform/AppWindowingComponent.inl
rename to include/Nazara/Platform/WindowingAppComponent.inl
index 0354d00b0..10bcdf8a1 100644
--- a/include/Nazara/Platform/AppWindowingComponent.inl
+++ b/include/Nazara/Platform/WindowingAppComponent.inl
@@ -7,28 +7,28 @@
 namespace Nz
 {
 	template<typename... Args>
-	Window& AppWindowingComponent::CreateWindow(Args&&... args)
+	Window& WindowingAppComponent::CreateWindow(Args&&... args)
 	{
 		return *m_windows.emplace_back(std::make_unique<Window>(std::forward<Args>(args)...));
 	}
 
-	inline AppWindowingComponent::AppWindowingComponent(ApplicationBase& app) :
+	inline WindowingAppComponent::WindowingAppComponent(ApplicationBase& app) :
 	ApplicationComponent(app),
 	m_quitOnLastWindowClosed(true)
 	{
 	}
 
-	inline void AppWindowingComponent::DisableQuitOnLastWindowClosed()
+	inline void WindowingAppComponent::DisableQuitOnLastWindowClosed()
 	{
 		return EnableQuitOnLastWindowClosed(false);
 	}
 
-	inline void AppWindowingComponent::EnableQuitOnLastWindowClosed(bool enable)
+	inline void WindowingAppComponent::EnableQuitOnLastWindowClosed(bool enable)
 	{
 		m_quitOnLastWindowClosed = enable;
 	}
 
-	inline bool AppWindowingComponent::IsQuitOnLastWindowClosedEnabled() const
+	inline bool WindowingAppComponent::IsQuitOnLastWindowClosedEnabled() const
 	{
 		return m_quitOnLastWindowClosed;
 	}
diff --git a/src/Nazara/Core/AppEntitySystemComponent.cpp b/src/Nazara/Core/EntitySystemAppComponent.cpp
similarity index 75%
rename from src/Nazara/Core/AppEntitySystemComponent.cpp
rename to src/Nazara/Core/EntitySystemAppComponent.cpp
index 80e5be67a..0df145306 100644
--- a/src/Nazara/Core/AppEntitySystemComponent.cpp
+++ b/src/Nazara/Core/EntitySystemAppComponent.cpp
@@ -2,12 +2,12 @@
 // 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/AppEntitySystemComponent.hpp>
+#include <Nazara/Core/EntitySystemAppComponent.hpp>
 #include <Nazara/Core/Debug.hpp>
 
 namespace Nz
 {
-	void AppEntitySystemComponent::Update(Time elapsedTime)
+	void EntitySystemAppComponent::Update(Time elapsedTime)
 	{
 		for (auto& worldPtr : m_worlds)
 			worldPtr->Update(elapsedTime);
diff --git a/src/Nazara/Core/AppFilesystemComponent.cpp b/src/Nazara/Core/FilesystemAppComponent.cpp
similarity index 80%
rename from src/Nazara/Core/AppFilesystemComponent.cpp
rename to src/Nazara/Core/FilesystemAppComponent.cpp
index 9be0dbd73..47f7a5d60 100644
--- a/src/Nazara/Core/AppFilesystemComponent.cpp
+++ b/src/Nazara/Core/FilesystemAppComponent.cpp
@@ -2,18 +2,18 @@
 // 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/AppFilesystemComponent.hpp>
+#include <Nazara/Core/FilesystemAppComponent.hpp>
 #include <Nazara/Core/VirtualDirectoryFilesystemResolver.hpp>
 #include <Nazara/Core/Debug.hpp>
 
 namespace Nz
 {
-	const VirtualDirectoryPtr& AppFilesystemComponent::Mount(std::string_view name, std::filesystem::path filepath)
+	const VirtualDirectoryPtr& FilesystemAppComponent::Mount(std::string_view name, std::filesystem::path filepath)
 	{
 		return Mount(name, std::make_shared<VirtualDirectory>(std::make_shared<VirtualDirectoryFilesystemResolver>(std::move(filepath))));
 	}
 
-	const VirtualDirectoryPtr& AppFilesystemComponent::Mount(std::string_view name, VirtualDirectoryPtr directory)
+	const VirtualDirectoryPtr& FilesystemAppComponent::Mount(std::string_view name, VirtualDirectoryPtr directory)
 	{
 		if (name.empty())
 		{
@@ -27,7 +27,7 @@ namespace Nz
 		return m_rootDirectory->StoreDirectory(name, std::move(directory)).directory;
 	}
 
-	void AppFilesystemComponent::MountDefaultDirectories()
+	void FilesystemAppComponent::MountDefaultDirectories()
 	{
 		m_rootDirectory = std::make_shared<VirtualDirectory>(std::make_shared<VirtualDirectoryFilesystemResolver>(std::filesystem::current_path()));
 	}
diff --git a/src/Nazara/Graphics/Graphics.cpp b/src/Nazara/Graphics/Graphics.cpp
index 5618b92ce..232ed620c 100644
--- a/src/Nazara/Graphics/Graphics.cpp
+++ b/src/Nazara/Graphics/Graphics.cpp
@@ -3,9 +3,9 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Graphics/Graphics.hpp>
-#include <Nazara/Core/AppFilesystemComponent.hpp>
 #include <Nazara/Core/CommandLineParameters.hpp>
 #include <Nazara/Core/EnvironmentVariables.hpp>
+#include <Nazara/Core/FilesystemAppComponent.hpp>
 #include <Nazara/Graphics/DebugDrawPipelinePass.hpp>
 #include <Nazara/Graphics/DepthPipelinePass.hpp>
 #include <Nazara/Graphics/ForwardPipelinePass.hpp>
@@ -205,7 +205,7 @@ namespace Nz
 		m_defaultTextures = DefaultTextures{};
 	}
 
-	void Graphics::RegisterComponent(AppFilesystemComponent& component)
+	void Graphics::RegisterComponent(FilesystemAppComponent& component)
 	{
 		TextureParams defaultTexParams;
 		defaultTexParams.renderDevice = m_renderDevice;
diff --git a/src/Nazara/Platform/AppWindowingComponent.cpp b/src/Nazara/Platform/WindowingAppComponent.cpp
similarity index 84%
rename from src/Nazara/Platform/AppWindowingComponent.cpp
rename to src/Nazara/Platform/WindowingAppComponent.cpp
index 780853d7c..81f7b4e11 100644
--- a/src/Nazara/Platform/AppWindowingComponent.cpp
+++ b/src/Nazara/Platform/WindowingAppComponent.cpp
@@ -2,13 +2,13 @@
 // This file is part of the "Nazara Engine - Platform module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Platform/AppWindowingComponent.hpp>
+#include <Nazara/Platform/WindowingAppComponent.hpp>
 #include <Nazara/Core/ApplicationBase.hpp>
 #include <Nazara/Platform/Debug.hpp>
 
 namespace Nz
 {
-	void AppWindowingComponent::Update(Time /*elapsedTime*/)
+	void WindowingAppComponent::Update(Time /*elapsedTime*/)
 	{
 		Window::ProcessEvents();
 
diff --git a/tests/GraphicsTest/main.cpp b/tests/GraphicsTest/main.cpp
index 32ec46eea..2cd64c1b8 100644
--- a/tests/GraphicsTest/main.cpp
+++ b/tests/GraphicsTest/main.cpp
@@ -26,7 +26,7 @@ int main()
 #endif
 
 	Nz::Application<Nz::Graphics> app(rendererConfig);
-	auto& windowingApp = app.AddComponent<Nz::AppWindowingComponent>();
+	auto& windowingApp = app.AddComponent<Nz::WindowingAppComponent>();
 
 	std::shared_ptr<Nz::RenderDevice> device = Nz::Graphics::Instance()->GetRenderDevice();
 
diff --git a/tests/PresentModeTest/main.cpp b/tests/PresentModeTest/main.cpp
index 13a3a1aa5..c2e51eeb7 100644
--- a/tests/PresentModeTest/main.cpp
+++ b/tests/PresentModeTest/main.cpp
@@ -20,9 +20,9 @@ int main()
 
 	Nz::Application<Nz::Graphics> app(rendererConfig);
 
-	auto& windowing = app.AddComponent<Nz::AppWindowingComponent>();
+	auto& windowing = app.AddComponent<Nz::WindowingAppComponent>();
 
-	auto& ecs = app.AddComponent<Nz::AppEntitySystemComponent>();
+	auto& ecs = app.AddComponent<Nz::EntitySystemAppComponent>();
 
 	auto& world = ecs.AddWorld<Nz::EnttWorld>();
 	Nz::RenderSystem& renderSystem = world.AddSystem<Nz::RenderSystem>();
diff --git a/tests/RenderTest/main.cpp b/tests/RenderTest/main.cpp
index dee8f85fc..5125d8f47 100644
--- a/tests/RenderTest/main.cpp
+++ b/tests/RenderTest/main.cpp
@@ -97,7 +97,7 @@ int main()
 #endif
 
 	Nz::Application<Nz::Renderer> app(rendererConfig);
-	auto& windowingApp = app.AddComponent<Nz::AppWindowingComponent>();
+	auto& windowingApp = app.AddComponent<Nz::WindowingAppComponent>();
 
 	std::shared_ptr<Nz::RenderDevice> device = Nz::Renderer::Instance()->InstanciateRenderDevice(0);