diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 4346d4d3f..431e3cd97 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -55,19 +55,16 @@ class Renderer(object):
 
     ``theme_manager``
         The ThemeManager instance, used to get the current theme details.
-
-    ``screen_number``
-        Defaults to *0*. The index of the output/display screen.
     """
     log.info(u'Renderer Loaded')
 
-    def __init__(self, imageManager, theme_manager):
+    def __init__(self, image_manager, theme_manager):
         """
         Initialise the render manager.
         """
         log.debug(u'Initilisation started')
         self.theme_manager = theme_manager
-        self.image_manager = imageManager
+        self.image_manager = image_manager
         self.screens = ScreenList.get_instance()
         self.service_theme = u''
         self.theme_level = u''
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index a20d28c39..c6edbca25 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -60,11 +60,11 @@ class MainDisplay(DisplayWidget):
     """
     This is the display screen.
     """
-    def __init__(self, parent, imageManager, live):
+    def __init__(self, parent, image_manager, live):
         DisplayWidget.__init__(self, live, parent)
         self.parent = parent
         self.isLive = live
-        self.imageManager = imageManager
+        self.image_manager = image_manager
         self.screens = ScreenList.get_instance()
         self.alertTab = None
         self.hideMode = None
@@ -245,7 +245,7 @@ class MainDisplay(DisplayWidget):
         """
         API for replacement backgrounds so Images are added directly to cache
         """
-        self.imageManager.add_image(name, path)
+        self.image_manager.add_image(name, path)
         self.image(name)
         if hasattr(self, u'serviceItem'):
             self.override[u'image'] = name
@@ -260,7 +260,7 @@ class MainDisplay(DisplayWidget):
             The name of the image to be displayed
         """
         log.debug(u'image to display')
-        image = self.imageManager.get_image_bytes(name)
+        image = self.image_manager.get_image_bytes(name)
         self.resetVideo()
         self.displayImage(image)
         return self.preview()
@@ -490,13 +490,13 @@ class MainDisplay(DisplayWidget):
                 self.override = {}
             else:
                 # replace the background
-                background = self.imageManager. \
+                background = self.image_manager. \
                     get_image_bytes(self.override[u'image'])
         if self.serviceItem.themedata.background_filename:
-            self.serviceItem.bg_image_bytes = self.imageManager. \
+            self.serviceItem.bg_image_bytes = self.image_manager. \
                 get_image_bytes(self.serviceItem.themedata.theme_name)
         if image:
-            image_bytes = self.imageManager.get_image_bytes(image)
+            image_bytes = self.image_manager.get_image_bytes(image)
         else:
             image_bytes = None
         html = build_html(self.serviceItem, self.screen, self.alertTab,
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index abff4068e..9f526fb2e 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -475,7 +475,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         pluginpath = AppLocation.get_directory(AppLocation.PluginsDir)
         self.pluginManager = PluginManager(pluginpath)
         self.pluginHelpers = {}
-        self.imageManager = ImageManager()
+        self.image_manager = ImageManager()
         # Set up the interface
         self.setupUi(self)
         # Load settings after setupUi so default UI sizes are overwritten
@@ -541,7 +541,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         # warning cyclic dependency
         # renderer needs to call ThemeManager and
         # ThemeManager needs to call Renderer
-        self.renderer = Renderer(self.imageManager, self.themeManagerContents)
+        self.renderer = Renderer(self.image_manager, self.themeManagerContents)
         # Define the media Dock Manager
         self.mediaDockManager = MediaDockManager(self.MediaToolBox)
         log.info(u'Load Plugins')
@@ -774,8 +774,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         their locations
         """
         log.debug(u'screenChanged')
-        self.setFocus()
         self.renderer.update_display()
+        self.setFocus()
         self.activateWindow()
 
     def closeEvent(self, event):
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index de90e7cd4..ad3d4ec87 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -63,7 +63,7 @@ class SlideController(QtGui.QWidget):
         self.screens = ScreenList.get_instance()
         self.ratio = float(self.screens.current[u'size'].width()) / \
             float(self.screens.current[u'size'].height())
-        self.image_manager = self.parent.imageManager
+        self.image_manager = self.parent.image_manager
         self.display = MainDisplay(self, self.image_manager, isLive)
         self.display.setup()
         self.loopList = [