diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 91c5da716..3891c22b1 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -365,7 +365,7 @@ class Ui_MainWindow(object):
         self.ViewMediaManagerItem.setText(
             translate('OpenLP.MainWindow', '&Media Manager'))
         self.ViewMediaManagerItem.setToolTip(
-            UiStrings.Toggle % UiStrings.MediaManager)
+            UiStrings.ToggleType % UiStrings.MediaManager)
         self.ViewMediaManagerItem.setStatusTip(
             UiStrings.ToggleVisibility % UiStrings.MediaManager.toLower())
         self.ViewMediaManagerItem.setShortcut(
@@ -373,7 +373,7 @@ class Ui_MainWindow(object):
         self.ViewThemeManagerItem.setText(
             translate('OpenLP.MainWindow', '&Theme Manager'))
         self.ViewThemeManagerItem.setToolTip(
-            UiStrings.Toggle % UiStrings.ThemeManager)
+            UiStrings.ToggleType % UiStrings.ThemeManager)
         self.ViewThemeManagerItem.setStatusTip(
             UiStrings.ToggleVisibility % UiStrings.ThemeManager.toLower())
         self.ViewThemeManagerItem.setShortcut(
@@ -381,7 +381,7 @@ class Ui_MainWindow(object):
         self.ViewServiceManagerItem.setText(
             translate('OpenLP.MainWindow', '&Service Manager'))
         self.ViewServiceManagerItem.setToolTip(
-            UiStrings.Toggle % UiStrings.ServiceManager)
+            UiStrings.ToggleType % UiStrings.ServiceManager)
         self.ViewServiceManagerItem.setStatusTip(
             UiStrings.ToggleVisibility % UiStrings.ServiceManager.toLower())
         self.ViewServiceManagerItem.setShortcut(
@@ -389,7 +389,7 @@ class Ui_MainWindow(object):
         self.ViewPreviewPanel.setText(
             translate('OpenLP.MainWindow', '&Preview Panel'))
         self.ViewPreviewPanel.setToolTip(
-            UiStrings.Toggle % UiStrings.PreviewPanel)
+            UiStrings.ToggleType % UiStrings.PreviewPanel)
         self.ViewPreviewPanel.setStatusTip(
             UiStrings.ToggleVisibility % UiStrings.PreviewPanel.toLower())
         self.ViewPreviewPanel.setShortcut(
@@ -397,7 +397,7 @@ class Ui_MainWindow(object):
         self.ViewLivePanel.setText(
             translate('OpenLP.MainWindow', '&Live Panel'))
         self.ViewLivePanel.setToolTip(
-            UiStrings.Toggle % UiStrings.LivePanel)
+            UiStrings.ToggleType % UiStrings.LivePanel)
         self.ViewLivePanel.setStatusTip(
             UiStrings.ToggleVisibility % UiStrings.LivePanel.toLower())
         self.ViewLivePanel.setShortcut(
diff --git a/openlp/plugins/songs/forms/songmaintenancedialog.py b/openlp/plugins/songs/forms/songmaintenancedialog.py
index f6454fcb0..14ad1132d 100644
--- a/openlp/plugins/songs/forms/songmaintenancedialog.py
+++ b/openlp/plugins/songs/forms/songmaintenancedialog.py
@@ -26,7 +26,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import build_icon
+from openlp.core.lib import build_icon, StringContent
 from openlp.core.lib.ui import UiStrings
 from openlp.plugins.songs.lib.ui import SongStrings
 
@@ -145,8 +145,9 @@ class Ui_SongMaintenanceDialog(object):
         QtCore.QMetaObject.connectSlotsByName(songMaintenanceDialog)
 
     def retranslateUi(self, songMaintenanceDialog):
-        songMaintenanceDialog.setWindowTitle(
-            SongStrings.TypeMaintenance % SongStrings.Song)
+        songMaintenanceDialog.setWindowTitle(SongStrings.TypeMaintenance %
+            songMaintenanceDialog.parent().plugin.getString(
+            StringContent.Name)[u'singular'])
         self.listItemAuthors.setText(SongStrings.Authors)
         self.listItemTopics.setText(SongStrings.Topics)
         self.listItemBooks.setText(SongStrings.SongBooks)
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index b59d0a7b8..99a827a4e 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -32,7 +32,7 @@ from PyQt4 import QtCore, QtGui
 from sqlalchemy.sql import or_
 
 from openlp.core.lib import MediaManagerItem, Receiver, ItemCapabilities, \
-    translate, check_item_selected, PluginStatus
+    translate, check_item_selected, PluginStatus, StringContent
 from openlp.core.lib.ui import UiStrings
 from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm, \
     SongImportForm, SongExportForm
@@ -129,8 +129,8 @@ class SongMediaItem(MediaManagerItem):
             translate('SongsPlugin.MediaItem', 'Search:'))
         self.searchTextButton.setText(
             translate('SongsPlugin.MediaItem', 'Search'))
-        self.maintenanceAction.setText(
-            SongStrings.TypeMaintenance % SongStrings.Song)
+        self.maintenanceAction.setText(SongStrings.TypeMaintenance %
+            self.plugin.getString(StringContent.Name)[u'singular'])
         self.maintenanceAction.setToolTip(translate('SongsPlugin.MediaItem',
             'Maintain the lists of authors, topics and books'))