diff --git a/openlp/core/ui/firsttimeform.py b/openlp/core/ui/firsttimeform.py
index 8d7eee496..188bc3c02 100644
--- a/openlp/core/ui/firsttimeform.py
+++ b/openlp/core/ui/firsttimeform.py
@@ -61,7 +61,7 @@ class ThemeScreenshotThread(QtCore.QThread):
         config = self.parent().config
         for theme in themes:
             # Stop if the wizard has been cancelled.
-            if self.parent().downloadCancelled:
+            if self.parent().was_download_cancelled:
                 return
             title = config.get(u'theme_%s' % theme, u'title')
             filename = config.get(u'theme_%s' % theme, u'filename')
@@ -91,9 +91,9 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
         # check to see if we have web access
         self.web = u'http://openlp.org/files/frw/'
         self.config = SafeConfigParser()
-        self.webAccess = get_web_page(u'%s%s' % (self.web, u'download.cfg'))
-        if self.webAccess:
-            files = self.webAccess.read()
+        self.web_access = get_web_page(u'%s%s' % (self.web, u'download.cfg'))
+        if self.web_access:
+            files = self.web_access.read()
             self.config.readfp(io.BytesIO(files))
         self.update_screen_list_combo()
         self.was_download_cancelled = False
@@ -117,13 +117,12 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
         Set up display at start of theme edit.
         """
         self.restart()
-        check_directory_exists(os.path.join(
-            unicode(gettempdir(), get_filesystem_encoding()), u'openlp'))
+        check_directory_exists(os.path.join(unicode(gettempdir(), get_filesystem_encoding()), u'openlp'))
         self.noInternetFinishButton.setVisible(False)
         # Check if this is a re-run of the wizard.
         self.hasRunWizard = Settings().value(u'general/has run wizard')
         # Sort out internet access for downloads
-        if self.webAccess:
+        if self.web_access:
             songs = self.config.get(u'songs', u'languages')
             songs = songs.split(u',')
             for song in songs:
@@ -159,7 +158,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
         """
         self.application.process_events()
         if self.currentId() == FirstTimePage.Plugins:
-            if not self.webAccess:
+            if not self.web_access:
                 return FirstTimePage.NoInternet
             else:
                 return FirstTimePage.Songs
@@ -240,8 +239,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
         """
         Process the triggering of the cancel button.
         """
-        if self.lastId == FirstTimePage.NoInternet or \
-                (self.lastId <= FirstTimePage.Plugins and not self.hasRunWizard):
+        if self.lastId == FirstTimePage.NoInternet or (self.lastId <= FirstTimePage.Plugins and not self.hasRunWizard):
             QtCore.QCoreApplication.exit()
             sys.exit()
         self.was_download_cancelled = True
@@ -427,7 +425,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
         self._setPluginStatus(self.customCheckBox, u'custom/status')
         self._setPluginStatus(self.songUsageCheckBox, u'songusage/status')
         self._setPluginStatus(self.alertCheckBox, u'alerts/status')
-        if self.webAccess:
+        if self.web_access:
             # Build directories for downloads
             songs_destination = os.path.join(
                 unicode(gettempdir(), get_filesystem_encoding()), u'openlp')
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 83604766d..c58a8aefd 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -156,7 +156,7 @@ class ThemeManager(QtGui.QWidget):
         files = SettingsManager.get_files(self.settingsSection, u'.otz')
         for theme_file in files:
             theme_file = os.path.join(self.path, theme_file)
-            self.unzipTheme(theme_file, self.path)
+            self.unzip_theme(theme_file, self.path)
             delete_file(theme_file)
         self.application.set_normal_cursor()