diff --git a/projects/first_mesh/src/main.cpp b/projects/first_mesh/src/main.cpp
index feb2153f5b5274a168fb49bd7087a8b4092dcc47..17be476ca7af0504a2d4e4f2e2d610ca43f6cee2 100644
--- a/projects/first_mesh/src/main.cpp
+++ b/projects/first_mesh/src/main.cpp
@@ -161,7 +161,7 @@ int main(int argc, const char** argv) {
 
     auto start = std::chrono::system_clock::now();
     
-	while (vkcv::WindowManager::hasOpenWindow()) {
+	while (vkcv::Window::hasOpenWindow()) {
         vkcv::Window::pollEvents();
 		
 		if(core.getWindow().getHeight() == 0 || core.getWindow().getWidth() == 0)
diff --git a/projects/first_scene/src/main.cpp b/projects/first_scene/src/main.cpp
index f8867227abf143e02eba87a3c2c3d91b07544518..289d6a05213f064c45b9e578c44c8cc8f1bf883f 100644
--- a/projects/first_scene/src/main.cpp
+++ b/projects/first_scene/src/main.cpp
@@ -97,7 +97,7 @@ int main(int argc, const char** argv) {
 	const vkcv::ImageHandle swapchainInput = vkcv::ImageHandle::createSwapchainImageHandle();
 	
 	auto start = std::chrono::system_clock::now();
-	while (vkcv::WindowManager::hasOpenWindow()) {
+	while (vkcv::Window::hasOpenWindow()) {
         vkcv::Window::pollEvents();
 		
 		if(window.getHeight() == 0 || window.getWidth() == 0)
diff --git a/projects/indirect_dispatch/src/App.cpp b/projects/indirect_dispatch/src/App.cpp
index d8551bce3826bef56e6cec54e8e83ebdba392a20..bc0e45d7c0017fd642b6ade1af5e93129ea6d474 100644
--- a/projects/indirect_dispatch/src/App.cpp
+++ b/projects/indirect_dispatch/src/App.cpp
@@ -133,7 +133,7 @@ void App::run() {
 
 	auto frameEndTime = std::chrono::system_clock::now();
 
-	while (vkcv::WindowManager::hasOpenWindow()) {
+	while (vkcv::Window::hasOpenWindow()) {
 
 		vkcv::Window::pollEvents();
 
diff --git a/projects/mesh_shader/src/main.cpp b/projects/mesh_shader/src/main.cpp
index e2856a57fa16170c44e2613b4cab1cac902847a3..7d5c1a12d27d405cb4c189e2f7ab580b1907fbe1 100644
--- a/projects/mesh_shader/src/main.cpp
+++ b/projects/mesh_shader/src/main.cpp
@@ -304,7 +304,7 @@ int main(int argc, const char** argv) {
 	bool useMeshShader          = true;
 	bool updateFrustumPlanes    = true;
 
-	while (window.isOpen())
+	while (vkcv::Window::hasOpenWindow())
 	{
 		vkcv::Window::pollEvents();
 
diff --git a/projects/particle_simulation/src/main.cpp b/projects/particle_simulation/src/main.cpp
index 3543e73ab1ff4ab3154ab8a887750d60daf24587..f6f5c100cb6e6505fe1332663eb0fee8c9eb05a0 100644
--- a/projects/particle_simulation/src/main.cpp
+++ b/projects/particle_simulation/src/main.cpp
@@ -227,7 +227,7 @@ int main(int argc, const char **argv) {
 
     std::uniform_real_distribution<float> rdm = std::uniform_real_distribution<float>(0.95f, 1.05f);
     std::default_random_engine rdmEngine;
-    while (vkcv::WindowManager::hasOpenWindow()) {
+    while (vkcv::Window::hasOpenWindow()) {
         vkcv::Window::pollEvents();
 
         uint32_t swapchainWidth, swapchainHeight;
diff --git a/projects/voxelization/src/main.cpp b/projects/voxelization/src/main.cpp
index 712040ba08f7e1f1b723fde3693e73282c970fbe..db2d6c2453325a38a7b054a2ff990ed22e0e1e67 100644
--- a/projects/voxelization/src/main.cpp
+++ b/projects/voxelization/src/main.cpp
@@ -581,7 +581,7 @@ int main(int argc, const char** argv) {
 
 	auto start = std::chrono::system_clock::now();
 	const auto appStartTime = start;
-	while (window.isOpen()) {
+	while (vkcv::Window::hasOpenWindow()) {
 		vkcv::Window::pollEvents();
 
 		uint32_t swapchainWidth, swapchainHeight;