diff --git a/youtube_dl_gui/__init__.py b/youtube_dl_gui/__init__.py
index 7e75a32..5ad6423 100644
--- a/youtube_dl_gui/__init__.py
+++ b/youtube_dl_gui/__init__.py
@@ -24,9 +24,9 @@ from .data import (
     __descriptionfull__,
 )
 
-from .MainFrame import MainFrame
-from .LogManager import LogManager
-from .OptionsManager import OptionsManager
+from .mainframe import MainFrame
+from .logmanager import LogManager
+from .optionsmanager import OptionsManager
 
 from .utils import get_config_path
 
diff --git a/youtube_dl_gui/__main__.py b/youtube_dl_gui/__main__.py
index ae7866c..2dda59b 100644
--- a/youtube_dl_gui/__main__.py
+++ b/youtube_dl_gui/__main__.py
@@ -12,5 +12,6 @@ if __package__ is None and not hasattr(sys, "frozen"):
 
 import youtube_dl_gui
 
+
 if __name__ == '__main__':
     youtube_dl_gui.main()
diff --git a/youtube_dl_gui/DownloadThread.py b/youtube_dl_gui/dlthread.py
similarity index 98%
rename from youtube_dl_gui/DownloadThread.py
rename to youtube_dl_gui/dlthread.py
index bfa7ac9..c7d81d0 100644
--- a/youtube_dl_gui/DownloadThread.py
+++ b/youtube_dl_gui/dlthread.py
@@ -10,12 +10,10 @@ from wx import CallAfter
 from wx.lib.pubsub import setuparg1
 from wx.lib.pubsub import pub as Publisher
 
-from .OptionsParser import OptionsParser
-from .DownloadObject import YoutubeDLDownloader
+from .parsers import OptionsParser
+from .downloaders import YoutubeDLDownloader
 
-from .utils import (
-    YOUTUBEDL_BIN
-)
+from .utils import YOUTUBEDL_BIN
 
 
 class DownloadManager(Thread):
diff --git a/youtube_dl_gui/DownloadObject.py b/youtube_dl_gui/downloaders.py
similarity index 100%
rename from youtube_dl_gui/DownloadObject.py
rename to youtube_dl_gui/downloaders.py
diff --git a/youtube_dl_gui/LogManager.py b/youtube_dl_gui/logmanager.py
similarity index 100%
rename from youtube_dl_gui/LogManager.py
rename to youtube_dl_gui/logmanager.py
diff --git a/youtube_dl_gui/MainFrame.py b/youtube_dl_gui/mainframe.py
similarity index 98%
rename from youtube_dl_gui/MainFrame.py
rename to youtube_dl_gui/mainframe.py
index df0750f..5a44244 100644
--- a/youtube_dl_gui/MainFrame.py
+++ b/youtube_dl_gui/mainframe.py
@@ -10,11 +10,9 @@ from wx.lib.pubsub import pub as Publisher
 
 from wx.lib.mixins.listctrl import ListCtrlAutoWidthMixin
 
-from .LogManager import LogManager
-from .OptionsFrame import OptionsFrame
-from .UpdateThread import UpdateThread
-from .OptionsManager import OptionsManager
-from .DownloadThread import DownloadManager, DownloadThread
+from .optionsframe import OptionsFrame
+from .updthread import UpdateThread
+from .dlthread import DownloadManager, DownloadThread
 
 from .utils import (
     YOUTUBEDL_BIN,
diff --git a/youtube_dl_gui/OptionsFrame.py b/youtube_dl_gui/optionsframe.py
similarity index 99%
rename from youtube_dl_gui/OptionsFrame.py
rename to youtube_dl_gui/optionsframe.py
index b5fda09..1a55b4c 100644
--- a/youtube_dl_gui/OptionsFrame.py
+++ b/youtube_dl_gui/optionsframe.py
@@ -6,7 +6,7 @@ from os import name
 
 import wx
 
-from .LogManager import LogGUI
+from .logmanager import LogGUI
 from .version import __version__
 
 
diff --git a/youtube_dl_gui/OptionsManager.py b/youtube_dl_gui/optionsmanager.py
similarity index 98%
rename from youtube_dl_gui/OptionsManager.py
rename to youtube_dl_gui/optionsmanager.py
index f02116e..578a8fc 100644
--- a/youtube_dl_gui/OptionsManager.py
+++ b/youtube_dl_gui/optionsmanager.py
@@ -5,9 +5,7 @@
 import json
 import os.path
 
-from .utils import (
-    check_path
-)
+from .utils import check_path
 
 
 class OptionsManager(object):
diff --git a/youtube_dl_gui/OptionsParser.py b/youtube_dl_gui/parsers.py
similarity index 100%
rename from youtube_dl_gui/OptionsParser.py
rename to youtube_dl_gui/parsers.py
diff --git a/youtube_dl_gui/UpdateThread.py b/youtube_dl_gui/updthread.py
similarity index 100%
rename from youtube_dl_gui/UpdateThread.py
rename to youtube_dl_gui/updthread.py