diff --git a/packaging/osx/lbry-osx-app/lbrygui/LBRYApp.py b/packaging/osx/lbry-osx-app/lbrygui/LBRYApp.py
index 9cc914364..072eb9f00 100644
--- a/packaging/osx/lbry-osx-app/lbrygui/LBRYApp.py
+++ b/packaging/osx/lbry-osx-app/lbrygui/LBRYApp.py
@@ -27,7 +27,7 @@ if not os.path.isfile(lbrycrdd_path_conf):
     f.write(lbrycrdd_path)
     f.close()
 
-from lbrynet.lbrynet_daemon.LBRYDaemonServer import LBRYDaemonServer, LBRYDaemonRequest
+from lbrynet.lbrynet_daemon.DaemonServer import DaemonServer, DaemonRequest
 from lbrynet.conf import API_PORT, API_INTERFACE, ICON_PATH, APP_NAME
 from lbrynet.conf import UI_ADDRESS
 
@@ -75,11 +75,11 @@ class LBRYDaemonApp(AppKit.NSApplication):
             sys.exit(0)
 
 
-        lbry = LBRYDaemonServer()
+        lbry = DaemonServer()
         d = lbry.start()
         d.addCallback(lambda _: webbrowser.open(UI_ADDRESS))
         lbrynet_server = server.Site(lbry.root)
-        lbrynet_server.requestFactory = LBRYDaemonRequest
+        lbrynet_server.requestFactory = DaemonRequest
         reactor.listenTCP(API_PORT, lbrynet_server, interface=API_INTERFACE)
 
     def openui_(self, sender):
diff --git a/packaging/windows/lbry-win32-app/LBRYWin32App.py b/packaging/windows/lbry-win32-app/LBRYWin32App.py
index bb47a707a..e26ebc3f2 100644
--- a/packaging/windows/lbry-win32-app/LBRYWin32App.py
+++ b/packaging/windows/lbry-win32-app/LBRYWin32App.py
@@ -18,7 +18,7 @@ try:
 except ImportError:
     import win32gui
 
-from lbrynet.lbrynet_daemon.LBRYDaemonServer import LBRYDaemonServer, LBRYDaemonRequest
+from lbrynet.lbrynet_daemon.LBRYDaemonServer import DaemonServer, DaemonRequest
 from lbrynet.conf import API_PORT, API_INTERFACE, ICON_PATH, APP_NAME
 from lbrynet.conf import UI_ADDRESS, API_CONNECTION_STRING, LOG_FILE_NAME
 from packaging.uri_handler.LBRYURIHandler import LBRYURIHandler
@@ -284,11 +284,11 @@ def main(lbry_name=None):
     systray_thread.daemon = True
     systray_thread.start()
 
-    lbry = LBRYDaemonServer()
+    lbry = DaemonServer()
     d = lbry.start()
     d.addCallback(lambda _: LBRYURIHandler.open_address(lbry_name))
     lbrynet_server = server.Site(lbry.root)
-    lbrynet_server.requestFactory = LBRYDaemonRequest
+    lbrynet_server.requestFactory = DaemonRequest
     try:
         reactor.listenTCP(API_PORT, lbrynet_server, interface=API_INTERFACE)
     except error.CannotListenError: