diff --git a/lbrynet/core/LBRYWallet.py b/lbrynet/core/Wallet.py
similarity index 100%
rename from lbrynet/core/LBRYWallet.py
rename to lbrynet/core/Wallet.py
diff --git a/lbrynet/lbryfile/LBRYFileMetadataManager.py b/lbrynet/lbryfile/FileMetadataManager.py
similarity index 100%
rename from lbrynet/lbryfile/LBRYFileMetadataManager.py
rename to lbrynet/lbryfile/FileMetadataManager.py
diff --git a/lbrynet/lbryfile/client/LBRYFileDownloader.py b/lbrynet/lbryfile/client/FileDownloader.py
similarity index 100%
rename from lbrynet/lbryfile/client/LBRYFileDownloader.py
rename to lbrynet/lbryfile/client/FileDownloader.py
diff --git a/lbrynet/lbryfile/client/LBRYFileMetadataHandler.py b/lbrynet/lbryfile/client/FileMetadataHandler.py
similarity index 100%
rename from lbrynet/lbryfile/client/LBRYFileMetadataHandler.py
rename to lbrynet/lbryfile/client/FileMetadataHandler.py
diff --git a/lbrynet/lbryfile/client/LBRYFileOptions.py b/lbrynet/lbryfile/client/FileOptions.py
similarity index 100%
rename from lbrynet/lbryfile/client/LBRYFileOptions.py
rename to lbrynet/lbryfile/client/FileOptions.py
diff --git a/lbrynet/lbryfilemanager/LBRYFileCreator.py b/lbrynet/lbryfilemanager/FileCreator.py
similarity index 100%
rename from lbrynet/lbryfilemanager/LBRYFileCreator.py
rename to lbrynet/lbryfilemanager/FileCreator.py
diff --git a/lbrynet/lbryfilemanager/LBRYFileDownloader.py b/lbrynet/lbryfilemanager/FileDownloader.py
similarity index 100%
rename from lbrynet/lbryfilemanager/LBRYFileDownloader.py
rename to lbrynet/lbryfilemanager/FileDownloader.py
diff --git a/lbrynet/lbryfilemanager/LBRYFileManager.py b/lbrynet/lbryfilemanager/FileManager.py
similarity index 100%
rename from lbrynet/lbryfilemanager/LBRYFileManager.py
rename to lbrynet/lbryfilemanager/FileManager.py
diff --git a/lbrynet/lbryfilemanager/LBRYFileStatusReport.py b/lbrynet/lbryfilemanager/FileStatusReport.py
similarity index 100%
rename from lbrynet/lbryfilemanager/LBRYFileStatusReport.py
rename to lbrynet/lbryfilemanager/FileStatusReport.py
diff --git a/lbrynet/lbrylive/LBRYStdinUploader.py b/lbrynet/lbrylive/StdinUploader.py
similarity index 100%
rename from lbrynet/lbrylive/LBRYStdinUploader.py
rename to lbrynet/lbrylive/StdinUploader.py
diff --git a/lbrynet/lbrylive/LBRYStdoutDownloader.py b/lbrynet/lbrylive/StdoutDownloader.py
similarity index 100%
rename from lbrynet/lbrylive/LBRYStdoutDownloader.py
rename to lbrynet/lbrylive/StdoutDownloader.py
diff --git a/lbrynet/lbrynet_console/LBRYConsole.py b/lbrynet/lbrynet_console/Console.py
similarity index 100%
rename from lbrynet/lbrynet_console/LBRYConsole.py
rename to lbrynet/lbrynet_console/Console.py
diff --git a/lbrynet/lbrynet_console/LBRYPlugin.py b/lbrynet/lbrynet_console/Plugin.py
similarity index 100%
rename from lbrynet/lbrynet_console/LBRYPlugin.py
rename to lbrynet/lbrynet_console/Plugin.py
diff --git a/lbrynet/lbrynet_console/LBRYSettings.py b/lbrynet/lbrynet_console/Settings.py
similarity index 100%
rename from lbrynet/lbrynet_console/LBRYSettings.py
rename to lbrynet/lbrynet_console/Settings.py
diff --git a/lbrynet/lbrynet_daemon/LBRYDaemon.py b/lbrynet/lbrynet_daemon/Daemon.py
similarity index 100%
rename from lbrynet/lbrynet_daemon/LBRYDaemon.py
rename to lbrynet/lbrynet_daemon/Daemon.py
diff --git a/lbrynet/lbrynet_daemon/LBRYDaemonCLI.py b/lbrynet/lbrynet_daemon/DaemonCLI.py
similarity index 100%
rename from lbrynet/lbrynet_daemon/LBRYDaemonCLI.py
rename to lbrynet/lbrynet_daemon/DaemonCLI.py
diff --git a/lbrynet/lbrynet_daemon/LBRYDaemonControl.py b/lbrynet/lbrynet_daemon/DaemonControl.py
similarity index 100%
rename from lbrynet/lbrynet_daemon/LBRYDaemonControl.py
rename to lbrynet/lbrynet_daemon/DaemonControl.py
diff --git a/lbrynet/lbrynet_daemon/LBRYDaemonServer.py b/lbrynet/lbrynet_daemon/DaemonServer.py
similarity index 100%
rename from lbrynet/lbrynet_daemon/LBRYDaemonServer.py
rename to lbrynet/lbrynet_daemon/DaemonServer.py
diff --git a/lbrynet/lbrynet_daemon/LBRYDownloader.py b/lbrynet/lbrynet_daemon/Downloader.py
similarity index 100%
rename from lbrynet/lbrynet_daemon/LBRYDownloader.py
rename to lbrynet/lbrynet_daemon/Downloader.py
diff --git a/lbrynet/lbrynet_daemon/LBRYExchangeRateManager.py b/lbrynet/lbrynet_daemon/ExchangeRateManager.py
similarity index 100%
rename from lbrynet/lbrynet_daemon/LBRYExchangeRateManager.py
rename to lbrynet/lbrynet_daemon/ExchangeRateManager.py
diff --git a/lbrynet/lbrynet_daemon/LBRYPublisher.py b/lbrynet/lbrynet_daemon/Publisher.py
similarity index 100%
rename from lbrynet/lbrynet_daemon/LBRYPublisher.py
rename to lbrynet/lbrynet_daemon/Publisher.py
diff --git a/lbrynet/lbrynet_daemon/LBRYUIManager.py b/lbrynet/lbrynet_daemon/UIManager.py
similarity index 100%
rename from lbrynet/lbrynet_daemon/LBRYUIManager.py
rename to lbrynet/lbrynet_daemon/UIManager.py
diff --git a/lbrynet/metadata/LBRYFee.py b/lbrynet/metadata/Fee.py
similarity index 100%
rename from lbrynet/metadata/LBRYFee.py
rename to lbrynet/metadata/Fee.py
diff --git a/lbrynet/metadata/LBRYMetadata.py b/lbrynet/metadata/Metadata.py
similarity index 100%
rename from lbrynet/metadata/LBRYMetadata.py
rename to lbrynet/metadata/Metadata.py