diff --git a/documentation/api/source/core/lib.rst b/documentation/api/source/core/lib.rst
index 6ca952d7d..fa894875d 100644
--- a/documentation/api/source/core/lib.rst
+++ b/documentation/api/source/core/lib.rst
@@ -6,18 +6,18 @@ Object Library
 .. automodule:: openlp.core.lib
    :members:
 
-:mod:`BaseListWithDnD`
-----------------------
-
-.. autoclass:: openlp.core.lib.baselistwithdnd.BaseListWithDnD
-   :members:
-
 :mod:`EventReceiver`
 --------------------
 
 .. autoclass:: openlp.core.lib.eventreceiver.EventReceiver
    :members:
 
+:mod:`ListWidgetWithDnD`
+----------------------
+
+.. autoclass:: openlp.core.lib.listwidgetwithdnd.ListWidgetWithDnD
+   :members:
+
 :mod:`MediaManagerItem`
 -----------------------
 
diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index 644f0a4c6..5247ae938 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -319,7 +319,7 @@ def check_directory_exists(dir):
     if not os.path.exists(dir):
         os.makedirs(dir)
 
-from baselistwithdnd import BaseListWithDnD
+from listwidgetwithdnd import ListWidgetWithDnD
 from theme import ThemeLevel, ThemeXML, BackgroundGradientType, \
     BackgroundType, HorizontalType, VerticalType
 from displaytags import DisplayTags
diff --git a/openlp/core/lib/baselistwithdnd.py b/openlp/core/lib/listwidgetwithdnd.py
similarity index 98%
rename from openlp/core/lib/baselistwithdnd.py
rename to openlp/core/lib/listwidgetwithdnd.py
index 3bc91d577..a1a11217b 100644
--- a/openlp/core/lib/baselistwithdnd.py
+++ b/openlp/core/lib/listwidgetwithdnd.py
@@ -28,7 +28,7 @@ Extend QListWidget to handle drag and drop functionality
 """
 from PyQt4 import QtCore, QtGui
 
-class BaseListWithDnD(QtGui.QListWidget):
+class ListWidgetWithDnD(QtGui.QListWidget):
     """
     Provide a list widget to store objects and handle drag and drop events
     """
diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index 26e51737d..06e80b7ca 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -33,7 +33,7 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import context_menu_action, context_menu_separator, \
     SettingsManager, OpenLPToolbar, ServiceItem, StringContent, build_icon, \
-    translate, Receiver, BaseListWithDnD
+    translate, Receiver, ListWidgetWithDnD
 
 log = logging.getLogger(__name__)
 
@@ -258,7 +258,7 @@ class MediaManagerItem(QtGui.QWidget):
         Creates the main widget for listing items the media item is tracking
         """
         # Add the List widget
-        self.listView = BaseListWithDnD(self, self.title)
+        self.listView = ListWidgetWithDnD(self, self.title)
         self.listView.uniformItemSizes = True
         self.listView.setSpacing(1)
         self.listView.setSelectionMode(