diff --git a/game/src/event/handlers.c b/game/src/event/handlers.c
index 9b80cd5..6cdb664 100644
--- a/game/src/event/handlers.c
+++ b/game/src/event/handlers.c
@@ -4,14 +4,14 @@ extern vec3 camera_position;
 extern vec3 camera_rotation;
 
 void
-handlers_init ()
+evt_handlers_init ()
 {
-  EventManager_add_SDL_handler (handler_lookaround);
-  EventManager_add_SDL_handler (handler_movement);
+  evtman_add_SDL_handler (evt_handler_lookaround);
+  evtman_add_SDL_handler (evt_handler_movement);
 }
 
 void
-handler_lookaround (SDL_Event *event)
+evt_handler_lookaround (SDL_Event *event)
 {
   if (event->type == SDL_EVENT_MOUSE_MOTION)
     {
@@ -23,7 +23,7 @@ handler_lookaround (SDL_Event *event)
 }
 
 void
-handler_movement (SDL_Event *event)
+evt_handler_movement (SDL_Event *event)
 {
   if (event->type == SDL_EVENT_KEY_DOWN)
     {
diff --git a/game/src/event/handlers.h b/game/src/event/handlers.h
index 632f6c6..656c304 100644
--- a/game/src/event/handlers.h
+++ b/game/src/event/handlers.h
@@ -9,6 +9,6 @@
 #include "../program.h"
 #include "../state.h"
 
-void handlers_init ();
-void handler_lookaround (SDL_Event *event);
-void handler_movement (SDL_Event *event);
+void evt_handlers_init ();
+void evt_handler_lookaround (SDL_Event *event);
+void evt_handler_movement (SDL_Event *event);
diff --git a/game/src/event/manager.c b/game/src/event/manager.c
index 16e75c0..ffffaa9 100644
--- a/game/src/event/manager.c
+++ b/game/src/event/manager.c
@@ -1,16 +1,15 @@
 #include "manager.h"
 
-EventManager event_manager;
+static GSList *sdl_handlers;
 
 void
-EventManager_add_SDL_handler (SDLHandler h)
+evtman_add_SDL_handler (SDLHandler h)
 {
-  event_manager.sdl_handlers = g_slist_append (event_manager.sdl_handlers, h);
+  sdl_handlers = g_slist_append (sdl_handlers, h);
 }
 
-
 void
-em_handle_sdl_internal (gpointer data, gpointer userdata)
+evtman_handle_sdl_internal (gpointer data, gpointer userdata)
 {
   SDLHandler handler = data;
   SDL_Event *event = userdata;
@@ -18,7 +17,7 @@ em_handle_sdl_internal (gpointer data, gpointer userdata)
 }
 
 void
-EventManager_handle_SDL_Event (SDL_Event *event)
+evtman_handle_SDL_Event (SDL_Event *event)
 {
-  g_slist_foreach (event_manager.sdl_handlers, em_handle_sdl_internal, event);
+  g_slist_foreach (sdl_handlers, evtman_handle_sdl_internal, event);
 }
diff --git a/game/src/event/manager.h b/game/src/event/manager.h
index 3c19b45..06502fe 100644
--- a/game/src/event/manager.h
+++ b/game/src/event/manager.h
@@ -7,12 +7,7 @@
 
 #include "../util.h"
 
-typedef struct EventManager
-{
-  GSList *sdl_handlers;
-} EventManager;
-
 typedef void (*SDLHandler) (SDL_Event *event);
 
-void EventManager_add_SDL_handler (SDLHandler handler);
-void EventManager_handle_SDL_Event (SDL_Event *event);
+void evtman_add_SDL_handler (SDLHandler handler);
+void evtman_handle_SDL_Event (SDL_Event *event);
diff --git a/game/src/main.c b/game/src/main.c
index ad618e0..3d03c24 100644
--- a/game/src/main.c
+++ b/game/src/main.c
@@ -20,7 +20,7 @@ SDL_AppInit (void **appstate, int argc, char **argv)
   SDL_SetAppMetadata (GAME_NAME, GAME_VERSION, "eur.chopininteractive.wschod-game");
   
   graphics_init ();
-  handlers_init ();
+  evt_handlers_init ();
   resources_init ();
   chunkman_init ();
   entman_init ();
@@ -41,7 +41,7 @@ SDL_AppEvent (void *appstate, SDL_Event *event)
       return SDL_APP_SUCCESS;
     }
 
-  EventManager_handle_SDL_Event (event);
+  evtman_handle_SDL_Event (event);
   return SDL_APP_CONTINUE;
 }