diff --git a/examples/Demo/main.cpp b/examples/Demo/main.cpp
index 92ecf92..d7c5488 100644
--- a/examples/Demo/main.cpp
+++ b/examples/Demo/main.cpp
@@ -2,8 +2,8 @@
 #include <Nazara/Core/Application.hpp>
 #include <Nazara/Core/Clock.hpp>
 #include <Nazara/Graphics/Graphics.hpp>
-#include <Nazara/Platform/AppWindowingComponent.hpp>
 #include <Nazara/Platform/Platform.hpp>
+#include <Nazara/Platform/WindowingAppComponent.hpp>
 #include <Nazara/Renderer/GpuSwitch.hpp>
 #include <Nazara/Renderer/WindowSwapchain.hpp>
 
@@ -43,7 +43,7 @@ int WinMain(int argc, char* argv[])
 #endif
 {
 	Nz::Application<Nz::Graphics, Nz::Imgui> nazara(argc, argv);
-	auto& windowing = nazara.AddComponent<Nz::AppWindowingComponent>();
+	auto& windowing = nazara.AddComponent<Nz::WindowingAppComponent>();
 	std::shared_ptr<Nz::RenderDevice> device = Nz::Graphics::Instance()->GetRenderDevice();
 
 	std::string windowTitle = "Nazara Imgui Demo";
diff --git a/examples/Ecs/main.cpp b/examples/Ecs/main.cpp
index 74a3efe..96af77c 100644
--- a/examples/Ecs/main.cpp
+++ b/examples/Ecs/main.cpp
@@ -3,7 +3,6 @@
 #include <Nazara/Graphics.hpp>
 #include <Nazara/Platform.hpp>
 #include <Nazara/Renderer.hpp>
-#include <Nazara/Utility.hpp>
 
 #include <NazaraImgui/ImguiHandler.hpp>
 #include <NazaraImgui/ImguiWidgets.hpp>
@@ -41,10 +40,10 @@ int WinMain(int argc, char* argv[])
 #endif
 {
 	Nz::Application<Nz::Graphics, Nz::Imgui> nazara(argc, argv);
-	auto& windowing = nazara.AddComponent<Nz::AppWindowingComponent>();
+	auto& windowing = nazara.AddComponent<Nz::WindowingAppComponent>();
 	std::shared_ptr<Nz::RenderDevice> device = Nz::Graphics::Instance()->GetRenderDevice();
 
-	auto& ecs = nazara.AddComponent<Nz::AppEntitySystemComponent>();
+	auto& ecs = nazara.AddComponent<Nz::EntitySystemAppComponent>();
 	auto& world = ecs.AddWorld<Nz::EnttWorld>();
 
 	auto& renderer = world.AddSystem<Nz::RenderSystem>();