diff --git a/headers/enduro2d/core/window.hpp b/headers/enduro2d/core/window.hpp
index c02ba712..5c6df546 100644
--- a/headers/enduro2d/core/window.hpp
+++ b/headers/enduro2d/core/window.hpp
@@ -64,7 +64,7 @@ namespace e2d
 
         void bind_context() noexcept;
         void swap_buffers(bool vsync) noexcept;
-        static bool frame_tick() noexcept;
+        static bool poll_events() noexcept;
 
         template < typename T, typename... Args >
         T& register_event_listener(Args&&... args);
diff --git a/samples/sources/sample_00/sample_00.cpp b/samples/sources/sample_00/sample_00.cpp
index 643c2b37..d2d0643f 100644
--- a/samples/sources/sample_00/sample_00.cpp
+++ b/samples/sources/sample_00/sample_00.cpp
@@ -20,9 +20,9 @@ int e2d_main() {
     while ( !the<window>().should_close() && !k.is_key_just_released(keyboard_key::escape) ) {
         the<render>().set_clear_color({1.f, 0.4f, 0.f});
         the<render>().clear(true, true, true);
-        the<input>().frame_tick();
         the<window>().swap_buffers(true);
-        window::frame_tick();
+        the<input>().frame_tick();
+        window::poll_events();
     }
     return 0;
 }
diff --git a/samples/sources/sample_01/sample_01.cpp b/samples/sources/sample_01/sample_01.cpp
index 66f96cfe..c5692b86 100644
--- a/samples/sources/sample_01/sample_01.cpp
+++ b/samples/sources/sample_01/sample_01.cpp
@@ -8,23 +8,24 @@
 using namespace e2d;
 
 int e2d_main() {
-    input& i = modules::initialize<input>();
-    debug& d = modules::initialize<debug>();
-    window& w = modules::initialize<window>(v2u{640, 480}, "Enduro2D", false);
+    modules::initialize<debug>();
+    modules::initialize<input>();
+    modules::initialize<window>(v2u{640, 480}, "Enduro2D", false);
 
-    d.add_sink<debug_console_sink>();
-    w.register_event_listener<window_input_source>(i);
-    w.register_event_listener<window_trace_event_listener>(d);
+    the<debug>().add_sink<debug_console_sink>();
+    the<window>().register_event_listener<window_input_source>(the<input>());
+    the<window>().register_event_listener<window_trace_event_listener>(the<debug>());
 
-    d.trace("SAMPLE: window real size: %0", w.real_size())
-     .trace("SAMPLE: window virtual size: %0", w.virtual_size())
-     .trace("SAMPLE: window framebuffer size: %0", w.framebuffer_size());
+    the<debug>()
+        .trace("SAMPLE: window real size: %0", the<window>().real_size())
+        .trace("SAMPLE: window virtual size: %0", the<window>().virtual_size())
+        .trace("SAMPLE: window framebuffer size: %0", the<window>().framebuffer_size());
 
-    const keyboard& k = i.keyboard();
-    while ( !w.should_close() && !k.is_key_just_released(keyboard_key::escape) ) {
-        i.frame_tick();
-        w.swap_buffers(true);
-        window::frame_tick();
+    const keyboard& k = the<input>().keyboard();
+    while ( !the<window>().should_close() && !k.is_key_just_released(keyboard_key::escape) ) {
+        the<window>().swap_buffers(true);
+        the<input>().frame_tick();
+        window::poll_events();
     }
     return 0;
 }
diff --git a/sources/enduro2d/core/window_impl/window_glfw.cpp b/sources/enduro2d/core/window_impl/window_glfw.cpp
index 1f9e442c..378c1b46 100644
--- a/sources/enduro2d/core/window_impl/window_glfw.cpp
+++ b/sources/enduro2d/core/window_impl/window_glfw.cpp
@@ -573,7 +573,7 @@ namespace e2d
         glfwSwapBuffers(state_->window.get());
     }
 
-    bool window::frame_tick() noexcept {
+    bool window::poll_events() noexcept {
         return glfw_state::poll_events();
     }
 
diff --git a/sources/enduro2d/core/window_impl/window_none.cpp b/sources/enduro2d/core/window_impl/window_none.cpp
index 01218052..435ea856 100644
--- a/sources/enduro2d/core/window_impl/window_none.cpp
+++ b/sources/enduro2d/core/window_impl/window_none.cpp
@@ -164,7 +164,7 @@ namespace e2d
         E2D_UNUSED(vsync);
     }
 
-    bool window::frame_tick() noexcept {
+    bool window::poll_events() noexcept {
         return false;
     }