diff --git a/openlp/core/common/registry.py b/openlp/core/common/registry.py
index bc32fc930..85fca6912 100644
--- a/openlp/core/common/registry.py
+++ b/openlp/core/common/registry.py
@@ -24,7 +24,6 @@ Provide Registry Services
 """
 import logging
 import sys
-import re
 
 from openlp.core.common import trace_error_handler
 
@@ -57,7 +56,6 @@ class Registry(object):
         registry.service_list = {}
         registry.functions_list = {}
         registry.working_flags = {}
-        registry.remote_apis = {}
         # Allow the tests to remove Registry entries but not the live system
         registry.running_under_test = 'nose' in sys.argv[0]
         registry.initialising = True
diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index 773174fa2..358c82543 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -607,7 +607,7 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties):
                 self.generate_slide_data(service_item)
                 self.service_manager.add_service_item(service_item, replace=True)
             else:
-                # Turn off the api edit update message indicator
+                # Turn off the remote edit update message indicator
                 QtWidgets.QMessageBox.information(self, translate('OpenLP.MediaManagerItem', 'Invalid Service Item'),
                                                   translate('OpenLP.MediaManagerItem',
                                                             'You must select a {title} '
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index bf68ca1b5..c0a819390 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -286,7 +286,7 @@ class ServiceItem(RegistryProperties):
         :param path: The directory in which the image file is located.
         :param title: A title for the slide in the service item.
         :param background:
-        :param thumbnail: Optional alternative thumbnail, used for api thumbnails.
+        :param thumbnail: Optional alternative thumbnail, used for remote thumbnails.
         """
         if background:
             self.image_border = background
diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py
index 1215ceff7..e9e26111f 100644
--- a/openlp/plugins/custom/lib/mediaitem.py
+++ b/openlp/plugins/custom/lib/mediaitem.py
@@ -129,7 +129,7 @@ class CustomMediaItem(MediaManagerItem):
                 self.list_view.setCurrentItem(custom_name)
         self.auto_select_id = -1
         # Called to redisplay the custom list screen edith from a search
-        # or from the exit of the Custom edit dialog. If api editing is
+        # or from the exit of the Custom edit dialog. If remote editing is
         # active trigger it and clean up so it will not update again.
         self.check_search_result()
 
diff --git a/openlp/plugins/remotes/html/assets/jquery.js b/openlp/plugins/remotes/html/assets/jquery.js
index f7006d07a..3774ff986 100644
--- a/openlp/plugins/remotes/html/assets/jquery.js
+++ b/openlp/plugins/remotes/html/assets/jquery.js
@@ -7158,7 +7158,7 @@ jQuery.fn.extend({
 
 		var self = this;
 
-		// Request the api document
+		// Request the remote document
 		jQuery.ajax({
 			url: url,
 			type: type,
diff --git a/openlp/plugins/remotes/lib/remotetab.py b/openlp/plugins/remotes/lib/remotetab.py
index e5ee4a4cb..a94e204c3 100644
--- a/openlp/plugins/remotes/lib/remotetab.py
+++ b/openlp/plugins/remotes/lib/remotetab.py
@@ -252,10 +252,10 @@ class RemoteTab(SettingsTab):
         Generate icon for main window
         """
         self.remote_server_icon.hide()
-        icon = QtGui.QImage(':/api/network_server.png')
+        icon = QtGui.QImage(':/remote/network_server.png')
         icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
         if Settings().value(self.settings_section + '/authentication enabled'):
-            overlay = QtGui.QImage(':/api/network_auth.png')
+            overlay = QtGui.QImage(':/remote/network_auth.png')
             overlay = overlay.scaled(60, 60, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
             painter = QtGui.QPainter(icon)
             painter.drawImage(20, 0, overlay)
diff --git a/openlp/plugins/remotes/remoteplugin.py b/openlp/plugins/remotes/remoteplugin.py
index ad9330ab3..3e41f077b 100644
--- a/openlp/plugins/remotes/remoteplugin.py
+++ b/openlp/plugins/remotes/remoteplugin.py
@@ -115,7 +115,7 @@ class RemotesPlugin(Plugin, OpenLPMixin):
         """
         Called when Config is changed to requests a restart with the server on new address or port
         """
-        log.debug('api config changed')
+        log.debug('remote config changed')
         QtWidgets.QMessageBox.information(self.main_window,
                                           translate('RemotePlugin', 'Server Config Change'),
                                           translate('RemotePlugin',
diff --git a/scripts/check_dependencies.py b/scripts/check_dependencies.py
index 079965092..03ddce484 100755
--- a/scripts/check_dependencies.py
+++ b/scripts/check_dependencies.py
@@ -95,6 +95,7 @@ MODULES = [
     'uno',
     'websockets',
     'asyncio',
+    'waitress',
     'six'
 ]