diff --git a/lbrynet/lbrynet_daemon/Daemon.py b/lbrynet/lbrynet_daemon/Daemon.py
index cdb510339..b259eefd5 100644
--- a/lbrynet/lbrynet_daemon/Daemon.py
+++ b/lbrynet/lbrynet_daemon/Daemon.py
@@ -25,7 +25,7 @@ from txjsonrpc.web import jsonrpc
 from txjsonrpc.web.jsonrpc import Handler
 
 from lbrynet import __version__ as lbrynet_version
-from lbryum.version import UM_VERSION as lbryum_version
+from lbryum.version import LBRYUM_VERSION as lbryum_version
 from lbrynet import analytics
 from lbrynet.core.PaymentRateManager import PaymentRateManager
 from lbrynet.core.server.BlobAvailabilityHandler import BlobAvailabilityHandlerFactory
@@ -621,7 +621,7 @@ class Daemon(jsonrpc.JSONRPC):
             try:
                 r = urlopen("https://raw.githubusercontent.com/lbryio/lbryum/master/lib/version.py").read().split('\n')
                 version = next(line.split("=")[1].split("#")[0].replace(" ", "")
-                               for line in r if "UM_VERSION" in line)
+                               for line in r if "LBRYUM_VERSION" in line)
                 version = version.replace("'", "")
                 log.info(
                     "remote lbryum %s > local lbryum %s = %s",
@@ -812,11 +812,11 @@ class Daemon(jsonrpc.JSONRPC):
 
     def _upload_log(self, log_type=None, exclude_previous=False, force=False):
         if self.upload_log or force:
-            for lm, lp in [('lbrynet', lbrynet_log)]: #, ('lbryum', lbryum_log)]:
+            for lm, lp in [('lbrynet', lbrynet_log)]:
                 if os.path.isfile(lp):
                     if exclude_previous:
                         f = open(lp, "r")
-                        f.seek(PREVIOUS_NET_LOG) # if lm == 'lbrynet' else PREVIOUS_UM_LOG)
+                        f.seek(PREVIOUS_NET_LOG)
                         log_contents = f.read()
                         f.close()
                     else:
diff --git a/lbrynet/lbrynet_daemon/UIManager.py b/lbrynet/lbrynet_daemon/UIManager.py
index 60f39b11b..8bde1a7b1 100644
--- a/lbrynet/lbrynet_daemon/UIManager.py
+++ b/lbrynet/lbrynet_daemon/UIManager.py
@@ -11,7 +11,7 @@ from twisted.internet import defer
 from twisted.internet.task import LoopingCall
 from lbrynet.conf import DEFAULT_UI_BRANCH, LOG_FILE_NAME
 from lbrynet import __version__ as lbrynet_version
-from lbryum.version import UM_VERSION as lbryum_version
+from lbryum.version import LBRYUM_VERSION as lbryum_version
 from zipfile import ZipFile
 from appdirs import user_data_dir
 
diff --git a/setup.py b/setup.py
index 76f90e2ca..87b68a60c 100644
--- a/setup.py
+++ b/setup.py
@@ -57,9 +57,9 @@ console_scripts = [
     # 'lbrynet-rpc-node-cli = lbrynet.node_rpc_cli:main',
     # 'lbrynet-lookup-hosts-for-hash = lbrynet.dht_scripts:get_hosts_for_hash_in_dht',
     # 'lbrynet-announce_hash_to_dht = lbrynet.dht_scripts:announce_hash_to_dht',
-    'lbrynet-daemon = lbrynet.lbrynet_daemon.LBRYDaemonControl:start',
-    'stop-lbrynet-daemon = lbrynet.lbrynet_daemon.LBRYDaemonControl:stop',
-    'lbrynet-cli = lbrynet.lbrynet_daemon.LBRYDaemonCLI:main'
+    'lbrynet-daemon = lbrynet.lbrynet_daemon.DaemonControl:start',
+    'stop-lbrynet-daemon = lbrynet.lbrynet_daemon.DaemonControl:stop',
+    'lbrynet-cli = lbrynet.lbrynet_daemon.DaemonCLI:main'
 ]
 
 if platform == LINUX:
@@ -303,7 +303,7 @@ elif platform == WINDOWS:
     )
 
     daemon_exe = Executable(
-        script=os.path.join(daemon_dir, 'LBRYDaemonControl.py'),
+        script=os.path.join(daemon_dir, 'DaemonControl.py'),
         icon=win_icon,
         # shortcutName="lbrynet-daemon",
         # shortcutDir='DesktopFolder',
@@ -311,7 +311,7 @@ elif platform == WINDOWS:
     )
 
     cli_exe = Executable(
-        script=os.path.join(daemon_dir, 'LBRYDaemonCLI.py'),
+        script=os.path.join(daemon_dir, 'DaemonCLI.py'),
         icon=win_icon,
         # shortcutName="lbrynet-cli",
         # shortcutDir='DesktopFolder',