diff --git a/openlp/core/ui/amendthemedialog.py b/openlp/core/ui/amendthemedialog.py
index bef41e8fa..893b5e32d 100644
--- a/openlp/core/ui/amendthemedialog.py
+++ b/openlp/core/ui/amendthemedialog.py
@@ -123,18 +123,18 @@ class Ui_AmendThemeDialog(object):
             self.gradientComboBox)
         self.imageFilenameWidget = QtGui.QWidget(self.backgroundTab)
         self.imageFilenameWidget.setObjectName(u'imageFilenameWidget')
-        self.horizontalLayout_2 = QtGui.QHBoxLayout(self.imageFilenameWidget)
-        self.horizontalLayout_2.setSpacing(0)
-        self.horizontalLayout_2.setMargin(0)
-        self.horizontalLayout_2.setObjectName(u'horizontalLayout_2')
+        self.horizontalLayout2 = QtGui.QHBoxLayout(self.imageFilenameWidget)
+        self.horizontalLayout2.setSpacing(0)
+        self.horizontalLayout2.setMargin(0)
+        self.horizontalLayout2.setObjectName(u'horizontalLayout2')
         self.imageLineEdit = QtGui.QLineEdit(self.imageFilenameWidget)
         self.imageLineEdit.setObjectName(u'imageLineEdit')
-        self.horizontalLayout_2.addWidget(self.imageLineEdit)
+        self.horizontalLayout2.addWidget(self.imageLineEdit)
         self.imageToolButton = QtGui.QToolButton(self.imageFilenameWidget)
         self.imageToolButton.setIcon(build_icon(u':/general/general_open.png'))
         self.imageToolButton.setObjectName(u'imageToolButton')
         self.imageToolButton.setAutoRaise(True)
-        self.horizontalLayout_2.addWidget(self.imageToolButton)
+        self.horizontalLayout2.addWidget(self.imageToolButton)
         self.backgroundLayout.setWidget(4, QtGui.QFormLayout.FieldRole,
             self.imageFilenameWidget)
         self.themeTabWidget.addTab(self.backgroundTab, u'')
@@ -572,40 +572,40 @@ class Ui_AmendThemeDialog(object):
         self.optionsRightLayout.setObjectName(u'optionsRightLayout')
         self.alignmentGroupBox = QtGui.QGroupBox(self.optionsRightWidget)
         self.alignmentGroupBox.setObjectName(u'alignmentGroupBox')
-        self.gridLayout_4 = QtGui.QGridLayout(self.alignmentGroupBox)
-        self.gridLayout_4.setObjectName(u'gridLayout_4')
+        self.gridLayout4 = QtGui.QGridLayout(self.alignmentGroupBox)
+        self.gridLayout4.setObjectName(u'gridLayout4')
         self.horizontalLabel = QtGui.QLabel(self.alignmentGroupBox)
         self.horizontalLabel.setObjectName(u'horizontalLabel')
-        self.gridLayout_4.addWidget(self.horizontalLabel, 0, 0, 1, 1)
+        self.gridLayout4.addWidget(self.horizontalLabel, 0, 0, 1, 1)
         self.horizontalComboBox = QtGui.QComboBox(self.alignmentGroupBox)
         self.horizontalComboBox.setObjectName(u'horizontalComboBox')
         self.horizontalComboBox.addItem(QtCore.QString())
         self.horizontalComboBox.addItem(QtCore.QString())
         self.horizontalComboBox.addItem(QtCore.QString())
-        self.gridLayout_4.addWidget(self.horizontalComboBox, 0, 1, 1, 1)
+        self.gridLayout4.addWidget(self.horizontalComboBox, 0, 1, 1, 1)
         self.verticalLabel = QtGui.QLabel(self.alignmentGroupBox)
         self.verticalLabel.setObjectName(u'verticalLabel')
-        self.gridLayout_4.addWidget(self.verticalLabel, 1, 0, 1, 1)
+        self.gridLayout4.addWidget(self.verticalLabel, 1, 0, 1, 1)
         self.verticalComboBox = QtGui.QComboBox(self.alignmentGroupBox)
         self.verticalComboBox.setObjectName(u'verticalComboBox')
         self.verticalComboBox.addItem(QtCore.QString())
         self.verticalComboBox.addItem(QtCore.QString())
         self.verticalComboBox.addItem(QtCore.QString())
-        self.gridLayout_4.addWidget(self.verticalComboBox, 1, 1, 1, 1)
+        self.gridLayout4.addWidget(self.verticalComboBox, 1, 1, 1, 1)
         self.optionsRightLayout.addWidget(self.alignmentGroupBox)
         self.transitionGroupBox = QtGui.QGroupBox(self.optionsRightWidget)
         self.transitionGroupBox.setObjectName(u'transitionGroupBox')
-        self.gridLayout_5 = QtGui.QGridLayout(self.transitionGroupBox)
-        self.gridLayout_5.setObjectName(u'gridLayout_5')
+        self.gridLayout5 = QtGui.QGridLayout(self.transitionGroupBox)
+        self.gridLayout5.setObjectName(u'gridLayout5')
         self.slideTransitionCheckBoxLabel = QtGui.QLabel(
             self.transitionGroupBox)
         self.slideTransitionCheckBoxLabel.setObjectName(
             u'slideTransitionCheckBoxLabel')
-        self.gridLayout_5.addWidget(
+        self.gridLayout5.addWidget(
             self.slideTransitionCheckBoxLabel, 0, 0, 1, 1)
         self.slideTransitionCheckBox = QtGui.QCheckBox(self.alignmentGroupBox)
         self.slideTransitionCheckBox.setTristate(False)
-        self.gridLayout_5.addWidget(self.slideTransitionCheckBox, 0, 1, 1, 1)
+        self.gridLayout5.addWidget(self.slideTransitionCheckBox, 0, 1, 1, 1)
         self.optionsRightLayout.addWidget(self.transitionGroupBox)
         spacerItem6 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum,
             QtGui.QSizePolicy.Expanding)
diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py
index 4e6dc96ca..a47743c63 100644
--- a/openlp/core/ui/generaltab.py
+++ b/openlp/core/ui/generaltab.py
@@ -401,7 +401,7 @@ class GeneralTab(SettingsTab):
         self.customYValueEdit.setEnabled(self.overrideCheckBox.isChecked())
         self.customHeightValueEdit.setEnabled(self.overrideCheckBox.isChecked())
         self.customWidthValueEdit.setEnabled(self.overrideCheckBox.isChecked())
-        self.override_changed = False
+        self.overrideChanged = False
 
     def save(self):
         """
@@ -473,4 +473,4 @@ class GeneralTab(SettingsTab):
         self.customYValueEdit.setEnabled(checked)
         self.customHeightValueEdit.setEnabled(checked)
         self.customWidthValueEdit.setEnabled(checked)
-        self.override_changed = True
+        self.overrideChanged = True