diff --git a/.luacheckrc b/.luacheckrc
index eae275a..0def48a 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -3,13 +3,15 @@
 
 globals = {
   "Util",
-  "DecisionManager",
-  "ScreenManager",
+  "Decision",
+  "Screen",
   "UI",
   "Print",
   "Input",
   "Audio",
   "Context",
+  "Meters",
+  "Minigames",
   "mset",
   "mget",
   "btnp",
@@ -30,7 +32,7 @@ globals = {
   "exit",
   "trace",
   "index_menu",
-  "MapManager",
+  "Map",
   "map",
 }
 
diff --git a/inc/decision/decision.go_to_home.lua b/inc/decision/decision.go_to_home.lua
index f906f5d..f6aeb1a 100644
--- a/inc/decision/decision.go_to_home.lua
+++ b/inc/decision/decision.go_to_home.lua
@@ -1,4 +1,4 @@
-DecisionManager.register({
+Decision.register({
   id = "go_to_home",
   label = "Go to Home",
   handle = function()
diff --git a/inc/decision/decision.go_to_office.lua b/inc/decision/decision.go_to_office.lua
index 72118a7..baf50b7 100644
--- a/inc/decision/decision.go_to_office.lua
+++ b/inc/decision/decision.go_to_office.lua
@@ -1,4 +1,4 @@
-DecisionManager.register({
+Decision.register({
   id = "go_to_office",
   label = "Go to Office",
   handle = function()
diff --git a/inc/decision/decision.go_to_toilet.lua b/inc/decision/decision.go_to_toilet.lua
index 6525cbf..db80534 100644
--- a/inc/decision/decision.go_to_toilet.lua
+++ b/inc/decision/decision.go_to_toilet.lua
@@ -1,4 +1,4 @@
-DecisionManager.register({
+Decision.register({
   id = "go_to_toilet",
   label = "Go to Toilet",
   handle = function()
diff --git a/inc/decision/decision.go_to_walking_to_home.lua b/inc/decision/decision.go_to_walking_to_home.lua
index 9accc3d..d17e1da 100644
--- a/inc/decision/decision.go_to_walking_to_home.lua
+++ b/inc/decision/decision.go_to_walking_to_home.lua
@@ -1,4 +1,4 @@
-DecisionManager.register({
+Decision.register({
   id = "go_to_walking_to_home",
   label = "Walking to home",
   handle = function()
diff --git a/inc/decision/decision.go_to_walking_to_office.lua b/inc/decision/decision.go_to_walking_to_office.lua
index 265401a..685141d 100644
--- a/inc/decision/decision.go_to_walking_to_office.lua
+++ b/inc/decision/decision.go_to_walking_to_office.lua
@@ -1,4 +1,4 @@
-DecisionManager.register({
+Decision.register({
   id = "go_to_walking_to_office",
   label = "Walking to office",
   handle = function()
diff --git a/inc/decision/decision.manager.lua b/inc/decision/decision.manager.lua
index 8a660eb..cc78a26 100644
--- a/inc/decision/decision.manager.lua
+++ b/inc/decision/decision.manager.lua
@@ -1,6 +1,6 @@
 local _decisions = {}
 
-function DecisionManager.register(decision)
+function Decision.register(decision)
   if not decision or not decision.id then
     PopupWindow.show({"Error: Invalid decision object registered (missing id)!"})
     return
@@ -22,10 +22,10 @@ function DecisionManager.register(decision)
   _decisions[decision.id] = decision
 end
 
-function DecisionManager.get(id)
+function Decision.get(id)
   return _decisions[id]
 end
 
-function DecisionManager.get_all()
+function Decision.get_all()
   return _decisions
 end
diff --git a/inc/decision/decision.play_button_mash.lua b/inc/decision/decision.play_button_mash.lua
index 1d88a44..cbfd47a 100644
--- a/inc/decision/decision.play_button_mash.lua
+++ b/inc/decision/decision.play_button_mash.lua
@@ -1,4 +1,4 @@
-DecisionManager.register({
+Decision.register({
   id = "play_button_mash",
   label = "Play Button Mash",
   handle = function() Meters.hide() MinigameButtonMashWindow.start(WINDOW_GAME) end,
diff --git a/inc/decision/decision.play_ddr.lua b/inc/decision/decision.play_ddr.lua
index d4d8cf9..2dcb4e0 100644
--- a/inc/decision/decision.play_ddr.lua
+++ b/inc/decision/decision.play_ddr.lua
@@ -1,4 +1,4 @@
-DecisionManager.register({
+Decision.register({
   id = "play_ddr",
   label = "Play DDR (Random)",
   handle = function() Meters.hide() MinigameDDRWindow.start(WINDOW_GAME, nil) end,
diff --git a/inc/decision/decision.play_rhythm.lua b/inc/decision/decision.play_rhythm.lua
index ccb465e..196a743 100644
--- a/inc/decision/decision.play_rhythm.lua
+++ b/inc/decision/decision.play_rhythm.lua
@@ -1,4 +1,4 @@
-DecisionManager.register({
+Decision.register({
   id = "play_rhythm",
   label = "Play Rhythm Game",
   handle = function() Meters.hide() MinigameRhythmWindow.start(WINDOW_GAME) end,
diff --git a/inc/init/init.context.lua b/inc/init/init.context.lua
index 36aac59..0d7ae1e 100644
--- a/inc/init/init.context.lua
+++ b/inc/init/init.context.lua
@@ -67,7 +67,7 @@ local function reset_context_to_initial_state()
   Context.screen_indices_by_id = {}
   local screen_order = {"home", "toilet", "walking_to_office", "office", "walking_to_home"}
   for i, screen_id in ipairs(screen_order) do
-    local screen_data = ScreenManager.get_by_id(screen_id)
+    local screen_data = Screen.get_by_id(screen_id)
     if screen_data then
       table.insert(Context.screens, screen_data)
       Context.screen_indices_by_id[screen_id] = i
diff --git a/inc/init/init.modules.lua b/inc/init/init.modules.lua
index 0adcba2..d0f06e2 100644
--- a/inc/init/init.modules.lua
+++ b/inc/init/init.modules.lua
@@ -11,9 +11,9 @@ local MinigameDDRWindow = {}
 Util = {}
 Meters = {}
 Minigames = {}
-DecisionManager = {}
-ScreenManager = {}
-MapManager = {}
+Decision = {}
+Screen = {}
+Map = {}
 UI = {}
 Print = {}
 Input = {}
diff --git a/inc/map/map.bedroom.lua b/inc/map/map.bedroom.lua
index 1628abc..d5db80f 100644
--- a/inc/map/map.bedroom.lua
+++ b/inc/map/map.bedroom.lua
@@ -1,4 +1,4 @@
-MapManager.register({
+Map.register({
   id = "bedroom",
   from_x =  0,
   from_y =  0,
diff --git a/inc/map/map.manager.lua b/inc/map/map.manager.lua
index 33fbec5..d2be257 100644
--- a/inc/map/map.manager.lua
+++ b/inc/map/map.manager.lua
@@ -1,6 +1,6 @@
 local _maps = {}
 
-function MapManager.get_maps_array()
+function Map.get_maps_array()
   local maps_array = {}
   for _, map_data in pairs(_maps) do
     table.insert(maps_array, map_data)
@@ -8,19 +8,19 @@ function MapManager.get_maps_array()
   return maps_array
 end
 
-function MapManager.register(map_data)
+function Map.register(map_data)
   if _maps[map_data.id] then
     trace("Warning: Overwriting map with id: " .. map_data.id)
   end
   _maps[map_data.id] = map_data
 end
 
-function MapManager.get_by_id(map_id)
+function Map.get_by_id(map_id)
   return _maps[map_id]
 end
 
-function MapManager.draw(map_id)
-  local map_data = MapManager.get_by_id(map_id)
+function Map.draw(map_id)
+  local map_data = Map.get_by_id(map_id)
   if not map_data then
     return
   end
diff --git a/inc/screen/screen.home.lua b/inc/screen/screen.home.lua
index 7fd5ce8..49d2bda 100644
--- a/inc/screen/screen.home.lua
+++ b/inc/screen/screen.home.lua
@@ -1,4 +1,4 @@
-ScreenManager.register({
+Screen.register({
   id = "home",
   name = "Home",
   decisions = {
diff --git a/inc/screen/screen.manager.lua b/inc/screen/screen.manager.lua
index 254eec2..9a54f95 100644
--- a/inc/screen/screen.manager.lua
+++ b/inc/screen/screen.manager.lua
@@ -1,6 +1,6 @@
 local _screens = {}
 
-function ScreenManager.get_screens_array()
+function Screen.get_screens_array()
   local screens_array = {}
   for _, screen_data in pairs(_screens) do
     table.insert(screens_array, screen_data)
@@ -8,13 +8,13 @@ function ScreenManager.get_screens_array()
   return screens_array
 end
 
-function ScreenManager.register(screen_data)
+function Screen.register(screen_data)
   if _screens[screen_data.id] then
     trace("Warning: Overwriting screen with id: " .. screen_data.id)
   end
   _screens[screen_data.id] = screen_data
 end
 
-function ScreenManager.get_by_id(screen_id)
+function Screen.get_by_id(screen_id)
   return _screens[screen_id]
 end
diff --git a/inc/screen/screen.office.lua b/inc/screen/screen.office.lua
index 7a619b0..ad0e61a 100644
--- a/inc/screen/screen.office.lua
+++ b/inc/screen/screen.office.lua
@@ -1,4 +1,4 @@
-ScreenManager.register({
+Screen.register({
   id = "office",
   name = "Office",
   decisions = {
diff --git a/inc/screen/screen.toilet.lua b/inc/screen/screen.toilet.lua
index ebe9543..075bf8d 100644
--- a/inc/screen/screen.toilet.lua
+++ b/inc/screen/screen.toilet.lua
@@ -1,4 +1,4 @@
-ScreenManager.register({
+Screen.register({
   id = "toilet",
   name = "Toilet",
   decisions = {
diff --git a/inc/screen/screen.walking_to_home.lua b/inc/screen/screen.walking_to_home.lua
index a12739f..675ed35 100644
--- a/inc/screen/screen.walking_to_home.lua
+++ b/inc/screen/screen.walking_to_home.lua
@@ -1,4 +1,4 @@
-ScreenManager.register({
+Screen.register({
   id = "walking_to_home",
   name = "Walking to home",
   decisions = {
diff --git a/inc/screen/screen.walking_to_office.lua b/inc/screen/screen.walking_to_office.lua
index 95a89df..a940084 100644
--- a/inc/screen/screen.walking_to_office.lua
+++ b/inc/screen/screen.walking_to_office.lua
@@ -1,4 +1,4 @@
-ScreenManager.register({
+Screen.register({
   id = "walking_to_office",
   name = "Walking to office",
   decisions = {
diff --git a/inc/window/window.game.lua b/inc/window/window.game.lua
index fbf322f..766537b 100644
--- a/inc/window/window.game.lua
+++ b/inc/window/window.game.lua
@@ -1,11 +1,11 @@
 function GameWindow.draw()
   local screen = Context.screens[Context.current_screen]
-  MapManager.draw(screen.background)
+  Map.draw(screen.background)
   UI.draw_top_bar(screen.name)
   if screen and screen.decisions and #screen.decisions > 0 then
     local available_decisions = {}
     for _, decision_id in ipairs(screen.decisions) do
-      local decision = DecisionManager.get(decision_id)
+      local decision = Decision.get(decision_id)
       if decision and decision.condition() then
         table.insert(available_decisions, decision)
       end
@@ -39,7 +39,7 @@ function GameWindow.update()
   if screen and screen.decisions and #screen.decisions > 0 then
     local available_decisions = {}
     for _, decision_id in ipairs(screen.decisions) do
-      local decision = DecisionManager.get(decision_id)
+      local decision = Decision.get(decision_id)
       if decision and decision.condition() then         table.insert(available_decisions, decision)
       end
     end