diff --git a/openlp/core/__init__.py b/openlp/core/__init__.py
index 4916928d2..74dd7b24d 100644
--- a/openlp/core/__init__.py
+++ b/openlp/core/__init__.py
@@ -136,8 +136,8 @@ class OpenLP(QtGui.QApplication):
         self.processEvents()
         # start the main app window
         self.main_window = MainWindow()
-        Registry().execute(u'bootstrap_stage_1')
-        Registry().execute(u'bootstrap_stage_2')
+        Registry().execute(u'bootstrap_initialise')
+        Registry().execute(u'bootstrap_post_set_up')
         self.main_window.show()
         if show_splash:
             # now kill the splashscreen
diff --git a/openlp/core/lib/pluginmanager.py b/openlp/core/lib/pluginmanager.py
index 0390874b9..42f2d715a 100644
--- a/openlp/core/lib/pluginmanager.py
+++ b/openlp/core/lib/pluginmanager.py
@@ -54,13 +54,13 @@ class PluginManager(object):
         """
         log.info(u'Plugin manager Initialising')
         Registry().register(u'plugin_manager', self)
-        Registry().register_function(u'bootstrap_stage_1', self.bootstrap_stage_1)
+        Registry().register_function(u'bootstrap_initialise', self.bootstrap_initialise)
         self.base_path = os.path.abspath(AppLocation.get_directory(AppLocation.PluginsDir))
         log.debug(u'Base path %s ', self.base_path)
         self.plugins = []
         log.info(u'Plugin manager Initialised')
 
-    def bootstrap_stage_1(self):
+    def bootstrap_initialise(self):
         """
         Bootstrap all the plugin manager functions
         """
diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py
index b055f249e..301e48f1a 100644
--- a/openlp/core/ui/media/mediacontroller.py
+++ b/openlp/core/ui/media/mediacontroller.py
@@ -99,7 +99,7 @@ class MediaController(object):
         """
         self.mainWindow = parent
         Registry().register(u'media_controller', self)
-        Registry().register_function(u'bootstrap_stage_1', self.check_available_media_players)
+        Registry().register_function(u'bootstrap_initialise', self.check_available_media_players)
         self.mediaPlayers = {}
         self.displayControllers = {}
         self.currentMediaPlayer = {}
diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py
index 80ee7eb29..166f7908a 100644
--- a/openlp/core/ui/settingsform.py
+++ b/openlp/core/ui/settingsform.py
@@ -50,7 +50,7 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
         Initialise the settings form
         """
         Registry().register(u'settings_form', self)
-        Registry().register_function(u'bootstrap_stage_2', self.post_set_up)
+        Registry().register_function(u'bootstrap_post_set_up', self.post_set_up)
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
         # General tab
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 88907f945..3f179331a 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -60,7 +60,7 @@ class ThemeManager(QtGui.QWidget):
         """
         QtGui.QWidget.__init__(self, parent)
         Registry().register(u'theme_manager', self)
-        Registry().register_function(u'bootstrap_stage_1', self.load_first_time_themes)
+        Registry().register_function(u'bootstrap_initialise', self.load_first_time_themes)
         self.settingsSection = u'themes'
         self.themeForm = ThemeForm(self)
         self.fileRenameForm = FileRenameForm()