handleFree -> handle_free and so on...

102 files changed, 152 insertions, 152 deletions

diff --git a/pyload/plugin/account/DropboxCom.py b/pyload/plugin/account/DropboxCom.py
index 055c28195..b8ce0e21a 100644
--- a/pyload/plugin/account/DropboxCom.py
+++ b/pyload/plugin/account/DropboxCom.py
@@ -30,5 +30,5 @@ class DropboxCom(SimpleHoster):
         self.resumeDownload = True
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         self.download(pyfile.url, get={'dl': "1"})
diff --git a/pyload/plugin/crypter/TusfilesNet.py b/pyload/plugin/crypter/TusfilesNet.py
index 23d305003..53fde5643 100644
--- a/pyload/plugin/crypter/TusfilesNet.py
+++ b/pyload/plugin/crypter/TusfilesNet.py
@@ -31,7 +31,7 @@ class TusfilesNet(XFSCrypter):
         return self.load(urlparse.urljoin(self.pyfile.url, str(page_n)), decode=True)
 
 
-    def handlePages(self, pyfile):
+    def handle_pages(self, pyfile):
         pages = re.search(self.PAGES_PATTERN, self.html)
         if pages:
             pages = int(math.ceil(int(pages.group('pages')) / 25.0))
diff --git a/pyload/plugin/hoster/AlldebridCom.py b/pyload/plugin/hoster/AlldebridCom.py
index 9f7497e72..9f1f689cd 100644
--- a/pyload/plugin/hoster/AlldebridCom.py
+++ b/pyload/plugin/hoster/AlldebridCom.py
@@ -22,7 +22,7 @@ class AlldebridCom(MultiHoster):
         self.chunkLimit = 16
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         password = self.getPassword()
 
         data = json_loads(self.load("http://www.alldebrid.com/service.php",
diff --git a/pyload/plugin/hoster/AndroidfilehostCom.py b/pyload/plugin/hoster/AndroidfilehostCom.py
index 584001725..22cc71857 100644
--- a/pyload/plugin/hoster/AndroidfilehostCom.py
+++ b/pyload/plugin/hoster/AndroidfilehostCom.py
@@ -36,7 +36,7 @@ class AndroidfilehostCom(SimpleHoster):
         self.chunkLimit     = 1
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         wait = re.search(self.WAIT_PATTERN, self.html)
         self.logDebug("Waiting time: %s seconds" % wait.group(1))
 
diff --git a/pyload/plugin/hoster/BasketbuildCom.py b/pyload/plugin/hoster/BasketbuildCom.py
index d005eae74..2e94eefe2 100644
--- a/pyload/plugin/hoster/BasketbuildCom.py
+++ b/pyload/plugin/hoster/BasketbuildCom.py
@@ -33,7 +33,7 @@ class BasketbuildCom(SimpleHoster):
         self.chunkLimit     = 1
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         try:
             link1 = re.search(r'href="(.+dlgate/.+)"', self.html).group(1)
             self.html = self.load(link1)
diff --git a/pyload/plugin/hoster/BezvadataCz.py b/pyload/plugin/hoster/BezvadataCz.py
index fa29c83d5..33e641635 100644
--- a/pyload/plugin/hoster/BezvadataCz.py
+++ b/pyload/plugin/hoster/BezvadataCz.py
@@ -28,7 +28,7 @@ class BezvadataCz(SimpleHoster):
         self.multiDL        = True
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         # download button
         m = re.search(r'<a class="stahnoutSoubor".*?href="(.*?)"', self.html)
         if m is None:
diff --git a/pyload/plugin/hoster/CatShareNet.py b/pyload/plugin/hoster/CatShareNet.py
index fa3c13b3f..124d22591 100644
--- a/pyload/plugin/hoster/CatShareNet.py
+++ b/pyload/plugin/hoster/CatShareNet.py
@@ -46,7 +46,7 @@ class CatShareNet(SimpleHoster):
         return super(CatShareNet, self).checkErrors()
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         recaptcha = ReCaptcha(self)
 
         response, challenge = recaptcha.challenge()
diff --git a/pyload/plugin/hoster/CloudzillaTo.py b/pyload/plugin/hoster/CloudzillaTo.py
index a244b1fae..7b1faaed2 100644
--- a/pyload/plugin/hoster/CloudzillaTo.py
+++ b/pyload/plugin/hoster/CloudzillaTo.py
@@ -33,7 +33,7 @@ class CloudzillaTo(SimpleHoster):
             self.retry(reason="Wrong password")
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         self.html = self.load("http://www.cloudzilla.to/generateticket/",
                               post={'file_id': self.info['pattern']['ID'], 'key': self.getPassword()})
 
@@ -55,5 +55,5 @@ class CloudzillaTo(SimpleHoster):
                                                                               'ticket_id': ticket['ticket_id']}
 
 
-    def handlePremium(self, pyfile):
-        return self.handleFree(pyfile)
+    def handle_premium(self, pyfile):
+        return self.handle_free(pyfile)
diff --git a/pyload/plugin/hoster/CrockoCom.py b/pyload/plugin/hoster/CrockoCom.py
index 3be0c5909..aaced0cdb 100644
--- a/pyload/plugin/hoster/CrockoCom.py
+++ b/pyload/plugin/hoster/CrockoCom.py
@@ -31,7 +31,7 @@ class CrockoCom(SimpleHoster):
     NAME_REPLACEMENTS = [(r'<.*?>', '')]
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         if "You need Premium membership to download this file." in self.html:
             self.fail(_("You need Premium membership to download this file"))
 
diff --git a/pyload/plugin/hoster/CzshareCom.py b/pyload/plugin/hoster/CzshareCom.py
index 9926c8d74..85ed238f0 100644
--- a/pyload/plugin/hoster/CzshareCom.py
+++ b/pyload/plugin/hoster/CzshareCom.py
@@ -64,7 +64,7 @@ class CzshareCom(SimpleHoster):
         return True
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
     # parse download link
         try:
             form = re.search(self.PREMIUM_FORM_PATTERN, self.html, re.S).group(1)
@@ -77,7 +77,7 @@ class CzshareCom(SimpleHoster):
         self.download("http://sdilej.cz/profi_down.php", post=inputs, disposition=True)
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         # get free url
         m = re.search(self.FREE_URL_PATTERN, self.html)
         if m is None:
diff --git a/pyload/plugin/hoster/DataportCz.py b/pyload/plugin/hoster/DataportCz.py
index 9a7ceda46..15ae7d0d6 100644
--- a/pyload/plugin/hoster/DataportCz.py
+++ b/pyload/plugin/hoster/DataportCz.py
@@ -24,7 +24,7 @@ class DataportCz(SimpleHoster):
     FREE_SLOTS_PATTERN = ur'Počet volných slotů: <span class="darkblue">(\d+)</span><br />'
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         captchas = {"1": "jkeG", "2": "hMJQ", "3": "vmEK", "4": "ePQM", "5": "blBd"}
 
         for _i in xrange(60):
diff --git a/pyload/plugin/hoster/DateiTo.py b/pyload/plugin/hoster/DateiTo.py
index f967c894a..eaca8d6db 100644
--- a/pyload/plugin/hoster/DateiTo.py
+++ b/pyload/plugin/hoster/DateiTo.py
@@ -29,7 +29,7 @@ class DateiTo(SimpleHoster):
     DATA_PATTERN = r'url: "(.*?)", data: "(.*?)",'
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         url = 'http://datei.to/ajax/download.php'
         data = {'P': 'I', 'ID': self.info['pattern']['ID']}
         recaptcha = ReCaptcha(self)
diff --git a/pyload/plugin/hoster/DebridItaliaCom.py b/pyload/plugin/hoster/DebridItaliaCom.py
index a0308e28e..56bb355d5 100644
--- a/pyload/plugin/hoster/DebridItaliaCom.py
+++ b/pyload/plugin/hoster/DebridItaliaCom.py
@@ -22,7 +22,7 @@ class DebridItaliaCom(MultiHoster):
     URL_REPLACEMENTS = [("https://", "http://")]
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         self.html = self.load("http://www.debriditalia.com/api.php",
                               get={'generate': "on", 'link': pyfile.url, 'p': self.getPassword()})
 
diff --git a/pyload/plugin/hoster/DepositfilesCom.py b/pyload/plugin/hoster/DepositfilesCom.py
index e16222856..49f9d4384 100644
--- a/pyload/plugin/hoster/DepositfilesCom.py
+++ b/pyload/plugin/hoster/DepositfilesCom.py
@@ -40,7 +40,7 @@ class DepositfilesCom(SimpleHoster):
     LINK_MIRROR_PATTERN  = r'class="repeat_mirror"><a href="(.+?)"'
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         self.html = self.load(pyfile.url, post={'gateway_result': "1"})
 
         self.checkErrors()
@@ -69,7 +69,7 @@ class DepositfilesCom(SimpleHoster):
             self.link = urllib.unquote(m.group(1))
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         if '<span class="html_download_api-gold_traffic_limit">' in self.html:
             self.logWarning(_("Download limit reached"))
             self.retry(25, 60 * 60, "Download limit reached")
diff --git a/pyload/plugin/hoster/DlFreeFr.py b/pyload/plugin/hoster/DlFreeFr.py
index 684da2b6d..2c4889d67 100644
--- a/pyload/plugin/hoster/DlFreeFr.py
+++ b/pyload/plugin/hoster/DlFreeFr.py
@@ -80,7 +80,7 @@ class DlFreeFr(SimpleHoster):
             if content_type and content_type.startswith("text/html"):
                 # Undirect acces to requested file, with a web page providing it (captcha)
                 self.html = self.load(valid_url)
-                self.handleFree(pyfile)
+                self.handle_free(pyfile)
             else:
                 # Direct access to requested file for users using free.fr as Internet Service Provider.
                 self.link = valid_url
@@ -92,7 +92,7 @@ class DlFreeFr(SimpleHoster):
             self.fail(_("Invalid return code: ") + str(headers.get('code')))
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         action, inputs = self.parseHtmlForm('action="getfile.pl"')
 
         adyoulike = AdYouLike(self)
diff --git a/pyload/plugin/hoster/EuroshareEu.py b/pyload/plugin/hoster/EuroshareEu.py
index b66369fe0..09fd1bf5b 100644
--- a/pyload/plugin/hoster/EuroshareEu.py
+++ b/pyload/plugin/hoster/EuroshareEu.py
@@ -29,7 +29,7 @@ class EuroshareEu(SimpleHoster):
     URL_REPLACEMENTS = [(r"(http://[^/]*\.)(sk|cz|hu|pl)/", r"\1eu/")]
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         if self.ERR_NOT_LOGGED_IN_PATTERN in self.html:
             self.account.relogin(self.user)
             self.retry(reason=_("User not logged in"))
@@ -47,7 +47,7 @@ class EuroshareEu(SimpleHoster):
             self.fail(self.lastCheck.group(1))
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         if re.search(self.ERR_PARDL_PATTERN, self.html):
             self.longWait(5 * 60, 12)
 
diff --git a/pyload/plugin/hoster/ExashareCom.py b/pyload/plugin/hoster/ExashareCom.py
index c7b876076..6036da66d 100644
--- a/pyload/plugin/hoster/ExashareCom.py
+++ b/pyload/plugin/hoster/ExashareCom.py
@@ -27,7 +27,7 @@ class ExashareCom(XFSHoster):
         self.resumeDownload = self.premium
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
             self.error(_("Free download link not found"))
diff --git a/pyload/plugin/hoster/ExtabitCom.py b/pyload/plugin/hoster/ExtabitCom.py
index d0bcaa4e6..6fd65842d 100644
--- a/pyload/plugin/hoster/ExtabitCom.py
+++ b/pyload/plugin/hoster/ExtabitCom.py
@@ -29,7 +29,7 @@ class ExtabitCom(SimpleHoster):
     LINK_FREE_PATTERN = r'[\'"](http://guest\d+\.extabit\.com/\w+/.*?)[\'"]'
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         if r">Only premium users can download this file" in self.html:
             self.fail(_("Only premium users can download this file"))
 
diff --git a/pyload/plugin/hoster/FastixRu.py b/pyload/plugin/hoster/FastixRu.py
index eee4da08c..0f79ac44c 100644
--- a/pyload/plugin/hoster/FastixRu.py
+++ b/pyload/plugin/hoster/FastixRu.py
@@ -21,7 +21,7 @@ class FastixRu(MultiHoster):
         self.chunkLimit = 3
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         api_key = self.account.getAccountData(self.user)
         api_key = api_key['api']
 
diff --git a/pyload/plugin/hoster/FastshareCz.py b/pyload/plugin/hoster/FastshareCz.py
index 7e688a941..cd054b61c 100644
--- a/pyload/plugin/hoster/FastshareCz.py
+++ b/pyload/plugin/hoster/FastshareCz.py
@@ -46,7 +46,7 @@ class FastshareCz(SimpleHoster):
         self.info.pop('error', None)
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         m = re.search(self.FREE_URL_PATTERN, self.html)
         if m:
             action, captcha_src = m.groups()
diff --git a/pyload/plugin/hoster/FileSharkPl.py b/pyload/plugin/hoster/FileSharkPl.py
index 5d37a55c6..9a90352bb 100644
--- a/pyload/plugin/hoster/FileSharkPl.py
+++ b/pyload/plugin/hoster/FileSharkPl.py
@@ -72,7 +72,7 @@ class FileSharkPl(SimpleHoster):
         self.info.pop('error', None)
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
             self.error(_("Download url not found"))
diff --git a/pyload/plugin/hoster/FileStoreTo.py b/pyload/plugin/hoster/FileStoreTo.py
index 6315f208d..8670577df 100644
--- a/pyload/plugin/hoster/FileStoreTo.py
+++ b/pyload/plugin/hoster/FileStoreTo.py
@@ -29,7 +29,7 @@ class FileStoreTo(SimpleHoster):
         self.multiDL        = True
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         self.wait(10)
         self.link = self.load("http://filestore.to/ajax/download.php",
                               get={'D': re.search(r'"D=(\w+)', self.html).group(1)})
diff --git a/pyload/plugin/hoster/FilecloudIo.py b/pyload/plugin/hoster/FilecloudIo.py
index 4f57d3a74..0475edeff 100644
--- a/pyload/plugin/hoster/FilecloudIo.py
+++ b/pyload/plugin/hoster/FilecloudIo.py
@@ -44,7 +44,7 @@ class FilecloudIo(SimpleHoster):
         self.chunkLimit     = 1
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         data = {"ukey": self.info['pattern']['ID']}
 
         m = re.search(self.AB1_PATTERN, self.html)
@@ -109,7 +109,7 @@ class FilecloudIo(SimpleHoster):
             self.fail(_("Unexpected server response"))
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         akey = self.account.getAccountData(self.user)['akey']
         ukey = self.info['pattern']['ID']
         self.logDebug("Akey: %s | Ukey: %s" % (akey, ukey))
diff --git a/pyload/plugin/hoster/FilefactoryCom.py b/pyload/plugin/hoster/FilefactoryCom.py
index 782b6ba48..5c42961ce 100644
--- a/pyload/plugin/hoster/FilefactoryCom.py
+++ b/pyload/plugin/hoster/FilefactoryCom.py
@@ -42,7 +42,7 @@ class FilefactoryCom(SimpleHoster):
     COOKIES = [("filefactory.com", "locale", "en_US.utf8")]
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         if "Currently only Premium Members can download files larger than" in self.html:
             self.fail(_("File too large for free download"))
         elif "All free download slots on this server are currently in use" in self.html:
@@ -73,7 +73,7 @@ class FilefactoryCom(SimpleHoster):
         return super(FilefactoryCom, self).checkFile(rules)
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         self.link = self.directLink(self.load(pyfile.url, just_header=True))
 
         if not self.link:
diff --git a/pyload/plugin/hoster/FilepostCom.py b/pyload/plugin/hoster/FilepostCom.py
index 1d2843a2e..4f7862588 100644
--- a/pyload/plugin/hoster/FilepostCom.py
+++ b/pyload/plugin/hoster/FilepostCom.py
@@ -29,7 +29,7 @@ class FilepostCom(SimpleHoster):
     FLP_TOKEN_PATTERN = r'set_store_options\({token: \'(.+?)\''
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         m = re.search(self.FLP_TOKEN_PATTERN, self.html)
         if m is None:
             self.error(_("Token"))
diff --git a/pyload/plugin/hoster/FilepupNet.py b/pyload/plugin/hoster/FilepupNet.py
index 91d640e00..6f6689de7 100644
--- a/pyload/plugin/hoster/FilepupNet.py
+++ b/pyload/plugin/hoster/FilepupNet.py
@@ -36,7 +36,7 @@ class FilepupNet(SimpleHoster):
         self.chunkLimit = 1
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
             self.error(_("Download link not found"))
diff --git a/pyload/plugin/hoster/FilerNet.py b/pyload/plugin/hoster/FilerNet.py
index 106dd2ade..a0abe97cb 100644
--- a/pyload/plugin/hoster/FilerNet.py
+++ b/pyload/plugin/hoster/FilerNet.py
@@ -32,7 +32,7 @@ class FilerNet(SimpleHoster):
     LINK_FREE_PATTERN = LINK_PREMIUM_PATTERN = r'href="([^"]+)">Get download</a>'
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         inputs = self.parseHtmlForm(input_names={'token': re.compile(r'.+')})[1]
         if 'token' not in inputs:
             self.error(_("Unable to detect token"))
diff --git a/pyload/plugin/hoster/FileserveCom.py b/pyload/plugin/hoster/FileserveCom.py
index 1d4179e5c..e368adbcc 100644
--- a/pyload/plugin/hoster/FileserveCom.py
+++ b/pyload/plugin/hoster/FileserveCom.py
@@ -72,12 +72,12 @@ class FileserveCom(Hoster):
         self.logDebug("File Name: %s Size: %d" % (pyfile.name, pyfile.size))
 
         if self.premium:
-            self.handlePremium(pyfile)
+            self.handle_premium(pyfile)
         else:
-            self.handleFree(pyfile)
+            self.handle_free(pyfile)
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         self.html = self.load(self.url)
         action = self.load(self.url, post={"checkDownload": "check"}, decode=True)
         action = json_loads(action)
@@ -182,7 +182,7 @@ class FileserveCom(Hoster):
         self.retry()
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         premium_url = None
         if self.getClassName() == "FileserveCom":
             # try api download
diff --git a/pyload/plugin/hoster/FourSharedCom.py b/pyload/plugin/hoster/FourSharedCom.py
index 7ea5e55b8..cda3bb7a3 100644
--- a/pyload/plugin/hoster/FourSharedCom.py
+++ b/pyload/plugin/hoster/FourSharedCom.py
@@ -35,7 +35,7 @@ class FourSharedCom(SimpleHoster):
     ID_PATTERN = r'name="d3fid" value="(.*?)"'
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         m = re.search(self.LINK_BTN_PATTERN, self.html)
         if m:
             link = m.group(1)
diff --git a/pyload/plugin/hoster/FreeWayMe.py b/pyload/plugin/hoster/FreeWayMe.py
index 2406ed031..1459bb858 100644
--- a/pyload/plugin/hoster/FreeWayMe.py
+++ b/pyload/plugin/hoster/FreeWayMe.py
@@ -22,7 +22,7 @@ class FreeWayMe(MultiHoster):
         self.chunkLimit     = 1
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         user, data = self.account.selectAccount()
 
         for _i in xrange(5):
diff --git a/pyload/plugin/hoster/FshareVn.py b/pyload/plugin/hoster/FshareVn.py
index 05f213680..b44553149 100644
--- a/pyload/plugin/hoster/FshareVn.py
+++ b/pyload/plugin/hoster/FshareVn.py
@@ -52,7 +52,7 @@ class FshareVn(SimpleHoster):
             self.html = unicode(self.html, self.TEXT_ENCODING)
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         self.html = self.load(pyfile.url, decode=True)
 
         self.checkErrors()
diff --git a/pyload/plugin/hoster/GigapetaCom.py b/pyload/plugin/hoster/GigapetaCom.py
index 6314a17c8..668760d17 100644
--- a/pyload/plugin/hoster/GigapetaCom.py
+++ b/pyload/plugin/hoster/GigapetaCom.py
@@ -26,7 +26,7 @@ class GigapetaCom(SimpleHoster):
     COOKIES = [("gigapeta.com", "lang", "us")]
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         captcha_key = str(random.randint(1, 100000000))
         captcha_url = "http://gigapeta.com/img/captcha.gif?x=%s" % captcha_key
 
diff --git a/pyload/plugin/hoster/GooIm.py b/pyload/plugin/hoster/GooIm.py
index 6fc4a1fce..50e16de4b 100644
--- a/pyload/plugin/hoster/GooIm.py
+++ b/pyload/plugin/hoster/GooIm.py
@@ -28,6 +28,6 @@ class GooIm(SimpleHoster):
         self.multiDL        = True
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         self.wait(10)
         self.link = pyfile.url
diff --git a/pyload/plugin/hoster/GoogledriveCom.py b/pyload/plugin/hoster/GoogledriveCom.py
index db4ee788a..8c94bd9b4 100644
--- a/pyload/plugin/hoster/GoogledriveCom.py
+++ b/pyload/plugin/hoster/GoogledriveCom.py
@@ -34,7 +34,7 @@ class GoogledriveCom(SimpleHoster):
         self.chunkLimit     = 1
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         try:
             link1 = re.search(r'"(https://docs.google.com/uc\?id.*?export=download)",',
                               self.html.decode('unicode-escape')).group(1)
diff --git a/pyload/plugin/hoster/HostujeNet.py b/pyload/plugin/hoster/HostujeNet.py
index 4dd5bb1c3..0d292958e 100644
--- a/pyload/plugin/hoster/HostujeNet.py
+++ b/pyload/plugin/hoster/HostujeNet.py
@@ -27,7 +27,7 @@ class HostujeNet(SimpleHoster):
         self.chunkLimit = 1
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         m = re.search(r'<script src="([\w^_]+.php)"></script>', self.html)
         if m:
             jscript = self.load("http://hostuje.net/" + m.group(1))
diff --git a/pyload/plugin/hoster/IfolderRu.py b/pyload/plugin/hoster/IfolderRu.py
index d16dc695c..4cbddfaa3 100644
--- a/pyload/plugin/hoster/IfolderRu.py
+++ b/pyload/plugin/hoster/IfolderRu.py
@@ -38,7 +38,7 @@ class IfolderRu(SimpleHoster):
         self.chunkLimit     = 1
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         url = "http://rusfolder.com/%s" % self.info['pattern']['ID']
         self.html = self.load("http://rusfolder.com/%s" % self.info['pattern']['ID'], decode=True)
         self.getFileInfo()
diff --git a/pyload/plugin/hoster/JumbofilesCom.py b/pyload/plugin/hoster/JumbofilesCom.py
index 69e2c645a..47a8ebca1 100644
--- a/pyload/plugin/hoster/JumbofilesCom.py
+++ b/pyload/plugin/hoster/JumbofilesCom.py
@@ -28,7 +28,7 @@ class JumbofilesCom(SimpleHoster):
         self.multiDL        = True
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         post_data = {"id": self.info['pattern']['ID'], "op": "download3", "rand": ""}
         html = self.load(self.pyfile.url, post=post_data, decode=True)
         self.link = re.search(self.LINK_FREE_PATTERN, html).group(1)
diff --git a/pyload/plugin/hoster/Keep2ShareCc.py b/pyload/plugin/hoster/Keep2ShareCc.py
index 05dafffa8..464cac9bb 100644
--- a/pyload/plugin/hoster/Keep2ShareCc.py
+++ b/pyload/plugin/hoster/Keep2ShareCc.py
@@ -65,7 +65,7 @@ class Keep2ShareCc(SimpleHoster):
         self.info.pop('error', None)
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         self.fid  = re.search(r'<input type="hidden" name="slow_id" value="(.+?)">', self.html).group(1)
         self.html = self.load(pyfile.url, post={'yt0': '', 'slow_id': self.fid})
 
diff --git a/pyload/plugin/hoster/KingfilesNet.py b/pyload/plugin/hoster/KingfilesNet.py
index 557f1f836..b8223ceb6 100644
--- a/pyload/plugin/hoster/KingfilesNet.py
+++ b/pyload/plugin/hoster/KingfilesNet.py
@@ -35,7 +35,7 @@ class KingfilesNet(SimpleHoster):
         self.multiDL        = True
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         # Click the free user button
         post_data = {'op'         : "download1",
                      'usr_login'  : "",
diff --git a/pyload/plugin/hoster/LetitbitNet.py b/pyload/plugin/hoster/LetitbitNet.py
index 85fd55b89..9751c2658 100644
--- a/pyload/plugin/hoster/LetitbitNet.py
+++ b/pyload/plugin/hoster/LetitbitNet.py
@@ -56,7 +56,7 @@ class LetitbitNet(SimpleHoster):
         self.resumeDownload = True
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         action, inputs = self.parseHtmlForm('id="ifree_form"')
         if not action:
             self.error(_("ifree_form"))
@@ -121,7 +121,7 @@ class LetitbitNet(SimpleHoster):
         self.link = urls[0]
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         api_key = self.user
         premium_key = self.account.getAccountData(self.user)['password']
 
diff --git a/pyload/plugin/hoster/LinksnappyCom.py b/pyload/plugin/hoster/LinksnappyCom.py
index 186639a81..cd15301db 100644
--- a/pyload/plugin/hoster/LinksnappyCom.py
+++ b/pyload/plugin/hoster/LinksnappyCom.py
@@ -23,7 +23,7 @@ class LinksnappyCom(MultiHoster):
     SINGLE_CHUNK_HOSTERS = ["easybytez.com"]
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         host        = self._get_host(pyfile.url)
         json_params = json_dumps({'link'    : pyfile.url,
                                   'type'    : host,
diff --git a/pyload/plugin/hoster/LoadTo.py b/pyload/plugin/hoster/LoadTo.py
index 3a625dbe3..1f9696a52 100644
--- a/pyload/plugin/hoster/LoadTo.py
+++ b/pyload/plugin/hoster/LoadTo.py
@@ -39,7 +39,7 @@ class LoadTo(SimpleHoster):
         self.chunkLimit = 1
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         # Search for Download URL
         m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
diff --git a/pyload/plugin/hoster/LolabitsEs.py b/pyload/plugin/hoster/LolabitsEs.py
index 890cb0239..b98563bcf 100644
--- a/pyload/plugin/hoster/LolabitsEs.py
+++ b/pyload/plugin/hoster/LolabitsEs.py
@@ -31,7 +31,7 @@ class LolabitsEs(SimpleHoster):
         self.chunkLimit = 1
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         fileid = re.search(self.FILEID_PATTERN, self.html).group(1)
         self.logDebug("FileID: " + fileid)
 
diff --git a/pyload/plugin/hoster/LuckyShareNet.py b/pyload/plugin/hoster/LuckyShareNet.py
index 6dff7d517..b199ab468 100644
--- a/pyload/plugin/hoster/LuckyShareNet.py
+++ b/pyload/plugin/hoster/LuckyShareNet.py
@@ -44,7 +44,7 @@ class LuckyShareNet(SimpleHoster):
     # TODO: Some files could not be downloaded in free mode
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         rep = self.load(r"http://luckyshare.net/download/request/type/time/file/" + self.info['pattern']['ID'], decode=True)
 
         self.logDebug("JSON: " + rep)
diff --git a/pyload/plugin/hoster/MediafireCom.py b/pyload/plugin/hoster/MediafireCom.py
index d05a51479..c3069d021 100644
--- a/pyload/plugin/hoster/MediafireCom.py
+++ b/pyload/plugin/hoster/MediafireCom.py
@@ -34,7 +34,7 @@ class MediafireCom(SimpleHoster):
         self.multiDL        = True
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         solvemedia  = SolveMedia(self)
         captcha_key = solvemedia.detect_key()
 
@@ -57,4 +57,4 @@ class MediafireCom(SimpleHoster):
                 if self.PASSWORD_PATTERN in self.html:
                     self.fail(_("Incorrect password"))
 
-        return super(MediafireCom, self).handleFree(pyfile)
+        return super(MediafireCom, self).handle_free(pyfile)
diff --git a/pyload/plugin/hoster/MegaDebridEu.py b/pyload/plugin/hoster/MegaDebridEu.py
index fd578a83c..4eeb07d1d 100644
--- a/pyload/plugin/hoster/MegaDebridEu.py
+++ b/pyload/plugin/hoster/MegaDebridEu.py
@@ -37,7 +37,7 @@ class MegaDebridEu(MultiHoster):
             return False
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         """
         Debrid a link
         Return The debrided link if succeed or original link if fail
diff --git a/pyload/plugin/hoster/MegaRapidCz.py b/pyload/plugin/hoster/MegaRapidCz.py
index d7ed78202..41e6e7412 100644
--- a/pyload/plugin/hoster/MegaRapidCz.py
+++ b/pyload/plugin/hoster/MegaRapidCz.py
@@ -51,7 +51,7 @@ class MegaRapidCz(SimpleHoster):
         self.chunkLimit = 1
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         m = re.search(self.LINK_PREMIUM_PATTERN, self.html)
         if m:
             self.link = m.group(1)
diff --git a/pyload/plugin/hoster/MegaRapidoNet.py b/pyload/plugin/hoster/MegaRapidoNet.py
index 1be61f235..484f8e72f 100644
--- a/pyload/plugin/hoster/MegaRapidoNet.py
+++ b/pyload/plugin/hoster/MegaRapidoNet.py
@@ -38,7 +38,7 @@ class MegaRapidoNet(MultiHoster):
     ERROR_PATTERN = r'<\s*?div[^>]*?class\s*?=\s*?["\']?alert-message error.*?>([^<]*)'
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         self.html = self.load("http://megarapido.net/gerar.php",
                          post={'rand'     :random_with_N_digits(16),
                                'urllist'  : pyfile.url,
@@ -51,4 +51,4 @@ class MegaRapidoNet(MultiHoster):
         if "desloga e loga novamente para gerar seus links" in self.html.lower():
             self.error("You have logged in at another place")
 
-        return super(MegaRapidoNet, self).handlePremium(pyfile)
+        return super(MegaRapidoNet, self).handle_premium(pyfile)
diff --git a/pyload/plugin/hoster/MegasharesCom.py b/pyload/plugin/hoster/MegasharesCom.py
index ac7a81313..11010b63e 100644
--- a/pyload/plugin/hoster/MegasharesCom.py
+++ b/pyload/plugin/hoster/MegasharesCom.py
@@ -39,11 +39,11 @@ class MegasharesCom(SimpleHoster):
         self.multiDL        = self.premium
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         self.handleDownload(True)
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         if self.NO_SLOTS_PATTERN in self.html:
             self.retry(wait_time=5 * 60)
 
diff --git a/pyload/plugin/hoster/MultishareCz.py b/pyload/plugin/hoster/MultishareCz.py
index b19dfba38..ade049f50 100644
--- a/pyload/plugin/hoster/MultishareCz.py
+++ b/pyload/plugin/hoster/MultishareCz.py
@@ -27,15 +27,15 @@ class MultishareCz(SimpleHoster):
     OFFLINE_PATTERN = ur'<h1>Stáhnout soubor</h1><p><strong>Požadovaný soubor neexistuje.</strong></p>'
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         self.download("http://www.multishare.cz/html/download_free.php", get={'ID': self.info['pattern']['ID']})
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         self.download("http://www.multishare.cz/html/download_premium.php", get={'ID': self.info['pattern']['ID']})
 
 
-    def handleMulti(self, pyfile):
+    def handle_multi(self, pyfile):
         self.html = self.load('http://www.multishare.cz/html/mms_ajax.php', post={"link": pyfile.url}, decode=True)
 
         self.checkInfo()
diff --git a/pyload/plugin/hoster/MyfastfileCom.py b/pyload/plugin/hoster/MyfastfileCom.py
index 12418670a..4ed89f8f7 100644
--- a/pyload/plugin/hoster/MyfastfileCom.py
+++ b/pyload/plugin/hoster/MyfastfileCom.py
@@ -21,7 +21,7 @@ class MyfastfileCom(MultiHoster):
         self.chunkLimit = -1
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         self.html = self.load('http://myfastfile.com/api.php',
                          get={'user': self.user, 'pass': self.account.getAccountData(self.user)['password'],
                               'link': pyfile.url})
diff --git a/pyload/plugin/hoster/MystoreTo.py b/pyload/plugin/hoster/MystoreTo.py
index 581dec612..1518dd75f 100644
--- a/pyload/plugin/hoster/MystoreTo.py
+++ b/pyload/plugin/hoster/MystoreTo.py
@@ -32,7 +32,7 @@ class MystoreTo(SimpleHoster):
         self.multiDL        = True
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         try:
             fid = re.search(r'wert="(.+?)"', self.html).group(1)
 
diff --git a/pyload/plugin/hoster/NarodRu.py b/pyload/plugin/hoster/NarodRu.py
index 456baefec..38c867304 100644
--- a/pyload/plugin/hoster/NarodRu.py
+++ b/pyload/plugin/hoster/NarodRu.py
@@ -31,7 +31,7 @@ class NarodRu(SimpleHoster):
     LINK_FREE_PATTERN = r'<a class="h-link" rel="yandex_bar" href="(.+?)">'
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         for _i in xrange(5):
             self.html = self.load('http://narod.ru/disk/getcapchaxml/?rnd=%d' % int(random.random() * 777))
 
diff --git a/pyload/plugin/hoster/NitroflareCom.py b/pyload/plugin/hoster/NitroflareCom.py
index a93ff67ec..aed0b404f 100644
--- a/pyload/plugin/hoster/NitroflareCom.py
+++ b/pyload/plugin/hoster/NitroflareCom.py
@@ -58,7 +58,7 @@ class NitroflareCom(SimpleHoster):
         self.info.pop('error', None)
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         # used here to load the cookies which will be required later
         self.load(pyfile.url, post={'goToFreePage': ""})
 
diff --git a/pyload/plugin/hoster/NoPremiumPl.py b/pyload/plugin/hoster/NoPremiumPl.py
index be1e4794e..4714270b5 100644
--- a/pyload/plugin/hoster/NoPremiumPl.py
+++ b/pyload/plugin/hoster/NoPremiumPl.py
@@ -59,7 +59,7 @@ class NoPremiumPl(MultiHoster):
         return self.load(self.API_URL, post=query)
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         try:
             data = self.runFileQuery(pyfile.url, 'fileinfo')
 
diff --git a/pyload/plugin/hoster/NowDownloadSx.py b/pyload/plugin/hoster/NowDownloadSx.py
index 967c14e81..b0c8d60e2 100644
--- a/pyload/plugin/hoster/NowDownloadSx.py
+++ b/pyload/plugin/hoster/NowDownloadSx.py
@@ -37,7 +37,7 @@ class NowDownloadSx(SimpleHoster):
         self.chunkLimit     = -1
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         tokenlink = re.search(self.TOKEN_PATTERN, self.html)
         continuelink = re.search(self.CONTINUE_PATTERN, self.html)
         if tokenlink is None or continuelink is None:
diff --git a/pyload/plugin/hoster/NowVideoSx.py b/pyload/plugin/hoster/NowVideoSx.py
index bfa186e60..70dc1fdf5 100644
--- a/pyload/plugin/hoster/NowVideoSx.py
+++ b/pyload/plugin/hoster/NowVideoSx.py
@@ -32,7 +32,7 @@ class NowVideoSx(SimpleHoster):
         self.multiDL        = True
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         self.html = self.load("http://www.nowvideo.sx/mobile/video.php", get={'id': self.info['pattern']['ID']})
 
         m = re.search(self.LINK_FREE_PATTERN, self.html)
diff --git a/pyload/plugin/hoster/OneFichierCom.py b/pyload/plugin/hoster/OneFichierCom.py
index 1fc89db10..1c5c87a99 100644
--- a/pyload/plugin/hoster/OneFichierCom.py
+++ b/pyload/plugin/hoster/OneFichierCom.py
@@ -38,7 +38,7 @@ class OneFichierCom(SimpleHoster):
         self.resumeDownload = True
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         id = self.info['pattern']['ID1'] or self.info['pattern']['ID2']
         url, inputs = self.parseHtmlForm('action="https://1fichier.com/\?%s' % id)
 
@@ -53,5 +53,5 @@ class OneFichierCom(SimpleHoster):
         self.download(url, post=inputs)
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         self.download(pyfile.url, post={'dl': "Download", 'did': 0})
diff --git a/pyload/plugin/hoster/OverLoadMe.py b/pyload/plugin/hoster/OverLoadMe.py
index c9ee5e653..0ed1e1d57 100644
--- a/pyload/plugin/hoster/OverLoadMe.py
+++ b/pyload/plugin/hoster/OverLoadMe.py
@@ -22,7 +22,7 @@ class OverLoadMe(MultiHoster):
         self.chunkLimit = 5
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         https = "https" if self.getConfig('ssl') else "http"
         data  = self.account.getAccountData(self.user)
         page  = self.load(https + "://api.over-load.me/getdownload.php",
diff --git a/pyload/plugin/hoster/PremiumTo.py b/pyload/plugin/hoster/PremiumTo.py
index 59fd37459..47169a6a3 100644
--- a/pyload/plugin/hoster/PremiumTo.py
+++ b/pyload/plugin/hoster/PremiumTo.py
@@ -26,7 +26,7 @@ class PremiumTo(MultiHoster):
     CHECK_TRAFFIC = True
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         # raise timeout to 2min
         self.download("http://premium.to/api/getfile.php",
                       get={'username': self.account.username,
diff --git a/pyload/plugin/hoster/PremiumizeMe.py b/pyload/plugin/hoster/PremiumizeMe.py
index f577da90e..e23ba6b44 100644
--- a/pyload/plugin/hoster/PremiumizeMe.py
+++ b/pyload/plugin/hoster/PremiumizeMe.py
@@ -17,7 +17,7 @@ class PremiumizeMe(MultiHoster):
     __authors     = [("Florian Franzen", "FlorianFranzen@gmail.com")]
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         # In some cases hostsers do not supply us with a filename at download, so we
         # are going to set a fall back filename (e.g. for freakshare or xfileshare)
         pyfile.name = pyfile.name.split('/').pop()  #: Remove everthing before last slash
diff --git a/pyload/plugin/hoster/PromptfileCom.py b/pyload/plugin/hoster/PromptfileCom.py
index 27b669382..e3ec899c7 100644
--- a/pyload/plugin/hoster/PromptfileCom.py
+++ b/pyload/plugin/hoster/PromptfileCom.py
@@ -25,7 +25,7 @@ class PromptfileCom(SimpleHoster):
     LINK_FREE_PATTERN = r'<a href=\"(.+)\" target=\"_blank\" class=\"view_dl_link\">Download File</a>'
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         # STAGE 1: get link to continue
         m = re.search(self.CHASH_PATTERN, self.html)
         if m is None:
diff --git a/pyload/plugin/hoster/QuickshareCz.py b/pyload/plugin/hoster/QuickshareCz.py
index 9d66147f6..f0afd1a95 100644
--- a/pyload/plugin/hoster/QuickshareCz.py
+++ b/pyload/plugin/hoster/QuickshareCz.py
@@ -43,15 +43,15 @@ class QuickshareCz(SimpleHoster):
                     self.premium = False
 
         if self.premium:
-            self.handlePremium(pyfile)
+            self.handle_premium(pyfile)
         else:
-            self.handleFree(pyfile)
+            self.handle_free(pyfile)
 
         if self.checkDownload({"error": re.compile(r"\AChyba!")}, max_size=100):
             self.fail(_("File not m or plugin defect"))
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         # get download url
         download_url = '%s/download.php' % self.jsvars['server']
         data = dict((x, self.jsvars[x]) for x in self.jsvars if x in ("ID1", "ID2", "ID3", "ID4"))
@@ -78,7 +78,7 @@ class QuickshareCz(SimpleHoster):
                 self.fail(_("Error %d") % m.group(1))
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         download_url = '%s/download_premium.php' % self.jsvars['server']
         data = dict((x, self.jsvars[x]) for x in self.jsvars if x in ("ID1", "ID2", "ID4", "ID5"))
         self.download(download_url, get=data)
diff --git a/pyload/plugin/hoster/RPNetBiz.py b/pyload/plugin/hoster/RPNetBiz.py
index b84f171c3..1d15aa3c7 100644
--- a/pyload/plugin/hoster/RPNetBiz.py
+++ b/pyload/plugin/hoster/RPNetBiz.py
@@ -21,7 +21,7 @@ class RPNetBiz(MultiHoster):
         self.chunkLimit = -1
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         user, data = self.account.selectAccount()
 
         # Get the download link
diff --git a/pyload/plugin/hoster/RapideoPl.py b/pyload/plugin/hoster/RapideoPl.py
index 35d4da0ad..8df0a9a4d 100644
--- a/pyload/plugin/hoster/RapideoPl.py
+++ b/pyload/plugin/hoster/RapideoPl.py
@@ -59,7 +59,7 @@ class RapideoPl(MultiHoster):
         return self.load(self.API_URL, post=query)
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         try:
             data = self.runFileQuery(pyfile.url, 'fileinfo')
 
diff --git a/pyload/plugin/hoster/RapidgatorNet.py b/pyload/plugin/hoster/RapidgatorNet.py
index b05b0d5d0..f989eadda 100644
--- a/pyload/plugin/hoster/RapidgatorNet.py
+++ b/pyload/plugin/hoster/RapidgatorNet.py
@@ -88,7 +88,7 @@ class RapidgatorNet(SimpleHoster):
             self.retry(wait_time=60)
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         self.api_data = self.api_response('info')
         self.api_data['md5'] = self.api_data['hash']
 
@@ -98,7 +98,7 @@ class RapidgatorNet(SimpleHoster):
         self.link = self.api_response('download')['url']
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         jsvars = dict(re.findall(self.JSVARS_PATTERN, self.html))
         self.logDebug(jsvars)
 
diff --git a/pyload/plugin/hoster/RapiduNet.py b/pyload/plugin/hoster/RapiduNet.py
index 81d25a3fa..35f51e6af 100644
--- a/pyload/plugin/hoster/RapiduNet.py
+++ b/pyload/plugin/hoster/RapiduNet.py
@@ -36,7 +36,7 @@ class RapiduNet(SimpleHoster):
         self.multiDL        = self.premium
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         self.req.http.lastURL = pyfile.url
         self.req.http.c.setopt(pycurl.HTTPHEADER, ["X-Requested-With: XMLHttpRequest"])
 
diff --git a/pyload/plugin/hoster/RealdebridCom.py b/pyload/plugin/hoster/RealdebridCom.py
index 642de3f92..ece063ccf 100644
--- a/pyload/plugin/hoster/RealdebridCom.py
+++ b/pyload/plugin/hoster/RealdebridCom.py
@@ -24,7 +24,7 @@ class RealdebridCom(MultiHoster):
         self.chunkLimit = 3
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         data = json_loads(self.load("https://real-debrid.com/ajax/unrestrict.php",
                                     get={'lang'    : "en",
                                          'link'    : pyfile.url,
diff --git a/pyload/plugin/hoster/RehostTo.py b/pyload/plugin/hoster/RehostTo.py
index f6f5630fb..d63ca54b7 100644
--- a/pyload/plugin/hoster/RehostTo.py
+++ b/pyload/plugin/hoster/RehostTo.py
@@ -16,7 +16,7 @@ class RehostTo(MultiHoster):
     __authors     = [("RaNaN", "RaNaN@pyload.org")]
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         self.download("http://rehost.to/process_download.php",
                       get={'user': "cookie",
                            'pass': self.account.getAccountInfo(self.user)['session'],
diff --git a/pyload/plugin/hoster/RemixshareCom.py b/pyload/plugin/hoster/RemixshareCom.py
index ba61887cd..0b331c1c6 100644
--- a/pyload/plugin/hoster/RemixshareCom.py
+++ b/pyload/plugin/hoster/RemixshareCom.py
@@ -43,7 +43,7 @@ class RemixshareCom(SimpleHoster):
         self.chunkLimit = 1
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         b = re.search(self.LINK_PATTERN, self.html)
         if not b:
             self.error(_("File url"))
diff --git a/pyload/plugin/hoster/SendspaceCom.py b/pyload/plugin/hoster/SendspaceCom.py
index 740774313..39951f55b 100644
--- a/pyload/plugin/hoster/SendspaceCom.py
+++ b/pyload/plugin/hoster/SendspaceCom.py
@@ -28,7 +28,7 @@ class SendspaceCom(SimpleHoster):
     USER_CAPTCHA_PATTERN = r'<td><img src="/captchas/captcha\.php?user=(.+?))"></td>'
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         params = {}
         for _i in xrange(3):
             m = re.search(self.LINK_FREE_PATTERN, self.html)
diff --git a/pyload/plugin/hoster/ShareonlineBiz.py b/pyload/plugin/hoster/ShareonlineBiz.py
index 0f5a8692a..ad56b83f4 100644
--- a/pyload/plugin/hoster/ShareonlineBiz.py
+++ b/pyload/plugin/hoster/ShareonlineBiz.py
@@ -88,7 +88,7 @@ class ShareonlineBiz(SimpleHoster):
             self.fail(_("No valid captcha solution received"))
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         self.wait(3)
 
         self.html = self.load("%s/free/" % pyfile.url,
@@ -121,7 +121,7 @@ class ShareonlineBiz(SimpleHoster):
         return super(ShareonlineBiz, self).checkFile(rules)
 
 
-    def handlePremium(self, pyfile):  #: should be working better loading (account) api internally
+    def handle_premium(self, pyfile):  #: should be working better loading (account) api internally
         html = self.load("http://api.share-online.biz/account.php",
                          get={'username': self.user,
                               'password': self.account.getAccountData(self.user)['password'],
diff --git a/pyload/plugin/hoster/SimplyPremiumCom.py b/pyload/plugin/hoster/SimplyPremiumCom.py
index 327bfdcc1..f4f7a3006 100644
--- a/pyload/plugin/hoster/SimplyPremiumCom.py
+++ b/pyload/plugin/hoster/SimplyPremiumCom.py
@@ -45,7 +45,7 @@ class SimplyPremiumCom(MultiHoster):
             self.retry(5, 60, _("Hoster is temporarily unavailable"))
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         for _i in xrange(5):
             self.html = self.load("http://www.simply-premium.com/premium.php", get={'info': "", 'link': self.pyfile.url})
 
diff --git a/pyload/plugin/hoster/SimplydebridCom.py b/pyload/plugin/hoster/SimplydebridCom.py
index fb7beb3fb..a053e0b76 100644
--- a/pyload/plugin/hoster/SimplydebridCom.py
+++ b/pyload/plugin/hoster/SimplydebridCom.py
@@ -16,7 +16,7 @@ class SimplydebridCom(MultiHoster):
     __authors     = [("Kagenoshin", "kagenoshin@gmx.ch")]
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         # fix the links for simply-debrid.com!
         self.link = replace_patterns(pyfile.url, [("clz.to", "cloudzer.net/file")
                                                   ("http://share-online", "http://www.share-online")
diff --git a/pyload/plugin/hoster/SizedriveCom.py b/pyload/plugin/hoster/SizedriveCom.py
index c9491d0ab..d4e705ae0 100644
--- a/pyload/plugin/hoster/SizedriveCom.py
+++ b/pyload/plugin/hoster/SizedriveCom.py
@@ -28,7 +28,7 @@ class SizedriveCom(SimpleHoster):
         self.chunkLimit     = 1
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         self.wait(5)
         self.html = self.load("http://www.sizedrive.com/getdownload.php",
                               post={'id': self.info['pattern']['ID']})
diff --git a/pyload/plugin/hoster/SmoozedCom.py b/pyload/plugin/hoster/SmoozedCom.py
index f216a95bc..dce714e06 100644
--- a/pyload/plugin/hoster/SmoozedCom.py
+++ b/pyload/plugin/hoster/SmoozedCom.py
@@ -17,7 +17,7 @@ class SmoozedCom(MultiHoster):
     __authors     = [("", "")]
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         # In some cases hostsers do not supply us with a filename at download, so we
         # are going to set a fall back filename (e.g. for freakshare or xfileshare)
         pyfile.name = pyfile.name.split('/').pop()  #: Remove everthing before last slash
diff --git a/pyload/plugin/hoster/SoundcloudCom.py b/pyload/plugin/hoster/SoundcloudCom.py
index 7ce0e3787..15d2b9f17 100644
--- a/pyload/plugin/hoster/SoundcloudCom.py
+++ b/pyload/plugin/hoster/SoundcloudCom.py
@@ -24,7 +24,7 @@ class SoundcloudCom(SimpleHoster):
     OFFLINE_PATTERN = r'<title>"SoundCloud - Hear the world’s sounds"</title>'
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         try:
             song_id = re.search(r'sounds:(\d+)"', self.html).group(1)
 
diff --git a/pyload/plugin/hoster/SpeedyshareCom.py b/pyload/plugin/hoster/SpeedyshareCom.py
index 27b866f70..5ad141bc1 100644
--- a/pyload/plugin/hoster/SpeedyshareCom.py
+++ b/pyload/plugin/hoster/SpeedyshareCom.py
@@ -34,7 +34,7 @@ class SpeedyshareCom(SimpleHoster):
         self.chunkLimit = 1
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
             self.link = m.group(1)
diff --git a/pyload/plugin/hoster/TurbobitNet.py b/pyload/plugin/hoster/TurbobitNet.py
index a55d824a3..bcbeddd17 100644
--- a/pyload/plugin/hoster/TurbobitNet.py
+++ b/pyload/plugin/hoster/TurbobitNet.py
@@ -42,7 +42,7 @@ class TurbobitNet(SimpleHoster):
     CAPTCHA_PATTERN    = r'<img alt="Captcha" src="(.+?)"'
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         self.html = self.load("http://turbobit.net/download/free/%s" % self.info['pattern']['ID'],
                               decode=True)
 
diff --git a/pyload/plugin/hoster/UlozTo.py b/pyload/plugin/hoster/UlozTo.py
index 611541990..83e2af953 100644
--- a/pyload/plugin/hoster/UlozTo.py
+++ b/pyload/plugin/hoster/UlozTo.py
@@ -48,7 +48,7 @@ class UlozTo(SimpleHoster):
         self.resumeDownload = True
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         action, inputs = self.parseHtmlForm('id="frm-downloadDialog-freeDownloadForm"')
         if not action or not inputs:
             self.error(_("Free download form not found"))
@@ -83,7 +83,7 @@ class UlozTo(SimpleHoster):
         self.download("http://www.ulozto.net" + action, post=inputs)
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         self.download(pyfile.url, get={'do': "directDownload"})
 
 
diff --git a/pyload/plugin/hoster/UloziskoSk.py b/pyload/plugin/hoster/UloziskoSk.py
index 4a37d5ba9..1fde11a78 100644
--- a/pyload/plugin/hoster/UloziskoSk.py
+++ b/pyload/plugin/hoster/UloziskoSk.py
@@ -36,10 +36,10 @@ class UloziskoSk(SimpleHoster):
         if m:
             self.link = "http://ulozisko.sk" + m.group(1)
         else:
-            self.handleFree(pyfile)
+            self.handle_free(pyfile)
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
             self.error(_("LINK_FREE_PATTERN not found"))
diff --git a/pyload/plugin/hoster/UnibytesCom.py b/pyload/plugin/hoster/UnibytesCom.py
index 4a2592941..52f376dcd 100644
--- a/pyload/plugin/hoster/UnibytesCom.py
+++ b/pyload/plugin/hoster/UnibytesCom.py
@@ -26,7 +26,7 @@ class UnibytesCom(SimpleHoster):
     LINK_FREE_PATTERN = r'<a href="(.+?)">Download</a>'
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         domain            = "http://www.%s/" % self.HOSTER_DOMAIN
         action, post_data = self.parseHtmlForm('id="startForm"')
 
diff --git a/pyload/plugin/hoster/UnrestrictLi.py b/pyload/plugin/hoster/UnrestrictLi.py
index b0230a7b4..74dcadb5b 100644
--- a/pyload/plugin/hoster/UnrestrictLi.py
+++ b/pyload/plugin/hoster/UnrestrictLi.py
@@ -26,7 +26,7 @@ class UnrestrictLi(MultiHoster):
         self.resumeDownload = True
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         for _i in xrange(5):
             self.html = self.load('https://unrestrict.li/unrestrict.php',
                              post={'link': pyfile.url, 'domain': 'long'})
diff --git a/pyload/plugin/hoster/UpleaCom.py b/pyload/plugin/hoster/UpleaCom.py
index 0459a82ea..4e4db81a7 100644
--- a/pyload/plugin/hoster/UpleaCom.py
+++ b/pyload/plugin/hoster/UpleaCom.py
@@ -42,7 +42,7 @@ class UpleaCom(XFSHoster):
         self.resumeDownload = True
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         m = re.search(self.STEP_PATTERN, self.html)
         if m is None:
             self.error(_("STEP_PATTERN not found"))
diff --git a/pyload/plugin/hoster/UploadableCh.py b/pyload/plugin/hoster/UploadableCh.py
index c030c4178..b5b8ee8a9 100644
--- a/pyload/plugin/hoster/UploadableCh.py
+++ b/pyload/plugin/hoster/UploadableCh.py
@@ -32,7 +32,7 @@ class UploadableCh(SimpleHoster):
     RECAPTCHA_KEY = "6LdlJuwSAAAAAPJbPIoUhyqOJd7-yrah5Nhim5S3"
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         # Click the "free user" button and wait
         a = self.load(pyfile.url, post={'downloadLink': "wait"}, decode=True)
         self.logDebug(a)
diff --git a/pyload/plugin/hoster/UploadedTo.py b/pyload/plugin/hoster/UploadedTo.py
index 308b7c1ca..f5877c1a9 100644
--- a/pyload/plugin/hoster/UploadedTo.py
+++ b/pyload/plugin/hoster/UploadedTo.py
@@ -90,7 +90,7 @@ class UploadedTo(SimpleHoster):
                 self.wait(m.group(1))
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         self.load("http://uploaded.net/language/en", just_header=True)
 
         self.html = self.load("http://uploaded.net/js/download.js", decode=True)
diff --git a/pyload/plugin/hoster/UploadheroCom.py b/pyload/plugin/hoster/UploadheroCom.py
index 4a01d5db0..f112d9c56 100644
--- a/pyload/plugin/hoster/UploadheroCom.py
+++ b/pyload/plugin/hoster/UploadheroCom.py
@@ -38,7 +38,7 @@ class UploadheroCom(SimpleHoster):
     LINK_PREMIUM_PATTERN = r'<a href="(.+?)" id="downloadnow"'
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         m = re.search(self.CAPTCHA_PATTERN, self.html)
         if m is None:
             self.error(_("Captcha not found"))
diff --git a/pyload/plugin/hoster/UploadingCom.py b/pyload/plugin/hoster/UploadingCom.py
index e6c4cb7de..6bf3988cb 100644
--- a/pyload/plugin/hoster/UploadingCom.py
+++ b/pyload/plugin/hoster/UploadingCom.py
@@ -39,12 +39,12 @@ class UploadingCom(SimpleHoster):
         self.getFileInfo()
 
         if self.premium:
-            self.handlePremium(pyfile)
+            self.handle_premium(pyfile)
         else:
-            self.handleFree(pyfile)
+            self.handle_free(pyfile)
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         postData = {'action': 'get_link',
                     'code'  : self.info['pattern']['ID'],
                     'pass'  : 'undefined'}
@@ -57,7 +57,7 @@ class UploadingCom(SimpleHoster):
         raise Exception("Plugin defect")
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         m = re.search('<h2>((Daily )?Download Limit)</h2>', self.html)
         if m:
             pyfile.error = m.group(1)
diff --git a/pyload/plugin/hoster/UpstoreNet.py b/pyload/plugin/hoster/UpstoreNet.py
index adf63e382..7d21d16ac 100644
--- a/pyload/plugin/hoster/UpstoreNet.py
+++ b/pyload/plugin/hoster/UpstoreNet.py
@@ -27,7 +27,7 @@ class UpstoreNet(SimpleHoster):
     LINK_FREE_PATTERN = r'<a href="(https?://.*?)" target="_blank"><b>'
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         # STAGE 1: get link to continue
         m = re.search(self.CHASH_PATTERN, self.html)
         if m is None:
diff --git a/pyload/plugin/hoster/VeohCom.py b/pyload/plugin/hoster/VeohCom.py
index e1ee00ea1..4461b547a 100644
--- a/pyload/plugin/hoster/VeohCom.py
+++ b/pyload/plugin/hoster/VeohCom.py
@@ -33,7 +33,7 @@ class VeohCom(SimpleHoster):
         self.chunkLimit     = -1
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         quality = self.getConfig('quality')
         if quality == "Auto":
             quality = ("High", "Low")
diff --git a/pyload/plugin/hoster/VimeoCom.py b/pyload/plugin/hoster/VimeoCom.py
index f83e15815..86abf362e 100644
--- a/pyload/plugin/hoster/VimeoCom.py
+++ b/pyload/plugin/hoster/VimeoCom.py
@@ -35,7 +35,7 @@ class VimeoCom(SimpleHoster):
         self.chunkLimit     = -1
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         password = self.getPassword()
 
         if self.js and 'class="btn iconify_down_b"' in self.html:
diff --git a/pyload/plugin/hoster/WebshareCz.py b/pyload/plugin/hoster/WebshareCz.py
index 49a8da89f..5608cd272 100644
--- a/pyload/plugin/hoster/WebshareCz.py
+++ b/pyload/plugin/hoster/WebshareCz.py
@@ -41,7 +41,7 @@ class WebshareCz(SimpleHoster):
         return info
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         wst = self.account.infos['wst'] if self.account and 'wst' in self.account.infos else ""
 
         api_data = getURL('https://webshare.cz/api/file_link/',
@@ -57,5 +57,5 @@ class WebshareCz(SimpleHoster):
         self.link = m.group(1)
 
 
-    def handlePremium(self, pyfile):
-        return self.handleFree(pyfile)
+    def handle_premium(self, pyfile):
+        return self.handle_free(pyfile)
diff --git a/pyload/plugin/hoster/WrzucTo.py b/pyload/plugin/hoster/WrzucTo.py
index 34306b75f..00af10b23 100644
--- a/pyload/plugin/hoster/WrzucTo.py
+++ b/pyload/plugin/hoster/WrzucTo.py
@@ -29,7 +29,7 @@ class WrzucTo(SimpleHoster):
         self.multiDL = True
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         data = dict(re.findall(r'(md5|file): "(.*?)"', self.html))
         if len(data) != 2:
             self.error(_("No file ID"))
diff --git a/pyload/plugin/hoster/XdadevelopersCom.py b/pyload/plugin/hoster/XdadevelopersCom.py
index 9183563b7..040057cd5 100644
--- a/pyload/plugin/hoster/XdadevelopersCom.py
+++ b/pyload/plugin/hoster/XdadevelopersCom.py
@@ -30,6 +30,6 @@ class XdadevelopersCom(SimpleHoster):
         self.chunkLimit     = 1
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         self.download(pyfile.url,
                       get={'task': "get"})
diff --git a/pyload/plugin/hoster/YadiSk.py b/pyload/plugin/hoster/YadiSk.py
index a9d9e4706..96ca04cff 100644
--- a/pyload/plugin/hoster/YadiSk.py
+++ b/pyload/plugin/hoster/YadiSk.py
@@ -64,7 +64,7 @@ class YadiSk(SimpleHoster):
         self.chunkLimit     = 1
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         if any(True for _k in ['id', 'sk', 'version', 'idclient'] if _k not in self.info):
            self.error(_("Missing JSON data"))
 
diff --git a/pyload/plugin/hoster/YibaishiwuCom.py b/pyload/plugin/hoster/YibaishiwuCom.py
index 6581f7534..a6256bf6b 100644
--- a/pyload/plugin/hoster/YibaishiwuCom.py
+++ b/pyload/plugin/hoster/YibaishiwuCom.py
@@ -26,7 +26,7 @@ class YibaishiwuCom(SimpleHoster):
     LINK_FREE_PATTERN = r'(/\?ct=(pickcode|download)[^"\']+)'
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
             self.error(_("LINK_FREE_PATTERN not found"))
diff --git a/pyload/plugin/hoster/ZeveraCom.py b/pyload/plugin/hoster/ZeveraCom.py
index 005c32cf8..29e4da223 100644
--- a/pyload/plugin/hoster/ZeveraCom.py
+++ b/pyload/plugin/hoster/ZeveraCom.py
@@ -17,7 +17,7 @@ class ZeveraCom(MultiHoster):
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         self.link = "https://%s/getFiles.ashx?ourl=%s" % (self.account.HOSTER_DOMAIN, pyfile.url)
 
 
diff --git a/pyload/plugin/hoster/ZippyshareCom.py b/pyload/plugin/hoster/ZippyshareCom.py
index 7f91c04e5..40a879b55 100644
--- a/pyload/plugin/hoster/ZippyshareCom.py
+++ b/pyload/plugin/hoster/ZippyshareCom.py
@@ -38,7 +38,7 @@ class ZippyshareCom(SimpleHoster):
         self.resumeDownload = True
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         recaptcha   = ReCaptcha(self)
         captcha_key = recaptcha.detect_key()
 
diff --git a/pyload/plugin/internal/MultiHoster.py b/pyload/plugin/internal/MultiHoster.py
index 8dbcf4f30..06d78475b 100644
--- a/pyload/plugin/internal/MultiHoster.py
+++ b/pyload/plugin/internal/MultiHoster.py
@@ -61,7 +61,7 @@ class MultiHoster(SimpleHoster):
             if self.directDL:
                 self.checkInfo()
                 self.logDebug("Looking for direct download link...")
-                self.handleDirect(pyfile)
+                self.handle_direct(pyfile)
 
             if not self.link and not self.lastDownload:
                 self.preload()
@@ -71,11 +71,11 @@ class MultiHoster(SimpleHoster):
 
                 if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
                     self.logDebug("Handled as premium download")
-                    self.handlePremium(pyfile)
+                    self.handle_premium(pyfile)
 
                 elif not self.LOGIN_ACCOUNT or (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
                     self.logDebug("Handled as free download")
-                    self.handleFree(pyfile)
+                    self.handle_free(pyfile)
 
             self.downloadLink(self.link, True)
             self.checkFile()
@@ -105,11 +105,11 @@ class MultiHoster(SimpleHoster):
                 raise Fail(e)
 
 
-    def handlePremium(self, pyfile):
-        return self.handleFree(pyfile)
+    def handle_premium(self, pyfile):
+        return self.handle_free(pyfile)
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         if self.premium:
             raise NotImplementedError
         else:
diff --git a/pyload/plugin/internal/SimpleCrypter.py b/pyload/plugin/internal/SimpleCrypter.py
index e22a4df29..dff543eed 100644
--- a/pyload/plugin/internal/SimpleCrypter.py
+++ b/pyload/plugin/internal/SimpleCrypter.py
@@ -94,7 +94,7 @@ class SimpleCrypter(Crypter, SimpleHoster):
         self.links = self.getLinks()
 
         if hasattr(self, 'PAGES_PATTERN') and hasattr(self, 'loadPage'):
-            self.handlePages(pyfile)
+            self.handle_pages(pyfile)
 
         self.logDebug("Package has %d links" % len(self.links))
 
@@ -142,7 +142,7 @@ class SimpleCrypter(Crypter, SimpleHoster):
                 for link in re.findall(self.LINK_PATTERN, self.html)]
 
 
-    def handlePages(self, pyfile):
+    def handle_pages(self, pyfile):
         try:
             pages = int(re.search(self.PAGES_PATTERN, self.html).group(1))
         except Exception:
diff --git a/pyload/plugin/internal/SimpleHoster.py b/pyload/plugin/internal/SimpleHoster.py
index d3e2edc48..7ba7db8da 100644
--- a/pyload/plugin/internal/SimpleHoster.py
+++ b/pyload/plugin/internal/SimpleHoster.py
@@ -287,7 +287,7 @@ class SimpleHoster(Hoster):
         example: ERROR_PATTERN = r''
 
 
-    Instead overriding handleFree and handlePremium methods you can define the following patterns for direct download:
+    Instead overriding handle_free and handle_premium methods you can define the following patterns for direct download:
 
       LINK_FREE_PATTERN: (optional) group(1) should be the direct link for free download
         example: LINK_FREE_PATTERN = r'<div class="link"><a href="(.+?)"'
@@ -303,8 +303,8 @@ class SimpleHoster(Hoster):
     TEXT_ENCODING = False  #: Set to True or encoding name if encoding value in http header is not correct
     COOKIES       = True   #: or False or list of tuples [(domain, name, value)]
     CHECK_TRAFFIC = False  #: Set to True to force checking traffic left for premium account
-    DIRECT_LINK   = None   #: Set to True to looking for direct link (as defined in handleDirect method), set to None to do it if self.account is True else False
-    MULTI_HOSTER  = False  #: Set to True to leech other hoster link (as defined in handleMulti method)
+    DIRECT_LINK   = None   #: Set to True to looking for direct link (as defined in handle_direct method), set to None to do it if self.account is True else False
+    MULTI_HOSTER  = False  #: Set to True to leech other hoster link (as defined in handle_multi method)
     LOGIN_ACCOUNT = False  #: Set to True to require account login
     DISPOSITION   = True   #: Set to True to use any content-disposition value in http header as file name
 
@@ -462,11 +462,11 @@ class SimpleHoster(Hoster):
 
             if self.directDL:
                 self.logDebug("Looking for direct download link...")
-                self.handleDirect(pyfile)
+                self.handle_direct(pyfile)
 
             if self.multihost and not self.link and not self.lastDownload:
                 self.logDebug("Looking for leeched download link...")
-                self.handleMulti(pyfile)
+                self.handle_multi(pyfile)
 
                 if not self.link and not self.lastDownload:
                     self.MULTI_HOSTER = False
@@ -478,11 +478,11 @@ class SimpleHoster(Hoster):
 
                 if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
                     self.logDebug("Handled as premium download")
-                    self.handlePremium(pyfile)
+                    self.handle_premium(pyfile)
 
                 elif not self.LOGIN_ACCOUNT or (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
                     self.logDebug("Handled as free download")
-                    self.handleFree(pyfile)
+                    self.handle_free(pyfile)
 
             self.downloadLink(self.link, self.DISPOSITION)
             self.checkFile()
@@ -659,7 +659,7 @@ class SimpleHoster(Hoster):
         return self.info
 
 
-    def handleDirect(self, pyfile):
+    def handle_direct(self, pyfile):
         link = self.directLink(pyfile.url, self.resumeDownload)
 
         if link:
@@ -669,11 +669,11 @@ class SimpleHoster(Hoster):
             self.logDebug("Direct download link not found")
 
 
-    def handleMulti(self, pyfile):  #: Multi-hoster handler
+    def handle_multi(self, pyfile):  #: Multi-hoster handler
         pass
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         if not hasattr(self, 'LINK_FREE_PATTERN'):
             self.logError(_("Free download not implemented"))
 
@@ -684,11 +684,11 @@ class SimpleHoster(Hoster):
             self.link = m.group(1)
 
 
-    def handlePremium(self, pyfile):
+    def handle_premium(self, pyfile):
         if not hasattr(self, 'LINK_PREMIUM_PATTERN'):
             self.logError(_("Premium download not implemented"))
             self.logDebug("Handled as free download")
-            self.handleFree(pyfile)
+            self.handle_free(pyfile)
 
         m = re.search(self.LINK_PREMIUM_PATTERN, self.html)
         if m is None:
diff --git a/pyload/plugin/internal/XFSHoster.py b/pyload/plugin/internal/XFSHoster.py
index 956f02b95..0a2dc4fbb 100644
--- a/pyload/plugin/internal/XFSHoster.py
+++ b/pyload/plugin/internal/XFSHoster.py
@@ -84,7 +84,7 @@ class XFSHoster(SimpleHoster):
             self.directDL = self.premium
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         for i in xrange(1, 6):
             self.logDebug("Getting download link: #%d" % i)
 
@@ -112,11 +112,11 @@ class XFSHoster(SimpleHoster):
         self.link = m.group(1)
 
 
-    def handlePremium(self, pyfile):
-        return self.handleFree(pyfile)
+    def handle_premium(self, pyfile):
+        return self.handle_free(pyfile)
 
 
-    def handleMulti(self, pyfile):
+    def handle_multi(self, pyfile):
         if not self.account:
             self.fail(_("Only registered or premium users can use url leech feature"))