diff --git a/Makefile b/Makefile
index 16fee1464..759344c2a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,6 @@ install:
 	cd lbry && pip install -e .
 
 lint:
-	cd lbry && pylint lbrynet
+	cd lbry && pylint lbry
 	cd torba && pylint --rcfile=setup.cfg torba
 	cd torba && mypy --ignore-missing-imports torba
diff --git a/lbry/.dockerignore b/lbry/.dockerignore
index e4467ee5b..4eef96cdf 100644
--- a/lbry/.dockerignore
+++ b/lbry/.dockerignore
@@ -2,6 +2,6 @@
 .tox
 __pycache__
 dist
-lbrynet.egg-info
+lbry.egg-info
 docs
 tests
diff --git a/lbry/.gitignore b/lbry/.gitignore
index f70b49ebc..08588a3df 100644
--- a/lbry/.gitignore
+++ b/lbry/.gitignore
@@ -6,7 +6,7 @@
 /.coverage
 /lbry-venv
 
-lbrynet.egg-info
+lbry.egg-info
 __pycache__
 _trial_temp/
 
diff --git a/lbry/lbry/extras/cli.py b/lbry/lbry/extras/cli.py
index efecd3ca7..1c9710728 100644
--- a/lbry/lbry/extras/cli.py
+++ b/lbry/lbry/extras/cli.py
@@ -12,12 +12,12 @@ from docopt import docopt
 import aiohttp
 from aiohttp.web import GracefulExit
 
-from lbry import __name__ as lbrynet_name, __version__ as lbrynet_version
+from lbry import __version__ as lbrynet_version
 from lbry.extras.daemon.loggly_handler import get_loggly_handler
 from lbry.conf import Config, CLIConfig
 from lbry.extras.daemon.Daemon import Daemon
 
-log = logging.getLogger(lbrynet_name)
+log = logging.getLogger('lbry')
 log.addHandler(logging.NullHandler())
 
 
@@ -231,7 +231,7 @@ def main(argv=None):
         ensure_directory_exists(directory)
 
     if args.cli_version:
-        print(f"{lbrynet_name} {lbrynet_version}")
+        print(f"lbrynet {lbrynet_version}")
         return 0
 
     elif args.command == 'start':
diff --git a/lbry/scripts/Dockerfile.lbry_orchstr8 b/lbry/scripts/Dockerfile.lbry_orchstr8
index 8fd087a73..e6c9d5082 100644
--- a/lbry/scripts/Dockerfile.lbry_orchstr8
+++ b/lbry/scripts/Dockerfile.lbry_orchstr8
@@ -28,7 +28,7 @@ EXPOSE 5280
 EXPOSE 50002
 # blockchain
 EXPOSE 9246
-ENV TORBA_LEDGER lbrynet.wallet
+ENV TORBA_LEDGER lbry.wallet
 
 RUN /usr/local/bin/orchstr8 download
 ENTRYPOINT ["/usr/local/bin/orchstr8"]
diff --git a/lbry/scripts/wine_build.sh b/lbry/scripts/wine_build.sh
index 57ba65bc3..b3fa4712d 100755
--- a/lbry/scripts/wine_build.sh
+++ b/lbry/scripts/wine_build.sh
@@ -18,5 +18,5 @@ cd lbry
 pip install -e .
 pip install pywin32
 
-pyinstaller --additional-hooks-dir=scripts/. --icon=icons/lbry256.ico -F -n lbrynet lbrynet/extras/cli.py
+pyinstaller --additional-hooks-dir=scripts/. --icon=icons/lbry256.ico -F -n lbrynet lbry/extras/cli.py
 wine dist/lbrynet.exe --version
diff --git a/lbry/tox.ini b/lbry/tox.ini
index 0d2faf5e8..2b7088e2b 100644
--- a/lbry/tox.ini
+++ b/lbry/tox.ini
@@ -10,7 +10,7 @@ extras = test
 changedir = {toxinidir}/tests
 setenv =
   HOME=/tmp
-  TORBA_LEDGER=lbrynet.wallet
+  TORBA_LEDGER=lbry.wallet
 commands =
   orchstr8 download
-  coverage run -p --source={envsitepackagesdir}/lbrynet -m unittest discover -vv integration
+  coverage run -p --source={envsitepackagesdir}/lbry -m unittest discover -vv integration