diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py
index 565413854..cfbb8a3da 100644
--- a/openlp/plugins/songs/forms/songmaintenanceform.py
+++ b/openlp/plugins/songs/forms/songmaintenanceform.py
@@ -87,15 +87,15 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
             QtCore.SIGNAL(u'currentRowChanged(int)'),
             self.onBooksListRowChanged)
 
-    def exec_(self, from_song_edit=False):
+    def exec_(self, fromSongEdit=False):
         """
         Show the dialog.
 
-        ``from_song_edit``
+        ``fromSongEdit``
             Indicates if the maintenance dialog has been opened from song edit
             or from the media manager. Defaults to **False**.
         """
-        self.from_song_edit = from_song_edit
+        self.fromSongEdit = fromSongEdit
         self.typeListWidget.setCurrentRow(0)
         self.resetAuthors()
         self.resetTopics()
@@ -283,7 +283,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
             if self.checkAuthor(author, True):
                 if self.manager.save_object(author):
                     self.resetAuthors()
-                    if not self.from_song_edit:
+                    if not self.fromSongEdit:
                         Receiver.send_message(u'songs_load_list')
                 else:
                     critical_error_message_box(
@@ -382,7 +382,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
         Receiver.send_message(u'cursor_busy')
         merge(dbObject)
         reset()
-        if not self.from_song_edit:
+        if not self.fromSongEdit:
             Receiver.send_message(u'songs_load_list')
         Receiver.send_message(u'cursor_normal')