diff --git a/sickbeard/providers/btdigg.py b/sickbeard/providers/btdigg.py
index c09b9ceac3f603a46fcd7a71de3d0c3ff6350a64..b11b8c42813e94f88c43fd47e03d6e495a38d07a 100644
--- a/sickbeard/providers/btdigg.py
+++ b/sickbeard/providers/btdigg.py
@@ -27,7 +27,7 @@ from sickrage.helper.common import convert_size
 from sickrage.providers.torrent.TorrentProvider import TorrentProvider
 
 
-class BTDIGGProvider(TorrentProvider):
+class BTDiggProvider(TorrentProvider):
 
     def __init__(self):
         TorrentProvider.__init__(self, "BTDigg")
@@ -138,4 +138,4 @@ class BTDiggCache(tvcache.TVCache):
         search_params = {'RSS': ['x264', 'x264.HDTV', '720.HDTV.x264']}
         return {'entries': self.provider.search(search_params)}
 
-provider = BTDIGGProvider()
+provider = BTDiggProvider()
diff --git a/sickbeard/providers/hd4free.py b/sickbeard/providers/hd4free.py
index 8770073c620e1db2c8f7854a4d602169ba51efc7..786953697be6c4569bef3d733b6f39e6b390b818 100644
--- a/sickbeard/providers/hd4free.py
+++ b/sickbeard/providers/hd4free.py
@@ -24,7 +24,7 @@ from sickrage.helper.common import convert_size
 from sickrage.providers.torrent.TorrentProvider import TorrentProvider
 
 
-class HD4FREEProvider(TorrentProvider):  # pylint: disable=too-many-instance-attributes
+class HD4FreeProvider(TorrentProvider):  # pylint: disable=too-many-instance-attributes
 
     def __init__(self):
         TorrentProvider.__init__(self, "HD4Free")
@@ -32,7 +32,7 @@ class HD4FREEProvider(TorrentProvider):  # pylint: disable=too-many-instance-att
         self.public = True
         self.url = 'https://hd4free.xyz'
         self.ratio = 0
-        self.cache = HD4FREECache(self)
+        self.cache = HD4FreeCache(self)
         self.minseed, self.minleech = 2 * [None]
         self.username = None
         self.api_key = None
@@ -117,7 +117,7 @@ class HD4FREEProvider(TorrentProvider):  # pylint: disable=too-many-instance-att
         return self.ratio
 
 
-class HD4FREECache(tvcache.TVCache):
+class HD4FreeCache(tvcache.TVCache):
     def __init__(self, provider_obj):
 
         tvcache.TVCache.__init__(self, provider_obj)
@@ -130,4 +130,4 @@ class HD4FREECache(tvcache.TVCache):
         search_params = {'RSS': ['']}
         return {'entries': self.provider.search(search_params)}
 
-provider = HD4FREEProvider()
+provider = HD4FreeProvider()
diff --git a/sickbeard/providers/kat.py b/sickbeard/providers/kat.py
index c0a5a759a16301a7adade164f5f9d98f773cb54e..4c79b6a01e5f180a327a42689870d50ae984fece 100644
--- a/sickbeard/providers/kat.py
+++ b/sickbeard/providers/kat.py
@@ -30,7 +30,7 @@ from sickrage.helper.common import try_int, convert_size
 from sickrage.providers.torrent.TorrentProvider import TorrentProvider
 
 
-class KATProvider(TorrentProvider): # pylint: disable=too-many-instance-attributes
+class KatProvider(TorrentProvider): # pylint: disable=too-many-instance-attributes
     def __init__(self):
 
         TorrentProvider.__init__(self, "KickAssTorrents")
@@ -60,7 +60,7 @@ class KATProvider(TorrentProvider): # pylint: disable=too-many-instance-attribut
             'category': 'tv'
         }
 
-        self.cache = KATCache(self)
+        self.cache = KatCache(self)
 
     def search(self, search_strings, age=0, ep_obj=None): # pylint: disable=too-many-branches, too-many-locals, too-many-statements
         results = []
@@ -157,7 +157,7 @@ class KATProvider(TorrentProvider): # pylint: disable=too-many-instance-attribut
         return self.ratio
 
 
-class KATCache(tvcache.TVCache):
+class KatCache(tvcache.TVCache):
     def __init__(self, provider_obj):
 
         tvcache.TVCache.__init__(self, provider_obj)
@@ -169,4 +169,4 @@ class KATCache(tvcache.TVCache):
         search_params = {'RSS': ['tv', 'anime']}
         return {'entries': self.provider.search(search_params)}
 
-provider = KATProvider()
+provider = KatProvider()
diff --git a/sickbeard/providers/torrentproject.py b/sickbeard/providers/torrentproject.py
index d9b89a9079e01a56ede050a015e7cf891a3ea865..d889274645049674789d4839790e89f4054b93db 100644
--- a/sickbeard/providers/torrentproject.py
+++ b/sickbeard/providers/torrentproject.py
@@ -26,7 +26,7 @@ from sickrage.helper.common import try_int, convert_size
 from sickrage.providers.torrent.TorrentProvider import TorrentProvider
 
 
-class TORRENTPROJECTProvider(TorrentProvider):
+class TorrentProjectProvider(TorrentProvider):
     def __init__(self):
         TorrentProvider.__init__(self, "TorrentProject")
 
@@ -121,4 +121,4 @@ class TorrentProjectCache(tvcache.TVCache):
         search_params = {'RSS': ['0day']}
         return {'entries': self.provider.search(search_params)}
 
-provider = TORRENTPROJECTProvider()
+provider = TorrentProjectProvider()
diff --git a/sickbeard/providers/torrentz.py b/sickbeard/providers/torrentz.py
index c825fee54998f6b12b9b5f4d051b20edda20470a..ff50134aa3109b977a3f2ac95ee429c8811186da 100644
--- a/sickbeard/providers/torrentz.py
+++ b/sickbeard/providers/torrentz.py
@@ -28,7 +28,7 @@ from sickrage.helper.common import convert_size
 from sickrage.providers.torrent.TorrentProvider import TorrentProvider
 
 
-class TORRENTZProvider(TorrentProvider):  # pylint: disable=too-many-instance-attributes
+class TorrentzProvider(TorrentProvider):  # pylint: disable=too-many-instance-attributes
 
     def __init__(self):
 
@@ -38,7 +38,7 @@ class TORRENTZProvider(TorrentProvider):  # pylint: disable=too-many-instance-at
         self.ratio = None
         self.minseed = None
         self.minleech = None
-        self.cache = TORRENTZCache(self)
+        self.cache = TorrentzCache(self)
         self.headers.update({'User-Agent': USER_AGENT})
         self.urls = {'verified': 'https://torrentz.eu/feed_verified',
                      'feed': 'https://torrentz.eu/feed',
@@ -106,7 +106,7 @@ class TORRENTZProvider(TorrentProvider):  # pylint: disable=too-many-instance-at
         return results
 
 
-class TORRENTZCache(tvcache.TVCache):
+class TorrentzCache(tvcache.TVCache):
 
     def __init__(self, provider_obj):
 
@@ -118,4 +118,4 @@ class TORRENTZCache(tvcache.TVCache):
     def _getRSSData(self):
         return {'entries': self.provider.search({'RSS': ['']})}
 
-provider = TORRENTZProvider()
+provider = TorrentzProvider()