diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py
index 68b717c4d..4e6dc96ca 100644
--- a/openlp/core/ui/generaltab.py
+++ b/openlp/core/ui/generaltab.py
@@ -61,96 +61,95 @@ class GeneralTab(SettingsTab):
         """
         self.setObjectName(u'GeneralTab')
         self.tabTitleVisible = translate('OpenLP.GeneralTab', 'General')
-        self.GeneralLayout = QtGui.QHBoxLayout(self)
-        self.GeneralLayout.setSpacing(8)
-        self.GeneralLayout.setMargin(8)
-        self.GeneralLayout.setObjectName(u'GeneralLayout')
-        self.GeneralLeftLayout = QtGui.QVBoxLayout()
-        self.GeneralLeftLayout.setObjectName(u'GeneralLeftLayout')
-        self.GeneralLeftLayout.setSpacing(8)
-        self.GeneralLeftLayout.setMargin(0)
-        self.GeneralLayout.addLayout(self.GeneralLeftLayout)
-        self.MonitorGroupBox = QtGui.QGroupBox(self)
-        self.MonitorGroupBox.setObjectName(u'MonitorGroupBox')
-        self.MonitorLayout = QtGui.QVBoxLayout(self.MonitorGroupBox)
-        self.MonitorLayout.setSpacing(8)
-        self.MonitorLayout.setMargin(8)
-        self.MonitorLayout.setObjectName(u'MonitorLayout')
-        self.MonitorLabel = QtGui.QLabel(self.MonitorGroupBox)
-        self.MonitorLabel.setObjectName(u'MonitorLabel')
-        self.MonitorLayout.addWidget(self.MonitorLabel)
-        self.MonitorComboBox = QtGui.QComboBox(self.MonitorGroupBox)
-        self.MonitorComboBox.setObjectName(u'MonitorComboBox')
-        self.MonitorLayout.addWidget(self.MonitorComboBox)
-        self.MonitorLayout.addWidget(self.MonitorComboBox)
-        self.DisplayOnMonitorCheck = QtGui.QCheckBox(self.MonitorGroupBox)
-        self.DisplayOnMonitorCheck.setObjectName(u'MonitorComboBox')
-        self.MonitorLayout.addWidget(self.DisplayOnMonitorCheck)
-        self.GeneralLeftLayout.addWidget(self.MonitorGroupBox)
-        self.StartupGroupBox = QtGui.QGroupBox(self)
-        self.StartupGroupBox.setObjectName(u'StartupGroupBox')
-        self.StartupLayout = QtGui.QVBoxLayout(self.StartupGroupBox)
-        self.StartupLayout.setSpacing(8)
-        self.StartupLayout.setMargin(8)
-        self.StartupLayout.setObjectName(u'StartupLayout')
-        self.WarningCheckBox = QtGui.QCheckBox(self.StartupGroupBox)
-        self.WarningCheckBox.setObjectName(u'WarningCheckBox')
-        self.StartupLayout.addWidget(self.WarningCheckBox)
-        self.AutoOpenCheckBox = QtGui.QCheckBox(self.StartupGroupBox)
-        self.AutoOpenCheckBox.setObjectName(u'AutoOpenCheckBox')
-        self.StartupLayout.addWidget(self.AutoOpenCheckBox)
-        self.ShowSplashCheckBox = QtGui.QCheckBox(self.StartupGroupBox)
-        self.ShowSplashCheckBox.setObjectName(u'ShowSplashCheckBox')
-        self.StartupLayout.addWidget(self.ShowSplashCheckBox)
-        self.GeneralLeftLayout.addWidget(self.StartupGroupBox)
-        self.SettingsGroupBox = QtGui.QGroupBox(self)
-        self.SettingsGroupBox.setObjectName(u'SettingsGroupBox')
-        self.SettingsLayout = QtGui.QVBoxLayout(self.SettingsGroupBox)
-        self.SettingsLayout.setSpacing(8)
-        self.SettingsLayout.setMargin(8)
-        self.SettingsLayout.setObjectName(u'SettingsLayout')
-        self.SaveCheckServiceCheckBox = QtGui.QCheckBox(self.SettingsGroupBox)
-        self.SaveCheckServiceCheckBox.setObjectName(u'SaveCheckServiceCheckBox')
-        self.SettingsLayout.addWidget(self.SaveCheckServiceCheckBox)
-        self.GeneralLeftLayout.addWidget(self.SettingsGroupBox)
-        self.AutoPreviewCheckBox = QtGui.QCheckBox(self.SettingsGroupBox)
-        self.AutoPreviewCheckBox.setObjectName(u'AutoPreviewCheckBox')
-        self.SettingsLayout.addWidget(self.AutoPreviewCheckBox)
-        self.GeneralLeftLayout.addWidget(self.SettingsGroupBox)
-        self.GeneralLeftSpacer = QtGui.QSpacerItem(20, 40,
+        self.generalLayout = QtGui.QHBoxLayout(self)
+        self.generalLayout.setSpacing(8)
+        self.generalLayout.setMargin(8)
+        self.generalLayout.setObjectName(u'generalLayout')
+        self.generalLeftLayout = QtGui.QVBoxLayout()
+        self.generalLeftLayout.setObjectName(u'generalLeftLayout')
+        self.generalLeftLayout.setSpacing(8)
+        self.generalLeftLayout.setMargin(0)
+        self.generalLayout.addLayout(self.generalLeftLayout)
+        self.monitorGroupBox = QtGui.QGroupBox(self)
+        self.monitorGroupBox.setObjectName(u'monitorGroupBox')
+        self.monitorLayout = QtGui.QVBoxLayout(self.monitorGroupBox)
+        self.monitorLayout.setSpacing(8)
+        self.monitorLayout.setMargin(8)
+        self.monitorLayout.setObjectName(u'monitorLayout')
+        self.monitorLabel = QtGui.QLabel(self.monitorGroupBox)
+        self.monitorLabel.setObjectName(u'monitorLabel')
+        self.monitorLayout.addWidget(self.monitorLabel)
+        self.monitorComboBox = QtGui.QComboBox(self.monitorGroupBox)
+        self.monitorComboBox.setObjectName(u'monitorComboBox')
+        self.monitorLayout.addWidget(self.monitorComboBox)
+        self.displayOnMonitorCheck = QtGui.QCheckBox(self.monitorGroupBox)
+        self.displayOnMonitorCheck.setObjectName(u'monitorComboBox')
+        self.monitorLayout.addWidget(self.displayOnMonitorCheck)
+        self.generalLeftLayout.addWidget(self.monitorGroupBox)
+        self.startupGroupBox = QtGui.QGroupBox(self)
+        self.startupGroupBox.setObjectName(u'startupGroupBox')
+        self.startupLayout = QtGui.QVBoxLayout(self.startupGroupBox)
+        self.startupLayout.setSpacing(8)
+        self.startupLayout.setMargin(8)
+        self.startupLayout.setObjectName(u'startupLayout')
+        self.warningCheckBox = QtGui.QCheckBox(self.startupGroupBox)
+        self.warningCheckBox.setObjectName(u'warningCheckBox')
+        self.startupLayout.addWidget(self.warningCheckBox)
+        self.autoOpenCheckBox = QtGui.QCheckBox(self.startupGroupBox)
+        self.autoOpenCheckBox.setObjectName(u'autoOpenCheckBox')
+        self.startupLayout.addWidget(self.autoOpenCheckBox)
+        self.showSplashCheckBox = QtGui.QCheckBox(self.startupGroupBox)
+        self.showSplashCheckBox.setObjectName(u'showSplashCheckBox')
+        self.startupLayout.addWidget(self.showSplashCheckBox)
+        self.generalLeftLayout.addWidget(self.startupGroupBox)
+        self.settingsGroupBox = QtGui.QGroupBox(self)
+        self.settingsGroupBox.setObjectName(u'settingsGroupBox')
+        self.settingsLayout = QtGui.QVBoxLayout(self.settingsGroupBox)
+        self.settingsLayout.setSpacing(8)
+        self.settingsLayout.setMargin(8)
+        self.settingsLayout.setObjectName(u'settingsLayout')
+        self.saveCheckServiceCheckBox = QtGui.QCheckBox(self.settingsGroupBox)
+        self.saveCheckServiceCheckBox.setObjectName(u'saveCheckServiceCheckBox')
+        self.settingsLayout.addWidget(self.saveCheckServiceCheckBox)
+        self.generalLeftLayout.addWidget(self.settingsGroupBox)
+        self.autoPreviewCheckBox = QtGui.QCheckBox(self.settingsGroupBox)
+        self.autoPreviewCheckBox.setObjectName(u'autoPreviewCheckBox')
+        self.settingsLayout.addWidget(self.autoPreviewCheckBox)
+        self.generalLeftLayout.addWidget(self.settingsGroupBox)
+        self.generalLeftSpacer = QtGui.QSpacerItem(20, 40,
             QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.GeneralLeftLayout.addItem(self.GeneralLeftSpacer)
-        self.GeneralRightLayout = QtGui.QVBoxLayout()
-        self.GeneralRightLayout.setSpacing(8)
-        self.GeneralRightLayout.setMargin(0)
-        self.GeneralRightLayout.setObjectName(u'GeneralRightLayout')
-        self.GeneralLayout.addLayout(self.GeneralRightLayout)
-        self.CCLIGroupBox = QtGui.QGroupBox(self)
-        self.CCLIGroupBox.setObjectName(u'CCLIGroupBox')
-        self.CCLILayout = QtGui.QGridLayout(self.CCLIGroupBox)
-        self.CCLILayout.setMargin(8)
-        self.CCLILayout.setSpacing(8)
-        self.CCLILayout.setObjectName(u'CCLILayout')
-        self.NumberLabel = QtGui.QLabel(self.CCLIGroupBox)
-        self.NumberLabel.setObjectName(u'NumberLabel')
-        self.CCLILayout.addWidget(self.NumberLabel, 0, 0, 1, 1)
-        self.NumberEdit = QtGui.QLineEdit(self.CCLIGroupBox)
-        self.NumberEdit.setObjectName(u'NumberEdit')
-        self.CCLILayout.addWidget(self.NumberEdit, 0, 1, 1, 1)
-        self.UsernameLabel = QtGui.QLabel(self.CCLIGroupBox)
-        self.UsernameLabel.setObjectName(u'UsernameLabel')
-        self.CCLILayout.addWidget(self.UsernameLabel, 1, 0, 1, 1)
-        self.UsernameEdit = QtGui.QLineEdit(self.CCLIGroupBox)
-        self.UsernameEdit.setObjectName(u'UsernameEdit')
-        self.CCLILayout.addWidget(self.UsernameEdit, 1, 1, 1, 1)
-        self.PasswordLabel = QtGui.QLabel(self.CCLIGroupBox)
-        self.PasswordLabel.setObjectName(u'PasswordLabel')
-        self.CCLILayout.addWidget(self.PasswordLabel, 2, 0, 1, 1)
-        self.PasswordEdit = QtGui.QLineEdit(self.CCLIGroupBox)
-        self.PasswordEdit.setEchoMode(QtGui.QLineEdit.Password)
-        self.PasswordEdit.setObjectName(u'PasswordEdit')
-        self.CCLILayout.addWidget(self.PasswordEdit, 2, 1, 1, 1)
-        self.GeneralRightLayout.addWidget(self.CCLIGroupBox)
+        self.generalLeftLayout.addItem(self.generalLeftSpacer)
+        self.generalRightLayout = QtGui.QVBoxLayout()
+        self.generalRightLayout.setSpacing(8)
+        self.generalRightLayout.setMargin(0)
+        self.generalRightLayout.setObjectName(u'generalRightLayout')
+        self.generalLayout.addLayout(self.generalRightLayout)
+        self.ccliGroupBox = QtGui.QGroupBox(self)
+        self.ccliGroupBox.setObjectName(u'ccliGroupBox')
+        self.ccliLayout = QtGui.QGridLayout(self.ccliGroupBox)
+        self.ccliLayout.setMargin(8)
+        self.ccliLayout.setSpacing(8)
+        self.ccliLayout.setObjectName(u'ccliLayout')
+        self.numberLabel = QtGui.QLabel(self.ccliGroupBox)
+        self.numberLabel.setObjectName(u'numberLabel')
+        self.ccliLayout.addWidget(self.numberLabel, 0, 0, 1, 1)
+        self.numberEdit = QtGui.QLineEdit(self.ccliGroupBox)
+        self.numberEdit.setObjectName(u'numberEdit')
+        self.ccliLayout.addWidget(self.numberEdit, 0, 1, 1, 1)
+        self.usernameLabel = QtGui.QLabel(self.ccliGroupBox)
+        self.usernameLabel.setObjectName(u'usernameLabel')
+        self.ccliLayout.addWidget(self.usernameLabel, 1, 0, 1, 1)
+        self.usernameEdit = QtGui.QLineEdit(self.ccliGroupBox)
+        self.usernameEdit.setObjectName(u'usernameEdit')
+        self.ccliLayout.addWidget(self.usernameEdit, 1, 1, 1, 1)
+        self.passwordLabel = QtGui.QLabel(self.ccliGroupBox)
+        self.passwordLabel.setObjectName(u'passwordLabel')
+        self.ccliLayout.addWidget(self.passwordLabel, 2, 0, 1, 1)
+        self.passwordEdit = QtGui.QLineEdit(self.ccliGroupBox)
+        self.passwordEdit.setEchoMode(QtGui.QLineEdit.Password)
+        self.passwordEdit.setObjectName(u'passwordEdit')
+        self.ccliLayout.addWidget(self.passwordEdit, 2, 1, 1, 1)
+        self.generalRightLayout.addWidget(self.ccliGroupBox)
         # Moved here from display tab
         self.displayGroupBox = QtGui.QGroupBox(self)
         self.displayGroupBox.setObjectName(u'displayGroupBox')
@@ -219,7 +218,7 @@ class GeneralTab(SettingsTab):
         self.overrideCheckBox = QtGui.QCheckBox(self.displayGroupBox)
         self.overrideCheckBox.setObjectName(u'overrideCheckBox')
         self.displayLayout.addWidget(self.overrideCheckBox)
-        self.GeneralRightLayout.addWidget(self.displayGroupBox)
+        self.generalRightLayout.addWidget(self.displayGroupBox)
         # Custom position
         self.customLayout = QtGui.QHBoxLayout()
         self.customLayout.setSpacing(8)
@@ -276,9 +275,9 @@ class GeneralTab(SettingsTab):
         self.customLayout.addLayout(self.customWidthLayout)
         self.displayLayout.addLayout(self.customLayout)
         # Bottom spacer
-        self.GeneralRightSpacer = QtGui.QSpacerItem(20, 40,
+        self.generalRightSpacer = QtGui.QSpacerItem(20, 40,
             QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.GeneralRightLayout.addItem(self.GeneralRightSpacer)
+        self.generalRightLayout.addItem(self.generalRightSpacer)
         # Signals and slots
         QtCore.QObject.connect(self.overrideCheckBox,
             QtCore.SIGNAL(u'toggled(bool)'), self.onOverrideCheckBoxToggled)
@@ -287,33 +286,33 @@ class GeneralTab(SettingsTab):
         """
         Translate the general settings tab to the currently selected language
         """
-        self.MonitorGroupBox.setTitle(translate('OpenLP.GeneralTab',
+        self.monitorGroupBox.setTitle(translate('OpenLP.GeneralTab',
             'Monitors'))
-        self.MonitorLabel.setText(translate('OpenLP.GeneralTab',
+        self.monitorLabel.setText(translate('OpenLP.GeneralTab',
             'Select monitor for output display:'))
-        self.DisplayOnMonitorCheck.setText(
+        self.displayOnMonitorCheck.setText(
             translate('OpenLP.GeneralTab', 'Display if a single screen'))
-        self.StartupGroupBox.setTitle(
+        self.startupGroupBox.setTitle(
             translate('OpenLP.GeneralTab', 'Application Startup'))
-        self.WarningCheckBox.setText(
+        self.warningCheckBox.setText(
             translate('OpenLP.GeneralTab', 'Show blank screen warning'))
-        self.AutoOpenCheckBox.setText(translate('OpenLP.GeneralTab',
+        self.autoOpenCheckBox.setText(translate('OpenLP.GeneralTab',
             'Automatically open the last service'))
-        self.ShowSplashCheckBox.setText(
+        self.showSplashCheckBox.setText(
             translate('OpenLP.GeneralTab', 'Show the splash screen'))
-        self.SettingsGroupBox.setTitle(
+        self.settingsGroupBox.setTitle(
             translate('OpenLP.GeneralTab', 'Application Settings'))
-        self.SaveCheckServiceCheckBox.setText(translate('OpenLP.GeneralTab',
+        self.saveCheckServiceCheckBox.setText(translate('OpenLP.GeneralTab',
             'Prompt to save before starting a new service'))
-        self.AutoPreviewCheckBox.setText(translate('OpenLP.GeneralTab',
+        self.autoPreviewCheckBox.setText(translate('OpenLP.GeneralTab',
             'Automatically preview next item in service'))
-        self.CCLIGroupBox.setTitle(
+        self.ccliGroupBox.setTitle(
             translate('OpenLP.GeneralTab', 'CCLI Details'))
-        self.NumberLabel.setText(
+        self.numberLabel.setText(
             translate('OpenLP.GeneralTab', 'CCLI number:'))
-        self.UsernameLabel.setText(
+        self.usernameLabel.setText(
             translate('OpenLP.GeneralTab', 'SongSelect username:'))
-        self.PasswordLabel.setText(
+        self.passwordLabel.setText(
             translate('OpenLP.GeneralTab', 'SongSelect password:'))
         # Moved from display tab
         self.displayGroupBox.setTitle(
@@ -348,24 +347,24 @@ class GeneralTab(SettingsTab):
             if screen[u'primary']:
                 screen_name = u'%s (%s)' % (screen_name,
                     translate('OpenLP.GeneralTab', 'primary'))
-            self.MonitorComboBox.addItem(screen_name)
-        self.NumberEdit.setText(unicode(settings.value(
+            self.monitorComboBox.addItem(screen_name)
+        self.numberEdit.setText(unicode(settings.value(
             u'ccli number', QtCore.QVariant(u'')).toString()))
-        self.UsernameEdit.setText(unicode(settings.value(
+        self.usernameEdit.setText(unicode(settings.value(
             u'songselect username', QtCore.QVariant(u'')).toString()))
-        self.PasswordEdit.setText(unicode(settings.value(
+        self.passwordEdit.setText(unicode(settings.value(
             u'songselect password', QtCore.QVariant(u'')).toString()))
-        self.SaveCheckServiceCheckBox.setChecked(settings.value(u'save prompt',
+        self.saveCheckServiceCheckBox.setChecked(settings.value(u'save prompt',
             QtCore.QVariant(False)).toBool())
-        self.MonitorComboBox.setCurrentIndex(self.monitorNumber)
-        self.DisplayOnMonitorCheck.setChecked(self.screens.display)
-        self.WarningCheckBox.setChecked(settings.value(u'blank warning',
+        self.monitorComboBox.setCurrentIndex(self.monitorNumber)
+        self.displayOnMonitorCheck.setChecked(self.screens.display)
+        self.warningCheckBox.setChecked(settings.value(u'blank warning',
             QtCore.QVariant(False)).toBool())
-        self.AutoOpenCheckBox.setChecked(settings.value(u'auto open',
+        self.autoOpenCheckBox.setChecked(settings.value(u'auto open',
             QtCore.QVariant(False)).toBool())
-        self.ShowSplashCheckBox.setChecked(settings.value(u'show splash',
+        self.showSplashCheckBox.setChecked(settings.value(u'show splash',
             QtCore.QVariant(True)).toBool())
-        self.AutoPreviewCheckBox.setChecked(settings.value(u'auto preview',
+        self.autoPreviewCheckBox.setChecked(settings.value(u'auto preview',
             QtCore.QVariant(False)).toBool())
         self.currentXValueLabel.setText(
             unicode(self.screens.current[u'size'].x()))
@@ -408,28 +407,28 @@ class GeneralTab(SettingsTab):
         """
         Save the settings from the form
         """
-        self.monitorNumber = self.MonitorComboBox.currentIndex()
+        self.monitorNumber = self.monitorComboBox.currentIndex()
         settings = QtCore.QSettings()
         settings.beginGroup(self.settingsSection)
         settings.setValue(u'monitor', QtCore.QVariant(self.monitorNumber))
         settings.setValue(u'display on monitor',
-            QtCore.QVariant(self.DisplayOnMonitorCheck.isChecked()))
+            QtCore.QVariant(self.displayOnMonitorCheck.isChecked()))
         settings.setValue(u'blank warning',
-            QtCore.QVariant(self.WarningCheckBox.isChecked()))
+            QtCore.QVariant(self.warningCheckBox.isChecked()))
         settings.setValue(u'auto open',
-            QtCore.QVariant(self.AutoOpenCheckBox.isChecked()))
+            QtCore.QVariant(self.autoOpenCheckBox.isChecked()))
         settings.setValue(u'show splash',
-            QtCore.QVariant(self.ShowSplashCheckBox.isChecked()))
+            QtCore.QVariant(self.showSplashCheckBox.isChecked()))
         settings.setValue(u'save prompt',
-            QtCore.QVariant(self.SaveCheckServiceCheckBox.isChecked()))
+            QtCore.QVariant(self.saveCheckServiceCheckBox.isChecked()))
         settings.setValue(u'auto preview',
-            QtCore.QVariant(self.AutoPreviewCheckBox.isChecked()))
+            QtCore.QVariant(self.autoPreviewCheckBox.isChecked()))
         settings.setValue(u'ccli number',
-            QtCore.QVariant(self.NumberEdit.displayText()))
+            QtCore.QVariant(self.numberEdit.displayText()))
         settings.setValue(u'songselect username',
-            QtCore.QVariant(self.UsernameEdit.displayText()))
+            QtCore.QVariant(self.usernameEdit.displayText()))
         settings.setValue(u'songselect password',
-            QtCore.QVariant(self.PasswordEdit.displayText()))
+            QtCore.QVariant(self.passwordEdit.displayText()))
         settings.setValue(u'x position',
             QtCore.QVariant(self.customXValueEdit.text()))
         settings.setValue(u'y position',
@@ -441,7 +440,7 @@ class GeneralTab(SettingsTab):
         settings.setValue(u'override position',
             QtCore.QVariant(self.overrideCheckBox.isChecked()))
         settings.endGroup()
-        self.screens.display = self.DisplayOnMonitorCheck.isChecked()
+        self.screens.display = self.displayOnMonitorCheck.isChecked()
         #Monitor Number has changed.
         if self.screens.monitor_number != self.monitorNumber:
             self.screens.monitor_number = self.monitorNumber