diff --git a/lbry/extras/cli.py b/lbry/extras/cli.py
index e988a6c0c..2e4163e01 100644
--- a/lbry/extras/cli.py
+++ b/lbry/extras/cli.py
@@ -17,7 +17,7 @@ import lbry.wallet
 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
+from lbry.extras.daemon.daemon import Daemon
 
 log = logging.getLogger('lbry')
 
diff --git a/lbry/extras/daemon/Daemon.py b/lbry/extras/daemon/daemon.py
similarity index 100%
rename from lbry/extras/daemon/Daemon.py
rename to lbry/extras/daemon/daemon.py
diff --git a/lbry/testcase.py b/lbry/testcase.py
index 76241231b..518488734 100644
--- a/lbry/testcase.py
+++ b/lbry/testcase.py
@@ -20,7 +20,7 @@ from lbry.wallet.util import satoshis_to_coins
 from lbry.wallet.orchstr8 import Conductor
 from lbry.wallet.orchstr8.node import BlockchainNode, WalletNode
 
-from lbry.extras.daemon.Daemon import Daemon, jsonrpc_dumps_pretty
+from lbry.extras.daemon.daemon import Daemon, jsonrpc_dumps_pretty
 from lbry.extras.daemon.components import Component, WalletComponent
 from lbry.extras.daemon.components import (
     DHT_COMPONENT, HASH_ANNOUNCER_COMPONENT, PEER_PROTOCOL_SERVER_COMPONENT,
diff --git a/scripts/generate_json_api.py b/scripts/generate_json_api.py
index 074d950ec..8e48b2a4e 100644
--- a/scripts/generate_json_api.py
+++ b/scripts/generate_json_api.py
@@ -10,7 +10,7 @@ from binascii import unhexlify
 from textwrap import indent
 from lbry.testcase import CommandTestCase
 from lbry.extras.cli import set_kwargs, get_argument_parser
-from lbry.extras.daemon.Daemon import (
+from lbry.extras.daemon.daemon import (
     Daemon, jsonrpc_dumps_pretty, encode_pagination_doc
 )
 from lbry.extras.daemon.json_response_encoder import (
diff --git a/tests/integration/blockchain/test_claim_commands.py b/tests/integration/blockchain/test_claim_commands.py
index 174809a5a..18153c984 100644
--- a/tests/integration/blockchain/test_claim_commands.py
+++ b/tests/integration/blockchain/test_claim_commands.py
@@ -7,7 +7,7 @@ from urllib.request import urlopen
 
 from lbry.error import InsufficientFundsError
 
-from lbry.extras.daemon.Daemon import DEFAULT_PAGE_SIZE
+from lbry.extras.daemon.daemon import DEFAULT_PAGE_SIZE
 from lbry.testcase import CommandTestCase
 from lbry.wallet.transaction import Transaction
 
diff --git a/tests/integration/other/test_cli.py b/tests/integration/other/test_cli.py
index 0338f79fe..b9e6c3d28 100644
--- a/tests/integration/other/test_cli.py
+++ b/tests/integration/other/test_cli.py
@@ -9,7 +9,7 @@ from lbry.extras.daemon.components import (
     HASH_ANNOUNCER_COMPONENT, STREAM_MANAGER_COMPONENT, PEER_PROTOCOL_SERVER_COMPONENT,
     UPNP_COMPONENT, EXCHANGE_RATE_MANAGER_COMPONENT
 )
-from lbry.extras.daemon.Daemon import Daemon
+from lbry.extras.daemon.daemon import Daemon
 
 
 class CLIIntegrationTest(AsyncioTestCase):
diff --git a/tests/unit/lbrynet_daemon/test_Daemon.py b/tests/unit/lbrynet_daemon/test_Daemon.py
index 59ea9f8ba..71f5325ed 100644
--- a/tests/unit/lbrynet_daemon/test_Daemon.py
+++ b/tests/unit/lbrynet_daemon/test_Daemon.py
@@ -9,7 +9,7 @@ from lbry.extras.daemon.components import DATABASE_COMPONENT, DHT_COMPONENT, WAL
 from lbry.extras.daemon.components import HASH_ANNOUNCER_COMPONENT
 from lbry.extras.daemon.components import UPNP_COMPONENT, BLOB_COMPONENT
 from lbry.extras.daemon.components import PEER_PROTOCOL_SERVER_COMPONENT, EXCHANGE_RATE_MANAGER_COMPONENT
-from lbry.extras.daemon.Daemon import Daemon as LBRYDaemon
+from lbry.extras.daemon.daemon import Daemon as LBRYDaemon
 from lbry.wallet import WalletManager, Wallet
 
 from tests import test_utils
diff --git a/tests/unit/test_cli.py b/tests/unit/test_cli.py
index 7f79c2dfb..c17ae6476 100644
--- a/tests/unit/test_cli.py
+++ b/tests/unit/test_cli.py
@@ -14,7 +14,7 @@ from lbry.testcase import AsyncioTestCase
 
 from lbry.extras.cli import normalize_value, main, setup_logging
 from lbry.extras.system_info import get_platform
-from lbry.extras.daemon.Daemon import Daemon
+from lbry.extras.daemon.daemon import Daemon
 from lbry.extras.daemon.loggly_handler import HTTPSLogglyHandler
 from lbry.conf import Config
 from lbry.extras import cli