diff --git a/modules/plugins/trackservice.py b/modules/plugins/trackservice.py
index 0823ffa753a27399abee3ac5caa11aedbc72de75..0d3dfa4e26b4200e7ef0a4fee681317abfa72b63 100644
--- a/modules/plugins/trackservice.py
+++ b/modules/plugins/trackservice.py
@@ -28,7 +28,7 @@ from modules.base.config import AuraConfig
 from modules.base.utils import SimpleUtil as SU
 from modules.core.resources import ResourceClass
 from modules.core.resources import ResourceUtil
-from modules.scheduling.fallback_manager import FallbackType
+from modules.scheduling.fallback import FallbackType
 
 
 
@@ -303,7 +303,7 @@ class Playlog:
         playlist = None
 
         if timeslot:
-            fallback_type, playlist = self.engine.scheduler.fallback_manager.resolve_playlist(timeslot)  
+            fallback_type, playlist = self.engine.scheduler.fallback.resolve_playlist(timeslot)  
 
         if playlist:
             data["playlist_id"] = playlist.playlist_id
diff --git a/modules/scheduling/scheduler.py b/modules/scheduling/scheduler.py
index 4f73c25771df948d969ef1b19d446de669205801..aca0d4b1728535fa5921f0ed2ddf11ec728f72d3 100644
--- a/modules/scheduling/scheduler.py
+++ b/modules/scheduling/scheduler.py
@@ -31,12 +31,13 @@ from modules.cli.redis.messenger            import RedisMessenger
 from modules.base.utils                     import SimpleUtil as SU
 from modules.base.models                    import AuraDatabaseModel, Schedule, Playlist
 from modules.base.exceptions                import NoActiveScheduleException, LoadSourceException
+from modules.core.control                   import EngineExecutor
 from modules.core.engine                    import Engine
 from modules.core.channels                  import ChannelType, TransitionType, EntryPlayState
 from modules.core.resources                 import ResourceClass, ResourceUtil
 from modules.scheduling.calendar            import AuraCalendarService
-from modules.scheduling.fallback_manager    import FallbackManager
-from modules.scheduling.fallback_manager    import EngineExecutor
+from modules.scheduling.fallback            import FallbackManager
+
 
 
 
@@ -78,7 +79,7 @@ class AuraScheduler(threading.Thread):
     last_successful_fetch = None
     programme = None
     message_timer = []
-    fallback_manager = None
+    fallback = None
     client = None
     is_soundsytem_ready = None
     is_initialized = None
@@ -98,7 +99,7 @@ class AuraScheduler(threading.Thread):
         self.logger = logging.getLogger("AuraEngine")
 
         self.init_database()
-        self.fallback_manager = FallbackManager(self)
+        self.fallback = FallbackManager(self)
         self.redismessenger = RedisMessenger(config)
         self.engine = engine
         self.engine.scheduler = self
@@ -208,7 +209,7 @@ class AuraScheduler(threading.Thread):
 
         # Schedule any available fallback playlist
         if active_schedule:
-            self.fallback_manager.queue_fallback_playlist(active_schedule)
+            self.fallback.queue_fallback_playlist(active_schedule)
             # Queue the fade-out of the schedule
             if not active_schedule.fadeouttimer:
                 self.queue_end_of_schedule(active_schedule, True)
@@ -422,7 +423,7 @@ class AuraScheduler(threading.Thread):
             (String):   Absolute path to the file to be played as a fallback.
         """
 
-        file = self.fallback_manager.get_fallback_for(fallbackname)
+        file = self.fallback.get_fallback_for(fallbackname)
 
         if file:
             self.logger.info("Got next file '%s' (fallback type: %s)" % (file, fallbackname))
@@ -451,7 +452,7 @@ class AuraScheduler(threading.Thread):
             if active_schedule.playlist:
                 planned_playlist = active_schedule.playlist[0]
 
-            (fallback_type, resolved_playlist) = self.fallback_manager.resolve_playlist(active_schedule)
+            (fallback_type, resolved_playlist) = self.fallback.resolve_playlist(active_schedule)
 
             s += "\n│   Playing timeslot %s         " % active_schedule
             if planned_playlist: 
@@ -500,7 +501,7 @@ class AuraScheduler(threading.Thread):
             s += "\n│   Nothing.         "
         else:
             for schedule in next_schedules:        
-                (fallback_type, resolved_playlist) = self.fallback_manager.resolve_playlist(schedule)
+                (fallback_type, resolved_playlist) = self.fallback.resolve_playlist(schedule)
                 if resolved_playlist:
 
                     s += "\n│   Queued timeslot %s         " % schedule
@@ -608,7 +609,7 @@ class AuraScheduler(threading.Thread):
         if schedules:
             for next_schedule in schedules:
                 # Schedule any available fallback playlist
-                self.fallback_manager.queue_fallback_playlist(next_schedule)
+                self.fallback.queue_fallback_playlist(next_schedule)
 
                 if next_schedule.playlist:
                     self.queue_playlist_entries(next_schedule, next_schedule.get_playlist().entries, False, True)
@@ -956,13 +957,13 @@ class AuraScheduler(threading.Thread):
                     self.logger.critical(SU.red("Could not pre-roll entries %s" % ResourceUtil.get_entries_string(entries)), e)
 
                     # # Pro-active fallback handling, avoiding the need of the silence detector kicking-in.
-                    # self.fallback_manager.handle_proactive_fallback(self, entries[0].playlist)
+                    # self.fallback.handle_proactive_fallback(self, entries[0].playlist)
 
                 if entries[-1].status != EntryPlayState.READY:
                     self.logger.critical(SU.red("Entries didn't reach 'ready' state during pre-rolling (Entries: %s)" % ResourceUtil.get_entries_string(entries)))
 
                     # # Pro-active fallback handling, avoiding the need of the silence detector kicking-in.
-                    # self.fallback_manager.handle_proactive_fallback(self, entries[0].playlist)
+                    # self.fallback.handle_proactive_fallback(self, entries[0].playlist)
 
             loader_diff = diff - self.config.get("preroll_offset")
             loader = CallFunctionTimer(diff=loader_diff, func=do_preroll, param=param, fadein=fadein, fadeout=fadeout, switcher=False, loader=True)