From c3b406a00aba3fa549676a8181a5eb2a99d77c87 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Thu, 26 Mar 2015 18:29:00 +0100
Subject: Revert ce103ce1e60661f7bcdf6a033335134de61d48b1

---
 pyload/plugin/account/AlldebridCom.py           | 12 +++++------
 pyload/plugin/account/BackinNet.py              | 12 +++++------
 pyload/plugin/account/BillionuploadsCom.py      | 12 +++++------
 pyload/plugin/account/BitshareCom.py            | 12 +++++------
 pyload/plugin/account/CatShareNet.py            | 12 +++++------
 pyload/plugin/account/CloudzillaTo.py           | 12 +++++------
 pyload/plugin/account/CramitIn.py               | 12 +++++------
 pyload/plugin/account/CzshareCom.py             | 12 +++++------
 pyload/plugin/account/DebridItaliaCom.py        | 12 +++++------
 pyload/plugin/account/DepositfilesCom.py        | 12 +++++------
 pyload/plugin/account/DropboxCom.py             | 16 +++++++-------
 pyload/plugin/account/EasybytezCom.py           | 12 +++++------
 pyload/plugin/account/EuroshareEu.py            | 12 +++++------
 pyload/plugin/account/ExashareCom.py            | 12 +++++------
 pyload/plugin/account/FastixRu.py               | 12 +++++------
 pyload/plugin/account/FastshareCz.py            | 12 +++++------
 pyload/plugin/account/File4SafeCom.py           | 12 +++++------
 pyload/plugin/account/FileParadoxIn.py          | 12 +++++------
 pyload/plugin/account/FilecloudIo.py            | 12 +++++------
 pyload/plugin/account/FilefactoryCom.py         | 12 +++++------
 pyload/plugin/account/FilejungleCom.py          | 12 +++++------
 pyload/plugin/account/FileomCom.py              | 12 +++++------
 pyload/plugin/account/FilerNet.py               | 12 +++++------
 pyload/plugin/account/FilerioCom.py             | 12 +++++------
 pyload/plugin/account/FilesMailRu.py            | 12 +++++------
 pyload/plugin/account/FileserveCom.py           | 12 +++++------
 pyload/plugin/account/FourSharedCom.py          | 12 +++++------
 pyload/plugin/account/FreakshareCom.py          | 12 +++++------
 pyload/plugin/account/FreeWayMe.py              | 12 +++++------
 pyload/plugin/account/FshareVn.py               | 12 +++++------
 pyload/plugin/account/Ftp.py                    | 12 +++++------
 pyload/plugin/account/HellshareCz.py            | 12 +++++------
 pyload/plugin/account/Http.py                   | 12 +++++------
 pyload/plugin/account/HugefilesNet.py           | 12 +++++------
 pyload/plugin/account/HundredEightyUploadCom.py | 12 +++++------
 pyload/plugin/account/JunkyvideoCom.py          | 12 +++++------
 pyload/plugin/account/JunocloudMe.py            | 12 +++++------
 pyload/plugin/account/Keep2ShareCc.py           | 12 +++++------
 pyload/plugin/account/LetitbitNet.py            | 12 +++++------
 pyload/plugin/account/LinestorageCom.py         | 12 +++++------
 pyload/plugin/account/LinksnappyCom.py          | 12 +++++------
 pyload/plugin/account/MegaDebridEu.py           | 12 +++++------
 pyload/plugin/account/MegaRapidCz.py            | 12 +++++------
 pyload/plugin/account/MegaRapidoNet.py          | 12 +++++------
 pyload/plugin/account/MegasharesCom.py          | 12 +++++------
 pyload/plugin/account/MovReelCom.py             | 12 +++++------
 pyload/plugin/account/MultihostersCom.py        | 12 +++++------
 pyload/plugin/account/MultishareCz.py           | 12 +++++------
 pyload/plugin/account/MyfastfileCom.py          | 12 +++++------
 pyload/plugin/account/NetloadIn.py              | 12 +++++------
 pyload/plugin/account/NoPremiumPl.py            | 12 +++++------
 pyload/plugin/account/NosuploadCom.py           | 12 +++++------
 pyload/plugin/account/NovafileCom.py            | 12 +++++------
 pyload/plugin/account/NowVideoSx.py             | 12 +++++------
 pyload/plugin/account/OboomCom.py               | 12 +++++------
 pyload/plugin/account/OneFichierCom.py          | 12 +++++------
 pyload/plugin/account/OverLoadMe.py             | 12 +++++------
 pyload/plugin/account/PremiumTo.py              | 12 +++++------
 pyload/plugin/account/PremiumizeMe.py           | 12 +++++------
 pyload/plugin/account/PutdriveCom.py            | 12 +++++------
 pyload/plugin/account/QuickshareCz.py           | 12 +++++------
 pyload/plugin/account/RPNetBiz.py               | 12 +++++------
 pyload/plugin/account/RapideoPl.py              | 12 +++++------
 pyload/plugin/account/RapidfileshareNet.py      | 12 +++++------
 pyload/plugin/account/RapidgatorNet.py          | 12 +++++------
 pyload/plugin/account/RapiduNet.py              | 12 +++++------
 pyload/plugin/account/RarefileNet.py            | 12 +++++------
 pyload/plugin/account/RealdebridCom.py          | 12 +++++------
 pyload/plugin/account/RehostTo.py               | 12 +++++------
 pyload/plugin/account/RyushareCom.py            | 12 +++++------
 pyload/plugin/account/SafesharingEu.py          | 12 +++++------
 pyload/plugin/account/SecureUploadEu.py         | 12 +++++------
 pyload/plugin/account/SendmywayCom.py           | 12 +++++------
 pyload/plugin/account/ShareonlineBiz.py         | 12 +++++------
 pyload/plugin/account/SimplyPremiumCom.py       | 12 +++++------
 pyload/plugin/account/SimplydebridCom.py        | 12 +++++------
 pyload/plugin/account/SmoozedCom.py             | 12 +++++------
 pyload/plugin/account/StahnuTo.py               | 12 +++++------
 pyload/plugin/account/StreamcloudEu.py          | 12 +++++------
 pyload/plugin/account/TurbobitNet.py            | 12 +++++------
 pyload/plugin/account/TusfilesNet.py            | 12 +++++------
 pyload/plugin/account/UlozTo.py                 | 12 +++++------
 pyload/plugin/account/UnrestrictLi.py           | 12 +++++------
 pyload/plugin/account/UploadableCh.py           | 12 +++++------
 pyload/plugin/account/UploadcCom.py             | 12 +++++------
 pyload/plugin/account/UploadedTo.py             | 12 +++++------
 pyload/plugin/account/UploadheroCom.py          | 12 +++++------
 pyload/plugin/account/UploadingCom.py           | 12 +++++------
 pyload/plugin/account/UptoboxCom.py             | 12 +++++------
 pyload/plugin/account/VidPlayNet.py             | 12 +++++------
 pyload/plugin/account/WebshareCz.py             | 12 +++++------
 pyload/plugin/account/XFileSharingPro.py        | 12 +++++------
 pyload/plugin/account/YibaishiwuCom.py          | 12 +++++------
 pyload/plugin/account/ZeveraCom.py              | 12 +++++------
 pyload/plugin/addon/AndroidPhoneNotify.py       | 14 ++++++-------
 pyload/plugin/addon/AntiVirus.py                | 14 ++++++-------
 pyload/plugin/addon/Checksum.py                 | 14 ++++++-------
 pyload/plugin/addon/ClickAndLoad.py             | 14 ++++++-------
 pyload/plugin/addon/DeleteFinished.py           | 16 +++++++-------
 pyload/plugin/addon/DownloadScheduler.py        | 14 ++++++-------
 pyload/plugin/addon/ExternalScripts.py          | 14 ++++++-------
 pyload/plugin/addon/ExtractArchive.py           | 18 ++++++++--------
 pyload/plugin/addon/HotFolder.py                | 14 ++++++-------
 pyload/plugin/addon/IRCInterface.py             | 14 ++++++-------
 pyload/plugin/addon/JustPremium.py              | 14 ++++++-------
 pyload/plugin/addon/MergeFiles.py               | 14 ++++++-------
 pyload/plugin/addon/MultiHome.py                | 14 ++++++-------
 pyload/plugin/addon/RestartFailed.py            | 16 +++++++-------
 pyload/plugin/addon/RestartSlow.py              | 14 ++++++-------
 pyload/plugin/addon/SkipRev.py                  | 14 ++++++-------
 pyload/plugin/addon/UnSkipOnFail.py             | 14 ++++++-------
 pyload/plugin/addon/UpdateManager.py            | 24 ++++++++++-----------
 pyload/plugin/addon/WindowsPhoneNotify.py       | 14 ++++++-------
 pyload/plugin/addon/XMPPInterface.py            | 14 ++++++-------
 pyload/plugin/captcha/AdYouLike.py              | 12 +++++------
 pyload/plugin/captcha/AdsCaptcha.py             | 12 +++++------
 pyload/plugin/captcha/ReCaptcha.py              | 12 +++++------
 pyload/plugin/captcha/SolveMedia.py             | 12 +++++------
 pyload/plugin/container/CCF.py                  | 14 ++++++-------
 pyload/plugin/container/DLC.py                  | 14 ++++++-------
 pyload/plugin/container/RSDF.py                 | 14 ++++++-------
 pyload/plugin/container/TXT.py                  | 16 +++++++-------
 pyload/plugin/crypter/BitshareCom.py            | 16 +++++++-------
 pyload/plugin/crypter/C1NeonCom.py              | 16 +++++++-------
 pyload/plugin/crypter/ChipDe.py                 | 16 +++++++-------
 pyload/plugin/crypter/CloudzillaTo.py           | 14 ++++++-------
 pyload/plugin/crypter/CrockoCom.py              | 16 +++++++-------
 pyload/plugin/crypter/CryptItCom.py             | 16 +++++++-------
 pyload/plugin/crypter/CzshareCom.py             | 16 +++++++-------
 pyload/plugin/crypter/DailymotionComFolder.py   | 18 ++++++++--------
 pyload/plugin/crypter/DataHu.py                 | 16 +++++++-------
 pyload/plugin/crypter/DdlstorageCom.py          | 16 +++++++-------
 pyload/plugin/crypter/DepositfilesCom.py        | 16 +++++++-------
 pyload/plugin/crypter/Dereferer.py              | 16 +++++++-------
 pyload/plugin/crypter/DevhostSt.py              | 16 +++++++-------
 pyload/plugin/crypter/DlProtectCom.py           | 16 +++++++-------
 pyload/plugin/crypter/DontKnowMe.py             | 16 +++++++-------
 pyload/plugin/crypter/DuckCryptInfo.py          | 20 +++++++++---------
 pyload/plugin/crypter/DuploadOrg.py             | 16 +++++++-------
 pyload/plugin/crypter/EasybytezCom.py           | 16 +++++++-------
 pyload/plugin/crypter/EmbeduploadCom.py         | 16 +++++++-------
 pyload/plugin/crypter/FilebeerInfo.py           | 16 +++++++-------
 pyload/plugin/crypter/FilecloudIo.py            | 16 +++++++-------
 pyload/plugin/crypter/FilecryptCc.py            | 14 ++++++-------
 pyload/plugin/crypter/FilefactoryCom.py         | 16 +++++++-------
 pyload/plugin/crypter/FilerNet.py               | 16 +++++++-------
 pyload/plugin/crypter/FileserveCom.py           | 16 +++++++-------
 pyload/plugin/crypter/FilesonicCom.py           | 16 +++++++-------
 pyload/plugin/crypter/FilestubeCom.py           | 16 +++++++-------
 pyload/plugin/crypter/FiletramCom.py            | 16 +++++++-------
 pyload/plugin/crypter/FiredriveCom.py           | 16 +++++++-------
 pyload/plugin/crypter/FourChanOrg.py            | 16 +++++++-------
 pyload/plugin/crypter/FreakhareCom.py           | 16 +++++++-------
 pyload/plugin/crypter/FreetexthostCom.py        | 16 +++++++-------
 pyload/plugin/crypter/FshareVn.py               | 16 +++++++-------
 pyload/plugin/crypter/Go4UpCom.py               | 16 +++++++-------
 pyload/plugin/crypter/GooGl.py                  | 16 +++++++-------
 pyload/plugin/crypter/HoerbuchIn.py             | 16 +++++++-------
 pyload/plugin/crypter/HotfileCom.py             | 16 +++++++-------
 pyload/plugin/crypter/ILoadTo.py                | 16 +++++++-------
 pyload/plugin/crypter/ImgurComAlbum.py          | 16 +++++++-------
 pyload/plugin/crypter/LetitbitNet.py            | 16 +++++++-------
 pyload/plugin/crypter/LinkCryptWs.py            | 16 +++++++-------
 pyload/plugin/crypter/LinkSaveIn.py             | 16 +++++++-------
 pyload/plugin/crypter/LinkdecrypterCom.py       | 16 +++++++-------
 pyload/plugin/crypter/LixIn.py                  | 18 ++++++++--------
 pyload/plugin/crypter/LofCc.py                  | 16 +++++++-------
 pyload/plugin/crypter/MBLinkInfo.py             | 16 +++++++-------
 pyload/plugin/crypter/MediafireCom.py           | 16 +++++++-------
 pyload/plugin/crypter/MegaCoNz.py               | 18 ++++++++--------
 pyload/plugin/crypter/MegaRapidCz.py            | 16 +++++++-------
 pyload/plugin/crypter/MegauploadCom.py          | 16 +++++++-------
 pyload/plugin/crypter/Movie2KTo.py              | 16 +++++++-------
 pyload/plugin/crypter/MultiUpOrg.py             | 18 ++++++++--------
 pyload/plugin/crypter/MultiloadCz.py            | 18 ++++++++--------
 pyload/plugin/crypter/MultiuploadCom.py         | 14 ++++++-------
 pyload/plugin/crypter/NCryptIn.py               | 18 ++++++++--------
 pyload/plugin/crypter/NetfolderIn.py            | 18 ++++++++--------
 pyload/plugin/crypter/NosvideoCom.py            | 16 +++++++-------
 pyload/plugin/crypter/OneKhDe.py                | 16 +++++++-------
 pyload/plugin/crypter/OronCom.py                | 16 +++++++-------
 pyload/plugin/crypter/PastebinCom.py            | 16 +++++++-------
 pyload/plugin/crypter/QuickshareCz.py           | 16 +++++++-------
 pyload/plugin/crypter/RSLayerCom.py             | 16 +++++++-------
 pyload/plugin/crypter/RelinkUs.py               | 18 ++++++++--------
 pyload/plugin/crypter/SafelinkingNet.py         | 18 ++++++++--------
 pyload/plugin/crypter/SecuredIn.py              | 16 +++++++-------
 pyload/plugin/crypter/SexuriaCom.py             | 16 +++++++-------
 pyload/plugin/crypter/ShareLinksBiz.py          | 20 +++++++++---------
 pyload/plugin/crypter/SharingmatrixCom.py       | 16 +++++++-------
 pyload/plugin/crypter/SpeedLoadOrg.py           | 16 +++++++-------
 pyload/plugin/crypter/StealthTo.py              | 16 +++++++-------
 pyload/plugin/crypter/TnyCz.py                  | 16 +++++++-------
 pyload/plugin/crypter/TrailerzoneInfo.py        | 16 +++++++-------
 pyload/plugin/crypter/TurbobitNet.py            | 18 ++++++++--------
 pyload/plugin/crypter/TusfilesNet.py            | 18 ++++++++--------
 pyload/plugin/crypter/UlozTo.py                 | 16 +++++++-------
 pyload/plugin/crypter/UploadableCh.py           | 16 +++++++-------
 pyload/plugin/crypter/UploadedTo.py             | 16 +++++++-------
 pyload/plugin/crypter/WiiReloadedOrg.py         | 16 +++++++-------
 pyload/plugin/crypter/WuploadCom.py             | 16 +++++++-------
 pyload/plugin/crypter/XFileSharingPro.py        | 22 +++++++++----------
 pyload/plugin/crypter/XupPl.py                  | 16 +++++++-------
 pyload/plugin/crypter/YoutubeComFolder.py       | 18 ++++++++--------
 pyload/plugin/extractor/SevenZip.py             | 12 +++++------
 pyload/plugin/extractor/UnRar.py                | 16 +++++++-------
 pyload/plugin/extractor/UnZip.py                | 12 +++++------
 pyload/plugin/hook/AlldebridCom.py              | 14 ++++++-------
 pyload/plugin/hook/BypassCaptcha.py             | 22 +++++++++----------
 pyload/plugin/hook/Captcha9Kw.py                | 14 ++++++-------
 pyload/plugin/hook/CaptchaBrotherhood.py        | 18 ++++++++--------
 pyload/plugin/hook/DeathByCaptcha.py            | 18 ++++++++--------
 pyload/plugin/hook/DebridItaliaCom.py           | 14 ++++++-------
 pyload/plugin/hook/EasybytezCom.py              | 14 ++++++-------
 pyload/plugin/hook/ExpertDecoders.py            | 14 ++++++-------
 pyload/plugin/hook/FastixRu.py                  | 14 ++++++-------
 pyload/plugin/hook/FreeWayMe.py                 | 14 ++++++-------
 pyload/plugin/hook/ImageTyperz.py               | 20 +++++++++---------
 pyload/plugin/hook/LinkdecrypterCom.py          | 14 ++++++-------
 pyload/plugin/hook/LinksnappyCom.py             | 14 ++++++-------
 pyload/plugin/hook/MegaDebridEu.py              | 14 ++++++-------
 pyload/plugin/hook/MegaRapidoNet.py             | 14 ++++++-------
 pyload/plugin/hook/MultihostersCom.py           | 14 ++++++-------
 pyload/plugin/hook/MultishareCz.py              | 14 ++++++-------
 pyload/plugin/hook/MyfastfileCom.py             | 14 ++++++-------
 pyload/plugin/hook/NoPremiumPl.py               | 14 ++++++-------
 pyload/plugin/hook/OverLoadMe.py                | 14 ++++++-------
 pyload/plugin/hook/PremiumTo.py                 | 14 ++++++-------
 pyload/plugin/hook/PremiumizeMe.py              | 14 ++++++-------
 pyload/plugin/hook/PutdriveCom.py               | 14 ++++++-------
 pyload/plugin/hook/RPNetBiz.py                  | 14 ++++++-------
 pyload/plugin/hook/RapideoPl.py                 | 14 ++++++-------
 pyload/plugin/hook/RealdebridCom.py             | 14 ++++++-------
 pyload/plugin/hook/RehostTo.py                  | 14 ++++++-------
 pyload/plugin/hook/SimplyPremiumCom.py          | 14 ++++++-------
 pyload/plugin/hook/SimplydebridCom.py           | 14 ++++++-------
 pyload/plugin/hook/SmoozedCom.py                | 14 ++++++-------
 pyload/plugin/hook/UnrestrictLi.py              | 14 ++++++-------
 pyload/plugin/hook/XFileSharingPro.py           | 14 ++++++-------
 pyload/plugin/hook/ZeveraCom.py                 | 14 ++++++-------
 pyload/plugin/hoster/AlldebridCom.py            | 16 +++++++-------
 pyload/plugin/hoster/AndroidfilehostCom.py      | 16 +++++++-------
 pyload/plugin/hoster/BasketbuildCom.py          | 16 +++++++-------
 pyload/plugin/hoster/BayfilesCom.py             | 16 +++++++-------
 pyload/plugin/hoster/BezvadataCz.py             | 16 +++++++-------
 pyload/plugin/hoster/BillionuploadsCom.py       | 14 ++++++-------
 pyload/plugin/hoster/BitshareCom.py             | 20 +++++++++---------
 pyload/plugin/hoster/BoltsharingCom.py          | 16 +++++++-------
 pyload/plugin/hoster/CatShareNet.py             | 16 +++++++-------
 pyload/plugin/hoster/CloudzerNet.py             | 16 +++++++-------
 pyload/plugin/hoster/CloudzillaTo.py            | 16 +++++++-------
 pyload/plugin/hoster/CramitIn.py                | 14 ++++++-------
 pyload/plugin/hoster/CrockoCom.py               | 16 +++++++-------
 pyload/plugin/hoster/CyberlockerCh.py           | 16 +++++++-------
 pyload/plugin/hoster/CzshareCom.py              | 16 +++++++-------
 pyload/plugin/hoster/DailymotionCom.py          | 20 +++++++++---------
 pyload/plugin/hoster/DataHu.py                  | 16 +++++++-------
 pyload/plugin/hoster/DataportCz.py              | 16 +++++++-------
 pyload/plugin/hoster/DateiTo.py                 | 16 +++++++-------
 pyload/plugin/hoster/DdlstorageCom.py           | 16 +++++++-------
 pyload/plugin/hoster/DebridItaliaCom.py         | 16 +++++++-------
 pyload/plugin/hoster/DepositfilesCom.py         | 18 ++++++++--------
 pyload/plugin/hoster/DevhostSt.py               | 16 +++++++-------
 pyload/plugin/hoster/DlFreeFr.py                | 18 ++++++++--------
 pyload/plugin/hoster/DodanePl.py                | 16 +++++++-------
 pyload/plugin/hoster/DuploadOrg.py              | 16 +++++++-------
 pyload/plugin/hoster/EasybytezCom.py            | 14 ++++++-------
 pyload/plugin/hoster/EdiskCz.py                 | 16 +++++++-------
 pyload/plugin/hoster/EgoFilesCom.py             | 16 +++++++-------
 pyload/plugin/hoster/EnteruploadCom.py          | 16 +++++++-------
 pyload/plugin/hoster/EpicShareNet.py            | 16 +++++++-------
 pyload/plugin/hoster/EuroshareEu.py             | 16 +++++++-------
 pyload/plugin/hoster/ExashareCom.py             | 14 ++++++-------
 pyload/plugin/hoster/ExtabitCom.py              | 18 ++++++++--------
 pyload/plugin/hoster/FastixRu.py                | 16 +++++++-------
 pyload/plugin/hoster/FastshareCz.py             | 16 +++++++-------
 pyload/plugin/hoster/FileApeCom.py              | 16 +++++++-------
 pyload/plugin/hoster/FileSharkPl.py             | 16 +++++++-------
 pyload/plugin/hoster/FileStoreTo.py             | 16 +++++++-------
 pyload/plugin/hoster/FilebeerInfo.py            | 16 +++++++-------
 pyload/plugin/hoster/FilecloudIo.py             | 16 +++++++-------
 pyload/plugin/hoster/FilefactoryCom.py          | 18 ++++++++--------
 pyload/plugin/hoster/FilejungleCom.py           | 14 ++++++-------
 pyload/plugin/hoster/FileomCom.py               | 14 ++++++-------
 pyload/plugin/hoster/FilepostCom.py             | 16 +++++++-------
 pyload/plugin/hoster/FilepupNet.py              | 16 +++++++-------
 pyload/plugin/hoster/FilerNet.py                | 16 +++++++-------
 pyload/plugin/hoster/FilerioCom.py              | 14 ++++++-------
 pyload/plugin/hoster/FilesMailRu.py             | 14 ++++++-------
 pyload/plugin/hoster/FileserveCom.py            | 20 +++++++++---------
 pyload/plugin/hoster/FileshareInUa.py           | 16 +++++++-------
 pyload/plugin/hoster/FilesonicCom.py            | 16 +++++++-------
 pyload/plugin/hoster/FilezyNet.py               | 16 +++++++-------
 pyload/plugin/hoster/FiredriveCom.py            | 16 +++++++-------
 pyload/plugin/hoster/FlyFilesNet.py             | 16 +++++++-------
 pyload/plugin/hoster/FourSharedCom.py           | 16 +++++++-------
 pyload/plugin/hoster/FreakshareCom.py           | 14 ++++++-------
 pyload/plugin/hoster/FreeWayMe.py               | 16 +++++++-------
 pyload/plugin/hoster/FreevideoCz.py             | 16 +++++++-------
 pyload/plugin/hoster/FshareVn.py                | 16 +++++++-------
 pyload/plugin/hoster/Ftp.py                     | 14 ++++++-------
 pyload/plugin/hoster/GamefrontCom.py            | 14 ++++++-------
 pyload/plugin/hoster/GigapetaCom.py             | 16 +++++++-------
 pyload/plugin/hoster/GooIm.py                   | 16 +++++++-------
 pyload/plugin/hoster/GoogledriveCom.py          | 16 +++++++-------
 pyload/plugin/hoster/HellshareCz.py             | 16 +++++++-------
 pyload/plugin/hoster/HellspyCz.py               | 16 +++++++-------
 pyload/plugin/hoster/HotfileCom.py              | 16 +++++++-------
 pyload/plugin/hoster/HugefilesNet.py            | 14 ++++++-------
 pyload/plugin/hoster/HundredEightyUploadCom.py  | 14 ++++++-------
 pyload/plugin/hoster/IFileWs.py                 | 16 +++++++-------
 pyload/plugin/hoster/IcyFilesCom.py             | 16 +++++++-------
 pyload/plugin/hoster/IfileIt.py                 | 16 +++++++-------
 pyload/plugin/hoster/IfolderRu.py               | 16 +++++++-------
 pyload/plugin/hoster/JumbofilesCom.py           | 16 +++++++-------
 pyload/plugin/hoster/JunocloudMe.py             | 14 ++++++-------
 pyload/plugin/hoster/Keep2ShareCc.py            | 18 ++++++++--------
 pyload/plugin/hoster/KickloadCom.py             | 16 +++++++-------
 pyload/plugin/hoster/KingfilesNet.py            | 16 +++++++-------
 pyload/plugin/hoster/LemUploadsCom.py           | 16 +++++++-------
 pyload/plugin/hoster/LetitbitNet.py             | 16 +++++++-------
 pyload/plugin/hoster/LinksnappyCom.py           | 16 +++++++-------
 pyload/plugin/hoster/LoadTo.py                  | 16 +++++++-------
 pyload/plugin/hoster/LomafileCom.py             | 16 +++++++-------
 pyload/plugin/hoster/LuckyShareNet.py           | 16 +++++++-------
 pyload/plugin/hoster/MediafireCom.py            | 16 +++++++-------
 pyload/plugin/hoster/MegaCoNz.py                | 16 +++++++-------
 pyload/plugin/hoster/MegaDebridEu.py            | 16 +++++++-------
 pyload/plugin/hoster/MegaFilesSe.py             | 16 +++++++-------
 pyload/plugin/hoster/MegaRapidCz.py             | 16 +++++++-------
 pyload/plugin/hoster/MegaRapidoNet.py           | 16 +++++++-------
 pyload/plugin/hoster/MegacrypterCom.py          | 16 +++++++-------
 pyload/plugin/hoster/MegareleaseOrg.py          | 16 +++++++-------
 pyload/plugin/hoster/MegasharesCom.py           | 16 +++++++-------
 pyload/plugin/hoster/MegauploadCom.py           | 16 +++++++-------
 pyload/plugin/hoster/MegavideoCom.py            | 16 +++++++-------
 pyload/plugin/hoster/MovReelCom.py              | 14 ++++++-------
 pyload/plugin/hoster/MultihostersCom.py         | 14 ++++++-------
 pyload/plugin/hoster/MultishareCz.py            | 16 +++++++-------
 pyload/plugin/hoster/MyfastfileCom.py           | 16 +++++++-------
 pyload/plugin/hoster/MystoreTo.py               | 16 +++++++-------
 pyload/plugin/hoster/MyvideoDe.py               | 14 ++++++-------
 pyload/plugin/hoster/NahrajCz.py                | 16 +++++++-------
 pyload/plugin/hoster/NarodRu.py                 | 16 +++++++-------
 pyload/plugin/hoster/NetloadIn.py               | 18 ++++++++--------
 pyload/plugin/hoster/NitroflareCom.py           | 16 +++++++-------
 pyload/plugin/hoster/NoPremiumPl.py             | 18 ++++++++--------
 pyload/plugin/hoster/NosuploadCom.py            | 14 ++++++-------
 pyload/plugin/hoster/NovafileCom.py             | 14 ++++++-------
 pyload/plugin/hoster/NowDownloadSx.py           | 16 +++++++-------
 pyload/plugin/hoster/NowVideoSx.py              | 18 ++++++++--------
 pyload/plugin/hoster/OboomCom.py                | 16 +++++++-------
 pyload/plugin/hoster/OneFichierCom.py           | 16 +++++++-------
 pyload/plugin/hoster/OronCom.py                 | 16 +++++++-------
 pyload/plugin/hoster/OverLoadMe.py              | 16 +++++++-------
 pyload/plugin/hoster/PandaplaNet.py             | 16 +++++++-------
 pyload/plugin/hoster/PornhostCom.py             | 14 ++++++-------
 pyload/plugin/hoster/PornhubCom.py              | 14 ++++++-------
 pyload/plugin/hoster/PotloadCom.py              | 16 +++++++-------
 pyload/plugin/hoster/PremiumTo.py               | 16 +++++++-------
 pyload/plugin/hoster/PremiumizeMe.py            | 16 +++++++-------
 pyload/plugin/hoster/PromptfileCom.py           | 16 +++++++-------
 pyload/plugin/hoster/PrzeklejPl.py              | 16 +++++++-------
 pyload/plugin/hoster/PutdriveCom.py             | 14 ++++++-------
 pyload/plugin/hoster/QuickshareCz.py            | 16 +++++++-------
 pyload/plugin/hoster/RPNetBiz.py                | 16 +++++++-------
 pyload/plugin/hoster/RapideoPl.py               | 18 ++++++++--------
 pyload/plugin/hoster/RapidfileshareNet.py       | 14 ++++++-------
 pyload/plugin/hoster/RapidgatorNet.py           | 16 +++++++-------
 pyload/plugin/hoster/RapiduNet.py               | 16 +++++++-------
 pyload/plugin/hoster/RarefileNet.py             | 14 ++++++-------
 pyload/plugin/hoster/RealdebridCom.py           | 16 +++++++-------
 pyload/plugin/hoster/RedtubeCom.py              | 14 ++++++-------
 pyload/plugin/hoster/RehostTo.py                | 16 +++++++-------
 pyload/plugin/hoster/RemixshareCom.py           | 16 +++++++-------
 pyload/plugin/hoster/RgHostNet.py               | 16 +++++++-------
 pyload/plugin/hoster/SafesharingEu.py           | 14 ++++++-------
 pyload/plugin/hoster/SecureUploadEu.py          | 14 ++++++-------
 pyload/plugin/hoster/SendspaceCom.py            | 16 +++++++-------
 pyload/plugin/hoster/Share4WebCom.py            | 14 ++++++-------
 pyload/plugin/hoster/Share76Com.py              | 16 +++++++-------
 pyload/plugin/hoster/ShareFilesCo.py            | 16 +++++++-------
 pyload/plugin/hoster/SharebeesCom.py            | 16 +++++++-------
 pyload/plugin/hoster/ShareonlineBiz.py          | 20 +++++++++---------
 pyload/plugin/hoster/ShareplaceCom.py           | 14 ++++++-------
 pyload/plugin/hoster/SharingmatrixCom.py        | 16 +++++++-------
 pyload/plugin/hoster/ShragleCom.py              | 16 +++++++-------
 pyload/plugin/hoster/SimplyPremiumCom.py        | 16 +++++++-------
 pyload/plugin/hoster/SimplydebridCom.py         | 16 +++++++-------
 pyload/plugin/hoster/SmoozedCom.py              | 16 +++++++-------
 pyload/plugin/hoster/SockshareCom.py            | 16 +++++++-------
 pyload/plugin/hoster/SoundcloudCom.py           | 16 +++++++-------
 pyload/plugin/hoster/SpeedLoadOrg.py            | 16 +++++++-------
 pyload/plugin/hoster/SpeedfileCz.py             | 16 +++++++-------
 pyload/plugin/hoster/SpeedyshareCom.py          | 16 +++++++-------
 pyload/plugin/hoster/StorageTo.py               | 16 +++++++-------
 pyload/plugin/hoster/StreamCz.py                | 14 ++++++-------
 pyload/plugin/hoster/StreamcloudEu.py           | 14 ++++++-------
 pyload/plugin/hoster/TurbobitNet.py             | 22 +++++++++----------
 pyload/plugin/hoster/TurbouploadCom.py          | 16 +++++++-------
 pyload/plugin/hoster/TusfilesNet.py             | 14 ++++++-------
 pyload/plugin/hoster/TwoSharedCom.py            | 16 +++++++-------
 pyload/plugin/hoster/UlozTo.py                  | 16 +++++++-------
 pyload/plugin/hoster/UloziskoSk.py              | 16 +++++++-------
 pyload/plugin/hoster/UnibytesCom.py             | 16 +++++++-------
 pyload/plugin/hoster/UnrestrictLi.py            | 16 +++++++-------
 pyload/plugin/hoster/UpleaCom.py                | 14 ++++++-------
 pyload/plugin/hoster/UploadStationCom.py        | 16 +++++++-------
 pyload/plugin/hoster/UploadableCh.py            | 18 ++++++++--------
 pyload/plugin/hoster/UploadboxCom.py            | 16 +++++++-------
 pyload/plugin/hoster/UploadedTo.py              | 20 +++++++++---------
 pyload/plugin/hoster/UploadhereCom.py           | 16 +++++++-------
 pyload/plugin/hoster/UploadheroCom.py           | 16 +++++++-------
 pyload/plugin/hoster/UploadingCom.py            | 14 ++++++-------
 pyload/plugin/hoster/UploadkingCom.py           | 16 +++++++-------
 pyload/plugin/hoster/UpstoreNet.py              | 16 +++++++-------
 pyload/plugin/hoster/UptoboxCom.py              | 14 ++++++-------
 pyload/plugin/hoster/VeehdCom.py                | 16 +++++++-------
 pyload/plugin/hoster/VeohCom.py                 | 18 ++++++++--------
 pyload/plugin/hoster/VidPlayNet.py              | 14 ++++++-------
 pyload/plugin/hoster/VimeoCom.py                | 18 ++++++++--------
 pyload/plugin/hoster/Vipleech4UCom.py           | 16 +++++++-------
 pyload/plugin/hoster/WarserverCz.py             | 16 +++++++-------
 pyload/plugin/hoster/WebshareCz.py              | 18 ++++++++--------
 pyload/plugin/hoster/WrzucTo.py                 | 16 +++++++-------
 pyload/plugin/hoster/WuploadCom.py              | 16 +++++++-------
 pyload/plugin/hoster/X7To.py                    | 16 +++++++-------
 pyload/plugin/hoster/XFileSharingPro.py         | 20 +++++++++---------
 pyload/plugin/hoster/XHamsterCom.py             | 16 +++++++-------
 pyload/plugin/hoster/XVideosCom.py              | 16 +++++++-------
 pyload/plugin/hoster/XdadevelopersCom.py        | 16 +++++++-------
 pyload/plugin/hoster/Xdcc.py                    | 16 +++++++-------
 pyload/plugin/hoster/YibaishiwuCom.py           | 16 +++++++-------
 pyload/plugin/hoster/YoupornCom.py              | 14 ++++++-------
 pyload/plugin/hoster/YourfilesTo.py             | 14 ++++++-------
 pyload/plugin/hoster/YoutubeCom.py              | 16 +++++++-------
 pyload/plugin/hoster/ZDF.py                     | 14 ++++++-------
 pyload/plugin/hoster/ZShareNet.py               | 16 +++++++-------
 pyload/plugin/hoster/ZeveraCom.py               | 16 +++++++-------
 pyload/plugin/hoster/ZippyshareCom.py           | 16 +++++++-------
 pyload/plugin/internal/BasePlugin.py            | 14 ++++++-------
 pyload/plugin/internal/DeadCrypter.py           | 14 ++++++-------
 pyload/plugin/internal/DeadHoster.py            | 14 ++++++-------
 pyload/plugin/internal/MultiHook.py             | 28 ++++++++++++-------------
 pyload/plugin/internal/MultiHoster.py           | 22 +++++++++----------
 pyload/plugin/internal/SimpleCrypter.py         | 16 +++++++-------
 pyload/plugin/internal/SimpleDereferer.py       | 18 ++++++++--------
 pyload/plugin/internal/SimpleHoster.py          | 24 ++++++++++-----------
 pyload/plugin/internal/XFSAccount.py            | 12 +++++------
 pyload/plugin/internal/XFSCrypter.py            | 16 +++++++-------
 pyload/plugin/internal/XFSHoster.py             | 16 +++++++-------
 pyload/plugin/ocr/GigasizeCom.py                | 12 +++++------
 pyload/plugin/ocr/LinksaveIn.py                 | 12 +++++------
 pyload/plugin/ocr/NetloadIn.py                  | 12 +++++------
 pyload/plugin/ocr/ShareonlineBiz.py             | 12 +++++------
 455 files changed, 3412 insertions(+), 3412 deletions(-)

diff --git a/pyload/plugin/account/AlldebridCom.py b/pyload/plugin/account/AlldebridCom.py
index 75ac430f1..e3eb01ac2 100644
--- a/pyload/plugin/account/AlldebridCom.py
+++ b/pyload/plugin/account/AlldebridCom.py
@@ -10,13 +10,13 @@ from pyload.plugin.Account import Account
 
 
 class AlldebridCom(Account):
-    __name__    = "AlldebridCom"
-    __type__    = "account"
-    __version__ = "0.23"
+    __name    = "AlldebridCom"
+    __type    = "account"
+    __version = "0.23"
 
-    __description__ = """AllDebrid.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Andy Voigt", "spamsales@online.de")]
+    __description = """AllDebrid.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Andy Voigt", "spamsales@online.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/BackinNet.py b/pyload/plugin/account/BackinNet.py
index ac751c8fb..79d46c761 100644
--- a/pyload/plugin/account/BackinNet.py
+++ b/pyload/plugin/account/BackinNet.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class BackinNet(XFSAccount):
-    __name__    = "BackinNet"
-    __type__    = "account"
-    __version__ = "0.01"
+    __name    = "BackinNet"
+    __type    = "account"
+    __version = "0.01"
 
-    __description__ = """Backin.net account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Backin.net account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "backin.net"
diff --git a/pyload/plugin/account/BillionuploadsCom.py b/pyload/plugin/account/BillionuploadsCom.py
index a3325c427..982a2cc34 100644
--- a/pyload/plugin/account/BillionuploadsCom.py
+++ b/pyload/plugin/account/BillionuploadsCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class BillionuploadsCom(XFSAccount):
-    __name__    = "BillionuploadsCom"
-    __type__    = "account"
-    __version__ = "0.02"
+    __name    = "BillionuploadsCom"
+    __type    = "account"
+    __version = "0.02"
 
-    __description__ = """Billionuploads.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Billionuploads.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "billionuploads.com"
diff --git a/pyload/plugin/account/BitshareCom.py b/pyload/plugin/account/BitshareCom.py
index 7d7b18ff4..8a64d3b4c 100644
--- a/pyload/plugin/account/BitshareCom.py
+++ b/pyload/plugin/account/BitshareCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.Account import Account
 
 
 class BitshareCom(Account):
-    __name__    = "BitshareCom"
-    __type__    = "account"
-    __version__ = "0.13"
+    __name    = "BitshareCom"
+    __type    = "account"
+    __version = "0.13"
 
-    __description__ = """Bitshare account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Paul King", "")]
+    __description = """Bitshare account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Paul King", "")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/CatShareNet.py b/pyload/plugin/account/CatShareNet.py
index 0dcd4a7ad..8f821413f 100644
--- a/pyload/plugin/account/CatShareNet.py
+++ b/pyload/plugin/account/CatShareNet.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class CatShareNet(Account):
-    __name__    = "CatShareNet"
-    __type__    = "account"
-    __version__ = "0.05"
+    __name    = "CatShareNet"
+    __type    = "account"
+    __version = "0.05"
 
-    __description__ = """CatShareNet account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("prOq", "")]
+    __description = """CatShareNet account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("prOq", "")]
 
 
     PREMIUM_PATTERN      = r'<a href="/premium">Konto:[\s\n]*Premium'
diff --git a/pyload/plugin/account/CloudzillaTo.py b/pyload/plugin/account/CloudzillaTo.py
index a07621234..af3544da9 100644
--- a/pyload/plugin/account/CloudzillaTo.py
+++ b/pyload/plugin/account/CloudzillaTo.py
@@ -6,13 +6,13 @@ from pyload.plugin.Account import Account
 
 
 class CloudzillaTo(Account):
-    __name__    = "CloudzillaTo"
-    __type__    = "account"
-    __version__ = "0.02"
+    __name    = "CloudzillaTo"
+    __type    = "account"
+    __version = "0.02"
 
-    __description__ = """Cloudzilla.to account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Cloudzilla.to account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     PREMIUM_PATTERN = r'<h2>account type</h2>\s*Premium Account'
diff --git a/pyload/plugin/account/CramitIn.py b/pyload/plugin/account/CramitIn.py
index 21503f625..ccd291776 100644
--- a/pyload/plugin/account/CramitIn.py
+++ b/pyload/plugin/account/CramitIn.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class CramitIn(XFSAccount):
-    __name__    = "CramitIn"
-    __type__    = "account"
-    __version__ = "0.03"
+    __name    = "CramitIn"
+    __type    = "account"
+    __version = "0.03"
 
-    __description__ = """Cramit.in account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Cramit.in account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     HOSTER_DOMAIN = "cramit.in"
diff --git a/pyload/plugin/account/CzshareCom.py b/pyload/plugin/account/CzshareCom.py
index c57e8195b..4913ed88f 100644
--- a/pyload/plugin/account/CzshareCom.py
+++ b/pyload/plugin/account/CzshareCom.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class CzshareCom(Account):
-    __name__    = "CzshareCom"
-    __type__    = "account"
-    __version__ = "0.18"
+    __name    = "CzshareCom"
+    __type    = "account"
+    __version = "0.18"
 
-    __description__ = """Czshare.com account plugin, now Sdilej.cz"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """Czshare.com account plugin, now Sdilej.cz"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/account/DebridItaliaCom.py b/pyload/plugin/account/DebridItaliaCom.py
index 563a7c531..49959d5c3 100644
--- a/pyload/plugin/account/DebridItaliaCom.py
+++ b/pyload/plugin/account/DebridItaliaCom.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class DebridItaliaCom(Account):
-    __name__    = "DebridItaliaCom"
-    __type__    = "account"
-    __version__ = "0.13"
+    __name    = "DebridItaliaCom"
+    __type    = "account"
+    __version = "0.13"
 
-    __description__ = """Debriditalia.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it"),
+    __description = """Debriditalia.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/account/DepositfilesCom.py b/pyload/plugin/account/DepositfilesCom.py
index 28d2178c4..4e09ee2ed 100644
--- a/pyload/plugin/account/DepositfilesCom.py
+++ b/pyload/plugin/account/DepositfilesCom.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class DepositfilesCom(Account):
-    __name__    = "DepositfilesCom"
-    __type__    = "account"
-    __version__ = "0.32"
+    __name    = "DepositfilesCom"
+    __type    = "account"
+    __version = "0.32"
 
-    __description__ = """Depositfiles.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("mkaay", "mkaay@mkaay.de"),
+    __description = """Depositfiles.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("mkaay", "mkaay@mkaay.de"),
                        ("stickell", "l.stickell@yahoo.it"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
diff --git a/pyload/plugin/account/DropboxCom.py b/pyload/plugin/account/DropboxCom.py
index d18504926..36e49adad 100644
--- a/pyload/plugin/account/DropboxCom.py
+++ b/pyload/plugin/account/DropboxCom.py
@@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class DropboxCom(SimpleHoster):
-    __name__    = "DropboxCom"
-    __type__    = "hoster"
-    __version__ = "0.04"
+    __name    = "DropboxCom"
+    __type    = "hoster"
+    __version = "0.04"
 
-    __pattern__ = r'https?://(?:www\.)?dropbox\.com/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?dropbox\.com/.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Dropbox.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]
+    __description = """Dropbox.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
     NAME_PATTERN = r'<title>Dropbox - (?P<N>.+?)<'
diff --git a/pyload/plugin/account/EasybytezCom.py b/pyload/plugin/account/EasybytezCom.py
index c7d717474..c1f641669 100644
--- a/pyload/plugin/account/EasybytezCom.py
+++ b/pyload/plugin/account/EasybytezCom.py
@@ -6,13 +6,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class EasybytezCom(XFSAccount):
-    __name__    = "EasybytezCom"
-    __type__    = "account"
-    __version__ = "0.12"
+    __name    = "EasybytezCom"
+    __type    = "account"
+    __version = "0.12"
 
-    __description__ = """EasyBytez.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """EasyBytez.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("guidobelix", "guidobelix@hotmail.it")]
 
 
diff --git a/pyload/plugin/account/EuroshareEu.py b/pyload/plugin/account/EuroshareEu.py
index 6fa9f35b0..e1e037bf9 100644
--- a/pyload/plugin/account/EuroshareEu.py
+++ b/pyload/plugin/account/EuroshareEu.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class EuroshareEu(Account):
-    __name__    = "EuroshareEu"
-    __type__    = "account"
-    __version__ = "0.02"
+    __name    = "EuroshareEu"
+    __type    = "account"
+    __version = "0.02"
 
-    __description__ = """Euroshare.eu account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Euroshare.eu account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/ExashareCom.py b/pyload/plugin/account/ExashareCom.py
index efd2587c0..e61c2f12d 100644
--- a/pyload/plugin/account/ExashareCom.py
+++ b/pyload/plugin/account/ExashareCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class ExashareCom(XFSAccount):
-    __name__    = "ExashareCom"
-    __type__    = "account"
-    __version__ = "0.01"
+    __name    = "ExashareCom"
+    __type    = "account"
+    __version = "0.01"
 
-    __description__ = """Exashare.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Exashare.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "exashare.com"
diff --git a/pyload/plugin/account/FastixRu.py b/pyload/plugin/account/FastixRu.py
index 69f78c3d9..fbb635437 100644
--- a/pyload/plugin/account/FastixRu.py
+++ b/pyload/plugin/account/FastixRu.py
@@ -5,13 +5,13 @@ from pyload.utils import json_loads
 
 
 class FastixRu(Account):
-    __name__    = "FastixRu"
-    __type__    = "account"
-    __version__ = "0.03"
+    __name    = "FastixRu"
+    __type    = "account"
+    __version = "0.03"
 
-    __description__ = """Fastix account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Massimo Rosamilia", "max@spiritix.eu")]
+    __description = """Fastix account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Massimo Rosamilia", "max@spiritix.eu")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/FastshareCz.py b/pyload/plugin/account/FastshareCz.py
index ce79e26ad..518746710 100644
--- a/pyload/plugin/account/FastshareCz.py
+++ b/pyload/plugin/account/FastshareCz.py
@@ -7,13 +7,13 @@ from pyload.utils import parseFileSize
 
 
 class FastshareCz(Account):
-    __name__    = "FastshareCz"
-    __type__    = "account"
-    __version__ = "0.06"
+    __name    = "FastshareCz"
+    __type    = "account"
+    __version = "0.06"
 
-    __description__ = """Fastshare.cz account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """Fastshare.cz account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/account/File4SafeCom.py b/pyload/plugin/account/File4SafeCom.py
index c48956d38..1c7e00fcf 100644
--- a/pyload/plugin/account/File4SafeCom.py
+++ b/pyload/plugin/account/File4SafeCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class File4SafeCom(XFSAccount):
-    __name__    = "File4SafeCom"
-    __type__    = "account"
-    __version__ = "0.05"
+    __name    = "File4SafeCom"
+    __type    = "account"
+    __version = "0.05"
 
-    __description__ = """File4Safe.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """File4Safe.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     HOSTER_DOMAIN = "file4safe.com"
diff --git a/pyload/plugin/account/FileParadoxIn.py b/pyload/plugin/account/FileParadoxIn.py
index 02b923519..0e103c4e7 100644
--- a/pyload/plugin/account/FileParadoxIn.py
+++ b/pyload/plugin/account/FileParadoxIn.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class FileParadoxIn(XFSAccount):
-    __name__    = "FileParadoxIn"
-    __type__    = "account"
-    __version__ = "0.02"
+    __name    = "FileParadoxIn"
+    __type    = "account"
+    __version = "0.02"
 
-    __description__ = """FileParadox.in account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """FileParadox.in account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "fileparadox.in"
diff --git a/pyload/plugin/account/FilecloudIo.py b/pyload/plugin/account/FilecloudIo.py
index 6d2dcb92a..12e2d44f5 100644
--- a/pyload/plugin/account/FilecloudIo.py
+++ b/pyload/plugin/account/FilecloudIo.py
@@ -5,13 +5,13 @@ from pyload.utils import json_loads
 
 
 class FilecloudIo(Account):
-    __name__    = "FilecloudIo"
-    __type__    = "account"
-    __version__ = "0.04"
+    __name    = "FilecloudIo"
+    __type    = "account"
+    __version = "0.04"
 
-    __description__ = """FilecloudIo account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """FilecloudIo account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/account/FilefactoryCom.py b/pyload/plugin/account/FilefactoryCom.py
index 36720595f..71a040b65 100644
--- a/pyload/plugin/account/FilefactoryCom.py
+++ b/pyload/plugin/account/FilefactoryCom.py
@@ -9,13 +9,13 @@ from pyload.plugin.Account import Account
 
 
 class FilefactoryCom(Account):
-    __name__    = "FilefactoryCom"
-    __type__    = "account"
-    __version__ = "0.15"
+    __name    = "FilefactoryCom"
+    __type    = "account"
+    __version = "0.15"
 
-    __description__ = """Filefactory.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """Filefactory.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/account/FilejungleCom.py b/pyload/plugin/account/FilejungleCom.py
index dfa7edddb..19d343372 100644
--- a/pyload/plugin/account/FilejungleCom.py
+++ b/pyload/plugin/account/FilejungleCom.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class FilejungleCom(Account):
-    __name__    = "FilejungleCom"
-    __type__    = "account"
-    __version__ = "0.12"
+    __name    = "FilejungleCom"
+    __type    = "account"
+    __version = "0.12"
 
-    __description__ = """Filejungle.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Filejungle.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     login_timeout = 60
diff --git a/pyload/plugin/account/FileomCom.py b/pyload/plugin/account/FileomCom.py
index 36a11e411..2868e49e6 100644
--- a/pyload/plugin/account/FileomCom.py
+++ b/pyload/plugin/account/FileomCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class FileomCom(XFSAccount):
-    __name__    = "FileomCom"
-    __type__    = "account"
-    __version__ = "0.02"
+    __name    = "FileomCom"
+    __type    = "account"
+    __version = "0.02"
 
-    __description__ = """Fileom.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Fileom.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "fileom.com"
diff --git a/pyload/plugin/account/FilerNet.py b/pyload/plugin/account/FilerNet.py
index f3cc42367..ac624a4b3 100644
--- a/pyload/plugin/account/FilerNet.py
+++ b/pyload/plugin/account/FilerNet.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class FilerNet(Account):
-    __name__    = "FilerNet"
-    __type__    = "account"
-    __version__ = "0.04"
+    __name    = "FilerNet"
+    __type    = "account"
+    __version = "0.04"
 
-    __description__ = """Filer.net account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Filer.net account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     TOKEN_PATTERN = r'_csrf_token" value="([^"]+)" />'
diff --git a/pyload/plugin/account/FilerioCom.py b/pyload/plugin/account/FilerioCom.py
index 1d9f8744b..d222fa78b 100644
--- a/pyload/plugin/account/FilerioCom.py
+++ b/pyload/plugin/account/FilerioCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class FilerioCom(XFSAccount):
-    __name__    = "FilerioCom"
-    __type__    = "account"
-    __version__ = "0.03"
+    __name    = "FilerioCom"
+    __type    = "account"
+    __version = "0.03"
 
-    __description__ = """FileRio.in account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """FileRio.in account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     HOSTER_DOMAIN = "filerio.in"
diff --git a/pyload/plugin/account/FilesMailRu.py b/pyload/plugin/account/FilesMailRu.py
index 5989b5f1a..03b56be44 100644
--- a/pyload/plugin/account/FilesMailRu.py
+++ b/pyload/plugin/account/FilesMailRu.py
@@ -4,13 +4,13 @@ from pyload.plugin.Account import Account
 
 
 class FilesMailRu(Account):
-    __name__    = "FilesMailRu"
-    __type__    = "account"
-    __version__ = "0.11"
+    __name    = "FilesMailRu"
+    __type    = "account"
+    __version = "0.11"
 
-    __description__ = """Filesmail.ru account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
+    __description = """Filesmail.ru account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/FileserveCom.py b/pyload/plugin/account/FileserveCom.py
index 08dfe24c7..46cb3cbad 100644
--- a/pyload/plugin/account/FileserveCom.py
+++ b/pyload/plugin/account/FileserveCom.py
@@ -7,13 +7,13 @@ from pyload.utils import json_loads
 
 
 class FileserveCom(Account):
-    __name__    = "FileserveCom"
-    __type__    = "account"
-    __version__ = "0.20"
+    __name    = "FileserveCom"
+    __type    = "account"
+    __version = "0.20"
 
-    __description__ = """Fileserve.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("mkaay", "mkaay@mkaay.de")]
+    __description = """Fileserve.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("mkaay", "mkaay@mkaay.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/FourSharedCom.py b/pyload/plugin/account/FourSharedCom.py
index 127f9d58a..a04c9bc46 100644
--- a/pyload/plugin/account/FourSharedCom.py
+++ b/pyload/plugin/account/FourSharedCom.py
@@ -5,13 +5,13 @@ from pyload.utils import json_loads
 
 
 class FourSharedCom(Account):
-    __name__    = "FourSharedCom"
-    __type__    = "account"
-    __version__ = "0.04"
+    __name    = "FourSharedCom"
+    __type    = "account"
+    __version = "0.04"
 
-    __description__ = """FourShared.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """FourShared.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/account/FreakshareCom.py b/pyload/plugin/account/FreakshareCom.py
index 5aef6f86c..5bfcf9bcd 100644
--- a/pyload/plugin/account/FreakshareCom.py
+++ b/pyload/plugin/account/FreakshareCom.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class FreakshareCom(Account):
-    __name__    = "FreakshareCom"
-    __type__    = "account"
-    __version__ = "0.13"
+    __name    = "FreakshareCom"
+    __type    = "account"
+    __version = "0.13"
 
-    __description__ = """Freakshare.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
+    __description = """Freakshare.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/FreeWayMe.py b/pyload/plugin/account/FreeWayMe.py
index dcd9d34cf..e139b25a6 100644
--- a/pyload/plugin/account/FreeWayMe.py
+++ b/pyload/plugin/account/FreeWayMe.py
@@ -5,13 +5,13 @@ from pyload.utils import json_loads
 
 
 class FreeWayMe(Account):
-    __name__    = "FreeWayMe"
-    __type__    = "account"
-    __version__ = "0.13"
+    __name    = "FreeWayMe"
+    __type    = "account"
+    __version = "0.13"
 
-    __description__ = """FreeWayMe account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Nicolas Giese", "james@free-way.me")]
+    __description = """FreeWayMe account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Nicolas Giese", "james@free-way.me")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/FshareVn.py b/pyload/plugin/account/FshareVn.py
index 539a739df..e1e9a1285 100644
--- a/pyload/plugin/account/FshareVn.py
+++ b/pyload/plugin/account/FshareVn.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class FshareVn(Account):
-    __name__    = "FshareVn"
-    __type__    = "account"
-    __version__ = "0.09"
+    __name    = "FshareVn"
+    __type    = "account"
+    __version = "0.09"
 
-    __description__ = """Fshare.vn account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """Fshare.vn account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/account/Ftp.py b/pyload/plugin/account/Ftp.py
index 67cde2cdd..c7983b0c2 100644
--- a/pyload/plugin/account/Ftp.py
+++ b/pyload/plugin/account/Ftp.py
@@ -4,13 +4,13 @@ from pyload.plugin.Account import Account
 
 
 class Ftp(Account):
-    __name__    = "Ftp"
-    __type__    = "account"
-    __version__ = "0.01"
+    __name    = "Ftp"
+    __type    = "account"
+    __version = "0.01"
 
-    __description__ = """Ftp dummy account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Ftp dummy account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     login_timeout  = -1  #: Unlimited
diff --git a/pyload/plugin/account/HellshareCz.py b/pyload/plugin/account/HellshareCz.py
index 94467b375..444677c88 100644
--- a/pyload/plugin/account/HellshareCz.py
+++ b/pyload/plugin/account/HellshareCz.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class HellshareCz(Account):
-    __name__    = "HellshareCz"
-    __type__    = "account"
-    __version__ = "0.16"
+    __name    = "HellshareCz"
+    __type    = "account"
+    __version = "0.16"
 
-    __description__ = """Hellshare.cz account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Hellshare.cz account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     CREDIT_LEFT_PATTERN = r'<div class="credit-link">\s*<table>\s*<tr>\s*<th>(\d+|\d\d\.\d\d\.)</th>'
diff --git a/pyload/plugin/account/Http.py b/pyload/plugin/account/Http.py
index 2571ef712..aacdbf89f 100644
--- a/pyload/plugin/account/Http.py
+++ b/pyload/plugin/account/Http.py
@@ -4,13 +4,13 @@ from pyload.plugin.Account import Account
 
 
 class Http(Account):
-    __name__    = "Http"
-    __type__    = "account"
-    __version__ = "0.01"
+    __name    = "Http"
+    __type    = "account"
+    __version = "0.01"
 
-    __description__ = """Http dummy account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Http dummy account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     login_timeout  = -1  #: Unlimited
diff --git a/pyload/plugin/account/HugefilesNet.py b/pyload/plugin/account/HugefilesNet.py
index eb383fb17..b4cd6f8c4 100644
--- a/pyload/plugin/account/HugefilesNet.py
+++ b/pyload/plugin/account/HugefilesNet.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class HugefilesNet(XFSAccount):
-    __name__    = "HugefilesNet"
-    __type__    = "account"
-    __version__ = "0.02"
+    __name    = "HugefilesNet"
+    __type    = "account"
+    __version = "0.02"
 
-    __description__ = """Hugefiles.net account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Hugefiles.net account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "hugefiles.net"
diff --git a/pyload/plugin/account/HundredEightyUploadCom.py b/pyload/plugin/account/HundredEightyUploadCom.py
index 72185a4bb..15ee1a12a 100644
--- a/pyload/plugin/account/HundredEightyUploadCom.py
+++ b/pyload/plugin/account/HundredEightyUploadCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class HundredEightyUploadCom(XFSAccount):
-    __name__    = "HundredEightyUploadCom"
-    __type__    = "account"
-    __version__ = "0.03"
+    __name    = "HundredEightyUploadCom"
+    __type    = "account"
+    __version = "0.03"
 
-    __description__ = """180upload.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """180upload.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "180upload.com"
diff --git a/pyload/plugin/account/JunkyvideoCom.py b/pyload/plugin/account/JunkyvideoCom.py
index 3380b8dc7..6c600f971 100644
--- a/pyload/plugin/account/JunkyvideoCom.py
+++ b/pyload/plugin/account/JunkyvideoCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class JunkyvideoCom(XFSAccount):
-    __name__    = "JunkyvideoCom"
-    __type__    = "account"
-    __version__ = "0.01"
+    __name    = "JunkyvideoCom"
+    __type    = "account"
+    __version = "0.01"
 
-    __description__ = """Junkyvideo.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Junkyvideo.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "junkyvideo.com"
diff --git a/pyload/plugin/account/JunocloudMe.py b/pyload/plugin/account/JunocloudMe.py
index 0ffa92eb6..75307c6dd 100644
--- a/pyload/plugin/account/JunocloudMe.py
+++ b/pyload/plugin/account/JunocloudMe.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class JunocloudMe(XFSAccount):
-    __name__    = "JunocloudMe"
-    __type__    = "account"
-    __version__ = "0.02"
+    __name    = "JunocloudMe"
+    __type    = "account"
+    __version = "0.02"
 
-    __description__ = """Junocloud.me account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
+    __description = """Junocloud.me account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
     HOSTER_DOMAIN = "junocloud.me"
diff --git a/pyload/plugin/account/Keep2ShareCc.py b/pyload/plugin/account/Keep2ShareCc.py
index a3cc2c40d..6ee45c256 100644
--- a/pyload/plugin/account/Keep2ShareCc.py
+++ b/pyload/plugin/account/Keep2ShareCc.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class Keep2ShareCc(Account):
-    __name__    = "Keep2ShareCc"
-    __type__    = "account"
-    __version__ = "0.05"
+    __name    = "Keep2ShareCc"
+    __type    = "account"
+    __version = "0.05"
 
-    __description__ = """Keep2Share.cc account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("aeronaut", "aeronaut@pianoguy.de"),
+    __description = """Keep2Share.cc account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("aeronaut", "aeronaut@pianoguy.de"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/account/LetitbitNet.py b/pyload/plugin/account/LetitbitNet.py
index d0f08d0bb..0ad36f219 100644
--- a/pyload/plugin/account/LetitbitNet.py
+++ b/pyload/plugin/account/LetitbitNet.py
@@ -5,13 +5,13 @@ from pyload.plugin.Account import Account
 
 
 class LetitbitNet(Account):
-    __name__    = "LetitbitNet"
-    __type__    = "account"
-    __version__ = "0.02"
+    __name    = "LetitbitNet"
+    __type    = "account"
+    __version = "0.02"
 
-    __description__ = """Letitbit.net account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Letitbit.net account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/LinestorageCom.py b/pyload/plugin/account/LinestorageCom.py
index 7a5d63a47..824d3bf77 100644
--- a/pyload/plugin/account/LinestorageCom.py
+++ b/pyload/plugin/account/LinestorageCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class LinestorageCom(XFSAccount):
-    __name__    = "LinestorageCom"
-    __type__    = "account"
-    __version__ = "0.03"
+    __name    = "LinestorageCom"
+    __type    = "account"
+    __version = "0.03"
 
-    __description__ = """Linestorage.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Linestorage.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "linestorage.com"
diff --git a/pyload/plugin/account/LinksnappyCom.py b/pyload/plugin/account/LinksnappyCom.py
index 0b1176ee9..4b91042e2 100644
--- a/pyload/plugin/account/LinksnappyCom.py
+++ b/pyload/plugin/account/LinksnappyCom.py
@@ -7,12 +7,12 @@ from pyload.utils import json_loads
 
 
 class LinksnappyCom(Account):
-    __name__    = "LinksnappyCom"
-    __type__    = "account"
-    __version__ = "0.05"
-    __description__ = """Linksnappy.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __name    = "LinksnappyCom"
+    __type    = "account"
+    __version = "0.05"
+    __description = """Linksnappy.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/MegaDebridEu.py b/pyload/plugin/account/MegaDebridEu.py
index c2e64bcc7..67af94541 100644
--- a/pyload/plugin/account/MegaDebridEu.py
+++ b/pyload/plugin/account/MegaDebridEu.py
@@ -5,13 +5,13 @@ from pyload.utils import json_loads
 
 
 class MegaDebridEu(Account):
-    __name__    = "MegaDebridEu"
-    __type__    = "account"
-    __version__ = "0.20"
+    __name    = "MegaDebridEu"
+    __type    = "account"
+    __version = "0.20"
 
-    __description__ = """mega-debrid.eu account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("D.Ducatel", "dducatel@je-geek.fr")]
+    __description = """mega-debrid.eu account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("D.Ducatel", "dducatel@je-geek.fr")]
 
 
     # Define the base URL of MegaDebrid api
diff --git a/pyload/plugin/account/MegaRapidCz.py b/pyload/plugin/account/MegaRapidCz.py
index cdb5c732b..ea788d446 100644
--- a/pyload/plugin/account/MegaRapidCz.py
+++ b/pyload/plugin/account/MegaRapidCz.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class MegaRapidCz(Account):
-    __name__    = "MegaRapidCz"
-    __type__    = "account"
-    __version__ = "0.35"
+    __name    = "MegaRapidCz"
+    __type    = "account"
+    __version = "0.35"
 
-    __description__ = """MegaRapid.cz account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("MikyWoW", "mikywow@seznam.cz"),
+    __description = """MegaRapid.cz account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("MikyWoW", "mikywow@seznam.cz"),
                        ("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/pyload/plugin/account/MegaRapidoNet.py b/pyload/plugin/account/MegaRapidoNet.py
index 22979a09a..7f31b5205 100644
--- a/pyload/plugin/account/MegaRapidoNet.py
+++ b/pyload/plugin/account/MegaRapidoNet.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class MegaRapidoNet(Account):
-    __name__    = "MegaRapidoNet"
-    __type__    = "account"
-    __version__ = "0.02"
+    __name    = "MegaRapidoNet"
+    __type    = "account"
+    __version = "0.02"
 
-    __description__ = """MegaRapido.net account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")]
+    __description = """MegaRapido.net account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Kagenoshin", "kagenoshin@gmx.ch")]
 
 
     VALID_UNTIL_PATTERN = r'<\s*?div[^>]*?class\s*?=\s*?[\'"]premium_index[\'"][^>]*>[^<]*?<[^>]*?b[^>]*>\s*?TEMPO\s*?PREMIUM[^<]*<[^>]*?/b[^>]*>\s*?(\d*)[^\d]*?DIAS[^\d]*?(\d*)[^\d]*?HORAS[^\d]*?(\d*)[^\d]*?MINUTOS[^\d]*?(\d*)[^\d]*?SEGUNDOS'
diff --git a/pyload/plugin/account/MegasharesCom.py b/pyload/plugin/account/MegasharesCom.py
index 7c5d0d357..42ecfc17d 100644
--- a/pyload/plugin/account/MegasharesCom.py
+++ b/pyload/plugin/account/MegasharesCom.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class MegasharesCom(Account):
-    __name__    = "MegasharesCom"
-    __type__    = "account"
-    __version__ = "0.03"
+    __name    = "MegasharesCom"
+    __type    = "account"
+    __version = "0.03"
 
-    __description__ = """Megashares.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Megashares.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     VALID_UNTIL_PATTERN = r'<p class="premium_info_box">Period Ends: (\w{3} \d{1,2}, \d{4})</p>'
diff --git a/pyload/plugin/account/MovReelCom.py b/pyload/plugin/account/MovReelCom.py
index 4d2855de1..9eabd0a6d 100644
--- a/pyload/plugin/account/MovReelCom.py
+++ b/pyload/plugin/account/MovReelCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class MovReelCom(XFSAccount):
-    __name__    = "MovReelCom"
-    __type__    = "account"
-    __version__ = "0.03"
+    __name    = "MovReelCom"
+    __type    = "account"
+    __version = "0.03"
 
-    __description__ = """Movreel.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]
+    __description = """Movreel.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]
 
 
     login_timeout = 60
diff --git a/pyload/plugin/account/MultihostersCom.py b/pyload/plugin/account/MultihostersCom.py
index 3f5d90c4e..bc48979bb 100644
--- a/pyload/plugin/account/MultihostersCom.py
+++ b/pyload/plugin/account/MultihostersCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.account.ZeveraCom import ZeveraCom
 
 
 class MultihostersCom(ZeveraCom):
-    __name__    = "MultihostersCom"
-    __type__    = "account"
-    __version__ = "0.03"
+    __name    = "MultihostersCom"
+    __type    = "account"
+    __version = "0.03"
 
-    __description__ = """Multihosters.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("tjeh", "tjeh@gmx.net")]
+    __description = """Multihosters.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("tjeh", "tjeh@gmx.net")]
 
 
     HOSTER_DOMAIN = "multihosters.com"
diff --git a/pyload/plugin/account/MultishareCz.py b/pyload/plugin/account/MultishareCz.py
index 9b4f4447b..ea1aef137 100644
--- a/pyload/plugin/account/MultishareCz.py
+++ b/pyload/plugin/account/MultishareCz.py
@@ -6,13 +6,13 @@ from pyload.plugin.Account import Account
 
 
 class MultishareCz(Account):
-    __name__    = "MultishareCz"
-    __type__    = "account"
-    __version__ = "0.05"
+    __name    = "MultishareCz"
+    __type    = "account"
+    __version = "0.05"
 
-    __description__ = """Multishare.cz account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Multishare.cz account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     TRAFFIC_LEFT_PATTERN = r'<span class="profil-zvyrazneni">Kredit:</span>\s*<strong>(?P<S>[\d.,]+)&nbsp;(?P<U>[\w^_]+)</strong>'
diff --git a/pyload/plugin/account/MyfastfileCom.py b/pyload/plugin/account/MyfastfileCom.py
index 350d77c57..a58767b72 100644
--- a/pyload/plugin/account/MyfastfileCom.py
+++ b/pyload/plugin/account/MyfastfileCom.py
@@ -7,13 +7,13 @@ from pyload.utils import json_loads
 
 
 class MyfastfileCom(Account):
-    __name__    = "MyfastfileCom"
-    __type__    = "account"
-    __version__ = "0.04"
+    __name    = "MyfastfileCom"
+    __type    = "account"
+    __version = "0.04"
 
-    __description__ = """Myfastfile.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Myfastfile.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/NetloadIn.py b/pyload/plugin/account/NetloadIn.py
index bec4690a8..db0f0ea5a 100644
--- a/pyload/plugin/account/NetloadIn.py
+++ b/pyload/plugin/account/NetloadIn.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class NetloadIn(Account):
-    __name__    = "NetloadIn"
-    __type__    = "account"
-    __version__ = "0.24"
+    __name    = "NetloadIn"
+    __type    = "account"
+    __version = "0.24"
 
-    __description__ = """Netload.in account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Netload.in account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     def api_response(self, id, password, req):
diff --git a/pyload/plugin/account/NoPremiumPl.py b/pyload/plugin/account/NoPremiumPl.py
index 49f20b1f2..0f5b16bb7 100644
--- a/pyload/plugin/account/NoPremiumPl.py
+++ b/pyload/plugin/account/NoPremiumPl.py
@@ -9,12 +9,12 @@ from pyload.utils import json_loads
 
 
 class NoPremiumPl(Account):
-    __name__ = "NoPremiumPl"
-    __version__ = "0.01"
-    __type__ = "account"
-    __description__ = "NoPremium.pl account plugin"
-    __license__ = "GPLv3"
-    __authors__ = [("goddie", "dev@nopremium.pl")]
+    __name = "NoPremiumPl"
+    __version = "0.01"
+    __type = "account"
+    __description = "NoPremium.pl account plugin"
+    __license = "GPLv3"
+    __authors = [("goddie", "dev@nopremium.pl")]
 
     _api_url = "http://crypt.nopremium.pl"
 
diff --git a/pyload/plugin/account/NosuploadCom.py b/pyload/plugin/account/NosuploadCom.py
index 7fc8b49de..10f9007a6 100644
--- a/pyload/plugin/account/NosuploadCom.py
+++ b/pyload/plugin/account/NosuploadCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class NosuploadCom(XFSAccount):
-    __name__    = "NosuploadCom"
-    __type__    = "account"
-    __version__ = "0.02"
+    __name    = "NosuploadCom"
+    __type    = "account"
+    __version = "0.02"
 
-    __description__ = """Nosupload.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Nosupload.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "nosupload.com"
diff --git a/pyload/plugin/account/NovafileCom.py b/pyload/plugin/account/NovafileCom.py
index 71a7dc2dc..8400cc267 100644
--- a/pyload/plugin/account/NovafileCom.py
+++ b/pyload/plugin/account/NovafileCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class NovafileCom(XFSAccount):
-    __name__    = "NovafileCom"
-    __type__    = "account"
-    __version__ = "0.02"
+    __name    = "NovafileCom"
+    __type    = "account"
+    __version = "0.02"
 
-    __description__ = """Novafile.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Novafile.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "novafile.com"
diff --git a/pyload/plugin/account/NowVideoSx.py b/pyload/plugin/account/NowVideoSx.py
index 3c63149ae..f072e3687 100644
--- a/pyload/plugin/account/NowVideoSx.py
+++ b/pyload/plugin/account/NowVideoSx.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class NowVideoSx(Account):
-    __name__    = "NowVideoSx"
-    __type__    = "account"
-    __version__ = "0.03"
+    __name    = "NowVideoSx"
+    __type    = "account"
+    __version = "0.03"
 
-    __description__ = """NowVideo.at account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """NowVideo.at account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     VALID_UNTIL_PATTERN = r'>Your premium membership expires on: (.+?)<'
diff --git a/pyload/plugin/account/OboomCom.py b/pyload/plugin/account/OboomCom.py
index 012fb42c3..7b73c38fa 100644
--- a/pyload/plugin/account/OboomCom.py
+++ b/pyload/plugin/account/OboomCom.py
@@ -9,13 +9,13 @@ from pyload.plugin.Account import Account
 
 
 class OboomCom(Account):
-    __name__    = "OboomCom"
-    __type__    = "account"
-    __version__ = "0.23"
+    __name    = "OboomCom"
+    __type    = "account"
+    __version = "0.23"
 
-    __description__ = """Oboom.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stanley", "stanley.foerster@gmail.com")]
+    __description = """Oboom.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stanley", "stanley.foerster@gmail.com")]
 
 
     def loadAccountData(self, user, req):
diff --git a/pyload/plugin/account/OneFichierCom.py b/pyload/plugin/account/OneFichierCom.py
index 0c37654ca..fbe5ed022 100644
--- a/pyload/plugin/account/OneFichierCom.py
+++ b/pyload/plugin/account/OneFichierCom.py
@@ -9,13 +9,13 @@ from pyload.plugin.Account import Account
 
 
 class OneFichierCom(Account):
-    __name__    = "OneFichierCom"
-    __type__    = "account"
-    __version__ = "0.12"
+    __name    = "OneFichierCom"
+    __type    = "account"
+    __version = "0.12"
 
-    __description__ = """1fichier.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Elrick69", "elrick69[AT]rocketmail[DOT]com"),
+    __description = """1fichier.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Elrick69", "elrick69[AT]rocketmail[DOT]com"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/account/OverLoadMe.py b/pyload/plugin/account/OverLoadMe.py
index 8677ecf47..d65e4ad31 100644
--- a/pyload/plugin/account/OverLoadMe.py
+++ b/pyload/plugin/account/OverLoadMe.py
@@ -5,13 +5,13 @@ from pyload.utils import json_loads
 
 
 class OverLoadMe(Account):
-    __name__    = "OverLoadMe"
-    __type__    = "account"
-    __version__ = "0.04"
+    __name    = "OverLoadMe"
+    __type    = "account"
+    __version = "0.04"
 
-    __description__ = """Over-Load.me account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("marley", "marley@over-load.me")]
+    __description = """Over-Load.me account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("marley", "marley@over-load.me")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/PremiumTo.py b/pyload/plugin/account/PremiumTo.py
index 04bbc10d5..01369554f 100644
--- a/pyload/plugin/account/PremiumTo.py
+++ b/pyload/plugin/account/PremiumTo.py
@@ -4,13 +4,13 @@ from pyload.plugin.Account import Account
 
 
 class PremiumTo(Account):
-    __name__    = "PremiumTo"
-    __type__    = "account"
-    __version__ = "0.08"
+    __name    = "PremiumTo"
+    __type    = "account"
+    __version = "0.08"
 
-    __description__ = """Premium.to account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+    __description = """Premium.to account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org"),
                        ("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
diff --git a/pyload/plugin/account/PremiumizeMe.py b/pyload/plugin/account/PremiumizeMe.py
index 3cd15ce23..7a701d03b 100644
--- a/pyload/plugin/account/PremiumizeMe.py
+++ b/pyload/plugin/account/PremiumizeMe.py
@@ -6,13 +6,13 @@ from pyload.utils import json_loads
 
 
 class PremiumizeMe(Account):
-    __name__    = "PremiumizeMe"
-    __type__    = "account"
-    __version__ = "0.13"
+    __name    = "PremiumizeMe"
+    __type    = "account"
+    __version = "0.13"
 
-    __description__ = """Premiumize.me account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Florian Franzen", "FlorianFranzen@gmail.com")]
+    __description = """Premiumize.me account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Florian Franzen", "FlorianFranzen@gmail.com")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/PutdriveCom.py b/pyload/plugin/account/PutdriveCom.py
index b30fb6565..3d7279034 100644
--- a/pyload/plugin/account/PutdriveCom.py
+++ b/pyload/plugin/account/PutdriveCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.account.ZeveraCom import ZeveraCom
 
 
 class PutdriveCom(ZeveraCom):
-    __name__    = "PutdriveCom"
-    __type__    = "account"
-    __version__ = "0.02"
+    __name    = "PutdriveCom"
+    __type    = "account"
+    __version = "0.02"
 
-    __description__ = """Putdrive.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Putdrive.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "putdrive.com"
diff --git a/pyload/plugin/account/QuickshareCz.py b/pyload/plugin/account/QuickshareCz.py
index 2bcde1c9d..67dd11ac3 100644
--- a/pyload/plugin/account/QuickshareCz.py
+++ b/pyload/plugin/account/QuickshareCz.py
@@ -6,13 +6,13 @@ from pyload.plugin.Account import Account
 
 
 class QuickshareCz(Account):
-    __name__    = "QuickshareCz"
-    __type__    = "account"
-    __version__ = "0.03"
+    __name    = "QuickshareCz"
+    __type    = "account"
+    __version = "0.03"
 
-    __description__ = """Quickshare.cz account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Quickshare.cz account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     TRAFFIC_LEFT_PATTERN = r'Stav kreditu: <strong>(.+?)</strong>'
diff --git a/pyload/plugin/account/RPNetBiz.py b/pyload/plugin/account/RPNetBiz.py
index e0b35b68c..2dfce536b 100644
--- a/pyload/plugin/account/RPNetBiz.py
+++ b/pyload/plugin/account/RPNetBiz.py
@@ -5,13 +5,13 @@ from pyload.utils import json_loads
 
 
 class RPNetBiz(Account):
-    __name__    = "RPNetBiz"
-    __type__    = "account"
-    __version__ = "0.12"
+    __name    = "RPNetBiz"
+    __type    = "account"
+    __version = "0.12"
 
-    __description__ = """RPNet.biz account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Dman", "dmanugm@gmail.com")]
+    __description = """RPNet.biz account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Dman", "dmanugm@gmail.com")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/RapideoPl.py b/pyload/plugin/account/RapideoPl.py
index f14e222c3..043657074 100644
--- a/pyload/plugin/account/RapideoPl.py
+++ b/pyload/plugin/account/RapideoPl.py
@@ -9,12 +9,12 @@ from pyload.utils import json_loads
 
 
 class RapideoPl(Account):
-    __name__ = "RapideoPl"
-    __version__ = "0.01"
-    __type__ = "account"
-    __description__ = "Rapideo.pl account plugin"
-    __license__ = "GPLv3"
-    __authors__ = [("goddie", "dev@rapideo.pl")]
+    __name = "RapideoPl"
+    __version = "0.01"
+    __type = "account"
+    __description = "Rapideo.pl account plugin"
+    __license = "GPLv3"
+    __authors = [("goddie", "dev@rapideo.pl")]
 
     _api_url = "http://enc.rapideo.pl"
 
diff --git a/pyload/plugin/account/RapidfileshareNet.py b/pyload/plugin/account/RapidfileshareNet.py
index ec0bf8db4..0b0ed210c 100644
--- a/pyload/plugin/account/RapidfileshareNet.py
+++ b/pyload/plugin/account/RapidfileshareNet.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class RapidfileshareNet(XFSAccount):
-    __name__    = "RapidfileshareNet"
-    __type__    = "account"
-    __version__ = "0.05"
+    __name    = "RapidfileshareNet"
+    __type    = "account"
+    __version = "0.05"
 
-    __description__ = """Rapidfileshare.net account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
+    __description = """Rapidfileshare.net account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
     HOSTER_DOMAIN = "rapidfileshare.net"
diff --git a/pyload/plugin/account/RapidgatorNet.py b/pyload/plugin/account/RapidgatorNet.py
index 7643f07d2..17b615a0b 100644
--- a/pyload/plugin/account/RapidgatorNet.py
+++ b/pyload/plugin/account/RapidgatorNet.py
@@ -5,13 +5,13 @@ from pyload.utils import json_loads
 
 
 class RapidgatorNet(Account):
-    __name__    = "RapidgatorNet"
-    __type__    = "account"
-    __version__ = "0.09"
+    __name    = "RapidgatorNet"
+    __type    = "account"
+    __version = "0.09"
 
-    __description__ = """Rapidgator.net account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Rapidgator.net account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     API_URL = "http://rapidgator.net/api/user"
diff --git a/pyload/plugin/account/RapiduNet.py b/pyload/plugin/account/RapiduNet.py
index b03bde6e0..c19e54a9b 100644
--- a/pyload/plugin/account/RapiduNet.py
+++ b/pyload/plugin/account/RapiduNet.py
@@ -8,13 +8,13 @@ from pyload.utils import json_loads
 
 
 class RapiduNet(Account):
-    __name__    = "RapiduNet"
-    __type__    = "account"
-    __version__ = "0.05"
+    __name    = "RapiduNet"
+    __type    = "account"
+    __version = "0.05"
 
-    __description__ = """Rapidu.net account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("prOq", None),
+    __description = """Rapidu.net account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("prOq", None),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/account/RarefileNet.py b/pyload/plugin/account/RarefileNet.py
index 1dc93681c..fc736bafc 100644
--- a/pyload/plugin/account/RarefileNet.py
+++ b/pyload/plugin/account/RarefileNet.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class RarefileNet(XFSAccount):
-    __name__    = "RarefileNet"
-    __type__    = "account"
-    __version__ = "0.04"
+    __name    = "RarefileNet"
+    __type    = "account"
+    __version = "0.04"
 
-    __description__ = """RareFile.net account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """RareFile.net account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     HOSTER_DOMAIN = "rarefile.net"
diff --git a/pyload/plugin/account/RealdebridCom.py b/pyload/plugin/account/RealdebridCom.py
index 07ff70496..0d28f2ad6 100644
--- a/pyload/plugin/account/RealdebridCom.py
+++ b/pyload/plugin/account/RealdebridCom.py
@@ -6,13 +6,13 @@ from pyload.plugin.Account import Account
 
 
 class RealdebridCom(Account):
-    __name__    = "RealdebridCom"
-    __type__    = "account"
-    __version__ = "0.45"
+    __name    = "RealdebridCom"
+    __type    = "account"
+    __version = "0.45"
 
-    __description__ = """Real-Debrid.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Devirex Hazzard", "naibaf_11@yahoo.de")]
+    __description = """Real-Debrid.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Devirex Hazzard", "naibaf_11@yahoo.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/RehostTo.py b/pyload/plugin/account/RehostTo.py
index d62e1918a..3b02145fc 100644
--- a/pyload/plugin/account/RehostTo.py
+++ b/pyload/plugin/account/RehostTo.py
@@ -4,13 +4,13 @@ from pyload.plugin.Account import Account
 
 
 class RehostTo(Account):
-    __name__    = "RehostTo"
-    __type__    = "account"
-    __version__ = "0.16"
+    __name    = "RehostTo"
+    __type    = "account"
+    __version = "0.16"
 
-    __description__ = """Rehost.to account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
+    __description = """Rehost.to account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/RyushareCom.py b/pyload/plugin/account/RyushareCom.py
index 466d971f6..f34d1d388 100644
--- a/pyload/plugin/account/RyushareCom.py
+++ b/pyload/plugin/account/RyushareCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class RyushareCom(XFSAccount):
-    __name__    = "RyushareCom"
-    __type__    = "account"
-    __version__ = "0.06"
+    __name    = "RyushareCom"
+    __type    = "account"
+    __version = "0.06"
 
-    __description__ = """Ryushare.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Ryushare.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "ryushare.com"
diff --git a/pyload/plugin/account/SafesharingEu.py b/pyload/plugin/account/SafesharingEu.py
index f5cbf050e..eae8140fb 100644
--- a/pyload/plugin/account/SafesharingEu.py
+++ b/pyload/plugin/account/SafesharingEu.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class SafesharingEu(XFSAccount):
-    __name__    = "SafesharingEu"
-    __type__    = "account"
-    __version__ = "0.02"
+    __name    = "SafesharingEu"
+    __type    = "account"
+    __version = "0.02"
 
-    __description__ = """Safesharing.eu account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
+    __description = """Safesharing.eu account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
     HOSTER_DOMAIN = "safesharing.eu"
diff --git a/pyload/plugin/account/SecureUploadEu.py b/pyload/plugin/account/SecureUploadEu.py
index bb47bcba3..b349e893f 100644
--- a/pyload/plugin/account/SecureUploadEu.py
+++ b/pyload/plugin/account/SecureUploadEu.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class SecureUploadEu(XFSAccount):
-    __name__    = "SecureUploadEu"
-    __type__    = "account"
-    __version__ = "0.02"
+    __name    = "SecureUploadEu"
+    __type    = "account"
+    __version = "0.02"
 
-    __description__ = """SecureUpload.eu account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """SecureUpload.eu account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "secureupload.eu"
diff --git a/pyload/plugin/account/SendmywayCom.py b/pyload/plugin/account/SendmywayCom.py
index d64658de3..add0b2183 100644
--- a/pyload/plugin/account/SendmywayCom.py
+++ b/pyload/plugin/account/SendmywayCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class SendmywayCom(XFSAccount):
-    __name__    = "SendmywayCom"
-    __type__    = "account"
-    __version__ = "0.02"
+    __name    = "SendmywayCom"
+    __type    = "account"
+    __version = "0.02"
 
-    __description__ = """Sendmyway.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Sendmyway.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "sendmyway.com"
diff --git a/pyload/plugin/account/ShareonlineBiz.py b/pyload/plugin/account/ShareonlineBiz.py
index 28bc3b9bc..a27d52736 100644
--- a/pyload/plugin/account/ShareonlineBiz.py
+++ b/pyload/plugin/account/ShareonlineBiz.py
@@ -6,13 +6,13 @@ from pyload.plugin.Account import Account
 
 
 class ShareonlineBiz(Account):
-    __name__    = "ShareonlineBiz"
-    __type__    = "account"
-    __version__ = "0.31"
+    __name    = "ShareonlineBiz"
+    __type    = "account"
+    __version = "0.31"
 
-    __description__ = """Share-online.biz account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Share-online.biz account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     def api_response(self, user, req):
diff --git a/pyload/plugin/account/SimplyPremiumCom.py b/pyload/plugin/account/SimplyPremiumCom.py
index 298ad8d59..92e4edbb9 100644
--- a/pyload/plugin/account/SimplyPremiumCom.py
+++ b/pyload/plugin/account/SimplyPremiumCom.py
@@ -5,13 +5,13 @@ from pyload.plugin.Account import Account
 
 
 class SimplyPremiumCom(Account):
-    __name__    = "SimplyPremiumCom"
-    __type__    = "account"
-    __version__ = "0.05"
+    __name    = "SimplyPremiumCom"
+    __type    = "account"
+    __version = "0.05"
 
-    __description__ = """Simply-Premium.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("EvolutionClip", "evolutionclip@live.de")]
+    __description = """Simply-Premium.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("EvolutionClip", "evolutionclip@live.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/SimplydebridCom.py b/pyload/plugin/account/SimplydebridCom.py
index 1d5ba201c..dc855c441 100644
--- a/pyload/plugin/account/SimplydebridCom.py
+++ b/pyload/plugin/account/SimplydebridCom.py
@@ -6,13 +6,13 @@ from pyload.plugin.Account import Account
 
 
 class SimplydebridCom(Account):
-    __name__    = "SimplydebridCom"
-    __type__    = "account"
-    __version__ = "0.11"
+    __name    = "SimplydebridCom"
+    __type    = "account"
+    __version = "0.11"
 
-    __description__ = """Simply-Debrid.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")]
+    __description = """Simply-Debrid.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Kagenoshin", "kagenoshin@gmx.ch")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/SmoozedCom.py b/pyload/plugin/account/SmoozedCom.py
index 686903553..54cd94fbf 100644
--- a/pyload/plugin/account/SmoozedCom.py
+++ b/pyload/plugin/account/SmoozedCom.py
@@ -10,13 +10,13 @@ from pyload.plugin.Account import Account
 
 
 class SmoozedCom(Account):
-    __name__    = "SmoozedCom"
-    __type__    = "account"
-    __version__ = "0.03"
+    __name    = "SmoozedCom"
+    __type    = "account"
+    __version = "0.03"
 
-    __description__ = """Smoozed.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("", "")]
+    __description = """Smoozed.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("", "")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/StahnuTo.py b/pyload/plugin/account/StahnuTo.py
index ed8df3b77..57f9adc10 100644
--- a/pyload/plugin/account/StahnuTo.py
+++ b/pyload/plugin/account/StahnuTo.py
@@ -6,13 +6,13 @@ from pyload.plugin.Account import Account
 
 
 class StahnuTo(Account):
-    __name__    = "StahnuTo"
-    __type__    = "account"
-    __version__ = "0.05"
+    __name    = "StahnuTo"
+    __type    = "account"
+    __version = "0.05"
 
-    __description__ = """StahnuTo account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """StahnuTo account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/StreamcloudEu.py b/pyload/plugin/account/StreamcloudEu.py
index 3ac74fbd0..f3eb6cce9 100644
--- a/pyload/plugin/account/StreamcloudEu.py
+++ b/pyload/plugin/account/StreamcloudEu.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class StreamcloudEu(XFSAccount):
-    __name__    = "StreamcloudEu"
-    __type__    = "account"
-    __version__ = "0.02"
+    __name    = "StreamcloudEu"
+    __type    = "account"
+    __version = "0.02"
 
-    __description__ = """Streamcloud.eu account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Streamcloud.eu account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "streamcloud.eu"
diff --git a/pyload/plugin/account/TurbobitNet.py b/pyload/plugin/account/TurbobitNet.py
index d00f4c0e4..4b1b6b2a0 100644
--- a/pyload/plugin/account/TurbobitNet.py
+++ b/pyload/plugin/account/TurbobitNet.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class TurbobitNet(Account):
-    __name__    = "TurbobitNet"
-    __type__    = "account"
-    __version__ = "0.02"
+    __name    = "TurbobitNet"
+    __type    = "account"
+    __version = "0.02"
 
-    __description__ = """TurbobitNet account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """TurbobitNet account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/TusfilesNet.py b/pyload/plugin/account/TusfilesNet.py
index 48f70b4f3..b18d49748 100644
--- a/pyload/plugin/account/TusfilesNet.py
+++ b/pyload/plugin/account/TusfilesNet.py
@@ -7,13 +7,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class TusfilesNet(XFSAccount):
-    __name__    = "TusfilesNet"
-    __type__    = "account"
-    __version__ = "0.06"
+    __name    = "TusfilesNet"
+    __type    = "account"
+    __version = "0.06"
 
-    __description__ = """Tusfile.net account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
+    __description = """Tusfile.net account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
     HOSTER_DOMAIN = "tusfiles.net"
diff --git a/pyload/plugin/account/UlozTo.py b/pyload/plugin/account/UlozTo.py
index 1570419b0..aeac52089 100644
--- a/pyload/plugin/account/UlozTo.py
+++ b/pyload/plugin/account/UlozTo.py
@@ -8,13 +8,13 @@ from pyload.plugin.Account import Account
 
 
 class UlozTo(Account):
-    __name__    = "UlozTo"
-    __type__    = "account"
-    __version__ = "0.10"
+    __name    = "UlozTo"
+    __type    = "account"
+    __version = "0.10"
 
-    __description__ = """Uloz.to account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """Uloz.to account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("pulpe", "")]
 
 
diff --git a/pyload/plugin/account/UnrestrictLi.py b/pyload/plugin/account/UnrestrictLi.py
index d8d7789bb..8d3071580 100644
--- a/pyload/plugin/account/UnrestrictLi.py
+++ b/pyload/plugin/account/UnrestrictLi.py
@@ -5,13 +5,13 @@ from pyload.utils import json_loads
 
 
 class UnrestrictLi(Account):
-    __name__    = "UnrestrictLi"
-    __type__    = "account"
-    __version__ = "0.05"
+    __name    = "UnrestrictLi"
+    __type    = "account"
+    __version = "0.05"
 
-    __description__ = """Unrestrict.li account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Unrestrict.li account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/UploadableCh.py b/pyload/plugin/account/UploadableCh.py
index 9406118cd..15717db44 100644
--- a/pyload/plugin/account/UploadableCh.py
+++ b/pyload/plugin/account/UploadableCh.py
@@ -4,13 +4,13 @@ from pyload.plugin.Account import Account
 
 
 class UploadableCh(Account):
-    __name__    = "UploadableCh"
-    __type__    = "account"
-    __version__ = "0.03"
+    __name    = "UploadableCh"
+    __type    = "account"
+    __version = "0.03"
 
-    __description__ = """Uploadable.ch account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Sasch", "gsasch@gmail.com")]
+    __description = """Uploadable.ch account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Sasch", "gsasch@gmail.com")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/UploadcCom.py b/pyload/plugin/account/UploadcCom.py
index 66863c456..01102168c 100644
--- a/pyload/plugin/account/UploadcCom.py
+++ b/pyload/plugin/account/UploadcCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class UploadcCom(XFSAccount):
-    __name__    = "UploadcCom"
-    __type__    = "account"
-    __version__ = "0.02"
+    __name    = "UploadcCom"
+    __type    = "account"
+    __version = "0.02"
 
-    __description__ = """Uploadc.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Uploadc.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "uploadc.com"
diff --git a/pyload/plugin/account/UploadedTo.py b/pyload/plugin/account/UploadedTo.py
index 37900c7d3..13b0f3112 100644
--- a/pyload/plugin/account/UploadedTo.py
+++ b/pyload/plugin/account/UploadedTo.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class UploadedTo(Account):
-    __name__    = "UploadedTo"
-    __type__    = "account"
-    __version__ = "0.30"
+    __name    = "UploadedTo"
+    __type    = "account"
+    __version = "0.30"
 
-    __description__ = """Uploaded.to account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Uploaded.to account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     PREMIUM_PATTERN = r'<em>Premium</em>'
diff --git a/pyload/plugin/account/UploadheroCom.py b/pyload/plugin/account/UploadheroCom.py
index c73fc30f5..a0c8e2aa8 100644
--- a/pyload/plugin/account/UploadheroCom.py
+++ b/pyload/plugin/account/UploadheroCom.py
@@ -8,13 +8,13 @@ from pyload.plugin.Account import Account
 
 
 class UploadheroCom(Account):
-    __name__    = "UploadheroCom"
-    __type__    = "account"
-    __version__ = "0.21"
+    __name    = "UploadheroCom"
+    __type    = "account"
+    __version = "0.21"
 
-    __description__ = """Uploadhero.co account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("mcmyst", "mcmyst@hotmail.fr")]
+    __description = """Uploadhero.co account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("mcmyst", "mcmyst@hotmail.fr")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/UploadingCom.py b/pyload/plugin/account/UploadingCom.py
index e1f0d07f7..f5333dd4c 100644
--- a/pyload/plugin/account/UploadingCom.py
+++ b/pyload/plugin/account/UploadingCom.py
@@ -8,13 +8,13 @@ from pyload.plugin.internal.SimpleHoster import set_cookies
 
 
 class UploadingCom(Account):
-    __name__    = "UploadingCom"
-    __type__    = "account"
-    __version__ = "0.12"
+    __name    = "UploadingCom"
+    __type    = "account"
+    __version = "0.12"
 
-    __description__ = """Uploading.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("mkaay", "mkaay@mkaay.de")]
+    __description = """Uploading.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("mkaay", "mkaay@mkaay.de")]
 
 
     PREMIUM_PATTERN = r'UPGRADE TO PREMIUM'
diff --git a/pyload/plugin/account/UptoboxCom.py b/pyload/plugin/account/UptoboxCom.py
index f7cb7a82e..f7e715a33 100644
--- a/pyload/plugin/account/UptoboxCom.py
+++ b/pyload/plugin/account/UptoboxCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class UptoboxCom(XFSAccount):
-    __name__    = "UptoboxCom"
-    __type__    = "account"
-    __version__ = "0.08"
+    __name    = "UptoboxCom"
+    __type    = "account"
+    __version = "0.08"
 
-    __description__ = """DDLStorage.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """DDLStorage.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     HOSTER_DOMAIN = "uptobox.com"
diff --git a/pyload/plugin/account/VidPlayNet.py b/pyload/plugin/account/VidPlayNet.py
index 390520a00..c5d4e0b5a 100644
--- a/pyload/plugin/account/VidPlayNet.py
+++ b/pyload/plugin/account/VidPlayNet.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class VidPlayNet(XFSAccount):
-    __name__    = "VidPlayNet"
-    __type__    = "account"
-    __version__ = "0.02"
+    __name    = "VidPlayNet"
+    __type    = "account"
+    __version = "0.02"
 
-    __description__ = """VidPlay.net account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """VidPlay.net account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "vidplay.net"
diff --git a/pyload/plugin/account/WebshareCz.py b/pyload/plugin/account/WebshareCz.py
index 5384134ad..47dfed255 100644
--- a/pyload/plugin/account/WebshareCz.py
+++ b/pyload/plugin/account/WebshareCz.py
@@ -10,13 +10,13 @@ from pyload.plugin.Account import Account
 
 
 class WebshareCz(Account):
-    __name__    = "WebshareCz"
-    __type__    = "account"
-    __version__ = "0.07"
+    __name    = "WebshareCz"
+    __type    = "account"
+    __version = "0.07"
 
-    __description__ = """Webshare.cz account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("rush", "radek.senfeld@gmail.com")]
+    __description = """Webshare.cz account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("rush", "radek.senfeld@gmail.com")]
 
 
     VALID_UNTIL_PATTERN = r'<vip_until>(.+)</vip_until>'
diff --git a/pyload/plugin/account/XFileSharingPro.py b/pyload/plugin/account/XFileSharingPro.py
index 216af5385..79b5427ef 100644
--- a/pyload/plugin/account/XFileSharingPro.py
+++ b/pyload/plugin/account/XFileSharingPro.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class XFileSharingPro(XFSAccount):
-    __name__    = "XFileSharingPro"
-    __type__    = "account"
-    __version__ = "0.06"
+    __name    = "XFileSharingPro"
+    __type    = "account"
+    __version = "0.06"
 
-    __description__ = """XFileSharingPro multi-purpose account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """XFileSharingPro multi-purpose account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = None
diff --git a/pyload/plugin/account/YibaishiwuCom.py b/pyload/plugin/account/YibaishiwuCom.py
index 150b0d931..ad9b089a9 100644
--- a/pyload/plugin/account/YibaishiwuCom.py
+++ b/pyload/plugin/account/YibaishiwuCom.py
@@ -6,13 +6,13 @@ from pyload.plugin.Account import Account
 
 
 class YibaishiwuCom(Account):
-    __name__    = "YibaishiwuCom"
-    __type__    = "account"
-    __version__ = "0.02"
+    __name    = "YibaishiwuCom"
+    __type    = "account"
+    __version = "0.02"
 
-    __description__ = """115.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """115.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     ACCOUNT_INFO_PATTERN = r'var USER_PERMISSION = {(.*?)}'
diff --git a/pyload/plugin/account/ZeveraCom.py b/pyload/plugin/account/ZeveraCom.py
index 0e6d50a9b..9be032ca1 100644
--- a/pyload/plugin/account/ZeveraCom.py
+++ b/pyload/plugin/account/ZeveraCom.py
@@ -6,13 +6,13 @@ from pyload.plugin.Account import Account
 
 
 class ZeveraCom(Account):
-    __name__    = "ZeveraCom"
-    __type__    = "account"
-    __version__ = "0.26"
+    __name    = "ZeveraCom"
+    __type    = "account"
+    __version = "0.26"
 
-    __description__ = """Zevera.com account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """Zevera.com account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/addon/AndroidPhoneNotify.py b/pyload/plugin/addon/AndroidPhoneNotify.py
index d3b390e6e..8332f668d 100644
--- a/pyload/plugin/addon/AndroidPhoneNotify.py
+++ b/pyload/plugin/addon/AndroidPhoneNotify.py
@@ -7,11 +7,11 @@ from pyload.plugin.Addon import Addon, Expose
 
 
 class AndroidPhoneNotify(Addon):
-    __name__    = "AndroidPhoneNotify"
-    __type__    = "addon"
-    __version__ = "0.07"
+    __name    = "AndroidPhoneNotify"
+    __type    = "addon"
+    __version = "0.07"
 
-    __config__ = [("apikey"         , "str" , "API key"                                  , ""   ),
+    __config = [("apikey"         , "str" , "API key"                                  , ""   ),
                   ("notifycaptcha"  , "bool", "Notify captcha request"                   , True ),
                   ("notifypackage"  , "bool", "Notify package finished"                  , True ),
                   ("notifyprocessed", "bool", "Notify packages processed"                , True ),
@@ -21,9 +21,9 @@ class AndroidPhoneNotify(Addon):
                   ("sendpermin"     , "int" , "Max notifications per minute"             , 12   ),
                   ("ignoreclient"   , "bool", "Send notifications if client is connected", False)]
 
-    __description__ = """Send push notifications to your Android Phone (using notifymyandroid.com)"""
-    __license__     = "GPLv3"
-    __authors__     = [("Steven Kosyra" , "steven.kosyra@gmail.com"),
+    __description = """Send push notifications to your Android Phone (using notifymyandroid.com)"""
+    __license     = "GPLv3"
+    __authors     = [("Steven Kosyra" , "steven.kosyra@gmail.com"),
                        ("Walter Purcaro", "vuolter@gmail.com"      )]
 
 
diff --git a/pyload/plugin/addon/AntiVirus.py b/pyload/plugin/addon/AntiVirus.py
index 619893735..ef0cda79e 100644
--- a/pyload/plugin/addon/AntiVirus.py
+++ b/pyload/plugin/addon/AntiVirus.py
@@ -9,21 +9,21 @@ from pyload.utils import fs_encode, fs_join
 
 
 class AntiVirus(Addon):
-    __name__    = "AntiVirus"
-    __type__    = "addon"
-    __version__ = "0.05"
+    __name    = "AntiVirus"
+    __type    = "addon"
+    __version = "0.05"
 
     #@TODO: add trash option (use Send2Trash lib)
-    __config__ = [("action"    , "Antivirus default;Delete;Quarantine", "Manage infected files"                    , "Antivirus default"),
+    __config = [("action"    , "Antivirus default;Delete;Quarantine", "Manage infected files"                    , "Antivirus default"),
                   ("quardir"   , "folder"                             , "Quarantine folder"                        , ""                 ),
                   ("scanfailed", "bool"                               , "Scan incompleted files (failed downloads)", False              ),
                   ("cmdfile"   , "file"                               , "Antivirus executable"                     , ""                 ),
                   ("cmdargs"   , "str"                                , "Scan options"                             , ""                 ),
                   ("ignore-err", "bool"                               , "Ignore scan errors"                       , False              )]
 
-    __description__ = """Scan downloaded files with antivirus program"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Scan downloaded files with antivirus program"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     @Expose
diff --git a/pyload/plugin/addon/Checksum.py b/pyload/plugin/addon/Checksum.py
index 4b1380506..53b9b4e9f 100644
--- a/pyload/plugin/addon/Checksum.py
+++ b/pyload/plugin/addon/Checksum.py
@@ -38,20 +38,20 @@ def computeChecksum(local_file, algorithm):
 
 
 class Checksum(Addon):
-    __name__    = "Checksum"
-    __type__    = "addon"
-    __version__ = "0.16"
+    __name    = "Checksum"
+    __type    = "addon"
+    __version = "0.16"
 
-    __config__ = [("activated"     , "bool"              , "Activated"                                            , True   ),
+    __config = [("activated"     , "bool"              , "Activated"                                            , True   ),
                 ("check_checksum", "bool"              , "Check checksum? (If False only size will be verified)", True   ),
                 ("check_action"  , "fail;retry;nothing", "What to do if check fails?"                           , "retry"),
                 ("max_tries"     , "int"               , "Number of retries"                                    , 2      ),
                 ("retry_action"  , "fail;nothing"      , "What to do if all retries fail?"                      , "fail" ),
                 ("wait_time"     , "int"               , "Time to wait before each retry (seconds)"             , 1      )]
 
-    __description__ = """Verify downloaded file size and checksum"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg"      , "zoidberg@mujmail.cz"),
+    __description = """Verify downloaded file size and checksum"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg"      , "zoidberg@mujmail.cz"),
                        ("Walter Purcaro", "vuolter@gmail.com"  ),
                        ("stickell"      , "l.stickell@yahoo.it")]
 
diff --git a/pyload/plugin/addon/ClickAndLoad.py b/pyload/plugin/addon/ClickAndLoad.py
index df8d09806..708f7da0b 100644
--- a/pyload/plugin/addon/ClickAndLoad.py
+++ b/pyload/plugin/addon/ClickAndLoad.py
@@ -22,17 +22,17 @@ def forward(source, destination):
 
 #@TODO: IPv6 support
 class ClickAndLoad(Addon):
-    __name__    = "ClickAndLoad"
-    __type__    = "addon"
-    __version__ = "0.41"
+    __name    = "ClickAndLoad"
+    __type    = "addon"
+    __version = "0.41"
 
-    __config__ = [("activated", "bool", "Activated"                             , True),
+    __config = [("activated", "bool", "Activated"                             , True),
                   ("port"     , "int" , "Port"                                  , 9666),
                   ("extern"   , "bool", "Listen on the public network interface", True)]
 
-    __description__ = """Click'n'Load addon plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN"         , "RaNaN@pyload.de"  ),
+    __description = """Click'n'Load addon plugin"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN"         , "RaNaN@pyload.de"  ),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/addon/DeleteFinished.py b/pyload/plugin/addon/DeleteFinished.py
index 989271fa8..2349503f6 100644
--- a/pyload/plugin/addon/DeleteFinished.py
+++ b/pyload/plugin/addon/DeleteFinished.py
@@ -5,17 +5,17 @@ from pyload.plugin.Addon import Addon
 
 
 class DeleteFinished(Addon):
-    __name__    = "DeleteFinished"
-    __type__    = "addon"
-    __version__ = "1.12"
+    __name    = "DeleteFinished"
+    __type    = "addon"
+    __version = "1.12"
 
-    __config__ = [("activated" , "bool", "Activated"                         , "False"),
+    __config = [("activated" , "bool", "Activated"                         , "False"),
                   ("interval"  , "int" , "Delete every (hours)"              , "72"   ),
                   ("deloffline", "bool", "Delete packages with offline links", "False")]
 
-    __description__ = """Automatically delete all finished packages from queue"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Automatically delete all finished packages from queue"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     # event_list = ["pluginConfigChanged"]
@@ -52,7 +52,7 @@ class DeleteFinished(Addon):
     def activate(self):
         self.info['sleep'] = True
         # interval = self.getConfig('interval')
-        # self.pluginConfigChanged(self.__name__, 'interval', interval)
+        # self.pluginConfigChanged(self.__name, 'interval', interval)
         self.interval = max(self.MIN_CHECK_INTERVAL, self.getConfig('interval') * 60 * 60)
         self.addEvent('packageFinished', self.wakeup)
         self.initPeriodical()
diff --git a/pyload/plugin/addon/DownloadScheduler.py b/pyload/plugin/addon/DownloadScheduler.py
index de961cc1f..62cee31c5 100644
--- a/pyload/plugin/addon/DownloadScheduler.py
+++ b/pyload/plugin/addon/DownloadScheduler.py
@@ -7,16 +7,16 @@ from pyload.plugin.Addon import Addon
 
 
 class DownloadScheduler(Addon):
-    __name__    = "DownloadScheduler"
-    __type__    = "addon"
-    __version__ = "0.22"
+    __name    = "DownloadScheduler"
+    __type    = "addon"
+    __version = "0.22"
 
-    __config__ = [("timetable", "str" , "List time periods as hh:mm full or number(kB/s)"      , "0:00 full, 7:00 250, 10:00 0, 17:00 150"),
+    __config = [("timetable", "str" , "List time periods as hh:mm full or number(kB/s)"      , "0:00 full, 7:00 250, 10:00 0, 17:00 150"),
                 ("abort"    , "bool", "Abort active downloads when start period with speed 0", False                                    )]
 
-    __description__ = """Download Scheduler"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """Download Scheduler"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/addon/ExternalScripts.py b/pyload/plugin/addon/ExternalScripts.py
index 502a6dc7b..1ba30323f 100644
--- a/pyload/plugin/addon/ExternalScripts.py
+++ b/pyload/plugin/addon/ExternalScripts.py
@@ -8,16 +8,16 @@ from pyload.utils import fs_encode, fs_join
 
 
 class ExternalScripts(Addon):
-    __name__    = "ExternalScripts"
-    __type__    = "addon"
-    __version__ = "0.37"
+    __name    = "ExternalScripts"
+    __type    = "addon"
+    __version = "0.37"
 
-    __config__ = [("activated", "bool", "Activated"         , True ),
+    __config = [("activated", "bool", "Activated"         , True ),
                   ("waitend"  , "bool", "Wait script ending", False)]
 
-    __description__ = """Run external scripts"""
-    __license__     = "GPLv3"
-    __authors__     = [("mkaay"         , "mkaay@mkaay.de"   ),
+    __description = """Run external scripts"""
+    __license     = "GPLv3"
+    __authors     = [("mkaay"         , "mkaay@mkaay.de"   ),
                        ("RaNaN"         , "ranan@pyload.org" ),
                        ("spoob"         , "spoob@pyload.org" ),
                        ("Walter Purcaro", "vuolter@gmail.com")]
diff --git a/pyload/plugin/addon/ExtractArchive.py b/pyload/plugin/addon/ExtractArchive.py
index 419ca609e..369be11bb 100644
--- a/pyload/plugin/addon/ExtractArchive.py
+++ b/pyload/plugin/addon/ExtractArchive.py
@@ -104,11 +104,11 @@ class ArchiveQueue(object):
 
 
 class ExtractArchive(Addon):
-    __name__    = "ExtractArchive"
-    __type__    = "addon"
-    __version__ = "1.38"
+    __name    = "ExtractArchive"
+    __type    = "addon"
+    __version = "1.38"
 
-    __config__ = [("activated"      , "bool"              , "Activated"                             , True                                                                     ),
+    __config = [("activated"      , "bool"              , "Activated"                             , True                                                                     ),
                   ("fullpath"       , "bool"              , "Extract with full paths"               , True                                                                     ),
                   ("overwrite"      , "bool"              , "Overwrite files"                       , False                                                                    ),
                   ("keepbroken"     , "bool"              , "Try to extract broken archives"        , False                                                                    ),
@@ -125,9 +125,9 @@ class ExtractArchive(Addon):
                   ("waitall"        , "bool"              , "Run after all downloads was processed" , False                                                                    ),
                   ("renice"         , "int"               , "CPU priority"                          , 0                                                                        )]
 
-    __description__ = """Extract different kind of archives"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com"),
+    __description = """Extract different kind of archives"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com"),
                        ("Immenz"        , "immenz@gmx.net"   )]
 
 
@@ -173,7 +173,7 @@ class ExtractArchive(Addon):
                     print_exc()
 
         if self.extractors:
-            self.logInfo(_("Activated") + " " + "|".join("%s %s" % (Extractor.__name__,Extractor.VERSION) for Extractor in self.extractors))
+            self.logInfo(_("Activated") + " " + "|".join("%s %s" % (Extractor.__name,Extractor.VERSION) for Extractor in self.extractors))
             self.extractQueued()  #: Resume unfinished extractions
         else:
             self.logInfo(_("No Extract plugins activated"))
@@ -288,7 +288,7 @@ class ExtractArchive(Addon):
                 for Extractor in self.extractors:
                     targets = Extractor.getTargets(files_ids)
                     if targets:
-                        self.logDebug("Targets for %s: %s" % (Extractor.__name__, targets))
+                        self.logDebug("Targets for %s: %s" % (Extractor.__name, targets))
                         matched = True
 
                     for fname, fid, fout in targets:
diff --git a/pyload/plugin/addon/HotFolder.py b/pyload/plugin/addon/HotFolder.py
index 0137514a8..14d0a7ce3 100644
--- a/pyload/plugin/addon/HotFolder.py
+++ b/pyload/plugin/addon/HotFolder.py
@@ -12,18 +12,18 @@ from pyload.utils import fs_encode, fs_join
 
 
 class HotFolder(Addon):
-    __name__    = "HotFolder"
-    __type__    = "addon"
-    __version__ = "0.14"
+    __name    = "HotFolder"
+    __type    = "addon"
+    __version = "0.14"
 
-    __config__ = [("folder"    , "str" , "Folder to observe"    , "container"),
+    __config = [("folder"    , "str" , "Folder to observe"    , "container"),
                 ("watch_file", "bool", "Observe link file"    , False      ),
                 ("keep"      , "bool", "Keep added containers", True       ),
                 ("file"      , "str" , "Link file"            , "links.txt")]
 
-    __description__ = """Observe folder and file for changes and add container and links"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.de")]
+    __description = """Observe folder and file for changes and add container and links"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.de")]
 
 
     def setup(self):
diff --git a/pyload/plugin/addon/IRCInterface.py b/pyload/plugin/addon/IRCInterface.py
index 6d85a5681..ba5fe1d0f 100644
--- a/pyload/plugin/addon/IRCInterface.py
+++ b/pyload/plugin/addon/IRCInterface.py
@@ -17,11 +17,11 @@ from pyload.utils import formatSize
 
 
 class IRCInterface(Thread, Addon):
-    __name__    = "IRCInterface"
-    __type__    = "addon"
-    __version__ = "0.13"
+    __name    = "IRCInterface"
+    __type    = "addon"
+    __version = "0.13"
 
-    __config__ = [("host"     , "str" , "IRC-Server Address"                           , "Enter your server here!"),
+    __config = [("host"     , "str" , "IRC-Server Address"                           , "Enter your server here!"),
                 ("port"     , "int" , "IRC-Server Port"                              , 6667                     ),
                 ("ident"    , "str" , "Clients ident"                                , "pyload-irc"             ),
                 ("realname" , "str" , "Realname"                                     , "pyload-irc"             ),
@@ -32,9 +32,9 @@ class IRCInterface(Thread, Addon):
                 ("info_pack", "bool", "Inform about every package finished"          , True                     ),
                 ("captcha"  , "bool", "Send captcha requests"                        , True                     )]
 
-    __description__ = """Connect to irc and let owner perform different tasks"""
-    __license__     = "GPLv3"
-    __authors__     = [("Jeix", "Jeix@hasnomail.com")]
+    __description = """Connect to irc and let owner perform different tasks"""
+    __license     = "GPLv3"
+    __authors     = [("Jeix", "Jeix@hasnomail.com")]
 
 
     def __init__(self, core, manager):
diff --git a/pyload/plugin/addon/JustPremium.py b/pyload/plugin/addon/JustPremium.py
index b878f302d..03a2b9261 100644
--- a/pyload/plugin/addon/JustPremium.py
+++ b/pyload/plugin/addon/JustPremium.py
@@ -6,16 +6,16 @@ from pyload.plugin.Addon import Addon
 
 
 class JustPremium(Addon):
-    __name__    = "JustPremium"
-    __type__    = "addon"
-    __version__ = "0.22"
+    __name    = "JustPremium"
+    __type    = "addon"
+    __version = "0.22"
 
-    __config__ = [("excluded", "str", "Exclude hosters (comma separated)", ""),
+    __config = [("excluded", "str", "Exclude hosters (comma separated)", ""),
                   ("included", "str", "Include hosters (comma separated)", "")]
 
-    __description__ = """Remove not-premium links from added urls"""
-    __license__     = "GPLv3"
-    __authors__     = [("mazleu"        , "mazleica@gmail.com"),
+    __description = """Remove not-premium links from added urls"""
+    __license     = "GPLv3"
+    __authors     = [("mazleu"        , "mazleica@gmail.com"),
                        ("Walter Purcaro", "vuolter@gmail.com" ),
                        ("immenz"        , "immenz@gmx.net"    )]
 
diff --git a/pyload/plugin/addon/MergeFiles.py b/pyload/plugin/addon/MergeFiles.py
index e0233af10..87775bea2 100644
--- a/pyload/plugin/addon/MergeFiles.py
+++ b/pyload/plugin/addon/MergeFiles.py
@@ -12,15 +12,15 @@ from pyload.utils import fs_join
 
 
 class MergeFiles(Addon):
-    __name__    = "MergeFiles"
-    __type__    = "addon"
-    __version__ = "0.14"
+    __name    = "MergeFiles"
+    __type    = "addon"
+    __version = "0.14"
 
-    __config__ = [("activated", "bool", "Activated", True)]
+    __config = [("activated", "bool", "Activated", True)]
 
-    __description__ = """Merges parts splitted with hjsplit"""
-    __license__     = "GPLv3"
-    __authors__     = [("and9000", "me@has-no-mail.com")]
+    __description = """Merges parts splitted with hjsplit"""
+    __license     = "GPLv3"
+    __authors     = [("and9000", "me@has-no-mail.com")]
 
 
     BUFFER_SIZE = 4096
diff --git a/pyload/plugin/addon/MultiHome.py b/pyload/plugin/addon/MultiHome.py
index 03974d6c6..458ddbeca 100644
--- a/pyload/plugin/addon/MultiHome.py
+++ b/pyload/plugin/addon/MultiHome.py
@@ -6,15 +6,15 @@ from pyload.plugin.Addon import Addon
 
 
 class MultiHome(Addon):
-    __name__    = "MultiHome"
-    __type__    = "addon"
-    __version__ = "0.12"
+    __name    = "MultiHome"
+    __type    = "addon"
+    __version = "0.12"
 
-    __config__ = [("interfaces", "str", "Interfaces", "None")]
+    __config = [("interfaces", "str", "Interfaces", "None")]
 
-    __description__ = """Ip address changer"""
-    __license__     = "GPLv3"
-    __authors__     = [("mkaay", "mkaay@mkaay.de")]
+    __description = """Ip address changer"""
+    __license     = "GPLv3"
+    __authors     = [("mkaay", "mkaay@mkaay.de")]
 
 
     def setup(self):
diff --git a/pyload/plugin/addon/RestartFailed.py b/pyload/plugin/addon/RestartFailed.py
index c568bfb0a..eaa86ebcb 100644
--- a/pyload/plugin/addon/RestartFailed.py
+++ b/pyload/plugin/addon/RestartFailed.py
@@ -4,16 +4,16 @@ from pyload.plugin.Addon import Addon
 
 
 class RestartFailed(Addon):
-    __name__    = "RestartFailed"
-    __type__    = "addon"
-    __version__ = "1.58"
+    __name    = "RestartFailed"
+    __type    = "addon"
+    __version = "1.58"
 
-    __config__ = [("activated", "bool", "Activated"                , True),
+    __config = [("activated", "bool", "Activated"                , True),
                 ("interval" , "int" , "Check interval in minutes", 90  )]
 
-    __description__ = """Restart all the failed downloads in queue"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Restart all the failed downloads in queue"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     # event_list = ["pluginConfigChanged"]
@@ -38,6 +38,6 @@ class RestartFailed(Addon):
 
 
     def activate(self):
-        # self.pluginConfigChanged(self.__name__, "interval", self.getConfig('interval'))
+        # self.pluginConfigChanged(self.__name, "interval", self.getConfig('interval'))
         self.interval = max(self.MIN_CHECK_INTERVAL, self.getConfig('interval') * 60)
         self.initPeriodical()
diff --git a/pyload/plugin/addon/RestartSlow.py b/pyload/plugin/addon/RestartSlow.py
index 34416e79a..1455fbd42 100644
--- a/pyload/plugin/addon/RestartSlow.py
+++ b/pyload/plugin/addon/RestartSlow.py
@@ -6,19 +6,19 @@ from pyload.plugin.Addon import Addon
 
 
 class RestartSlow(Addon):
-    __name__    = "RestartSlow"
-    __type__    = "addon"
-    __version__ = "0.04"
+    __name    = "RestartSlow"
+    __type    = "addon"
+    __version = "0.04"
 
-    __config__ = [("free_limit"   , "int" ,  "Transfer speed threshold in kilobytes"                     , 100 ),
+    __config = [("free_limit"   , "int" ,  "Transfer speed threshold in kilobytes"                     , 100 ),
                 ("free_time"    , "int" ,  "Sample interval in minutes"                                , 5   ),
                 ("premium_limit", "int" ,  "Transfer speed threshold for premium download in kilobytes", 300 ),
                 ("premium_time" , "int" ,  "Sample interval for premium download in minutes"           , 2   ),
                 ("safe_mode"    , "bool",  "Don't restart if download is not resumable"                , True)]
 
-    __description__ = """Restart slow downloads"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Restart slow downloads"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     event_list = ["downloadStarts"]
diff --git a/pyload/plugin/addon/SkipRev.py b/pyload/plugin/addon/SkipRev.py
index 1c42ddfd8..5209da615 100644
--- a/pyload/plugin/addon/SkipRev.py
+++ b/pyload/plugin/addon/SkipRev.py
@@ -12,16 +12,16 @@ from pyload.plugin.Plugin import SkipDownload
 
 
 class SkipRev(Addon):
-    __name__    = "SkipRev"
-    __type__    = "addon"
-    __version__ = "0.29"
+    __name    = "SkipRev"
+    __type    = "addon"
+    __version = "0.29"
 
-    __config__ = [("mode"     , "Auto;Manual", "Choose recovery archives to skip"               , "Auto"),
+    __config = [("mode"     , "Auto;Manual", "Choose recovery archives to skip"               , "Auto"),
                   ("revtokeep", "int"        , "Number of recovery archives to keep for package", 0     )]
 
-    __description__ = """Skip recovery archives (.rev)"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Skip recovery archives (.rev)"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     @staticmethod
diff --git a/pyload/plugin/addon/UnSkipOnFail.py b/pyload/plugin/addon/UnSkipOnFail.py
index f81066daa..b7496de0b 100644
--- a/pyload/plugin/addon/UnSkipOnFail.py
+++ b/pyload/plugin/addon/UnSkipOnFail.py
@@ -5,15 +5,15 @@ from pyload.plugin.Addon import Addon
 
 
 class UnSkipOnFail(Addon):
-    __name__    = "UnSkipOnFail"
-    __type__    = "addon"
-    __version__ = "0.05"
+    __name    = "UnSkipOnFail"
+    __type    = "addon"
+    __version = "0.05"
 
-    __config__ = [("activated", "bool", "Activated", True)]
+    __config = [("activated", "bool", "Activated", True)]
 
-    __description__ = """Restart skipped duplicates when download fails"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Restart skipped duplicates when download fails"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     def downloadFailed(self, pyfile):
diff --git a/pyload/plugin/addon/UpdateManager.py b/pyload/plugin/addon/UpdateManager.py
index cd8dc9a03..a2b26b618 100644
--- a/pyload/plugin/addon/UpdateManager.py
+++ b/pyload/plugin/addon/UpdateManager.py
@@ -27,11 +27,11 @@ def exists(path):
 
 
 class UpdateManager(Addon):
-    __name__    = "UpdateManager"
-    __type__    = "addon"
-    __version__ = "0.50"
+    __name    = "UpdateManager"
+    __type    = "addon"
+    __version = "0.50"
 
-    __config__ = [("activated"    , "bool", "Activated"                                , True ),
+    __config = [("activated"    , "bool", "Activated"                                , True ),
                   ("checkinterval", "int" , "Check interval in hours"                  , 8    ),
                   ("autorestart"  , "bool", "Auto-restart pyLoad when required"        , True ),
                   ("checkonstart" , "bool", "Check for updates on startup"             , True ),
@@ -39,9 +39,9 @@ class UpdateManager(Addon):
                   ("reloadplugins", "bool", "Monitor plugin code changes in debug mode", True ),
                   ("nodebugupdate", "bool", "Don't update plugins in debug mode"       , False)]
 
-    __description__ = """ Check for updates """
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """ Check for updates """
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
     SERVER_URL         = "http://updatemanager.pyload.org"
     MIN_CHECK_INTERVAL = 3 * 60 * 60  #: 3 hours
@@ -83,15 +83,15 @@ class UpdateManager(Addon):
     def autoreloadPlugins(self):
         """ reload and reindex all modified plugins """
         modules = filter(
-            lambda m: m and (m.__name__.startswith("module.plugins.") or
-                             m.__name__.startswith("userplugins.")) and
-                             m.__name__.count(".") >= 2, sys.modules.itervalues()
+            lambda m: m and (m.__name.startswith("module.plugins.") or
+                             m.__name.startswith("userplugins.")) and
+                             m.__name.count(".") >= 2, sys.modules.itervalues()
         )
 
         reloads = []
 
         for m in modules:
-            root, type, name = m.__name__.rsplit(".", 2)
+            root, type, name = m.__name.rsplit(".", 2)
             id = (type, name)
             if type in self.core.pluginManager.plugins:
                 f = m.__file__.replace(".pyc", ".py")
@@ -169,7 +169,7 @@ class UpdateManager(Addon):
         url    = data[0]
         schema = data[1].split('|')
 
-        VERSION = re.compile(r'__version__.*=.*("|\')([\d.]+)')
+        VERSION = re.compile(r'__version.*=.*("|\')([\d.]+)')
 
         if "BLACKLIST" in data:
             blacklist  = data[data.index('BLACKLIST') + 1:]
diff --git a/pyload/plugin/addon/WindowsPhoneNotify.py b/pyload/plugin/addon/WindowsPhoneNotify.py
index 341e682b2..b1d1c8b0f 100644
--- a/pyload/plugin/addon/WindowsPhoneNotify.py
+++ b/pyload/plugin/addon/WindowsPhoneNotify.py
@@ -7,11 +7,11 @@ from pyload.plugin.Addon import Addon, Expose
 
 
 class WindowsPhoneNotify(Addon):
-    __name__    = "WindowsPhoneNotify"
-    __type__    = "addon"
-    __version__ = "0.09"
+    __name    = "WindowsPhoneNotify"
+    __type    = "addon"
+    __version = "0.09"
 
-    __config__ = [("id"             , "str" , "Push ID"                                  , ""   ),
+    __config = [("id"             , "str" , "Push ID"                                  , ""   ),
                   ("url"            , "str" , "Push url"                                 , ""   ),
                   ("notifycaptcha"  , "bool", "Notify captcha request"                   , True ),
                   ("notifypackage"  , "bool", "Notify package finished"                  , True ),
@@ -22,9 +22,9 @@ class WindowsPhoneNotify(Addon):
                   ("sendpermin"     , "int" , "Max notifications per minute"             , 12   ),
                   ("ignoreclient"   , "bool", "Send notifications if client is connected", False)]
 
-    __description__ = """Send push notifications to Windows Phone"""
-    __license__     = "GPLv3"
-    __authors__     = [("Andy Voigt"    , "phone-support@hotmail.de"),
+    __description = """Send push notifications to Windows Phone"""
+    __license     = "GPLv3"
+    __authors     = [("Andy Voigt"    , "phone-support@hotmail.de"),
                        ("Walter Purcaro", "vuolter@gmail.com"       )]
 
 
diff --git a/pyload/plugin/addon/XMPPInterface.py b/pyload/plugin/addon/XMPPInterface.py
index c0c31c738..2733cfde0 100644
--- a/pyload/plugin/addon/XMPPInterface.py
+++ b/pyload/plugin/addon/XMPPInterface.py
@@ -10,11 +10,11 @@ from pyload.plugin.addon.IRCInterface import IRCInterface
 
 
 class XMPPInterface(IRCInterface, JabberClient):
-    __name__    = "XMPPInterface"
-    __type__    = "addon"
-    __version__ = "0.11"
+    __name    = "XMPPInterface"
+    __type    = "addon"
+    __version = "0.11"
 
-    __config__ = [("jid"      , "str" , "Jabber ID"                           , "user@exmaple-jabber-server.org"         ),
+    __config = [("jid"      , "str" , "Jabber ID"                           , "user@exmaple-jabber-server.org"         ),
                 ("pw"       , "str" , "Password"                            , ""                                       ),
                 ("tls"      , "bool", "Use TLS"                             , False                                    ),
                 ("owners"   , "str" , "List of JIDs accepting commands from", "me@icq-gateway.org;some@msn-gateway.org"),
@@ -22,9 +22,9 @@ class XMPPInterface(IRCInterface, JabberClient):
                 ("info_pack", "bool", "Inform about every package finished" , True                                     ),
                 ("captcha"  , "bool", "Send captcha requests"               , True                                     )]
 
-    __description__ = """Connect to jabber and let owner perform different tasks"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
+    __description = """Connect to jabber and let owner perform different tasks"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org")]
 
 
     implements(IMessageHandlersProvider)
diff --git a/pyload/plugin/captcha/AdYouLike.py b/pyload/plugin/captcha/AdYouLike.py
index d656acb09..42441ee86 100644
--- a/pyload/plugin/captcha/AdYouLike.py
+++ b/pyload/plugin/captcha/AdYouLike.py
@@ -7,13 +7,13 @@ from pyload.utils import json_loads
 
 
 class AdYouLike(Captcha):
-    __name__    = "AdYouLike"
-    __type__    = "captcha"
-    __version__ = "0.05"
+    __name    = "AdYouLike"
+    __type    = "captcha"
+    __version = "0.05"
 
-    __description__ = """AdYouLike captcha service plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """AdYouLike captcha service plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     AYL_PATTERN      = r'Adyoulike\.create\s*\((.+?)\)'
diff --git a/pyload/plugin/captcha/AdsCaptcha.py b/pyload/plugin/captcha/AdsCaptcha.py
index 5b23247c0..a6dcc26fc 100644
--- a/pyload/plugin/captcha/AdsCaptcha.py
+++ b/pyload/plugin/captcha/AdsCaptcha.py
@@ -8,13 +8,13 @@ from pyload.plugin.Captcha import Captcha
 
 
 class AdsCaptcha(Captcha):
-    __name__    = "AdsCaptcha"
-    __type__    = "captcha"
-    __version__ = "0.08"
+    __name    = "AdsCaptcha"
+    __type    = "captcha"
+    __version = "0.08"
 
-    __description__ = """AdsCaptcha captcha service plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team", "admin@pyload.org")]
+    __description = """AdsCaptcha captcha service plugin"""
+    __license     = "GPLv3"
+    __authors     = [("pyLoad Team", "admin@pyload.org")]
 
 
     CAPTCHAID_PATTERN  = r'api\.adscaptcha\.com/Get\.aspx\?[^"\']*CaptchaId=(\d+)'
diff --git a/pyload/plugin/captcha/ReCaptcha.py b/pyload/plugin/captcha/ReCaptcha.py
index 62b82d1d5..4f35ed30b 100644
--- a/pyload/plugin/captcha/ReCaptcha.py
+++ b/pyload/plugin/captcha/ReCaptcha.py
@@ -11,13 +11,13 @@ from pyload.plugin.Captcha import Captcha
 
 
 class ReCaptcha(Captcha):
-    __name__    = "ReCaptcha"
-    __type__    = "captcha"
-    __version__ = "0.14"
+    __name    = "ReCaptcha"
+    __type    = "captcha"
+    __version = "0.14"
 
-    __description__ = """ReCaptcha captcha service plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team", "admin@pyload.org"),
+    __description = """ReCaptcha captcha service plugin"""
+    __license     = "GPLv3"
+    __authors     = [("pyLoad Team", "admin@pyload.org"),
                        ("Walter Purcaro", "vuolter@gmail.com"),
                        ("zapp-brannigan", "fuerst.reinje@web.de")]
 
diff --git a/pyload/plugin/captcha/SolveMedia.py b/pyload/plugin/captcha/SolveMedia.py
index 7f421f490..06df13e7c 100644
--- a/pyload/plugin/captcha/SolveMedia.py
+++ b/pyload/plugin/captcha/SolveMedia.py
@@ -6,13 +6,13 @@ from pyload.plugin.Captcha import Captcha
 
 
 class SolveMedia(Captcha):
-    __name__    = "SolveMedia"
-    __type__    = "captcha"
-    __version__ = "0.12"
+    __name    = "SolveMedia"
+    __type    = "captcha"
+    __version = "0.12"
 
-    __description__ = """SolveMedia captcha service plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team", "admin@pyload.org")]
+    __description = """SolveMedia captcha service plugin"""
+    __license     = "GPLv3"
+    __authors     = [("pyLoad Team", "admin@pyload.org")]
 
 
     KEY_PATTERN = r'api\.solvemedia\.com/papi/challenge\.(?:no)?script\?k=(.+?)["\']'
diff --git a/pyload/plugin/container/CCF.py b/pyload/plugin/container/CCF.py
index 65f96033a..e663264d2 100644
--- a/pyload/plugin/container/CCF.py
+++ b/pyload/plugin/container/CCF.py
@@ -13,15 +13,15 @@ from pyload.utils import fs_encode, fs_join
 
 
 class CCF(Container):
-    __name__    = "CCF"
-    __type__    = "container"
-    __version__ = "0.23"
+    __name    = "CCF"
+    __type    = "container"
+    __version = "0.23"
 
-    __pattern__ = r'.+\.ccf$'
+    __pattern = r'.+\.ccf$'
 
-    __description__ = """CCF container decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Willnix", "Willnix@pyload.org"),
+    __description = """CCF container decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Willnix", "Willnix@pyload.org"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/container/DLC.py b/pyload/plugin/container/DLC.py
index 04dabb6b2..b2bfea30e 100644
--- a/pyload/plugin/container/DLC.py
+++ b/pyload/plugin/container/DLC.py
@@ -12,15 +12,15 @@ from pyload.utils import decode, fs_encode
 
 
 class DLC(Container):
-    __name__    = "DLC"
-    __type__    = "container"
-    __version__ = "0.24"
+    __name    = "DLC"
+    __type    = "container"
+    __version = "0.24"
 
-    __pattern__ = r'.+\.dlc$'
+    __pattern = r'.+\.dlc$'
 
-    __description__ = """DLC container decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+    __description = """DLC container decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org"),
                        ("spoob", "spoob@pyload.org"),
                        ("mkaay", "mkaay@mkaay.de"),
                        ("Schnusch", "Schnusch@users.noreply.github.com"),
diff --git a/pyload/plugin/container/RSDF.py b/pyload/plugin/container/RSDF.py
index e43eb4c2b..6f56ec06a 100644
--- a/pyload/plugin/container/RSDF.py
+++ b/pyload/plugin/container/RSDF.py
@@ -12,15 +12,15 @@ from pyload.utils import fs_encode
 
 
 class RSDF(Container):
-    __name__    = "RSDF"
-    __type__    = "container"
-    __version__ = "0.29"
+    __name    = "RSDF"
+    __type    = "container"
+    __version = "0.29"
 
-    __pattern__ = r'.+\.rsdf$'
+    __pattern = r'.+\.rsdf$'
 
-    __description__ = """RSDF container decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+    __description = """RSDF container decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org"),
                        ("spoob", "spoob@pyload.org"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
diff --git a/pyload/plugin/container/TXT.py b/pyload/plugin/container/TXT.py
index 75940f55d..4ef29c0b7 100644
--- a/pyload/plugin/container/TXT.py
+++ b/pyload/plugin/container/TXT.py
@@ -7,17 +7,17 @@ from pyload.utils import fs_encode
 
 
 class TXT(Container):
-    __name__    = "TXT"
-    __type__    = "container"
-    __version__ = "0.15"
+    __name    = "TXT"
+    __type    = "container"
+    __version = "0.15"
 
-    __pattern__ = r'.+\.(txt|text)$'
-    __config__  = [("flush"   , "bool"  , "Flush list after adding", False  ),
+    __pattern = r'.+\.(txt|text)$'
+    __config  = [("flush"   , "bool"  , "Flush list after adding", False  ),
                  ("encoding", "string", "File encoding"          , "utf-8")]
 
-    __description__ = """Read link lists in plain text formats"""
-    __license__     = "GPLv3"
-    __authors__     = [("spoob", "spoob@pyload.org"),
+    __description = """Read link lists in plain text formats"""
+    __license     = "GPLv3"
+    __authors     = [("spoob", "spoob@pyload.org"),
                      ("jeix", "jeix@hasnomail.com")]
 
 
diff --git a/pyload/plugin/crypter/BitshareCom.py b/pyload/plugin/crypter/BitshareCom.py
index 8458fac3e..2a4d17da1 100644
--- a/pyload/plugin/crypter/BitshareCom.py
+++ b/pyload/plugin/crypter/BitshareCom.py
@@ -4,18 +4,18 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class BitshareCom(SimpleCrypter):
-    __name__    = "BitshareCom"
-    __type__    = "crypter"
-    __version__ = "0.03"
+    __name    = "BitshareCom"
+    __type    = "crypter"
+    __version = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?bitshare\.com/\?d=\w+'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'http://(?:www\.)?bitshare\.com/\?d=\w+'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Bitshare.com folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Bitshare.com folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     LINK_PATTERN = r'<a href="(http://bitshare\.com/files/.+)">.+</a></td>'
diff --git a/pyload/plugin/crypter/C1NeonCom.py b/pyload/plugin/crypter/C1NeonCom.py
index dc1555b46..e0e1bda17 100644
--- a/pyload/plugin/crypter/C1NeonCom.py
+++ b/pyload/plugin/crypter/C1NeonCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class C1NeonCom(DeadCrypter):
-    __name__    = "C1NeonCom"
-    __type__    = "crypter"
-    __version__ = "0.05"
+    __name    = "C1NeonCom"
+    __type    = "crypter"
+    __version = "0.05"
 
-    __pattern__ = r'http://(?:www\.)?c1neon\.com/.+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?c1neon\.com/.+'
+    __config  = []
 
-    __description__ = """C1neon.com decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("godofdream", "soilfiction@gmail.com")]
+    __description = """C1neon.com decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("godofdream", "soilfiction@gmail.com")]
diff --git a/pyload/plugin/crypter/ChipDe.py b/pyload/plugin/crypter/ChipDe.py
index b9f9a6c4d..164531ee5 100644
--- a/pyload/plugin/crypter/ChipDe.py
+++ b/pyload/plugin/crypter/ChipDe.py
@@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class ChipDe(Crypter):
-    __name__    = "ChipDe"
-    __type__    = "crypter"
-    __version__ = "0.10"
+    __name    = "ChipDe"
+    __type    = "crypter"
+    __version = "0.10"
 
-    __pattern__ = r'http://(?:www\.)?chip\.de/video/.+\.html'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'http://(?:www\.)?chip\.de/video/.+\.html'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Chip.de decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("4Christopher", "4Christopher@gmx.de")]
+    __description = """Chip.de decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("4Christopher", "4Christopher@gmx.de")]
 
 
     def decrypt(self, pyfile):
diff --git a/pyload/plugin/crypter/CloudzillaTo.py b/pyload/plugin/crypter/CloudzillaTo.py
index 340892136..0990a1efd 100644
--- a/pyload/plugin/crypter/CloudzillaTo.py
+++ b/pyload/plugin/crypter/CloudzillaTo.py
@@ -8,15 +8,15 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class CloudzillaTo(SimpleHoster):
-    __name__    = "CloudzillaTo"
-    __type__    = "crypter"
-    __version__ = "0.02"
+    __name    = "CloudzillaTo"
+    __type    = "crypter"
+    __version = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?cloudzilla\.to/share/folder/(?P<ID>[\w^_]+)'
+    __pattern = r'http://(?:www\.)?cloudzilla\.to/share/folder/(?P<ID>[\w^_]+)'
 
-    __description__ = """Cloudzilla.to folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Cloudzilla.to folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     INFO_PATTERN    = r'<span class="name" title="(?P<N>.+?)"'
diff --git a/pyload/plugin/crypter/CrockoCom.py b/pyload/plugin/crypter/CrockoCom.py
index f1472a004..26275cb0f 100644
--- a/pyload/plugin/crypter/CrockoCom.py
+++ b/pyload/plugin/crypter/CrockoCom.py
@@ -4,18 +4,18 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class CrockoCom(SimpleCrypter):
-    __name__    = "CrockoCom"
-    __type__    = "crypter"
-    __version__ = "0.01"
+    __name    = "CrockoCom"
+    __type    = "crypter"
+    __version = "0.01"
 
-    __pattern__ = r'http://(?:www\.)?crocko\.com/f/.+'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'http://(?:www\.)?crocko\.com/f/.+'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Crocko.com folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Crocko.com folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     LINK_PATTERN = r'<td class="last"><a href="([^"]+)">download</a>'
diff --git a/pyload/plugin/crypter/CryptItCom.py b/pyload/plugin/crypter/CryptItCom.py
index 0d72cba61..615626f4f 100644
--- a/pyload/plugin/crypter/CryptItCom.py
+++ b/pyload/plugin/crypter/CryptItCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class CryptItCom(DeadCrypter):
-    __name__    = "CryptItCom"
-    __type__    = "crypter"
-    __version__ = "0.11"
+    __name    = "CryptItCom"
+    __type    = "crypter"
+    __version = "0.11"
 
-    __pattern__ = r'http://(?:www\.)?crypt-it\.com/(s|e|d|c)/\w+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?crypt-it\.com/(s|e|d|c)/\w+'
+    __config  = []
 
-    __description__ = """Crypt-it.com decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("jeix", "jeix@hasnomail.de")]
+    __description = """Crypt-it.com decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("jeix", "jeix@hasnomail.de")]
diff --git a/pyload/plugin/crypter/CzshareCom.py b/pyload/plugin/crypter/CzshareCom.py
index 230a038c5..4d03a4f7a 100644
--- a/pyload/plugin/crypter/CzshareCom.py
+++ b/pyload/plugin/crypter/CzshareCom.py
@@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class CzshareCom(Crypter):
-    __name__    = "CzshareCom"
-    __type__    = "crypter"
-    __version__ = "0.20"
+    __name    = "CzshareCom"
+    __type    = "crypter"
+    __version = "0.20"
 
-    __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/folders/.+'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/folders/.+'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Czshare.com folder decrypter plugin, now Sdilej.cz"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Czshare.com folder decrypter plugin, now Sdilej.cz"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     FOLDER_PATTERN = r'<tr class="subdirectory">\s*<td>\s*<table>(.*?)</table>'
diff --git a/pyload/plugin/crypter/DailymotionComFolder.py b/pyload/plugin/crypter/DailymotionComFolder.py
index 3c5000515..2fdb1ec8e 100644
--- a/pyload/plugin/crypter/DailymotionComFolder.py
+++ b/pyload/plugin/crypter/DailymotionComFolder.py
@@ -10,17 +10,17 @@ from pyload.utils import fs_join
 
 
 class DailymotionComFolder(Crypter):
-    __name__    = "DailymotionComFolder"
-    __type__    = "crypter"
-    __version__ = "0.01"
+    __name    = "DailymotionComFolder"
+    __type    = "crypter"
+    __version = "0.01"
 
-    __pattern__ = r'https?://(?:www\.)?dailymotion\.com/((playlists/)?(?P<TYPE>playlist|user)/)?(?P<ID>[\w^_]+)(?(TYPE)|#)'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'https?://(?:www\.)?dailymotion\.com/((playlists/)?(?P<TYPE>playlist|user)/)?(?P<ID>[\w^_]+)(?(TYPE)|#)'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Dailymotion.com channel & playlist decrypter"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Dailymotion.com channel & playlist decrypter"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     def api_response(self, ref, req=None):
@@ -83,7 +83,7 @@ class DailymotionComFolder(Crypter):
 
 
     def decrypt(self, pyfile):
-        m = re.match(self.__pattern__, pyfile.url)
+        m = re.match(self.__pattern, pyfile.url)
         m_id = m.group('ID')
         m_type = m.group('TYPE')
 
diff --git a/pyload/plugin/crypter/DataHu.py b/pyload/plugin/crypter/DataHu.py
index a2e5d4721..dd817b5ce 100644
--- a/pyload/plugin/crypter/DataHu.py
+++ b/pyload/plugin/crypter/DataHu.py
@@ -6,18 +6,18 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class DataHu(SimpleCrypter):
-    __name__    = "DataHu"
-    __type__    = "crypter"
-    __version__ = "0.06"
+    __name    = "DataHu"
+    __type    = "crypter"
+    __version = "0.06"
 
-    __pattern__ = r'http://(?:www\.)?data\.hu/dir/\w+'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'http://(?:www\.)?data\.hu/dir/\w+'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Data.hu folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("crash", ""),
+    __description = """Data.hu folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("crash", ""),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/crypter/DdlstorageCom.py b/pyload/plugin/crypter/DdlstorageCom.py
index f3744e15d..e3e1f1956 100644
--- a/pyload/plugin/crypter/DdlstorageCom.py
+++ b/pyload/plugin/crypter/DdlstorageCom.py
@@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class DdlstorageCom(DeadCrypter):
-    __name__    = "DdlstorageCom"
-    __type__    = "crypter"
-    __version__ = "0.03"
+    __name    = "DdlstorageCom"
+    __type    = "crypter"
+    __version = "0.03"
 
-    __pattern__ = r'https?://(?:www\.)?ddlstorage\.com/folder/\w+'
-    __config__  = []
+    __pattern = r'https?://(?:www\.)?ddlstorage\.com/folder/\w+'
+    __config  = []
 
-    __description__ = """DDLStorage.com folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("godofdream", "soilfiction@gmail.com"),
+    __description = """DDLStorage.com folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("godofdream", "soilfiction@gmail.com"),
                        ("stickell", "l.stickell@yahoo.it")]
diff --git a/pyload/plugin/crypter/DepositfilesCom.py b/pyload/plugin/crypter/DepositfilesCom.py
index a66136ab3..a2a28afa0 100644
--- a/pyload/plugin/crypter/DepositfilesCom.py
+++ b/pyload/plugin/crypter/DepositfilesCom.py
@@ -4,18 +4,18 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class DepositfilesCom(SimpleCrypter):
-    __name__    = "DepositfilesCom"
-    __type__    = "crypter"
-    __version__ = "0.01"
+    __name    = "DepositfilesCom"
+    __type    = "crypter"
+    __version = "0.01"
 
-    __pattern__ = r'http://(?:www\.)?depositfiles\.com/folders/\w+'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'http://(?:www\.)?depositfiles\.com/folders/\w+'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Depositfiles.com folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Depositfiles.com folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     LINK_PATTERN = r'<div class="progressName"[^>]*>\s*<a href="([^"]+)" title="[^"]*" target="_blank">'
diff --git a/pyload/plugin/crypter/Dereferer.py b/pyload/plugin/crypter/Dereferer.py
index 50e1257cc..b4b52f278 100644
--- a/pyload/plugin/crypter/Dereferer.py
+++ b/pyload/plugin/crypter/Dereferer.py
@@ -4,14 +4,14 @@ from pyload.plugin.Crypter import Crypter
 
 
 class Dereferer(SimpleDereferer):
-    __name__    = "Dereferer"
-    __type__    = "crypter"
-    __version__ = "0.11"
+    __name    = "Dereferer"
+    __type    = "crypter"
+    __version = "0.11"
 
-    __pattern__ = r'https?://([^/]+)/.*?(?P<LINK>(ht|f)tps?(://|%3A%2F%2F).+)'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'https?://([^/]+)/.*?(?P<LINK>(ht|f)tps?(://|%3A%2F%2F).+)'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Crypter for dereferers"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Crypter for dereferers"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/crypter/DevhostSt.py b/pyload/plugin/crypter/DevhostSt.py
index f06c8da30..1746e03ae 100644
--- a/pyload/plugin/crypter/DevhostSt.py
+++ b/pyload/plugin/crypter/DevhostSt.py
@@ -11,18 +11,18 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class DevhostSt(SimpleCrypter):
-    __name__    = "DevhostSt"
-    __type__    = "crypter"
-    __version__ = "0.05"
+    __name    = "DevhostSt"
+    __type    = "crypter"
+    __version = "0.05"
 
-    __pattern__ = r'http://(?:www\.)?d-h\.st/users/(?P<USER>\w+)(/\?fld_id=(?P<ID>\d+))?'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'http://(?:www\.)?d-h\.st/users/(?P<USER>\w+)(/\?fld_id=(?P<ID>\d+))?'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """d-h.st folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de"),
+    __description = """d-h.st folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/crypter/DlProtectCom.py b/pyload/plugin/crypter/DlProtectCom.py
index 081db7067..eae6d1d83 100644
--- a/pyload/plugin/crypter/DlProtectCom.py
+++ b/pyload/plugin/crypter/DlProtectCom.py
@@ -9,18 +9,18 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class DlProtectCom(SimpleCrypter):
-    __name__    = "DlProtectCom"
-    __type__    = "crypter"
-    __version__ = "0.03"
+    __name    = "DlProtectCom"
+    __type    = "crypter"
+    __version = "0.03"
 
-    __pattern__ = r'https?://(?:www\.)?dl-protect\.com/((en|fr)/)?\w+'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'https?://(?:www\.)?dl-protect\.com/((en|fr)/)?\w+'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Dl-protect.com decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Dl-protect.com decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     COOKIES = [("dl-protect.com", "l", "en")]
diff --git a/pyload/plugin/crypter/DontKnowMe.py b/pyload/plugin/crypter/DontKnowMe.py
index b0684ae8a..e4edd8129 100644
--- a/pyload/plugin/crypter/DontKnowMe.py
+++ b/pyload/plugin/crypter/DontKnowMe.py
@@ -4,14 +4,14 @@ from pyload.plugin.Crypter import Crypter
 
 
 class DontKnowMe(SimpleDereferer):
-    __name__    = "DontKnowMe"
-    __type__    = "crypter"
-    __version__ = "0.11"
+    __name    = "DontKnowMe"
+    __type    = "crypter"
+    __version = "0.11"
 
-    __pattern__ = r'http://(?:www\.)?dontknow\.me/at/\?(?P<LINK>.+)'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'http://(?:www\.)?dontknow\.me/at/\?(?P<LINK>.+)'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """DontKnow.me decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("selaux", "")]
+    __description = """DontKnow.me decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("selaux", "")]
diff --git a/pyload/plugin/crypter/DuckCryptInfo.py b/pyload/plugin/crypter/DuckCryptInfo.py
index 04a7d3ea2..3463d44f9 100644
--- a/pyload/plugin/crypter/DuckCryptInfo.py
+++ b/pyload/plugin/crypter/DuckCryptInfo.py
@@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class DuckCryptInfo(Crypter):
-    __name__    = "DuckCryptInfo"
-    __type__    = "crypter"
-    __version__ = "0.02"
+    __name    = "DuckCryptInfo"
+    __type    = "crypter"
+    __version = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?duckcrypt\.info/(folder|wait|link)/(\w+)/?(\w*)'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'http://(?:www\.)?duckcrypt\.info/(folder|wait|link)/(\w+)/?(\w*)'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """DuckCrypt.info decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("godofdream", "soilfiction@gmail.com")]
+    __description = """DuckCrypt.info decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("godofdream", "soilfiction@gmail.com")]
 
 
     TIMER_PATTERN = r'<span id="timer">(.*)</span>'
@@ -27,7 +27,7 @@ class DuckCryptInfo(Crypter):
     def decrypt(self, pyfile):
         url = pyfile.url
 
-        m = re.match(self.__pattern__, url)
+        m = re.match(self.__pattern, url)
         if m is None:
             self.fail(_("Weird error in link"))
         if str(m.group(1)) == "link":
@@ -38,7 +38,7 @@ class DuckCryptInfo(Crypter):
 
     def handleFolder(self, m):
         html = self.load("http://duckcrypt.info/ajax/auth.php?hash=" + str(m.group(2)))
-        m = re.match(self.__pattern__, html)
+        m = re.match(self.__pattern, html)
         self.logDebug("Redirectet to " + str(m.group(0)))
         html = self.load(str(m.group(0)))
         soup = BeautifulSoup(html)
diff --git a/pyload/plugin/crypter/DuploadOrg.py b/pyload/plugin/crypter/DuploadOrg.py
index f92eb2ede..445318ccc 100644
--- a/pyload/plugin/crypter/DuploadOrg.py
+++ b/pyload/plugin/crypter/DuploadOrg.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class DuploadOrg(DeadCrypter):
-    __name__    = "DuploadOrg"
-    __type__    = "crypter"
-    __version__ = "0.02"
+    __name    = "DuploadOrg"
+    __type    = "crypter"
+    __version = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?dupload\.org/folder/\d+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?dupload\.org/folder/\d+'
+    __config  = []
 
-    __description__ = """Dupload.org folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Dupload.org folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
diff --git a/pyload/plugin/crypter/EasybytezCom.py b/pyload/plugin/crypter/EasybytezCom.py
index 74fd5ad6a..06a958729 100644
--- a/pyload/plugin/crypter/EasybytezCom.py
+++ b/pyload/plugin/crypter/EasybytezCom.py
@@ -4,17 +4,17 @@ from pyload.plugin.internal.XFSCrypter import XFSCrypter
 
 
 class EasybytezCom(XFSCrypter):
-    __name__    = "EasybytezCom"
-    __type__    = "crypter"
-    __version__ = "0.10"
+    __name    = "EasybytezCom"
+    __type    = "crypter"
+    __version = "0.10"
 
-    __pattern__ = r'http://(?:www\.)?easybytez\.com/users/\d+/\d+'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'http://(?:www\.)?easybytez\.com/users/\d+/\d+'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Easybytez.com folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Easybytez.com folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     LOGIN_ACCOUNT = True
diff --git a/pyload/plugin/crypter/EmbeduploadCom.py b/pyload/plugin/crypter/EmbeduploadCom.py
index 06d71e21b..85b48b258 100644
--- a/pyload/plugin/crypter/EmbeduploadCom.py
+++ b/pyload/plugin/crypter/EmbeduploadCom.py
@@ -6,19 +6,19 @@ from pyload.network.HTTPRequest import BadHeader
 
 
 class EmbeduploadCom(Crypter):
-    __name__    = "EmbeduploadCom"
-    __type__    = "crypter"
-    __version__ = "0.02"
+    __name    = "EmbeduploadCom"
+    __type    = "crypter"
+    __version = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?embedupload\.com/\?d=.+'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"           , True         ),
+    __pattern = r'http://(?:www\.)?embedupload\.com/\?d=.+'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"           , True         ),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package" , True         ),
                    ("preferedHoster"    , "str" , "Prefered hoster list (bar-separated)", "embedupload"),
                    ("ignoredHoster"     , "str" , "Ignored hoster list (bar-separated)" , ""           )]
 
-    __description__ = """EmbedUpload.com decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """EmbedUpload.com decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     LINK_PATTERN = r'<div id="([^"]+)"[^>]*>\s*<a href="([^"]+)" target="_blank" (?:class="DownloadNow"|style="color:red")>'
diff --git a/pyload/plugin/crypter/FilebeerInfo.py b/pyload/plugin/crypter/FilebeerInfo.py
index e2e0e1e3c..5ec059375 100644
--- a/pyload/plugin/crypter/FilebeerInfo.py
+++ b/pyload/plugin/crypter/FilebeerInfo.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class FilebeerInfo(DeadCrypter):
-    __name__    = "FilebeerInfo"
-    __type__    = "crypter"
-    __version__ = "0.02"
+    __name    = "FilebeerInfo"
+    __type    = "crypter"
+    __version = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?filebeer\.info/\d*~f\w+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?filebeer\.info/\d*~f\w+'
+    __config  = []
 
-    __description__ = """Filebeer.info folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Filebeer.info folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/crypter/FilecloudIo.py b/pyload/plugin/crypter/FilecloudIo.py
index 1518fe813..91e7dfc3a 100644
--- a/pyload/plugin/crypter/FilecloudIo.py
+++ b/pyload/plugin/crypter/FilecloudIo.py
@@ -4,18 +4,18 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class FilecloudIo(SimpleCrypter):
-    __name__    = "FilecloudIo"
-    __type__    = "crypter"
-    __version__ = "0.03"
+    __name    = "FilecloudIo"
+    __type    = "crypter"
+    __version = "0.03"
 
-    __pattern__ = r'https?://(?:www\.)?(filecloud\.io|ifile\.it)/_\w+'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'https?://(?:www\.)?(filecloud\.io|ifile\.it)/_\w+'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Filecloud.io folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Filecloud.io folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     LINK_PATTERN = r'href="(http://filecloud\.io/\w+)" title'
diff --git a/pyload/plugin/crypter/FilecryptCc.py b/pyload/plugin/crypter/FilecryptCc.py
index 1d8388dcd..52242902e 100644
--- a/pyload/plugin/crypter/FilecryptCc.py
+++ b/pyload/plugin/crypter/FilecryptCc.py
@@ -14,15 +14,15 @@ from pyload.plugin.captcha.ReCaptcha import ReCaptcha
 
 
 class FilecryptCc(Crypter):
-    __name__    = "FilecryptCc"
-    __type__    = "crypter"
-    __version__ = "0.11"
+    __name    = "FilecryptCc"
+    __type    = "crypter"
+    __version = "0.11"
 
-    __pattern__ = r'https?://(?:www\.)?filecrypt\.cc/Container/\w+'
+    __pattern = r'https?://(?:www\.)?filecrypt\.cc/Container/\w+'
 
-    __description__ = """Filecrypt.cc decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]
+    __description = """Filecrypt.cc decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
     # URL_REPLACEMENTS  = [(r'.html$', ""), (r'$', ".html")]  #@TODO: Extend SimpleCrypter
diff --git a/pyload/plugin/crypter/FilefactoryCom.py b/pyload/plugin/crypter/FilefactoryCom.py
index 05d631ffe..0b6290273 100644
--- a/pyload/plugin/crypter/FilefactoryCom.py
+++ b/pyload/plugin/crypter/FilefactoryCom.py
@@ -4,18 +4,18 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class FilefactoryCom(SimpleCrypter):
-    __name__    = "FilefactoryCom"
-    __type__    = "crypter"
-    __version__ = "0.32"
+    __name    = "FilefactoryCom"
+    __type    = "crypter"
+    __version = "0.32"
 
-    __pattern__ = r'https?://(?:www\.)?filefactory\.com/(?:f|folder)/\w+'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'https?://(?:www\.)?filefactory\.com/(?:f|folder)/\w+'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Filefactory.com folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Filefactory.com folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     COOKIES = [("filefactory.com", "locale", "en_US.utf8")]
diff --git a/pyload/plugin/crypter/FilerNet.py b/pyload/plugin/crypter/FilerNet.py
index ea6eb9e49..6ff4c279c 100644
--- a/pyload/plugin/crypter/FilerNet.py
+++ b/pyload/plugin/crypter/FilerNet.py
@@ -4,18 +4,18 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class FilerNet(SimpleCrypter):
-    __name__    = "FilerNet"
-    __type__    = "crypter"
-    __version__ = "0.42"
+    __name    = "FilerNet"
+    __type    = "crypter"
+    __version = "0.42"
 
-    __pattern__ = r'https?://filer\.net/folder/\w{16}'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'https?://filer\.net/folder/\w{16}'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Filer.net decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("nath_schwarz", "nathan.notwhite@gmail.com"),
+    __description = """Filer.net decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("nath_schwarz", "nathan.notwhite@gmail.com"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/crypter/FileserveCom.py b/pyload/plugin/crypter/FileserveCom.py
index f68f8e98c..f442b0bb6 100644
--- a/pyload/plugin/crypter/FileserveCom.py
+++ b/pyload/plugin/crypter/FileserveCom.py
@@ -6,17 +6,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class FileserveCom(Crypter):
-    __name__    = "FileserveCom"
-    __type__    = "crypter"
-    __version__ = "0.11"
+    __name    = "FileserveCom"
+    __type    = "crypter"
+    __version = "0.11"
 
-    __pattern__ = r'http://(?:www\.)?fileserve\.com/list/\w+'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'http://(?:www\.)?fileserve\.com/list/\w+'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """FileServe.com folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("fionnc", "fionnc@gmail.com")]
+    __description = """FileServe.com folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("fionnc", "fionnc@gmail.com")]
 
 
     FOLDER_PATTERN = r'<table class="file_list">(.*?)</table>'
diff --git a/pyload/plugin/crypter/FilesonicCom.py b/pyload/plugin/crypter/FilesonicCom.py
index 60a6bc8be..5114d03b8 100644
--- a/pyload/plugin/crypter/FilesonicCom.py
+++ b/pyload/plugin/crypter/FilesonicCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class FilesonicCom(DeadCrypter):
-    __name__    = "FilesonicCom"
-    __type__    = "crypter"
-    __version__ = "0.12"
+    __name    = "FilesonicCom"
+    __type    = "crypter"
+    __version = "0.12"
 
-    __pattern__ = r'http://(?:www\.)?filesonic\.com/folder/\w+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?filesonic\.com/folder/\w+'
+    __config  = []
 
-    __description__ = """Filesonic.com folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Filesonic.com folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/crypter/FilestubeCom.py b/pyload/plugin/crypter/FilestubeCom.py
index 7774d248e..fadeddedc 100644
--- a/pyload/plugin/crypter/FilestubeCom.py
+++ b/pyload/plugin/crypter/FilestubeCom.py
@@ -4,18 +4,18 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class FilestubeCom(SimpleCrypter):
-    __name__    = "FilestubeCom"
-    __type__    = "crypter"
-    __version__ = "0.05"
+    __name    = "FilestubeCom"
+    __type    = "crypter"
+    __version = "0.05"
 
-    __pattern__ = r'http://(?:www\.)?filestube\.(?:com|to)/\w+'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'http://(?:www\.)?filestube\.(?:com|to)/\w+'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Filestube.com decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Filestube.com decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     LINK_PATTERN = r'<a class=\"file-link-main(?: noref)?\" [^>]* href=\"(http://[^\"]+)'
diff --git a/pyload/plugin/crypter/FiletramCom.py b/pyload/plugin/crypter/FiletramCom.py
index 47c8a7f54..4d6e898b4 100644
--- a/pyload/plugin/crypter/FiletramCom.py
+++ b/pyload/plugin/crypter/FiletramCom.py
@@ -4,18 +4,18 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class FiletramCom(SimpleCrypter):
-    __name__    = "FiletramCom"
-    __type__    = "crypter"
-    __version__ = "0.03"
+    __name    = "FiletramCom"
+    __type    = "crypter"
+    __version = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?filetram\.com/[^/]+/.+'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'http://(?:www\.)?filetram\.com/[^/]+/.+'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Filetram.com decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("igel", "igelkun@myopera.com"),
+    __description = """Filetram.com decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("igel", "igelkun@myopera.com"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/crypter/FiredriveCom.py b/pyload/plugin/crypter/FiredriveCom.py
index e258ed42f..be3a9ebdb 100644
--- a/pyload/plugin/crypter/FiredriveCom.py
+++ b/pyload/plugin/crypter/FiredriveCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class FiredriveCom(DeadCrypter):
-    __name__    = "FiredriveCom"
-    __type__    = "crypter"
-    __version__ = "0.03"
+    __name    = "FiredriveCom"
+    __type    = "crypter"
+    __version = "0.03"
 
-    __pattern__ = r'https?://(?:www\.)?(firedrive|putlocker)\.com/share/.+'
-    __config__  = []
+    __pattern = r'https?://(?:www\.)?(firedrive|putlocker)\.com/share/.+'
+    __config  = []
 
-    __description__ = """Firedrive.com folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Firedrive.com folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
diff --git a/pyload/plugin/crypter/FourChanOrg.py b/pyload/plugin/crypter/FourChanOrg.py
index 68d1e4a31..880fd36a3 100644
--- a/pyload/plugin/crypter/FourChanOrg.py
+++ b/pyload/plugin/crypter/FourChanOrg.py
@@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class FourChanOrg(Crypter):
-    __name__    = "FourChanOrg"
-    __type__    = "crypter"
-    __version__ = "0.31"
+    __name    = "FourChanOrg"
+    __type    = "crypter"
+    __version = "0.31"
 
-    __pattern__ = r'http://(?:www\.)?boards\.4chan\.org/\w+/res/(\d+)'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'http://(?:www\.)?boards\.4chan\.org/\w+/res/(\d+)'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """4chan.org folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = []
+    __description = """4chan.org folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = []
 
 
     def decrypt(self, pyfile):
diff --git a/pyload/plugin/crypter/FreakhareCom.py b/pyload/plugin/crypter/FreakhareCom.py
index 700c85f07..578007abe 100644
--- a/pyload/plugin/crypter/FreakhareCom.py
+++ b/pyload/plugin/crypter/FreakhareCom.py
@@ -6,18 +6,18 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class FreakhareCom(SimpleCrypter):
-    __name__    = "FreakhareCom"
-    __type__    = "crypter"
-    __version__ = "0.03"
+    __name    = "FreakhareCom"
+    __type    = "crypter"
+    __version = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?freakshare\.com/folder/.+'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'http://(?:www\.)?freakshare\.com/folder/.+'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Freakhare.com folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Freakhare.com folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     LINK_PATTERN = r'<a href="(http://freakshare\.com/files/[^"]+)" target="_blank">'
diff --git a/pyload/plugin/crypter/FreetexthostCom.py b/pyload/plugin/crypter/FreetexthostCom.py
index b6f8998b9..1f82c8ffa 100644
--- a/pyload/plugin/crypter/FreetexthostCom.py
+++ b/pyload/plugin/crypter/FreetexthostCom.py
@@ -6,18 +6,18 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class FreetexthostCom(SimpleCrypter):
-    __name__    = "FreetexthostCom"
-    __type__    = "crypter"
-    __version__ = "0.01"
+    __name    = "FreetexthostCom"
+    __type    = "crypter"
+    __version = "0.01"
 
-    __pattern__ = r'http://(?:www\.)?freetexthost\.com/\w+'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'http://(?:www\.)?freetexthost\.com/\w+'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Freetexthost.com decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Freetexthost.com decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     def getLinks(self):
diff --git a/pyload/plugin/crypter/FshareVn.py b/pyload/plugin/crypter/FshareVn.py
index 31523d78f..f31746190 100644
--- a/pyload/plugin/crypter/FshareVn.py
+++ b/pyload/plugin/crypter/FshareVn.py
@@ -4,18 +4,18 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class FshareVn(SimpleCrypter):
-    __name__    = "FshareVn"
-    __type__    = "crypter"
-    __version__ = "0.01"
+    __name    = "FshareVn"
+    __type    = "crypter"
+    __version = "0.01"
 
-    __pattern__ = r'http://(?:www\.)?fshare\.vn/folder/.+'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'http://(?:www\.)?fshare\.vn/folder/.+'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Fshare.vn folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Fshare.vn folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     LINK_PATTERN = r'<li class="w_80pc"><a href="([^"]+)" target="_blank">'
diff --git a/pyload/plugin/crypter/Go4UpCom.py b/pyload/plugin/crypter/Go4UpCom.py
index 0aa252ae3..d20233b99 100644
--- a/pyload/plugin/crypter/Go4UpCom.py
+++ b/pyload/plugin/crypter/Go4UpCom.py
@@ -8,18 +8,18 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class Go4UpCom(SimpleCrypter):
-    __name__    = "Go4UpCom"
-    __type__    = "crypter"
-    __version__ = "0.11"
+    __name    = "Go4UpCom"
+    __type    = "crypter"
+    __version = "0.11"
 
-    __pattern__ = r'http://go4up\.com/(dl/\w{12}|rd/\w{12}/\d+)'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'http://go4up\.com/(dl/\w{12}|rd/\w{12}/\d+)'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Go4Up.com decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("rlindner81", "rlindner81@gmail.com"),
+    __description = """Go4Up.com decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("rlindner81", "rlindner81@gmail.com"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/crypter/GooGl.py b/pyload/plugin/crypter/GooGl.py
index ed01f047f..552a9ea01 100644
--- a/pyload/plugin/crypter/GooGl.py
+++ b/pyload/plugin/crypter/GooGl.py
@@ -5,17 +5,17 @@ from pyload.utils import json_loads
 
 
 class GooGl(Crypter):
-    __name__    = "GooGl"
-    __type__    = "crypter"
-    __version__ = "0.01"
+    __name    = "GooGl"
+    __type    = "crypter"
+    __version = "0.01"
 
-    __pattern__ = r'https?://(?:www\.)?goo\.gl/\w+'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'https?://(?:www\.)?goo\.gl/\w+'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Goo.gl decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Goo.gl decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     API_URL = "https://www.googleapis.com/urlshortener/v1/url"
diff --git a/pyload/plugin/crypter/HoerbuchIn.py b/pyload/plugin/crypter/HoerbuchIn.py
index 6f5aa842f..500dad8cc 100644
--- a/pyload/plugin/crypter/HoerbuchIn.py
+++ b/pyload/plugin/crypter/HoerbuchIn.py
@@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class HoerbuchIn(Crypter):
-    __name__    = "HoerbuchIn"
-    __type__    = "crypter"
-    __version__ = "0.60"
+    __name    = "HoerbuchIn"
+    __type    = "crypter"
+    __version = "0.60"
 
-    __pattern__ = r'http://(?:www\.)?hoerbuch\.in/(wp/horbucher/\d+/.+/|tp/out\.php\?.+|protection/folder_\d+\.html)'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'http://(?:www\.)?hoerbuch\.in/(wp/horbucher/\d+/.+/|tp/out\.php\?.+|protection/folder_\d+\.html)'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Hoerbuch.in decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("spoob", "spoob@pyload.org"),
+    __description = """Hoerbuch.in decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("spoob", "spoob@pyload.org"),
                        ("mkaay", "mkaay@mkaay.de")]
 
 
diff --git a/pyload/plugin/crypter/HotfileCom.py b/pyload/plugin/crypter/HotfileCom.py
index 8085aa797..8fc10cf88 100644
--- a/pyload/plugin/crypter/HotfileCom.py
+++ b/pyload/plugin/crypter/HotfileCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class HotfileCom(DeadCrypter):
-    __name__    = "HotfileCom"
-    __type__    = "crypter"
-    __version__ = "0.30"
+    __name    = "HotfileCom"
+    __type    = "crypter"
+    __version = "0.30"
 
-    __pattern__ = r'https?://(?:www\.)?hotfile\.com/list/\w+/\w+'
-    __config__  = []
+    __pattern = r'https?://(?:www\.)?hotfile\.com/list/\w+/\w+'
+    __config  = []
 
-    __description__ = """Hotfile.com folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
+    __description = """Hotfile.com folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org")]
diff --git a/pyload/plugin/crypter/ILoadTo.py b/pyload/plugin/crypter/ILoadTo.py
index f333e262f..e00a88743 100644
--- a/pyload/plugin/crypter/ILoadTo.py
+++ b/pyload/plugin/crypter/ILoadTo.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class ILoadTo(DeadCrypter):
-    __name__    = "ILoadTo"
-    __type__    = "crypter"
-    __version__ = "0.11"
+    __name    = "ILoadTo"
+    __type    = "crypter"
+    __version = "0.11"
 
-    __pattern__ = r'http://(?:www\.)?iload\.to/go/\d+-[\w.-]+/'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?iload\.to/go/\d+-[\w.-]+/'
+    __config  = []
 
-    __description__ = """Iload.to decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("hzpz", "")]
+    __description = """Iload.to decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("hzpz", "")]
diff --git a/pyload/plugin/crypter/ImgurComAlbum.py b/pyload/plugin/crypter/ImgurComAlbum.py
index 89606716b..33a5553f9 100644
--- a/pyload/plugin/crypter/ImgurComAlbum.py
+++ b/pyload/plugin/crypter/ImgurComAlbum.py
@@ -5,18 +5,18 @@ from pyload.utils import uniqify
 
 
 class ImgurComAlbum(SimpleCrypter):
-    __name__    = "ImgurComAlbum"
-    __type__    = "crypter"
-    __version__ = "0.51"
+    __name    = "ImgurComAlbum"
+    __type    = "crypter"
+    __version = "0.51"
 
-    __pattern__ = r'https?://(?:www\.|m\.)?imgur\.com/(a|gallery|)/?\w{5,7}'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'https?://(?:www\.|m\.)?imgur\.com/(a|gallery|)/?\w{5,7}'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Imgur.com decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("nath_schwarz", "nathan.notwhite@gmail.com")]
+    __description = """Imgur.com decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("nath_schwarz", "nathan.notwhite@gmail.com")]
 
 
     NAME_PATTERN = r'(?P<N>.+?) - Imgur'
diff --git a/pyload/plugin/crypter/LetitbitNet.py b/pyload/plugin/crypter/LetitbitNet.py
index 5d19cca8e..c17afdb80 100644
--- a/pyload/plugin/crypter/LetitbitNet.py
+++ b/pyload/plugin/crypter/LetitbitNet.py
@@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class LetitbitNet(Crypter):
-    __name__    = "LetitbitNet"
-    __type__    = "crypter"
-    __version__ = "0.10"
+    __name    = "LetitbitNet"
+    __type    = "crypter"
+    __version = "0.10"
 
-    __pattern__ = r'http://(?:www\.)?letitbit\.net/folder/\w+'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'http://(?:www\.)?letitbit\.net/folder/\w+'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Letitbit.net folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("DHMH", "webmaster@pcProfil.de"),
+    __description = """Letitbit.net folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("DHMH", "webmaster@pcProfil.de"),
                        ("z00nx", "z00nx0@gmail.com")]
 
 
diff --git a/pyload/plugin/crypter/LinkCryptWs.py b/pyload/plugin/crypter/LinkCryptWs.py
index a3eb4f179..8e5ea2a03 100644
--- a/pyload/plugin/crypter/LinkCryptWs.py
+++ b/pyload/plugin/crypter/LinkCryptWs.py
@@ -12,15 +12,15 @@ from pyload.utils import html_unescape
 
 
 class LinkCryptWs(Crypter):
-    __name__    = "LinkCryptWs"
-    __type__    = "crypter"
-    __version__ = "0.08"
+    __name    = "LinkCryptWs"
+    __type    = "crypter"
+    __version = "0.08"
 
-    __pattern__ = r'http://(?:www\.)?linkcrypt\.ws/(dir|container)/(?P<ID>\w+)'
+    __pattern = r'http://(?:www\.)?linkcrypt\.ws/(dir|container)/(?P<ID>\w+)'
 
-    __description__ = """LinkCrypt.ws decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("kagenoshin", "kagenoshin[AT]gmx[DOT]ch"),
+    __description = """LinkCrypt.ws decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("kagenoshin", "kagenoshin[AT]gmx[DOT]ch"),
                        ("glukgluk", ""),
                        ("Gummibaer", "")]
 
@@ -37,7 +37,7 @@ class LinkCryptWs(Crypter):
 
     def prepare(self):
         # Init
-        self.fileid = re.match(self.__pattern__, self.pyfile.url).group('ID')
+        self.fileid = re.match(self.__pattern, self.pyfile.url).group('ID')
 
         self.req.cj.setCookie("linkcrypt.ws", "language", "en")
 
diff --git a/pyload/plugin/crypter/LinkSaveIn.py b/pyload/plugin/crypter/LinkSaveIn.py
index 752eee390..8c6f0b001 100644
--- a/pyload/plugin/crypter/LinkSaveIn.py
+++ b/pyload/plugin/crypter/LinkSaveIn.py
@@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleDereferer import SimpleDereferer
 
 
 class LinkSaveIn(SimpleDereferer):
-    __name__    = "LinkSaveIn"
-    __type__    = "crypter"
-    __version__ = "2.03"
+    __name    = "LinkSaveIn"
+    __type    = "crypter"
+    __version = "2.03"
 
-    __pattern__ = r'https?://(?:www\.)?linksave\.in/\w+'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'https?://(?:www\.)?linksave\.in/\w+'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """LinkSave.in decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """LinkSave.in decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     COOKIES = [("linksave.in", "Linksave_Language", "english")]
diff --git a/pyload/plugin/crypter/LinkdecrypterCom.py b/pyload/plugin/crypter/LinkdecrypterCom.py
index 09863989f..5d04cf94c 100644
--- a/pyload/plugin/crypter/LinkdecrypterCom.py
+++ b/pyload/plugin/crypter/LinkdecrypterCom.py
@@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class LinkdecrypterCom(Crypter):
-    __name__    = "LinkdecrypterCom"
-    __type__    = "crypter"
-    __version__ = "0.29"
+    __name    = "LinkdecrypterCom"
+    __type    = "crypter"
+    __version = "0.29"
 
-    __pattern__ = r'^unmatchable$'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'^unmatchable$'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Linkdecrypter.com decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """Linkdecrypter.com decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("flowlee", "")]
 
 
diff --git a/pyload/plugin/crypter/LixIn.py b/pyload/plugin/crypter/LixIn.py
index 95d7c34c5..d15761014 100644
--- a/pyload/plugin/crypter/LixIn.py
+++ b/pyload/plugin/crypter/LixIn.py
@@ -6,17 +6,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class LixIn(Crypter):
-    __name__    = "LixIn"
-    __type__    = "crypter"
-    __version__ = "0.22"
+    __name    = "LixIn"
+    __type    = "crypter"
+    __version = "0.22"
 
-    __pattern__ = r'http://(?:www\.)?lix\.in/(?P<ID>.+)'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'http://(?:www\.)?lix\.in/(?P<ID>.+)'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Lix.in decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("spoob", "spoob@pyload.org")]
+    __description = """Lix.in decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("spoob", "spoob@pyload.org")]
 
 
     CAPTCHA_PATTERN = r'<img src="(captcha_img\.php\?.*?)"'
@@ -27,7 +27,7 @@ class LixIn(Crypter):
     def decrypt(self, pyfile):
         url = pyfile.url
 
-        m = re.match(self.__pattern__, url)
+        m = re.match(self.__pattern, url)
         if m is None:
             self.error(_("Unable to identify file ID"))
 
diff --git a/pyload/plugin/crypter/LofCc.py b/pyload/plugin/crypter/LofCc.py
index 076ab59d7..680027b43 100644
--- a/pyload/plugin/crypter/LofCc.py
+++ b/pyload/plugin/crypter/LofCc.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class LofCc(DeadCrypter):
-    __name__    = "LofCc"
-    __type__    = "crypter"
-    __version__ = "0.21"
+    __name    = "LofCc"
+    __type    = "crypter"
+    __version = "0.21"
 
-    __pattern__ = r'http://(?:www\.)?lof\.cc/(.+)'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?lof\.cc/(.+)'
+    __config  = []
 
-    __description__ = """Lof.cc decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("mkaay", "mkaay@mkaay.de")]
+    __description = """Lof.cc decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("mkaay", "mkaay@mkaay.de")]
diff --git a/pyload/plugin/crypter/MBLinkInfo.py b/pyload/plugin/crypter/MBLinkInfo.py
index 7e7be2029..7b39f9b5b 100644
--- a/pyload/plugin/crypter/MBLinkInfo.py
+++ b/pyload/plugin/crypter/MBLinkInfo.py
@@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class MBLinkInfo(DeadCrypter):
-    __name__    = "MBLinkInfo"
-    __type__    = "crypter"
-    __version__ = "0.03"
+    __name    = "MBLinkInfo"
+    __type    = "crypter"
+    __version = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?mblink\.info/?\?id=(\d+)'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?mblink\.info/?\?id=(\d+)'
+    __config  = []
 
-    __description__ = """MBLink.info decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Gummibaer", "Gummibaer@wiki-bierkiste.de"),
+    __description = """MBLink.info decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Gummibaer", "Gummibaer@wiki-bierkiste.de"),
                        ("stickell", "l.stickell@yahoo.it")]
diff --git a/pyload/plugin/crypter/MediafireCom.py b/pyload/plugin/crypter/MediafireCom.py
index f9f7a43bd..479d1a70a 100644
--- a/pyload/plugin/crypter/MediafireCom.py
+++ b/pyload/plugin/crypter/MediafireCom.py
@@ -7,17 +7,17 @@ from pyload.utils import json_loads
 
 
 class MediafireCom(Crypter):
-    __name__    = "MediafireCom"
-    __type__    = "crypter"
-    __version__ = "0.14"
+    __name    = "MediafireCom"
+    __type    = "crypter"
+    __version = "0.14"
 
-    __pattern__ = r'http://(?:www\.)?mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'http://(?:www\.)?mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Mediafire.com folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Mediafire.com folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     FOLDER_KEY_PATTERN = r'var afI= \'(\w+)'
diff --git a/pyload/plugin/crypter/MegaCoNz.py b/pyload/plugin/crypter/MegaCoNz.py
index 10c1031de..2ab7ec55c 100644
--- a/pyload/plugin/crypter/MegaCoNz.py
+++ b/pyload/plugin/crypter/MegaCoNz.py
@@ -6,17 +6,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class MegaCoNz(Crypter):
-    __name__    = "MegaCoNz"
-    __type__    = "crypter"
-    __version__ = "0.04"
+    __name    = "MegaCoNz"
+    __type    = "crypter"
+    __version = "0.04"
 
-    __pattern__ = r'(?:https?://(?:www\.)?mega\.co\.nz/|mega:|chrome:.+?)#F!(?P<ID>[\w^_]+)!(?P<KEY>[\w,\\-]+)'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'(?:https?://(?:www\.)?mega\.co\.nz/|mega:|chrome:.+?)#F!(?P<ID>[\w^_]+)!(?P<KEY>[\w,\\-]+)'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Mega.co.nz folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Mega.co.nz folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     def setup(self):
@@ -24,7 +24,7 @@ class MegaCoNz(Crypter):
 
 
     def decrypt(self, pyfile):
-        url       = "https://mega.co.nz/#F!%s!%s" % re.match(self.__pattern__, pyfile.url).groups()
+        url       = "https://mega.co.nz/#F!%s!%s" % re.match(self.__pattern, pyfile.url).groups()
         self.html = self.load("http://rapidgen.org/linkfinder", post={'linklisturl': url})
         self.urls = re.findall(r'(https://mega.co.nz/#N!.+?)<', self.html)
 
diff --git a/pyload/plugin/crypter/MegaRapidCz.py b/pyload/plugin/crypter/MegaRapidCz.py
index 5a14b6f85..11793fd01 100644
--- a/pyload/plugin/crypter/MegaRapidCz.py
+++ b/pyload/plugin/crypter/MegaRapidCz.py
@@ -4,18 +4,18 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class MegaRapidCz(SimpleCrypter):
-    __name__    = "MegaRapidCz"
-    __type__    = "crypter"
-    __version__ = "0.02"
+    __name    = "MegaRapidCz"
+    __type    = "crypter"
+    __version = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?(share|mega)rapid\.cz/slozka/\d+/\w+'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'http://(?:www\.)?(share|mega)rapid\.cz/slozka/\d+/\w+'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Share-Rapid.com folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Share-Rapid.com folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     LINK_PATTERN = r'<td class="soubor"[^>]*><a href="([^"]+)">'
diff --git a/pyload/plugin/crypter/MegauploadCom.py b/pyload/plugin/crypter/MegauploadCom.py
index b9c675a7e..f300408e8 100644
--- a/pyload/plugin/crypter/MegauploadCom.py
+++ b/pyload/plugin/crypter/MegauploadCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class MegauploadCom(DeadCrypter):
-    __name__    = "MegauploadCom"
-    __type__    = "crypter"
-    __version__ = "0.02"
+    __name    = "MegauploadCom"
+    __type    = "crypter"
+    __version = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?megaupload\.com/(\?f|xml/folderfiles\.php\?.*&?folderid)=\w+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?megaupload\.com/(\?f|xml/folderfiles\.php\?.*&?folderid)=\w+'
+    __config  = []
 
-    __description__ = """Megaupload.com folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Megaupload.com folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/crypter/Movie2KTo.py b/pyload/plugin/crypter/Movie2KTo.py
index f8ff4e756..e807855af 100644
--- a/pyload/plugin/crypter/Movie2KTo.py
+++ b/pyload/plugin/crypter/Movie2KTo.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class Movie2KTo(DeadCrypter):
-    __name__    = "Movie2KTo"
-    __type__    = "crypter"
-    __version__ = "0.51"
+    __name    = "Movie2KTo"
+    __type    = "crypter"
+    __version = "0.51"
 
-    __pattern__ = r'http://(?:www\.)?movie2k\.to/(.+)\.html'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?movie2k\.to/(.+)\.html'
+    __config  = []
 
-    __description__ = """Movie2k.to decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("4Christopher", "4Christopher@gmx.de")]
+    __description = """Movie2k.to decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("4Christopher", "4Christopher@gmx.de")]
diff --git a/pyload/plugin/crypter/MultiUpOrg.py b/pyload/plugin/crypter/MultiUpOrg.py
index eabc5d219..6d11c95d0 100644
--- a/pyload/plugin/crypter/MultiUpOrg.py
+++ b/pyload/plugin/crypter/MultiUpOrg.py
@@ -7,25 +7,25 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class MultiUpOrg(SimpleCrypter):
-    __name__    = "MultiUpOrg"
-    __type__    = "crypter"
-    __version__ = "0.03"
+    __name    = "MultiUpOrg"
+    __type    = "crypter"
+    __version = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?multiup\.org/(en|fr)/(?P<TYPE>project|download|miror)/\w+(/\w+)?'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'http://(?:www\.)?multiup\.org/(en|fr)/(?P<TYPE>project|download|miror)/\w+(/\w+)?'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """MultiUp.org decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """MultiUp.org decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     NAME_PATTERN = r'<title>.*(?:Project|Projet|ownload|élécharger) (?P<N>.+?) (\(|- )'
 
 
     def getLinks(self):
-        m_type = re.match(self.__pattern__, self.pyfile.url).group('TYPE')
+        m_type = re.match(self.__pattern, self.pyfile.url).group('TYPE')
 
         if m_type == "project":
             pattern = r'\n(http://www\.multiup\.org/(?:en|fr)/download/.*)'
diff --git a/pyload/plugin/crypter/MultiloadCz.py b/pyload/plugin/crypter/MultiloadCz.py
index 0bcf94016..be9d62cd0 100644
--- a/pyload/plugin/crypter/MultiloadCz.py
+++ b/pyload/plugin/crypter/MultiloadCz.py
@@ -5,19 +5,19 @@ from pyload.plugin.Crypter import Crypter
 
 
 class MultiloadCz(Crypter):
-    __name__    = "MultiloadCz"
-    __type__    = "crypter"
-    __version__ = "0.40"
+    __name    = "MultiloadCz"
+    __type    = "crypter"
+    __version = "0.40"
 
-    __pattern__ = r'http://(?:[^/]*\.)?multiload\.cz/(stahnout|slozka)/.+'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"           , True),
+    __pattern = r'http://(?:[^/]*\.)?multiload\.cz/(stahnout|slozka)/.+'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"           , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package" , True),
                    ("usedHoster"        , "str" , "Prefered hoster list (bar-separated)", ""  ),
                    ("ignoredHoster"     , "str" , "Ignored hoster list (bar-separated)" , ""  )]
 
-    __description__ = """Multiload.cz decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Multiload.cz decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     FOLDER_PATTERN = r'<form action="" method="get"><textarea[^>]*>([^>]*)</textarea></form>'
@@ -27,7 +27,7 @@ class MultiloadCz(Crypter):
     def decrypt(self, pyfile):
         self.html = self.load(pyfile.url, decode=True)
 
-        if re.match(self.__pattern__, pyfile.url).group(1) == "slozka":
+        if re.match(self.__pattern, pyfile.url).group(1) == "slozka":
             m = re.search(self.FOLDER_PATTERN, self.html)
             if m:
                 self.urls.extend(m.group(1).split())
diff --git a/pyload/plugin/crypter/MultiuploadCom.py b/pyload/plugin/crypter/MultiuploadCom.py
index 9127140f1..439e0e69b 100644
--- a/pyload/plugin/crypter/MultiuploadCom.py
+++ b/pyload/plugin/crypter/MultiuploadCom.py
@@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class MultiuploadCom(DeadCrypter):
-    __name__    = "MultiuploadCom"
-    __type__    = "crypter"
-    __version__ = "0.02"
+    __name    = "MultiuploadCom"
+    __type    = "crypter"
+    __version = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?multiupload\.(com|nl)/\w+'
+    __pattern = r'http://(?:www\.)?multiupload\.(com|nl)/\w+'
 
-    __description__ = """MultiUpload.com decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """MultiUpload.com decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/crypter/NCryptIn.py b/pyload/plugin/crypter/NCryptIn.py
index a7ac286cd..94808db3b 100644
--- a/pyload/plugin/crypter/NCryptIn.py
+++ b/pyload/plugin/crypter/NCryptIn.py
@@ -10,17 +10,17 @@ from pyload.plugin.internal.captcha import ReCaptcha
 
 
 class NCryptIn(Crypter):
-    __name__    = "NCryptIn"
-    __type__    = "crypter"
-    __version__ = "1.34"
+    __name    = "NCryptIn"
+    __type    = "crypter"
+    __version = "1.34"
 
-    __pattern__ = r'http://(?:www\.)?ncrypt\.in/(?P<TYPE>folder|link|frame)-([^/\?]+)'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'http://(?:www\.)?ncrypt\.in/(?P<TYPE>folder|link|frame)-([^/\?]+)'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """NCrypt.in decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("fragonib", "fragonib[AT]yahoo[DOT]es"),
+    __description = """NCrypt.in decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("fragonib", "fragonib[AT]yahoo[DOT]es"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
@@ -79,7 +79,7 @@ class NCryptIn(Crypter):
 
 
     def isSingleLink(self):
-        link_type = re.match(self.__pattern__, self.pyfile.url).group('TYPE')
+        link_type = re.match(self.__pattern, self.pyfile.url).group('TYPE')
         return link_type in ("link", "frame")
 
 
diff --git a/pyload/plugin/crypter/NetfolderIn.py b/pyload/plugin/crypter/NetfolderIn.py
index 9672ff581..f036795d5 100644
--- a/pyload/plugin/crypter/NetfolderIn.py
+++ b/pyload/plugin/crypter/NetfolderIn.py
@@ -6,18 +6,18 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class NetfolderIn(SimpleCrypter):
-    __name__    = "NetfolderIn"
-    __type__    = "crypter"
-    __version__ = "0.72"
+    __name    = "NetfolderIn"
+    __type    = "crypter"
+    __version = "0.72"
 
-    __pattern__ = r'http://(?:www\.)?netfolder\.in/(folder\.php\?folder_id=)?(?P<ID>\w+)(?(1)|/\w+)'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'http://(?:www\.)?netfolder\.in/(folder\.php\?folder_id=)?(?P<ID>\w+)(?(1)|/\w+)'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """NetFolder.in decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+    __description = """NetFolder.in decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org"),
                        ("fragonib", "fragonib[AT]yahoo[DOT]es")]
 
 
@@ -44,7 +44,7 @@ class NetfolderIn(SimpleCrypter):
     def submitPassword(self):
         # Gather data
         try:
-            m  = re.match(self.__pattern__, self.pyfile.url)
+            m  = re.match(self.__pattern, self.pyfile.url)
             id = m.group('ID')
         except AttributeError:
             self.logDebug("Unable to get package id from url [%s]" % self.pyfile.url)
diff --git a/pyload/plugin/crypter/NosvideoCom.py b/pyload/plugin/crypter/NosvideoCom.py
index f2d7bfe04..2afc697f3 100644
--- a/pyload/plugin/crypter/NosvideoCom.py
+++ b/pyload/plugin/crypter/NosvideoCom.py
@@ -4,18 +4,18 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class NosvideoCom(SimpleCrypter):
-    __name__    = "NosvideoCom"
-    __type__    = "crypter"
-    __version__ = "0.03"
+    __name    = "NosvideoCom"
+    __type    = "crypter"
+    __version = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?nosvideo\.com/\?v=\w+'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'http://(?:www\.)?nosvideo\.com/\?v=\w+'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Nosvideo.com decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("igel", "igelkun@myopera.com")]
+    __description = """Nosvideo.com decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("igel", "igelkun@myopera.com")]
 
 
     LINK_PATTERN = r'href="(http://(?:w{3}\.)?nosupload\.com/\?d=\w+)"'
diff --git a/pyload/plugin/crypter/OneKhDe.py b/pyload/plugin/crypter/OneKhDe.py
index 6f5400f03..9d21710de 100644
--- a/pyload/plugin/crypter/OneKhDe.py
+++ b/pyload/plugin/crypter/OneKhDe.py
@@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class OneKhDe(Crypter):
-    __name__    = "OneKhDe"
-    __type__    = "crypter"
-    __version__ = "0.11"
+    __name    = "OneKhDe"
+    __type    = "crypter"
+    __version = "0.11"
 
-    __pattern__ = r'http://(?:www\.)?1kh\.de/f/'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'http://(?:www\.)?1kh\.de/f/'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """1kh.de decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("spoob", "spoob@pyload.org")]
+    __description = """1kh.de decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("spoob", "spoob@pyload.org")]
 
 
     def __init__(self, parent):
diff --git a/pyload/plugin/crypter/OronCom.py b/pyload/plugin/crypter/OronCom.py
index 257e0e046..316e6d525 100644
--- a/pyload/plugin/crypter/OronCom.py
+++ b/pyload/plugin/crypter/OronCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class OronCom(DeadCrypter):
-    __name__    = "OronCom"
-    __type__    = "crypter"
-    __version__ = "0.11"
+    __name    = "OronCom"
+    __type    = "crypter"
+    __version = "0.11"
 
-    __pattern__ = r'http://(?:www\.)?oron\.com/folder/\w+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?oron\.com/folder/\w+'
+    __config  = []
 
-    __description__ = """Oron.com folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("DHMH", "webmaster@pcProfil.de")]
+    __description = """Oron.com folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("DHMH", "webmaster@pcProfil.de")]
diff --git a/pyload/plugin/crypter/PastebinCom.py b/pyload/plugin/crypter/PastebinCom.py
index d0e34abaf..673637019 100644
--- a/pyload/plugin/crypter/PastebinCom.py
+++ b/pyload/plugin/crypter/PastebinCom.py
@@ -4,18 +4,18 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class PastebinCom(SimpleCrypter):
-    __name__    = "PastebinCom"
-    __type__    = "crypter"
-    __version__ = "0.03"
+    __name    = "PastebinCom"
+    __type    = "crypter"
+    __version = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?pastebin\.com/\w+'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'http://(?:www\.)?pastebin\.com/\w+'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Pastebin.com decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Pastebin.com decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     LINK_PATTERN = r'<div class="de\d+">(https?://[^ <]+)(?:[^<]*)</div>'
diff --git a/pyload/plugin/crypter/QuickshareCz.py b/pyload/plugin/crypter/QuickshareCz.py
index 8635c797d..8aa101335 100644
--- a/pyload/plugin/crypter/QuickshareCz.py
+++ b/pyload/plugin/crypter/QuickshareCz.py
@@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class QuickshareCz(Crypter):
-    __name__    = "QuickshareCz"
-    __type__    = "crypter"
-    __version__ = "0.10"
+    __name    = "QuickshareCz"
+    __type    = "crypter"
+    __version = "0.10"
 
-    __pattern__ = r'http://(?:www\.)?quickshare\.cz/slozka-\d+'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'http://(?:www\.)?quickshare\.cz/slozka-\d+'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Quickshare.cz folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Quickshare.cz folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     FOLDER_PATTERN = r'<textarea[^>]*>(.*?)</textarea>'
diff --git a/pyload/plugin/crypter/RSLayerCom.py b/pyload/plugin/crypter/RSLayerCom.py
index 8ea8a4369..756c356f7 100644
--- a/pyload/plugin/crypter/RSLayerCom.py
+++ b/pyload/plugin/crypter/RSLayerCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class RSLayerCom(DeadCrypter):
-    __name__    = "RSLayerCom"
-    __type__    = "crypter"
-    __version__ = "0.21"
+    __name    = "RSLayerCom"
+    __type    = "crypter"
+    __version = "0.21"
 
-    __pattern__ = r'http://(?:www\.)?rs-layer\.com/directory-'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?rs-layer\.com/directory-'
+    __config  = []
 
-    __description__ = """RS-Layer.com decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("hzpz", "")]
+    __description = """RS-Layer.com decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("hzpz", "")]
diff --git a/pyload/plugin/crypter/RelinkUs.py b/pyload/plugin/crypter/RelinkUs.py
index 448854325..b17ed6a72 100644
--- a/pyload/plugin/crypter/RelinkUs.py
+++ b/pyload/plugin/crypter/RelinkUs.py
@@ -12,17 +12,17 @@ from pyload.utils import fs_join
 
 
 class RelinkUs(Crypter):
-    __name__    = "RelinkUs"
-    __type__    = "crypter"
-    __version__ = "3.12"
+    __name    = "RelinkUs"
+    __type    = "crypter"
+    __version = "3.12"
 
-    __pattern__ = r'http://(?:www\.)?relink\.us/(f/|((view|go)\.php\?id=))(?P<ID>.+)'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'http://(?:www\.)?relink\.us/(f/|((view|go)\.php\?id=))(?P<ID>.+)'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Relink.us decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("fragonib", "fragonib[AT]yahoo[DOT]es"),
+    __description = """Relink.us decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("fragonib", "fragonib[AT]yahoo[DOT]es"),
                        ("AndroKev", "neureither.kevin@gmail.com")]
 
 
@@ -99,7 +99,7 @@ class RelinkUs(Crypter):
 
 
     def initPackage(self, pyfile):
-        self.fileid = re.match(self.__pattern__, pyfile.url).group('ID')
+        self.fileid = re.match(self.__pattern, pyfile.url).group('ID')
         self.package = pyfile.package()
 
 
diff --git a/pyload/plugin/crypter/SafelinkingNet.py b/pyload/plugin/crypter/SafelinkingNet.py
index dffce9ade..0c93d6919 100644
--- a/pyload/plugin/crypter/SafelinkingNet.py
+++ b/pyload/plugin/crypter/SafelinkingNet.py
@@ -10,17 +10,17 @@ from pyload.plugin.internal.captcha import SolveMedia
 
 
 class SafelinkingNet(Crypter):
-    __name__    = "SafelinkingNet"
-    __type__    = "crypter"
-    __version__ = "0.14"
+    __name    = "SafelinkingNet"
+    __type    = "crypter"
+    __version = "0.14"
 
-    __pattern__ = r'https?://(?:www\.)?safelinking\.net/([pd])/\w+'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'https?://(?:www\.)?safelinking\.net/([pd])/\w+'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Safelinking.net decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("quareevo", "quareevo@arcor.de")]
+    __description = """Safelinking.net decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("quareevo", "quareevo@arcor.de")]
 
 
     SOLVEMEDIA_PATTERN = "solvemediaApiKey = '([\w.-]+)';"
@@ -29,7 +29,7 @@ class SafelinkingNet(Crypter):
     def decrypt(self, pyfile):
         url = pyfile.url
 
-        if re.match(self.__pattern__, url).group(1) == "d":
+        if re.match(self.__pattern, url).group(1) == "d":
 
             header = self.load(url, just_header=True)
             if 'location' in header:
diff --git a/pyload/plugin/crypter/SecuredIn.py b/pyload/plugin/crypter/SecuredIn.py
index b0b8eb6d3..23bcea8ab 100644
--- a/pyload/plugin/crypter/SecuredIn.py
+++ b/pyload/plugin/crypter/SecuredIn.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class SecuredIn(DeadCrypter):
-    __name__    = "SecuredIn"
-    __type__    = "crypter"
-    __version__ = "0.21"
+    __name    = "SecuredIn"
+    __type    = "crypter"
+    __version = "0.21"
 
-    __pattern__ = r'http://(?:www\.)?secured\.in/download-[\d]+-\w{8}\.html'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?secured\.in/download-[\d]+-\w{8}\.html'
+    __config  = []
 
-    __description__ = """Secured.in decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("mkaay", "mkaay@mkaay.de")]
+    __description = """Secured.in decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("mkaay", "mkaay@mkaay.de")]
diff --git a/pyload/plugin/crypter/SexuriaCom.py b/pyload/plugin/crypter/SexuriaCom.py
index 39c3a8515..7a104ce38 100644
--- a/pyload/plugin/crypter/SexuriaCom.py
+++ b/pyload/plugin/crypter/SexuriaCom.py
@@ -6,17 +6,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class SexuriaCom(Crypter):
-    __name__    = "SexuriaCom"
-    __type__    = "crypter"
-    __version__ = "0.01"
+    __name    = "SexuriaCom"
+    __type    = "crypter"
+    __version = "0.01"
 
-    __pattern__ = r'http://(?:www\.)?sexuria\.com/(v1/)?(Pornos_Kostenlos_.+?_(\d+)\.html|dl_links_\d+_\d+\.html|id=\d+\&part=\d+\&link=\d+)'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'http://(?:www\.)?sexuria\.com/(v1/)?(Pornos_Kostenlos_.+?_(\d+)\.html|dl_links_\d+_\d+\.html|id=\d+\&part=\d+\&link=\d+)'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Sexuria.com decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("NETHead", "NETHead.AT.gmx.DOT.net")]
+    __description = """Sexuria.com decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("NETHead", "NETHead.AT.gmx.DOT.net")]
 
 
     PATTERN_SUPPORTED_MAIN     = re.compile(r'http://(www\.)?sexuria\.com/(v1/)?Pornos_Kostenlos_.+?_(\d+)\.html', re.I)
diff --git a/pyload/plugin/crypter/ShareLinksBiz.py b/pyload/plugin/crypter/ShareLinksBiz.py
index 5cc796475..b3a498880 100644
--- a/pyload/plugin/crypter/ShareLinksBiz.py
+++ b/pyload/plugin/crypter/ShareLinksBiz.py
@@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class ShareLinksBiz(Crypter):
-    __name__    = "ShareLinksBiz"
-    __type__    = "crypter"
-    __version__ = "1.14"
+    __name    = "ShareLinksBiz"
+    __type    = "crypter"
+    __version = "1.14"
 
-    __pattern__ = r'http://(?:www\.)?(share-links|s2l)\.biz/(?P<ID>_?\w+)'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'http://(?:www\.)?(share-links|s2l)\.biz/(?P<ID>_?\w+)'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Share-Links.biz decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("fragonib", "fragonib[AT]yahoo[DOT]es")]
+    __description = """Share-Links.biz decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("fragonib", "fragonib[AT]yahoo[DOT]es")]
 
 
     def setup(self):
@@ -67,8 +67,8 @@ class ShareLinksBiz(Crypter):
         url = pyfile.url
         if 's2l.biz' in url:
             url = self.load(url, just_header=True)['location']
-        self.baseUrl = "http://www.%s.biz" % re.match(self.__pattern__, url).group(1)
-        self.fileId = re.match(self.__pattern__, url).group('ID')
+        self.baseUrl = "http://www.%s.biz" % re.match(self.__pattern, url).group(1)
+        self.fileId = re.match(self.__pattern, url).group('ID')
         self.package = pyfile.package()
 
 
diff --git a/pyload/plugin/crypter/SharingmatrixCom.py b/pyload/plugin/crypter/SharingmatrixCom.py
index bd0a7a85a..4224bbd2d 100644
--- a/pyload/plugin/crypter/SharingmatrixCom.py
+++ b/pyload/plugin/crypter/SharingmatrixCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class SharingmatrixCom(DeadCrypter):
-    __name__    = "SharingmatrixCom"
-    __type__    = "crypter"
-    __version__ = "0.01"
+    __name    = "SharingmatrixCom"
+    __type    = "crypter"
+    __version = "0.01"
 
-    __pattern__ = r'http://(?:www\.)?sharingmatrix\.com/folder/\w+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?sharingmatrix\.com/folder/\w+'
+    __config  = []
 
-    __description__ = """Sharingmatrix.com folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Sharingmatrix.com folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/crypter/SpeedLoadOrg.py b/pyload/plugin/crypter/SpeedLoadOrg.py
index 95c8864dc..32677e9ef 100644
--- a/pyload/plugin/crypter/SpeedLoadOrg.py
+++ b/pyload/plugin/crypter/SpeedLoadOrg.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class SpeedLoadOrg(DeadCrypter):
-    __name__    = "SpeedLoadOrg"
-    __type__    = "crypter"
-    __version__ = "0.30"
+    __name    = "SpeedLoadOrg"
+    __type    = "crypter"
+    __version = "0.30"
 
-    __pattern__ = r'http://(?:www\.)?speedload\.org/(\d+~f$|folder/\d+/)'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?speedload\.org/(\d+~f$|folder/\d+/)'
+    __config  = []
 
-    __description__ = """Speedload decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Speedload decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
diff --git a/pyload/plugin/crypter/StealthTo.py b/pyload/plugin/crypter/StealthTo.py
index 23747be1b..b974a169c 100644
--- a/pyload/plugin/crypter/StealthTo.py
+++ b/pyload/plugin/crypter/StealthTo.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class StealthTo(DeadCrypter):
-    __name__    = "StealthTo"
-    __type__    = "crypter"
-    __version__ = "0.20"
+    __name    = "StealthTo"
+    __type    = "crypter"
+    __version = "0.20"
 
-    __pattern__ = r'http://(?:www\.)?stealth\.to/folder/.+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?stealth\.to/folder/.+'
+    __config  = []
 
-    __description__ = """Stealth.to decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("spoob", "spoob@pyload.org")]
+    __description = """Stealth.to decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("spoob", "spoob@pyload.org")]
diff --git a/pyload/plugin/crypter/TnyCz.py b/pyload/plugin/crypter/TnyCz.py
index f04127479..8de611a8e 100644
--- a/pyload/plugin/crypter/TnyCz.py
+++ b/pyload/plugin/crypter/TnyCz.py
@@ -6,18 +6,18 @@ import re
 
 
 class TnyCz(SimpleCrypter):
-    __name__    = "TnyCz"
-    __type__    = "crypter"
-    __version__ = "0.03"
+    __name    = "TnyCz"
+    __type    = "crypter"
+    __version = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?tny\.cz/\w+'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'http://(?:www\.)?tny\.cz/\w+'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Tny.cz decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Tny.cz decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     NAME_PATTERN = r'<title>(?P<N>.+) - .+</title>'
diff --git a/pyload/plugin/crypter/TrailerzoneInfo.py b/pyload/plugin/crypter/TrailerzoneInfo.py
index 06894054b..cad464d47 100644
--- a/pyload/plugin/crypter/TrailerzoneInfo.py
+++ b/pyload/plugin/crypter/TrailerzoneInfo.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class TrailerzoneInfo(DeadCrypter):
-    __name__    = "TrailerzoneInfo"
-    __type__    = "crypter"
-    __version__ = "0.03"
+    __name    = "TrailerzoneInfo"
+    __type    = "crypter"
+    __version = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?trailerzone\.info/.+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?trailerzone\.info/.+'
+    __config  = []
 
-    __description__ = """TrailerZone.info decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("godofdream", "soilfiction@gmail.com")]
+    __description = """TrailerZone.info decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("godofdream", "soilfiction@gmail.com")]
diff --git a/pyload/plugin/crypter/TurbobitNet.py b/pyload/plugin/crypter/TurbobitNet.py
index 8493af9da..d00380d71 100644
--- a/pyload/plugin/crypter/TurbobitNet.py
+++ b/pyload/plugin/crypter/TurbobitNet.py
@@ -7,18 +7,18 @@ from pyload.utils import json_loads
 
 
 class TurbobitNet(SimpleCrypter):
-    __name__    = "TurbobitNet"
-    __type__    = "crypter"
-    __version__ = "0.05"
+    __name    = "TurbobitNet"
+    __type    = "crypter"
+    __version = "0.05"
 
-    __pattern__ = r'http://(?:www\.)?turbobit\.net/download/folder/(?P<ID>\w+)'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'http://(?:www\.)?turbobit\.net/download/folder/(?P<ID>\w+)'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Turbobit.net folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it"),
+    __description = """Turbobit.net folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
@@ -40,6 +40,6 @@ class TurbobitNet(SimpleCrypter):
 
 
     def getLinks(self):
-        id = re.match(self.__pattern__, self.pyfile.url).group('ID')
+        id = re.match(self.__pattern, self.pyfile.url).group('ID')
         fixurl = lambda id: "http://turbobit.net/%s.html" % id
         return map(fixurl, self._getLinks(id))
diff --git a/pyload/plugin/crypter/TusfilesNet.py b/pyload/plugin/crypter/TusfilesNet.py
index a04723c47..8bf7cbe21 100644
--- a/pyload/plugin/crypter/TusfilesNet.py
+++ b/pyload/plugin/crypter/TusfilesNet.py
@@ -8,23 +8,23 @@ from pyload.plugin.internal.XFSCrypter import XFSCrypter
 
 
 class TusfilesNet(XFSCrypter):
-    __name__    = "TusfilesNet"
-    __type__    = "crypter"
-    __version__ = "0.08"
+    __name    = "TusfilesNet"
+    __type    = "crypter"
+    __version = "0.08"
 
-    __pattern__ = r'https?://(?:www\.)?tusfiles\.net/go/(?P<ID>\w+)'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'https?://(?:www\.)?tusfiles\.net/go/(?P<ID>\w+)'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Tusfiles.net folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com"),
+    __description = """Tusfiles.net folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
     PAGES_PATTERN = r'>\((\d+) \w+\)<'
 
-    URL_REPLACEMENTS = [(__pattern__ + ".*", r'https://www.tusfiles.net/go/\g<ID>/')]
+    URL_REPLACEMENTS = [(__pattern + ".*", r'https://www.tusfiles.net/go/\g<ID>/')]
 
 
     def loadPage(self, page_n):
diff --git a/pyload/plugin/crypter/UlozTo.py b/pyload/plugin/crypter/UlozTo.py
index 5909958bd..e31dfe61e 100644
--- a/pyload/plugin/crypter/UlozTo.py
+++ b/pyload/plugin/crypter/UlozTo.py
@@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class UlozTo(Crypter):
-    __name__    = "UlozTo"
-    __type__    = "crypter"
-    __version__ = "0.20"
+    __name    = "UlozTo"
+    __type    = "crypter"
+    __version = "0.20"
 
-    __pattern__ = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(m|soubory)/.+'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(m|soubory)/.+'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Uloz.to folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Uloz.to folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     FOLDER_PATTERN = r'<ul class="profile_files">(.*?)</ul>'
diff --git a/pyload/plugin/crypter/UploadableCh.py b/pyload/plugin/crypter/UploadableCh.py
index 1f1a5cf8b..45e57deb2 100644
--- a/pyload/plugin/crypter/UploadableCh.py
+++ b/pyload/plugin/crypter/UploadableCh.py
@@ -4,18 +4,18 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class UploadableCh(SimpleCrypter):
-    __name__    = "UploadableCh"
-    __type__    = "crypter"
-    __version__ = "0.03"
+    __name    = "UploadableCh"
+    __type    = "crypter"
+    __version = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?uploadable\.ch/list/\w+'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'http://(?:www\.)?uploadable\.ch/list/\w+'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Uploadable.ch folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("guidobelix", "guidobelix@hotmail.it"),
+    __description = """Uploadable.ch folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("guidobelix", "guidobelix@hotmail.it"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/crypter/UploadedTo.py b/pyload/plugin/crypter/UploadedTo.py
index 9286fb7a5..682bfde8a 100644
--- a/pyload/plugin/crypter/UploadedTo.py
+++ b/pyload/plugin/crypter/UploadedTo.py
@@ -8,18 +8,18 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class UploadedTo(SimpleCrypter):
-    __name__    = "UploadedTo"
-    __type__    = "crypter"
-    __version__ = "0.42"
+    __name    = "UploadedTo"
+    __type    = "crypter"
+    __version = "0.42"
 
-    __pattern__ = r'http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/(?P<ID>\w+)'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+    __pattern = r'http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/(?P<ID>\w+)'
+    __config  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """UploadedTo decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """UploadedTo decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     PLAIN_PATTERN = r'<small class="date"><a href="([\w/]+)" onclick='
diff --git a/pyload/plugin/crypter/WiiReloadedOrg.py b/pyload/plugin/crypter/WiiReloadedOrg.py
index 4190cb340..1fed5e4d2 100644
--- a/pyload/plugin/crypter/WiiReloadedOrg.py
+++ b/pyload/plugin/crypter/WiiReloadedOrg.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class WiiReloadedOrg(DeadCrypter):
-    __name__    = "WiiReloadedOrg"
-    __type__    = "crypter"
-    __version__ = "0.11"
+    __name    = "WiiReloadedOrg"
+    __type    = "crypter"
+    __version = "0.11"
 
-    __pattern__ = r'http://(?:www\.)?wii-reloaded\.org/protect/get\.php\?i=.+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?wii-reloaded\.org/protect/get\.php\?i=.+'
+    __config  = []
 
-    __description__ = """Wii-Reloaded.org decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("hzpz", "")]
+    __description = """Wii-Reloaded.org decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("hzpz", "")]
diff --git a/pyload/plugin/crypter/WuploadCom.py b/pyload/plugin/crypter/WuploadCom.py
index ed8d21565..29e2c97c5 100644
--- a/pyload/plugin/crypter/WuploadCom.py
+++ b/pyload/plugin/crypter/WuploadCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter
 
 
 class WuploadCom(DeadCrypter):
-    __name__    = "WuploadCom"
-    __type__    = "crypter"
-    __version__ = "0.01"
+    __name    = "WuploadCom"
+    __type    = "crypter"
+    __version = "0.01"
 
-    __pattern__ = r'http://(?:www\.)?wupload\.com/folder/\w+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?wupload\.com/folder/\w+'
+    __config  = []
 
-    __description__ = """Wupload.com folder decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Wupload.com folder decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/crypter/XFileSharingPro.py b/pyload/plugin/crypter/XFileSharingPro.py
index 1ae40c6c5..9422789f3 100644
--- a/pyload/plugin/crypter/XFileSharingPro.py
+++ b/pyload/plugin/crypter/XFileSharingPro.py
@@ -6,31 +6,31 @@ from pyload.plugin.internal.XFSCrypter import XFSCrypter
 
 
 class XFileSharingPro(XFSCrypter):
-    __name__    = "XFileSharingPro"
-    __type__    = "crypter"
-    __version__ = "0.05"
+    __name    = "XFileSharingPro"
+    __type    = "crypter"
+    __version = "0.05"
 
-    __pattern__ = r'^unmatchable$'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'^unmatchable$'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """XFileSharingPro dummy folder decrypter plugin for hook"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """XFileSharingPro dummy folder decrypter plugin for hook"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     def _log(self, type, args):
         msg = " | ".join(str(a).strip() for a in args if a)
         logger = getattr(self.log, type)
-        logger("%s: %s: %s" % (self.__name__, self.HOSTER_NAME, msg or _("%s MARK" % type.upper())))
+        logger("%s: %s: %s" % (self.__name, self.HOSTER_NAME, msg or _("%s MARK" % type.upper())))
 
 
     def init(self):
         super(XFileSharingPro, self).init()
 
-        self.__pattern__ = self.core.pluginManager.crypterPlugins[self.__name__]['pattern']
+        self.__pattern = self.core.pluginManager.crypterPlugins[self.__name]['pattern']
 
-        self.HOSTER_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group("DOMAIN").lower()
+        self.HOSTER_DOMAIN = re.match(self.__pattern, self.pyfile.url).group("DOMAIN").lower()
         self.HOSTER_NAME   = "".join(part.capitalize() for part in re.split(r'(\.|\d+)', self.HOSTER_DOMAIN) if part != '.')
 
         account = self.core.accountManager.getAccountPlugin(self.HOSTER_NAME)
diff --git a/pyload/plugin/crypter/XupPl.py b/pyload/plugin/crypter/XupPl.py
index b62e37db6..6dd9c3df8 100644
--- a/pyload/plugin/crypter/XupPl.py
+++ b/pyload/plugin/crypter/XupPl.py
@@ -4,17 +4,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class XupPl(Crypter):
-    __name__    = "XupPl"
-    __type__    = "crypter"
-    __version__ = "0.10"
+    __name    = "XupPl"
+    __type    = "crypter"
+    __version = "0.10"
 
-    __pattern__ = r'https?://(?:[^/]*\.)?xup\.pl/.+'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'https?://(?:[^/]*\.)?xup\.pl/.+'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Xup.pl decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("z00nx", "z00nx0@gmail.com")]
+    __description = """Xup.pl decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("z00nx", "z00nx0@gmail.com")]
 
 
     def decrypt(self, pyfile):
diff --git a/pyload/plugin/crypter/YoutubeComFolder.py b/pyload/plugin/crypter/YoutubeComFolder.py
index e42615af0..da76e556b 100644
--- a/pyload/plugin/crypter/YoutubeComFolder.py
+++ b/pyload/plugin/crypter/YoutubeComFolder.py
@@ -10,20 +10,20 @@ from pyload.utils import fs_join
 
 
 class YoutubeComFolder(Crypter):
-    __name__    = "YoutubeComFolder"
-    __type__    = "crypter"
-    __version__ = "1.01"
+    __name    = "YoutubeComFolder"
+    __type    = "crypter"
+    __version = "1.01"
 
-    __pattern__ = r'https?://(?:www\.|m\.)?youtube\.com/(?P<TYPE>user|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P<ID>[\w-]+)'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True ),
+    __pattern = r'https?://(?:www\.|m\.)?youtube\.com/(?P<TYPE>user|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P<ID>[\w-]+)'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True ),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True ),
                    ("likes"             , "bool", "Grab user (channel) liked videos"   , False),
                    ("favorites"         , "bool", "Grab user (channel) favorite videos", False),
                    ("uploads"           , "bool", "Grab channel unplaylisted videos"   , True )]
 
-    __description__ = """Youtube.com channel & playlist decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Youtube.com channel & playlist decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     API_KEY = "AIzaSyCKnWLNlkX-L4oD1aEzqqhRw1zczeD6_k0"
@@ -95,7 +95,7 @@ class YoutubeComFolder(Crypter):
 
 
     def decrypt(self, pyfile):
-        m = re.match(self.__pattern__, pyfile.url)
+        m = re.match(self.__pattern, pyfile.url)
         m_id = m.group('ID')
         m_type = m.group('TYPE')
 
diff --git a/pyload/plugin/extractor/SevenZip.py b/pyload/plugin/extractor/SevenZip.py
index cf397114f..71b288ab0 100644
--- a/pyload/plugin/extractor/SevenZip.py
+++ b/pyload/plugin/extractor/SevenZip.py
@@ -9,13 +9,13 @@ from pyload.utils import fs_encode, fs_join
 
 
 class SevenZip(UnRar):
-    __name__    = "SevenZip"
-    __type__    = "extractor"
-    __version__ = "0.11"
+    __name    = "SevenZip"
+    __type    = "extractor"
+    __version = "0.11"
 
-    __description__ = """7-Zip extractor plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Michael Nowak" , ""                 ),
+    __description = """7-Zip extractor plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Michael Nowak" , ""                 ),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/extractor/UnRar.py b/pyload/plugin/extractor/UnRar.py
index 3bc4f3464..cad58ff4f 100644
--- a/pyload/plugin/extractor/UnRar.py
+++ b/pyload/plugin/extractor/UnRar.py
@@ -21,13 +21,13 @@ def renice(pid, value):
 
 
 class UnRar(Extractor):
-    __name__    = "UnRar"
-    __type__    = "extractor"
-    __version__ = "1.20"
+    __name    = "UnRar"
+    __type    = "extractor"
+    __version = "1.20"
 
-    __description__ = """Rar extractor plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN"         , "RaNaN@pyload.org" ),
+    __description = """Rar extractor plugin"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN"         , "RaNaN@pyload.org" ),
                        ("Walter Purcaro", "vuolter@gmail.com"),
                        ("Immenz"        , "immenz@gmx.net"   )]
 
@@ -55,7 +55,7 @@ class UnRar(Extractor):
                 cls.CMD = os.path.join(pypath, "RAR.exe")
                 p = subprocess.Popen([cls.CMD], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                 out, err = p.communicate()
-                cls.__name__ = "RAR"
+                cls.__name = "RAR"
                 cls.REPAIR = True
 
             except OSError:
@@ -66,7 +66,7 @@ class UnRar(Extractor):
             try:
                 p = subprocess.Popen(["rar"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                 out, err = p.communicate()
-                cls.__name__ = "RAR"
+                cls.__name = "RAR"
                 cls.REPAIR = True
 
             except OSError:  #: fallback to unrar
diff --git a/pyload/plugin/extractor/UnZip.py b/pyload/plugin/extractor/UnZip.py
index 799af3926..b4fa637f0 100644
--- a/pyload/plugin/extractor/UnZip.py
+++ b/pyload/plugin/extractor/UnZip.py
@@ -11,13 +11,13 @@ from pyload.utils import fs_encode
 
 
 class UnZip(Extractor):
-    __name__    = "UnZip"
-    __type__    = "extractor"
-    __version__ = "1.12"
+    __name    = "UnZip"
+    __type    = "extractor"
+    __version = "1.12"
 
-    __description__ = """Zip extractor plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Zip extractor plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     EXTENSIONS = [".zip", ".zip64"]
diff --git a/pyload/plugin/hook/AlldebridCom.py b/pyload/plugin/hook/AlldebridCom.py
index 3d05fb761..141f86779 100644
--- a/pyload/plugin/hook/AlldebridCom.py
+++ b/pyload/plugin/hook/AlldebridCom.py
@@ -4,20 +4,20 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class AlldebridCom(MultiHook):
-    __name__    = "AlldebridCom"
-    __type__    = "hook"
-    __version__ = "0.16"
+    __name    = "AlldebridCom"
+    __type    = "hook"
+    __version = "0.16"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   ),
                   ("ssl"           , "bool"               , "Use HTTPS"                           , True )]
 
-    __description__ = """Alldebrid.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Andy Voigt", "spamsales@online.de")]
+    __description = """Alldebrid.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Andy Voigt", "spamsales@online.de")]
 
 
     def getHosters(self):
diff --git a/pyload/plugin/hook/BypassCaptcha.py b/pyload/plugin/hook/BypassCaptcha.py
index 4579d17c5..141ac7282 100644
--- a/pyload/plugin/hook/BypassCaptcha.py
+++ b/pyload/plugin/hook/BypassCaptcha.py
@@ -26,16 +26,16 @@ class BypassCaptchaException(Exception):
 
 
 class BypassCaptcha(Hook):
-    __name__    = "BypassCaptcha"
-    __type__    = "hook"
-    __version__ = "0.06"
+    __name    = "BypassCaptcha"
+    __type    = "hook"
+    __version = "0.06"
 
-    __config__ = [("force", "bool", "Force BC even if client is connected", False),
+    __config = [("force", "bool", "Force BC even if client is connected", False),
                 ("passkey", "password", "Passkey", "")]
 
-    __description__ = """Send captchas to BypassCaptcha.com"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN"     , "RaNaN@pyload.org"     ),
+    __description = """Send captchas to BypassCaptcha.com"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN"     , "RaNaN@pyload.org"     ),
                        ("Godofdream", "soilfcition@gmail.com"),
                        ("zoidberg"  , "zoidberg@mujmail.cz"  )]
 
@@ -104,21 +104,21 @@ class BypassCaptcha(Hook):
 
         if self.getCredits() > 0:
             task.handler.append(self)
-            task.data['service'] = self.__name__
+            task.data['service'] = self.__name
             task.setWaiting(100)
             self._processCaptcha(task)
 
         else:
-            self.logInfo(_("Your %s account has not enough credits") % self.__name__)
+            self.logInfo(_("Your %s account has not enough credits") % self.__name)
 
 
     def captchaCorrect(self, task):
-        if task.data['service'] == self.__name__ and "ticket" in task.data:
+        if task.data['service'] == self.__name and "ticket" in task.data:
             self.respond(task.data['ticket'], True)
 
 
     def captchaInvalid(self, task):
-        if task.data['service'] == self.__name__ and "ticket" in task.data:
+        if task.data['service'] == self.__name and "ticket" in task.data:
             self.respond(task.data['ticket'], False)
 
 
diff --git a/pyload/plugin/hook/Captcha9Kw.py b/pyload/plugin/hook/Captcha9Kw.py
index 012266739..9cb8e7928 100644
--- a/pyload/plugin/hook/Captcha9Kw.py
+++ b/pyload/plugin/hook/Captcha9Kw.py
@@ -14,11 +14,11 @@ from pyload.plugin.Hook import Hook, threaded
 
 
 class Captcha9kw(Hook):
-    __name__    = "Captcha9Kw"
-    __type__    = "hook"
-    __version__ = "0.28"
+    __name    = "Captcha9Kw"
+    __type    = "hook"
+    __version = "0.28"
 
-    __config__ = [("ssl"           , "bool"    , "Use HTTPS"                                                                       , True                                                               ),
+    __config = [("ssl"           , "bool"    , "Use HTTPS"                                                                       , True                                                               ),
                 ("force"         , "bool"    , "Force captcha resolving even if client is connected"                             , True                                                               ),
                 ("confirm"       , "bool"    , "Confirm Captcha (cost +6 credits)"                                               , False                                                              ),
                 ("captchaperhour", "int"     , "Captcha per hour"                                                                , "9999"                                                             ),
@@ -30,9 +30,9 @@ class Captcha9kw(Hook):
                 ("passkey"       , "password", "API key"                                                                         , ""                                                                 ),
                 ("timeout"       , "int"     , "Timeout in seconds (min 60, max 3999)"                                           , "900"                                                              )]
 
-    __description__ = """Send captchas to 9kw.eu"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN"         , "RaNaN@pyload.org" ),
+    __description = """Send captchas to 9kw.eu"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN"         , "RaNaN@pyload.org" ),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/hook/CaptchaBrotherhood.py b/pyload/plugin/hook/CaptchaBrotherhood.py
index 3cbdb27d7..eff005d14 100644
--- a/pyload/plugin/hook/CaptchaBrotherhood.py
+++ b/pyload/plugin/hook/CaptchaBrotherhood.py
@@ -36,17 +36,17 @@ class CaptchaBrotherhoodException(Exception):
 
 
 class CaptchaBrotherhood(Hook):
-    __name__    = "CaptchaBrotherhood"
-    __type__    = "hook"
-    __version__ = "0.08"
+    __name    = "CaptchaBrotherhood"
+    __type    = "hook"
+    __version = "0.08"
 
-    __config__ = [("username", "str", "Username", ""),
+    __config = [("username", "str", "Username", ""),
                 ("force", "bool", "Force CT even if client is connected", False),
                 ("passkey", "password", "Password", "")]
 
-    __description__ = """Send captchas to CaptchaBrotherhood.com"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN"   , "RaNaN@pyload.org"   ),
+    __description = """Send captchas to CaptchaBrotherhood.com"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN"   , "RaNaN@pyload.org"   ),
                        ("zoidberg", "zoidberg@mujmail.cz")]
 
 
@@ -147,7 +147,7 @@ class CaptchaBrotherhood(Hook):
 
         if self.getCredits() > 10:
             task.handler.append(self)
-            task.data['service'] = self.__name__
+            task.data['service'] = self.__name
             task.setWaiting(100)
             self._processCaptcha(task)
         else:
@@ -155,7 +155,7 @@ class CaptchaBrotherhood(Hook):
 
 
     def captchaInvalid(self, task):
-        if task.data['service'] == self.__name__ and "ticket" in task.data:
+        if task.data['service'] == self.__name and "ticket" in task.data:
             res = self.api_response("complainCaptcha", task.data['ticket'])
 
 
diff --git a/pyload/plugin/hook/DeathByCaptcha.py b/pyload/plugin/hook/DeathByCaptcha.py
index 0f0e66ea2..4b77c8718 100644
--- a/pyload/plugin/hook/DeathByCaptcha.py
+++ b/pyload/plugin/hook/DeathByCaptcha.py
@@ -49,17 +49,17 @@ class DeathByCaptchaException(Exception):
 
 
 class DeathByCaptcha(Hook):
-    __name__    = "DeathByCaptcha"
-    __type__    = "hook"
-    __version__ = "0.06"
+    __name    = "DeathByCaptcha"
+    __type    = "hook"
+    __version = "0.06"
 
-    __config__ = [("username", "str", "Username", ""),
+    __config = [("username", "str", "Username", ""),
                 ("passkey", "password", "Password", ""),
                 ("force", "bool", "Force DBC even if client is connected", False)]
 
-    __description__ = """Send captchas to DeathByCaptcha.com"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN"   , "RaNaN@pyload.org"   ),
+    __description = """Send captchas to DeathByCaptcha.com"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN"   , "RaNaN@pyload.org"   ),
                        ("zoidberg", "zoidberg@mujmail.cz")]
 
 
@@ -188,13 +188,13 @@ class DeathByCaptcha(Hook):
 
         if balance > rate:
             task.handler.append(self)
-            task.data['service'] = self.__name__
+            task.data['service'] = self.__name
             task.setWaiting(180)
             self._processCaptcha(task)
 
 
     def captchaInvalid(self, task):
-        if task.data['service'] == self.__name__ and "ticket" in task.data:
+        if task.data['service'] == self.__name and "ticket" in task.data:
             try:
                 res = self.api_response("captcha/%d/report" % task.data['ticket'], True)
 
diff --git a/pyload/plugin/hook/DebridItaliaCom.py b/pyload/plugin/hook/DebridItaliaCom.py
index e7760ba5a..e15f7d6ec 100644
--- a/pyload/plugin/hook/DebridItaliaCom.py
+++ b/pyload/plugin/hook/DebridItaliaCom.py
@@ -6,19 +6,19 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class DebridItaliaCom(MultiHook):
-    __name__    = "DebridItaliaCom"
-    __type__    = "hook"
-    __version__ = "0.12"
+    __name    = "DebridItaliaCom"
+    __type    = "hook"
+    __version = "0.12"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
 
-    __description__ = """Debriditalia.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell"      , "l.stickell@yahoo.it"),
+    __description = """Debriditalia.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell"      , "l.stickell@yahoo.it"),
                        ("Walter Purcaro", "vuolter@gmail.com"  )]
 
 
diff --git a/pyload/plugin/hook/EasybytezCom.py b/pyload/plugin/hook/EasybytezCom.py
index 79640a367..68b4d96d2 100644
--- a/pyload/plugin/hook/EasybytezCom.py
+++ b/pyload/plugin/hook/EasybytezCom.py
@@ -6,19 +6,19 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class EasybytezCom(MultiHook):
-    __name__    = "EasybytezCom"
-    __type__    = "hook"
-    __version__ = "0.07"
+    __name    = "EasybytezCom"
+    __type    = "hook"
+    __version = "0.07"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
 
-    __description__ = """EasyBytez.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """EasyBytez.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def getHosters(self):
diff --git a/pyload/plugin/hook/ExpertDecoders.py b/pyload/plugin/hook/ExpertDecoders.py
index 0f86baa17..2e2982d2d 100644
--- a/pyload/plugin/hook/ExpertDecoders.py
+++ b/pyload/plugin/hook/ExpertDecoders.py
@@ -12,16 +12,16 @@ from pyload.plugin.Hook import Hook, threaded
 
 
 class ExpertDecoders(Hook):
-    __name__    = "ExpertDecoders"
-    __type__    = "hook"
-    __version__ = "0.04"
+    __name    = "ExpertDecoders"
+    __type    = "hook"
+    __version = "0.04"
 
-    __config__ = [("force", "bool", "Force CT even if client is connected", False),
+    __config = [("force", "bool", "Force CT even if client is connected", False),
                 ("passkey", "password", "Access key", "")]
 
-    __description__ = """Send captchas to expertdecoders.com"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN"   , "RaNaN@pyload.org"   ),
+    __description = """Send captchas to expertdecoders.com"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN"   , "RaNaN@pyload.org"   ),
                        ("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/pyload/plugin/hook/FastixRu.py b/pyload/plugin/hook/FastixRu.py
index d0e2ff2fd..6c71384c8 100644
--- a/pyload/plugin/hook/FastixRu.py
+++ b/pyload/plugin/hook/FastixRu.py
@@ -5,19 +5,19 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class FastixRu(MultiHook):
-    __name__    = "FastixRu"
-    __type__    = "hook"
-    __version__ = "0.05"
+    __name    = "FastixRu"
+    __type    = "hook"
+    __version = "0.05"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
 
-    __description__ = """Fastix.ru hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Massimo Rosamilia", "max@spiritix.eu")]
+    __description = """Fastix.ru hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Massimo Rosamilia", "max@spiritix.eu")]
 
 
     def getHosters(self):
diff --git a/pyload/plugin/hook/FreeWayMe.py b/pyload/plugin/hook/FreeWayMe.py
index 086824550..fd1017ba9 100644
--- a/pyload/plugin/hook/FreeWayMe.py
+++ b/pyload/plugin/hook/FreeWayMe.py
@@ -4,19 +4,19 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class FreeWayMe(MultiHook):
-    __name__    = "FreeWayMe"
-    __type__    = "hook"
-    __version__ = "0.15"
+    __name    = "FreeWayMe"
+    __type    = "hook"
+    __version = "0.15"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
 
-    __description__ = """FreeWay.me hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Nicolas Giese", "james@free-way.me")]
+    __description = """FreeWay.me hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Nicolas Giese", "james@free-way.me")]
 
 
     def getHosters(self):
diff --git a/pyload/plugin/hook/ImageTyperz.py b/pyload/plugin/hook/ImageTyperz.py
index a7c3389c1..ca5e02559 100644
--- a/pyload/plugin/hook/ImageTyperz.py
+++ b/pyload/plugin/hook/ImageTyperz.py
@@ -30,17 +30,17 @@ class ImageTyperzException(Exception):
 
 
 class ImageTyperz(Hook):
-    __name__    = "ImageTyperz"
-    __type__    = "hook"
-    __version__ = "0.06"
+    __name    = "ImageTyperz"
+    __type    = "hook"
+    __version = "0.06"
 
-    __config__ = [("username", "str", "Username", ""),
+    __config = [("username", "str", "Username", ""),
                 ("passkey", "password", "Password", ""),
                 ("force", "bool", "Force IT even if client is connected", False)]
 
-    __description__ = """Send captchas to ImageTyperz.com"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN"   , "RaNaN@pyload.org"   ),
+    __description = """Send captchas to ImageTyperz.com"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN"   , "RaNaN@pyload.org"   ),
                        ("zoidberg", "zoidberg@mujmail.cz")]
 
 
@@ -118,16 +118,16 @@ class ImageTyperz(Hook):
 
         if self.getCredits() > 0:
             task.handler.append(self)
-            task.data['service'] = self.__name__
+            task.data['service'] = self.__name
             task.setWaiting(100)
             self._processCaptcha(task)
 
         else:
-            self.logInfo(_("Your %s account has not enough credits") % self.__name__)
+            self.logInfo(_("Your %s account has not enough credits") % self.__name)
 
 
     def captchaInvalid(self, task):
-        if task.data['service'] == self.__name__ and "ticket" in task.data:
+        if task.data['service'] == self.__name and "ticket" in task.data:
             res = getURL(self.RESPOND_URL,
                          post={'action': "SETBADIMAGE",
                                'username': self.getConfig('username'),
diff --git a/pyload/plugin/hook/LinkdecrypterCom.py b/pyload/plugin/hook/LinkdecrypterCom.py
index ab1e662dc..4bf3f5e50 100644
--- a/pyload/plugin/hook/LinkdecrypterCom.py
+++ b/pyload/plugin/hook/LinkdecrypterCom.py
@@ -6,18 +6,18 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class LinkdecrypterCom(MultiHook):
-    __name__    = "LinkdecrypterCom"
-    __type__    = "hook"
-    __version__ = "1.03"
+    __name    = "LinkdecrypterCom"
+    __type    = "hook"
+    __version = "1.03"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
 
-    __description__ = """Linkdecrypter.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Linkdecrypter.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     def getCrypters(self):
diff --git a/pyload/plugin/hook/LinksnappyCom.py b/pyload/plugin/hook/LinksnappyCom.py
index 7eddc5811..e09021d6d 100644
--- a/pyload/plugin/hook/LinksnappyCom.py
+++ b/pyload/plugin/hook/LinksnappyCom.py
@@ -5,19 +5,19 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class LinksnappyCom(MultiHook):
-    __name__    = "LinksnappyCom"
-    __type__    = "hook"
-    __version__ = "0.04"
+    __name    = "LinksnappyCom"
+    __type    = "hook"
+    __version = "0.04"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
 
-    __description__ = """Linksnappy.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Linksnappy.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     def getHosters(self):
diff --git a/pyload/plugin/hook/MegaDebridEu.py b/pyload/plugin/hook/MegaDebridEu.py
index e373a544b..a069cbcdd 100644
--- a/pyload/plugin/hook/MegaDebridEu.py
+++ b/pyload/plugin/hook/MegaDebridEu.py
@@ -5,19 +5,19 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class MegaDebridEu(MultiHook):
-    __name__    = "MegaDebridEu"
-    __type__    = "hook"
-    __version__ = "0.05"
+    __name    = "MegaDebridEu"
+    __type    = "hook"
+    __version = "0.05"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
 
-    __description__ = """Mega-debrid.eu hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("D.Ducatel", "dducatel@je-geek.fr")]
+    __description = """Mega-debrid.eu hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("D.Ducatel", "dducatel@je-geek.fr")]
 
 
     def getHosters(self):
diff --git a/pyload/plugin/hook/MegaRapidoNet.py b/pyload/plugin/hook/MegaRapidoNet.py
index 2f660c939..4650d8b6d 100644
--- a/pyload/plugin/hook/MegaRapidoNet.py
+++ b/pyload/plugin/hook/MegaRapidoNet.py
@@ -6,18 +6,18 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class MegaRapidoNet(MultiHook):
-    __name__    = "MegaRapidoNet"
-    __type__    = "hook"
-    __version__ = "0.02"
+    __name    = "MegaRapidoNet"
+    __type    = "hook"
+    __version = "0.02"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"              , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"              , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)", ""   ),
                   ("reload"        , "bool"               , "Reload plugin list"           , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"     , 12   )]
 
-    __description__ = """MegaRapido.net hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")]
+    __description = """MegaRapido.net hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Kagenoshin", "kagenoshin@gmx.ch")]
 
 
     def getHosters(self):
diff --git a/pyload/plugin/hook/MultihostersCom.py b/pyload/plugin/hook/MultihostersCom.py
index 7b92089a1..5cb2396ee 100644
--- a/pyload/plugin/hook/MultihostersCom.py
+++ b/pyload/plugin/hook/MultihostersCom.py
@@ -4,15 +4,15 @@ from pyload.plugin.hook.ZeveraCom import ZeveraCom
 
 
 class MultihostersCom(ZeveraCom):
-    __name__    = "MultihostersCom"
-    __type__    = "hook"
-    __version__ = "0.02"
+    __name    = "MultihostersCom"
+    __type    = "hook"
+    __version = "0.02"
 
-    __config__ = [("mode"        , "all;listed;unlisted", "Use for plugins (if supported)"               , "all"),
+    __config = [("mode"        , "all;listed;unlisted", "Use for plugins (if supported)"               , "all"),
                   ("pluginlist"  , "str"                , "Plugin list (comma separated)"                , ""   ),
                   ("revertfailed", "bool"               , "Revert to standard download if download fails", False),
                   ("interval"    , "int"                , "Reload interval in hours (0 to disable)"      , 12   )]
 
-    __description__ = """Multihosters.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("tjeh", "tjeh@gmx.net")]
+    __description = """Multihosters.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("tjeh", "tjeh@gmx.net")]
diff --git a/pyload/plugin/hook/MultishareCz.py b/pyload/plugin/hook/MultishareCz.py
index 21e200584..0a0fa9fcb 100644
--- a/pyload/plugin/hook/MultishareCz.py
+++ b/pyload/plugin/hook/MultishareCz.py
@@ -6,19 +6,19 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class MultishareCz(MultiHook):
-    __name__    = "MultishareCz"
-    __type__    = "hook"
-    __version__ = "0.07"
+    __name    = "MultishareCz"
+    __type    = "hook"
+    __version = "0.07"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
 
-    __description__ = """MultiShare.cz hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """MultiShare.cz hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     HOSTER_PATTERN = r'<img class="logo-shareserveru"[^>]*?alt="([^"]+)"></td>\s*<td class="stav">[^>]*?alt="OK"'
diff --git a/pyload/plugin/hook/MyfastfileCom.py b/pyload/plugin/hook/MyfastfileCom.py
index 3149e832c..b6573e56d 100644
--- a/pyload/plugin/hook/MyfastfileCom.py
+++ b/pyload/plugin/hook/MyfastfileCom.py
@@ -5,19 +5,19 @@ from pyload.utils import json_loads
 
 
 class MyfastfileCom(MultiHook):
-    __name__    = "MyfastfileCom"
-    __type__    = "hook"
-    __version__ = "0.05"
+    __name    = "MyfastfileCom"
+    __type    = "hook"
+    __version = "0.05"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
 
-    __description__ = """Myfastfile.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Myfastfile.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     def getHosters(self):
diff --git a/pyload/plugin/hook/NoPremiumPl.py b/pyload/plugin/hook/NoPremiumPl.py
index 93c5b8d1e..05bd6c0ba 100644
--- a/pyload/plugin/hook/NoPremiumPl.py
+++ b/pyload/plugin/hook/NoPremiumPl.py
@@ -5,19 +5,19 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class NoPremiumPl(MultiHook):
-    __name__    = "NoPremiumPl"
-    __type__    = "hook"
-    __version__ = "0.03"
+    __name    = "NoPremiumPl"
+    __type    = "hook"
+    __version = "0.03"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
 
-    __description__ = """NoPremium.pl hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("goddie", "dev@nopremium.pl")]
+    __description = """NoPremium.pl hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("goddie", "dev@nopremium.pl")]
 
 
     def getHosters(self):
diff --git a/pyload/plugin/hook/OverLoadMe.py b/pyload/plugin/hook/OverLoadMe.py
index 6db7c1fa2..5fc04e6f4 100644
--- a/pyload/plugin/hook/OverLoadMe.py
+++ b/pyload/plugin/hook/OverLoadMe.py
@@ -4,20 +4,20 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class OverLoadMe(MultiHook):
-    __name__    = "OverLoadMe"
-    __type__    = "hook"
-    __version__ = "0.04"
+    __name    = "OverLoadMe"
+    __type    = "hook"
+    __version = "0.04"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   ),
                   ("ssl"           , "bool"               , "Use HTTPS"                           , True )]
 
-    __description__ = """Over-Load.me hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("marley", "marley@over-load.me")]
+    __description = """Over-Load.me hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("marley", "marley@over-load.me")]
 
 
     def getHosters(self):
diff --git a/pyload/plugin/hook/PremiumTo.py b/pyload/plugin/hook/PremiumTo.py
index 51e801c4f..361f072a3 100644
--- a/pyload/plugin/hook/PremiumTo.py
+++ b/pyload/plugin/hook/PremiumTo.py
@@ -4,19 +4,19 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class PremiumTo(MultiHook):
-    __name__    = "PremiumTo"
-    __type__    = "hook"
-    __version__ = "0.08"
+    __name    = "PremiumTo"
+    __type    = "hook"
+    __version = "0.08"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
 
-    __description__ = """Premium.to hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN"   , "RaNaN@pyload.org"   ),
+    __description = """Premium.to hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN"   , "RaNaN@pyload.org"   ),
                        ("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
diff --git a/pyload/plugin/hook/PremiumizeMe.py b/pyload/plugin/hook/PremiumizeMe.py
index 209db7c75..1e4a58592 100644
--- a/pyload/plugin/hook/PremiumizeMe.py
+++ b/pyload/plugin/hook/PremiumizeMe.py
@@ -5,19 +5,19 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class PremiumizeMe(MultiHook):
-    __name__    = "PremiumizeMe"
-    __type__    = "hook"
-    __version__ = "0.17"
+    __name    = "PremiumizeMe"
+    __type    = "hook"
+    __version = "0.17"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
 
-    __description__ = """Premiumize.me hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Florian Franzen", "FlorianFranzen@gmail.com")]
+    __description = """Premiumize.me hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Florian Franzen", "FlorianFranzen@gmail.com")]
 
 
     def getHosters(self):
diff --git a/pyload/plugin/hook/PutdriveCom.py b/pyload/plugin/hook/PutdriveCom.py
index 85e2f541d..126eb86e8 100644
--- a/pyload/plugin/hook/PutdriveCom.py
+++ b/pyload/plugin/hook/PutdriveCom.py
@@ -4,15 +4,15 @@ from pyload.plugin.hook.ZeveraCom import ZeveraCom
 
 
 class PutdriveCom(ZeveraCom):
-    __name__    = "PutdriveCom"
-    __type__    = "hook"
-    __version__ = "0.01"
+    __name    = "PutdriveCom"
+    __type    = "hook"
+    __version = "0.01"
 
-    __config__ = [("mode"        , "all;listed;unlisted", "Use for plugins (if supported)"               , "all"),
+    __config = [("mode"        , "all;listed;unlisted", "Use for plugins (if supported)"               , "all"),
                   ("pluginlist"  , "str"                , "Plugin list (comma separated)"                , ""   ),
                   ("revertfailed", "bool"               , "Revert to standard download if download fails", False),
                   ("interval"    , "int"                , "Reload interval in hours (0 to disable)"      , 12   )]
 
-    __description__ = """Putdrive.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Putdrive.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
diff --git a/pyload/plugin/hook/RPNetBiz.py b/pyload/plugin/hook/RPNetBiz.py
index e8afb4fc0..d9d3e6177 100644
--- a/pyload/plugin/hook/RPNetBiz.py
+++ b/pyload/plugin/hook/RPNetBiz.py
@@ -5,19 +5,19 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class RPNetBiz(MultiHook):
-    __name__    = "RPNetBiz"
-    __type__    = "hook"
-    __version__ = "0.14"
+    __name    = "RPNetBiz"
+    __type    = "hook"
+    __version = "0.14"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
 
-    __description__ = """RPNet.biz hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Dman", "dmanugm@gmail.com")]
+    __description = """RPNet.biz hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Dman", "dmanugm@gmail.com")]
 
 
     def getHosters(self):
diff --git a/pyload/plugin/hook/RapideoPl.py b/pyload/plugin/hook/RapideoPl.py
index 74bad2cfd..a850c7710 100644
--- a/pyload/plugin/hook/RapideoPl.py
+++ b/pyload/plugin/hook/RapideoPl.py
@@ -5,19 +5,19 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class RapideoPl(MultiHook):
-    __name__    = "RapideoPl"
-    __type__    = "hook"
-    __version__ = "0.03"
+    __name    = "RapideoPl"
+    __type    = "hook"
+    __version = "0.03"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
 
-    __description__ = """Rapideo.pl hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("goddie", "dev@rapideo.pl")]
+    __description = """Rapideo.pl hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("goddie", "dev@rapideo.pl")]
 
 
     def getHosters(self):
diff --git a/pyload/plugin/hook/RealdebridCom.py b/pyload/plugin/hook/RealdebridCom.py
index 74a114105..916737cd8 100644
--- a/pyload/plugin/hook/RealdebridCom.py
+++ b/pyload/plugin/hook/RealdebridCom.py
@@ -4,20 +4,20 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class RealdebridCom(MultiHook):
-    __name__    = "RealdebridCom"
-    __type__    = "hook"
-    __version__ = "0.46"
+    __name    = "RealdebridCom"
+    __type    = "hook"
+    __version = "0.46"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   ),
                   ("ssl"           , "bool"               , "Use HTTPS"                           , True )]
 
-    __description__ = """Real-Debrid.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Devirex Hazzard", "naibaf_11@yahoo.de")]
+    __description = """Real-Debrid.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Devirex Hazzard", "naibaf_11@yahoo.de")]
 
 
     def getHosters(self):
diff --git a/pyload/plugin/hook/RehostTo.py b/pyload/plugin/hook/RehostTo.py
index 69978edaa..087701c5b 100644
--- a/pyload/plugin/hook/RehostTo.py
+++ b/pyload/plugin/hook/RehostTo.py
@@ -4,19 +4,19 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class RehostTo(MultiHook):
-    __name__    = "RehostTo"
-    __type__    = "hook"
-    __version__ = "0.50"
+    __name    = "RehostTo"
+    __type    = "hook"
+    __version = "0.50"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
 
-    __description__ = """Rehost.to hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
+    __description = """Rehost.to hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org")]
 
 
     def getHosters(self):
diff --git a/pyload/plugin/hook/SimplyPremiumCom.py b/pyload/plugin/hook/SimplyPremiumCom.py
index 9f696666f..f095cd7e6 100644
--- a/pyload/plugin/hook/SimplyPremiumCom.py
+++ b/pyload/plugin/hook/SimplyPremiumCom.py
@@ -5,19 +5,19 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class SimplyPremiumCom(MultiHook):
-    __name__    = "SimplyPremiumCom"
-    __type__    = "hook"
-    __version__ = "0.05"
+    __name    = "SimplyPremiumCom"
+    __type    = "hook"
+    __version = "0.05"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
 
-    __description__ = """Simply-Premium.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("EvolutionClip", "evolutionclip@live.de")]
+    __description = """Simply-Premium.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("EvolutionClip", "evolutionclip@live.de")]
 
 
     def getHosters(self):
diff --git a/pyload/plugin/hook/SimplydebridCom.py b/pyload/plugin/hook/SimplydebridCom.py
index 74eba106e..d831bf532 100644
--- a/pyload/plugin/hook/SimplydebridCom.py
+++ b/pyload/plugin/hook/SimplydebridCom.py
@@ -4,19 +4,19 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class SimplydebridCom(MultiHook):
-    __name__    = "SimplydebridCom"
-    __type__    = "hook"
-    __version__ = "0.04"
+    __name    = "SimplydebridCom"
+    __type    = "hook"
+    __version = "0.04"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
 
-    __description__ = """Simply-Debrid.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")]
+    __description = """Simply-Debrid.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Kagenoshin", "kagenoshin@gmx.ch")]
 
 
     def getHosters(self):
diff --git a/pyload/plugin/hook/SmoozedCom.py b/pyload/plugin/hook/SmoozedCom.py
index 37c0d9bcb..caecb8bc2 100644
--- a/pyload/plugin/hook/SmoozedCom.py
+++ b/pyload/plugin/hook/SmoozedCom.py
@@ -4,19 +4,19 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class SmoozedCom(MultiHook):
-    __name__    = "SmoozedCom"
-    __type__    = "hook"
-    __version__ = "0.03"
+    __name    = "SmoozedCom"
+    __type    = "hook"
+    __version = "0.03"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
 
-    __description__ = """Smoozed.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("", "")]
+    __description = """Smoozed.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("", "")]
 
 
     def getHosters(self):
diff --git a/pyload/plugin/hook/UnrestrictLi.py b/pyload/plugin/hook/UnrestrictLi.py
index a0fb53004..124a5109a 100644
--- a/pyload/plugin/hook/UnrestrictLi.py
+++ b/pyload/plugin/hook/UnrestrictLi.py
@@ -5,20 +5,20 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class UnrestrictLi(MultiHook):
-    __name__    = "UnrestrictLi"
-    __type__    = "hook"
-    __version__ = "0.05"
+    __name    = "UnrestrictLi"
+    __type    = "hook"
+    __version = "0.05"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   ),
                   ("history"       , "bool"               , "Delete History"                      , False)]
 
-    __description__ = """Unrestrict.li hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Unrestrict.li hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     def getHosters(self):
diff --git a/pyload/plugin/hook/XFileSharingPro.py b/pyload/plugin/hook/XFileSharingPro.py
index 9560cbd08..9ded9cd53 100644
--- a/pyload/plugin/hook/XFileSharingPro.py
+++ b/pyload/plugin/hook/XFileSharingPro.py
@@ -6,20 +6,20 @@ from pyload.plugin.Hook import Hook
 
 
 class XFileSharingPro(Hook):
-    __name__    = "XFileSharingPro"
-    __type__    = "hook"
-    __version__ = "0.36"
+    __name    = "XFileSharingPro"
+    __type    = "hook"
+    __version = "0.36"
 
-    __config__ = [("activated"       , "bool", "Activated"                     , True ),
+    __config = [("activated"       , "bool", "Activated"                     , True ),
                   ("use_hoster_list" , "bool", "Load listed hosters only"      , False),
                   ("use_crypter_list", "bool", "Load listed crypters only"     , False),
                   ("use_builtin_list", "bool", "Load built-in plugin list"     , True ),
                   ("hoster_list"     , "str" , "Hoster list (comma separated)" , ""   ),
                   ("crypter_list"    , "str" , "Crypter list (comma separated)", ""   )]
 
-    __description__ = """Load XFileSharingPro based hosters and crypter which don't need a own plugin to run"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Load XFileSharingPro based hosters and crypter which don't need a own plugin to run"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     # event_list = ["pluginConfigChanged"]
diff --git a/pyload/plugin/hook/ZeveraCom.py b/pyload/plugin/hook/ZeveraCom.py
index 0ca2e72d2..e52ec8eed 100644
--- a/pyload/plugin/hook/ZeveraCom.py
+++ b/pyload/plugin/hook/ZeveraCom.py
@@ -4,19 +4,19 @@ from pyload.plugin.internal.MultiHook import MultiHook
 
 
 class ZeveraCom(MultiHook):
-    __name__    = "ZeveraCom"
-    __type__    = "hook"
-    __version__ = "0.05"
+    __name    = "ZeveraCom"
+    __type    = "hook"
+    __version = "0.05"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
                   ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
                   ("reload"        , "bool"               , "Reload plugin list"                  , True ),
                   ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
 
-    __description__ = """Zevera.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg"      , "zoidberg@mujmail.cz"),
+    __description = """Zevera.com hook plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg"      , "zoidberg@mujmail.cz"),
                        ("Walter Purcaro", "vuolter@gmail.com"  )]
 
 
diff --git a/pyload/plugin/hoster/AlldebridCom.py b/pyload/plugin/hoster/AlldebridCom.py
index d739600d9..c1b4a757f 100644
--- a/pyload/plugin/hoster/AlldebridCom.py
+++ b/pyload/plugin/hoster/AlldebridCom.py
@@ -11,16 +11,16 @@ from pyload.utils import parseFileSize
 
 
 class AlldebridCom(MultiHoster):
-    __name__    = "AlldebridCom"
-    __type__    = "hoster"
-    __version__ = "0.46"
+    __name    = "AlldebridCom"
+    __type    = "hoster"
+    __version = "0.46"
 
-    __pattern__ = r'https?://(?:www\.|s\d+\.)?alldebrid\.com/dl/[\w^_]+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.|s\d+\.)?alldebrid\.com/dl/[\w^_]+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Alldebrid.com multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Andy Voigt", "spamsales@online.de")]
+    __description = """Alldebrid.com multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Andy Voigt", "spamsales@online.de")]
 
 
     def setup(self):
diff --git a/pyload/plugin/hoster/AndroidfilehostCom.py b/pyload/plugin/hoster/AndroidfilehostCom.py
index aa1387c24..584001725 100644
--- a/pyload/plugin/hoster/AndroidfilehostCom.py
+++ b/pyload/plugin/hoster/AndroidfilehostCom.py
@@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class AndroidfilehostCom(SimpleHoster):
-    __name__    = "AndroidfilehostCom"
-    __type__    = "hoster"
-    __version__ = "0.01"
+    __name    = "AndroidfilehostCom"
+    __type    = "hoster"
+    __version = "0.01"
 
-    __pattern__ = r'https?://(?:www\.)?androidfilehost\.com/\?fid=\d+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?androidfilehost\.com/\?fid=\d+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Androidfilehost.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]
+    __description = """Androidfilehost.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
     NAME_PATTERN    = r'<br />(?P<N>.*?)</h1>'
diff --git a/pyload/plugin/hoster/BasketbuildCom.py b/pyload/plugin/hoster/BasketbuildCom.py
index ea9b9bc29..d005eae74 100644
--- a/pyload/plugin/hoster/BasketbuildCom.py
+++ b/pyload/plugin/hoster/BasketbuildCom.py
@@ -10,16 +10,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class BasketbuildCom(SimpleHoster):
-    __name__    = "BasketbuildCom"
-    __type__    = "hoster"
-    __version__ = "0.03"
+    __name    = "BasketbuildCom"
+    __type    = "hoster"
+    __version = "0.03"
 
-    __pattern__ = r'https?://(?:www\.)?(?:\w\.)?basketbuild\.com/filedl/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?(?:\w\.)?basketbuild\.com/filedl/.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """basketbuild.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]
+    __description = """basketbuild.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
     NAME_PATTERN    = r'File Name:</strong> (?P<N>.+?)<br/>'
diff --git a/pyload/plugin/hoster/BayfilesCom.py b/pyload/plugin/hoster/BayfilesCom.py
index ab94b4015..b14e28dcb 100644
--- a/pyload/plugin/hoster/BayfilesCom.py
+++ b/pyload/plugin/hoster/BayfilesCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class BayfilesCom(DeadHoster):
-    __name__    = "BayfilesCom"
-    __type__    = "hoster"
-    __version__ = "0.09"
+    __name    = "BayfilesCom"
+    __type    = "hoster"
+    __version = "0.09"
 
-    __pattern__ = r'https?://(?:www\.)?bayfiles\.(com|net)/file/(?P<ID>\w+/\w+/[^/]+)'
-    __config__  = []
+    __pattern = r'https?://(?:www\.)?bayfiles\.(com|net)/file/(?P<ID>\w+/\w+/[^/]+)'
+    __config  = []
 
-    __description__ = """Bayfiles.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Bayfiles.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
diff --git a/pyload/plugin/hoster/BezvadataCz.py b/pyload/plugin/hoster/BezvadataCz.py
index 20da88010..0792c851c 100644
--- a/pyload/plugin/hoster/BezvadataCz.py
+++ b/pyload/plugin/hoster/BezvadataCz.py
@@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class BezvadataCz(SimpleHoster):
-    __name__    = "BezvadataCz"
-    __type__    = "hoster"
-    __version__ = "0.26"
+    __name    = "BezvadataCz"
+    __type    = "hoster"
+    __version = "0.26"
 
-    __pattern__ = r'http://(?:www\.)?bezvadata\.cz/stahnout/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?bezvadata\.cz/stahnout/.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """BezvaData.cz hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """BezvaData.cz hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     NAME_PATTERN = r'<p><b>Soubor: (?P<N>[^<]+)</b></p>'
diff --git a/pyload/plugin/hoster/BillionuploadsCom.py b/pyload/plugin/hoster/BillionuploadsCom.py
index 2dec3e8b8..e34584868 100644
--- a/pyload/plugin/hoster/BillionuploadsCom.py
+++ b/pyload/plugin/hoster/BillionuploadsCom.py
@@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class BillionuploadsCom(XFSHoster):
-    __name__    = "BillionuploadsCom"
-    __type__    = "hoster"
-    __version__ = "0.04"
+    __name    = "BillionuploadsCom"
+    __type    = "hoster"
+    __version = "0.04"
 
-    __pattern__ = r'http://(?:www\.)?billionuploads\.com/\w{12}'
+    __pattern = r'http://(?:www\.)?billionuploads\.com/\w{12}'
 
-    __description__ = """Billionuploads.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Billionuploads.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     NAME_PATTERN = r'<td class="dofir" title="(?P<N>.+?)"'
diff --git a/pyload/plugin/hoster/BitshareCom.py b/pyload/plugin/hoster/BitshareCom.py
index 8e8a87bc1..f4be88401 100644
--- a/pyload/plugin/hoster/BitshareCom.py
+++ b/pyload/plugin/hoster/BitshareCom.py
@@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class BitshareCom(SimpleHoster):
-    __name__    = "BitshareCom"
-    __type__    = "hoster"
-    __version__ = "0.53"
+    __name    = "BitshareCom"
+    __type    = "hoster"
+    __version = "0.53"
 
-    __pattern__ = r'http://(?:www\.)?bitshare\.com/(files/)?(?(1)|\?f=)(?P<ID>\w+)(?(1)/(?P<NAME>.+?)\.html)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?bitshare\.com/(files/)?(?(1)|\?f=)(?P<ID>\w+)(?(1)/(?P<NAME>.+?)\.html)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Bitshare.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Paul King", ""),
+    __description = """Bitshare.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Paul King", ""),
                        ("fragonib", "fragonib[AT]yahoo[DOT]es")]
 
 
@@ -41,7 +41,7 @@ class BitshareCom(SimpleHoster):
             self.account.relogin(self.user)
 
         # File id
-        m = re.match(self.__pattern__, pyfile.url)
+        m = re.match(self.__pattern, pyfile.url)
         self.file_id = max(m.group('ID1'), m.group('ID2'))
         self.logDebug("File id is [%s]" % self.file_id)
 
@@ -59,7 +59,7 @@ class BitshareCom(SimpleHoster):
             self.retry()
 
         # File name
-        m     = re.match(self.__pattern__, pyfile.url)
+        m     = re.match(self.__pattern, pyfile.url)
         name1 = m.group('NAME') if m else None
 
         m     = re.search(self.INFO_PATTERN, self.html)
diff --git a/pyload/plugin/hoster/BoltsharingCom.py b/pyload/plugin/hoster/BoltsharingCom.py
index 58d4a23a9..10716e695 100644
--- a/pyload/plugin/hoster/BoltsharingCom.py
+++ b/pyload/plugin/hoster/BoltsharingCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class BoltsharingCom(DeadHoster):
-    __name__    = "BoltsharingCom"
-    __type__    = "hoster"
-    __version__ = "0.02"
+    __name    = "BoltsharingCom"
+    __type    = "hoster"
+    __version = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?boltsharing\.com/\w{12}'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?boltsharing\.com/\w{12}'
+    __config  = []
 
-    __description__ = """Boltsharing.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Boltsharing.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/hoster/CatShareNet.py b/pyload/plugin/hoster/CatShareNet.py
index c2f7756c0..0aca297b8 100644
--- a/pyload/plugin/hoster/CatShareNet.py
+++ b/pyload/plugin/hoster/CatShareNet.py
@@ -7,16 +7,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class CatShareNet(SimpleHoster):
-    __name__    = "CatShareNet"
-    __type__    = "hoster"
-    __version__ = "0.12"
+    __name    = "CatShareNet"
+    __type    = "hoster"
+    __version = "0.12"
 
-    __pattern__ = r'http://(?:www\.)?catshare\.net/\w{16}'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?catshare\.net/\w{16}'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """CatShare.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("z00nx", "z00nx0@gmail.com"),
+    __description = """CatShare.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("z00nx", "z00nx0@gmail.com"),
                        ("prOq", ""),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
diff --git a/pyload/plugin/hoster/CloudzerNet.py b/pyload/plugin/hoster/CloudzerNet.py
index 775b4656a..c1b3beae8 100644
--- a/pyload/plugin/hoster/CloudzerNet.py
+++ b/pyload/plugin/hoster/CloudzerNet.py
@@ -4,15 +4,15 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class CloudzerNet(DeadHoster):
-    __name__    = "CloudzerNet"
-    __type__    = "hoster"
-    __version__ = "0.05"
+    __name    = "CloudzerNet"
+    __type    = "hoster"
+    __version = "0.05"
 
-    __pattern__ = r'https?://(?:www\.)?(cloudzer\.net/file/|clz\.to/(file/)?)\w+'
-    __config__  = []
+    __pattern = r'https?://(?:www\.)?(cloudzer\.net/file/|clz\.to/(file/)?)\w+'
+    __config  = []
 
-    __description__ = """Cloudzer.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("gs", "I-_-I-_-I@web.de"),
+    __description = """Cloudzer.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("gs", "I-_-I-_-I@web.de"),
                        ("z00nx", "z00nx0@gmail.com"),
                        ("stickell", "l.stickell@yahoo.it")]
diff --git a/pyload/plugin/hoster/CloudzillaTo.py b/pyload/plugin/hoster/CloudzillaTo.py
index 337aa9d3c..a244b1fae 100644
--- a/pyload/plugin/hoster/CloudzillaTo.py
+++ b/pyload/plugin/hoster/CloudzillaTo.py
@@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class CloudzillaTo(SimpleHoster):
-    __name__    = "CloudzillaTo"
-    __type__    = "hoster"
-    __version__ = "0.06"
+    __name    = "CloudzillaTo"
+    __type    = "hoster"
+    __version = "0.06"
 
-    __pattern__ = r'http://(?:www\.)?cloudzilla\.to/share/file/(?P<ID>[\w^_]+)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?cloudzilla\.to/share/file/(?P<ID>[\w^_]+)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Cloudzilla.to hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Cloudzilla.to hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     INFO_PATTERN    = r'title="(?P<N>.+?)">\1</span> <span class="size">\((?P<S>[\d.]+) (?P<U>[\w^_]+)'
diff --git a/pyload/plugin/hoster/CramitIn.py b/pyload/plugin/hoster/CramitIn.py
index 3ccb3cfc6..9d8d4960d 100644
--- a/pyload/plugin/hoster/CramitIn.py
+++ b/pyload/plugin/hoster/CramitIn.py
@@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class CramitIn(XFSHoster):
-    __name__    = "CramitIn"
-    __type__    = "hoster"
-    __version__ = "0.07"
+    __name    = "CramitIn"
+    __type    = "hoster"
+    __version = "0.07"
 
-    __pattern__ = r'http://(?:www\.)?cramit\.in/\w{12}'
+    __pattern = r'http://(?:www\.)?cramit\.in/\w{12}'
 
-    __description__ = """Cramit.in hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Cramit.in hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     INFO_PATTERN = r'<span class=t2>\s*(?P<N>.*?)</span>.*?<small>\s*\((?P<S>.*?)\)'
diff --git a/pyload/plugin/hoster/CrockoCom.py b/pyload/plugin/hoster/CrockoCom.py
index 42f4d7775..55bb126cd 100644
--- a/pyload/plugin/hoster/CrockoCom.py
+++ b/pyload/plugin/hoster/CrockoCom.py
@@ -7,16 +7,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class CrockoCom(SimpleHoster):
-    __name__    = "CrockoCom"
-    __type__    = "hoster"
-    __version__ = "0.19"
+    __name    = "CrockoCom"
+    __type    = "hoster"
+    __version = "0.19"
 
-    __pattern__ = r'http://(?:www\.)?(crocko|easy-share)\.com/\w+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?(crocko|easy-share)\.com/\w+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Crocko hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Crocko hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     NAME_PATTERN = r'<span class="fz24">Download:\s*<strong>(?P<N>.*)'
diff --git a/pyload/plugin/hoster/CyberlockerCh.py b/pyload/plugin/hoster/CyberlockerCh.py
index ec06844c3..b56736a8e 100644
--- a/pyload/plugin/hoster/CyberlockerCh.py
+++ b/pyload/plugin/hoster/CyberlockerCh.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class CyberlockerCh(DeadHoster):
-    __name__    = "CyberlockerCh"
-    __type__    = "hoster"
-    __version__ = "0.02"
+    __name    = "CyberlockerCh"
+    __type    = "hoster"
+    __version = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?cyberlocker\.ch/\w+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?cyberlocker\.ch/\w+'
+    __config  = []
 
-    __description__ = """Cyberlocker.ch hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Cyberlocker.ch hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
diff --git a/pyload/plugin/hoster/CzshareCom.py b/pyload/plugin/hoster/CzshareCom.py
index 70766d6fc..ee7bf5d55 100644
--- a/pyload/plugin/hoster/CzshareCom.py
+++ b/pyload/plugin/hoster/CzshareCom.py
@@ -10,16 +10,16 @@ from pyload.utils import parseFileSize
 
 
 class CzshareCom(SimpleHoster):
-    __name__    = "CzshareCom"
-    __type__    = "hoster"
-    __version__ = "0.99"
+    __name    = "CzshareCom"
+    __type    = "hoster"
+    __version = "0.99"
 
-    __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/(\d+/|download\.php\?).+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/(\d+/|download\.php\?).+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """CZshare.com hoster plugin, now Sdilej.cz"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """CZshare.com hoster plugin, now Sdilej.cz"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     NAME_PATTERN    = r'<div class="tab" id="parameters">\s*<p>\s*Cel. n.zev: <a href=[^>]*>(?P<N>[^<]+)</a>'
diff --git a/pyload/plugin/hoster/DailymotionCom.py b/pyload/plugin/hoster/DailymotionCom.py
index f90067446..3fdac761c 100644
--- a/pyload/plugin/hoster/DailymotionCom.py
+++ b/pyload/plugin/hoster/DailymotionCom.py
@@ -10,7 +10,7 @@ from pyload.plugin.Hoster import Hoster
 
 def getInfo(urls):
     result  = []
-    regex   = re.compile(DailymotionCom.__pattern__)
+    regex   = re.compile(DailymotionCom.__pattern)
     apiurl  = "https://api.dailymotion.com/video/%s"
     request = {"fields": "access_error,status,title"}
 
@@ -38,16 +38,16 @@ def getInfo(urls):
 
 
 class DailymotionCom(Hoster):
-    __name__    = "DailymotionCom"
-    __type__    = "hoster"
-    __version__ = "0.20"
+    __name    = "DailymotionCom"
+    __type    = "hoster"
+    __version = "0.20"
 
-    __pattern__ = r'https?://(?:www\.)?dailymotion\.com/.*video/(?P<ID>[\w^_]+)'
-    __config__  = [("quality", "Lowest;LD 144p;LD 240p;SD 384p;HQ 480p;HD 720p;HD 1080p;Highest", "Quality", "Highest")]
+    __pattern = r'https?://(?:www\.)?dailymotion\.com/.*video/(?P<ID>[\w^_]+)'
+    __config  = [("quality", "Lowest;LD 144p;LD 240p;SD 384p;HQ 480p;HD 720p;HD 1080p;Highest", "Quality", "Highest")]
 
-    __description__ = """Dailymotion.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Dailymotion.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     def setup(self):
@@ -116,7 +116,7 @@ class DailymotionCom(Hoster):
     def process(self, pyfile):
         self.checkInfo(pyfile)
 
-        id = re.match(self.__pattern__, pyfile.url).group('ID')
+        id = re.match(self.__pattern, pyfile.url).group('ID')
         self.html = self.load("http://www.dailymotion.com/embed/video/" + id, decode=True)
 
         streams = self.getStreams()
diff --git a/pyload/plugin/hoster/DataHu.py b/pyload/plugin/hoster/DataHu.py
index 820736e0a..eb65bbda9 100644
--- a/pyload/plugin/hoster/DataHu.py
+++ b/pyload/plugin/hoster/DataHu.py
@@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class DataHu(SimpleHoster):
-    __name__    = "DataHu"
-    __type__    = "hoster"
-    __version__ = "0.03"
+    __name    = "DataHu"
+    __type    = "hoster"
+    __version = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?data\.hu/get/\w+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?data\.hu/get/\w+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Data.hu hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("crash", ""),
+    __description = """Data.hu hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("crash", ""),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/hoster/DataportCz.py b/pyload/plugin/hoster/DataportCz.py
index 4f659b291..889d402d9 100644
--- a/pyload/plugin/hoster/DataportCz.py
+++ b/pyload/plugin/hoster/DataportCz.py
@@ -4,16 +4,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class DataportCz(SimpleHoster):
-    __name__    = "DataportCz"
-    __type__    = "hoster"
-    __version__ = "0.41"
+    __name    = "DataportCz"
+    __type    = "hoster"
+    __version = "0.41"
 
-    __pattern__ = r'http://(?:www\.)?dataport\.cz/file/(.+)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?dataport\.cz/file/(.+)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Dataport.cz hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Dataport.cz hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     NAME_PATTERN = r'<span itemprop="name">(?P<N>[^<]+)</span>'
diff --git a/pyload/plugin/hoster/DateiTo.py b/pyload/plugin/hoster/DateiTo.py
index 97fdd0155..6c160dfb9 100644
--- a/pyload/plugin/hoster/DateiTo.py
+++ b/pyload/plugin/hoster/DateiTo.py
@@ -7,16 +7,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class DateiTo(SimpleHoster):
-    __name__    = "DateiTo"
-    __type__    = "hoster"
-    __version__ = "0.07"
+    __name    = "DateiTo"
+    __type    = "hoster"
+    __version = "0.07"
 
-    __pattern__ = r'http://(?:www\.)?datei\.to/datei/(?P<ID>\w+)\.html'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?datei\.to/datei/(?P<ID>\w+)\.html'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Datei.to hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Datei.to hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     NAME_PATTERN    = r'Dateiname:</td>\s*<td colspan="2"><strong>(?P<N>.*?)</'
diff --git a/pyload/plugin/hoster/DdlstorageCom.py b/pyload/plugin/hoster/DdlstorageCom.py
index c2077eb16..53c0df7cb 100644
--- a/pyload/plugin/hoster/DdlstorageCom.py
+++ b/pyload/plugin/hoster/DdlstorageCom.py
@@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class DdlstorageCom(DeadHoster):
-    __name__    = "DdlstorageCom"
-    __type__    = "hoster"
-    __version__ = "1.02"
+    __name    = "DdlstorageCom"
+    __type    = "hoster"
+    __version = "1.02"
 
-    __pattern__ = r'https?://(?:www\.)?ddlstorage\.com/\w+'
-    __config__  = []
+    __pattern = r'https?://(?:www\.)?ddlstorage\.com/\w+'
+    __config  = []
 
-    __description__ = """DDLStorage.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """DDLStorage.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
diff --git a/pyload/plugin/hoster/DebridItaliaCom.py b/pyload/plugin/hoster/DebridItaliaCom.py
index af9500707..a0308e28e 100644
--- a/pyload/plugin/hoster/DebridItaliaCom.py
+++ b/pyload/plugin/hoster/DebridItaliaCom.py
@@ -6,16 +6,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster
 
 
 class DebridItaliaCom(MultiHoster):
-    __name__    = "DebridItaliaCom"
-    __type__    = "hoster"
-    __version__ = "0.17"
+    __name    = "DebridItaliaCom"
+    __type    = "hoster"
+    __version = "0.17"
 
-    __pattern__ = r'https?://(?:www\.|s\d+\.)?debriditalia\.com/dl/\d+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.|s\d+\.)?debriditalia\.com/dl/\d+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Debriditalia.com multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it"),
+    __description = """Debriditalia.com multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/hoster/DepositfilesCom.py b/pyload/plugin/hoster/DepositfilesCom.py
index 1832fd35b..736350f0c 100644
--- a/pyload/plugin/hoster/DepositfilesCom.py
+++ b/pyload/plugin/hoster/DepositfilesCom.py
@@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class DepositfilesCom(SimpleHoster):
-    __name__    = "DepositfilesCom"
-    __type__    = "hoster"
-    __version__ = "0.54"
+    __name    = "DepositfilesCom"
+    __type    = "hoster"
+    __version = "0.54"
 
-    __pattern__ = r'https?://(?:www\.)?(depositfiles\.com|dfiles\.(eu|ru))(/\w{1,3})?/files/(?P<ID>\w+)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?(depositfiles\.com|dfiles\.(eu|ru))(/\w{1,3})?/files/(?P<ID>\w+)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Depositfiles.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("spoob", "spoob@pyload.org"),
+    __description = """Depositfiles.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("spoob", "spoob@pyload.org"),
                        ("zoidberg", "zoidberg@mujmail.cz"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
@@ -29,7 +29,7 @@ class DepositfilesCom(SimpleHoster):
 
     NAME_REPLACEMENTS = [(r'\%u([0-9A-Fa-f]{4})', lambda m: unichr(int(m.group(1), 16))),
                               (r'.*<b title="(?P<N>[^"]+).*', "\g<N>")]
-    URL_REPLACEMENTS  = [(__pattern__ + ".*", "https://dfiles.eu/files/\g<ID>")]
+    URL_REPLACEMENTS  = [(__pattern + ".*", "https://dfiles.eu/files/\g<ID>")]
 
     COOKIES = [("dfiles.eu", "lang_current", "en")]
 
diff --git a/pyload/plugin/hoster/DevhostSt.py b/pyload/plugin/hoster/DevhostSt.py
index 5816f1ba0..573b92838 100644
--- a/pyload/plugin/hoster/DevhostSt.py
+++ b/pyload/plugin/hoster/DevhostSt.py
@@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class DevhostSt(SimpleHoster):
-    __name__    = "DevhostSt"
-    __type__    = "hoster"
-    __version__ = "0.05"
+    __name    = "DevhostSt"
+    __type    = "hoster"
+    __version = "0.05"
 
-    __pattern__ = r'http://(?:www\.)?d-h\.st/(?!users/)\w{3}'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?d-h\.st/(?!users/)\w{3}'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """d-h.st hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]
+    __description = """d-h.st hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
     NAME_PATTERN      = r'<span title="(?P<N>.*?)"'
diff --git a/pyload/plugin/hoster/DlFreeFr.py b/pyload/plugin/hoster/DlFreeFr.py
index 7df87bd5d..83e7c5d77 100644
--- a/pyload/plugin/hoster/DlFreeFr.py
+++ b/pyload/plugin/hoster/DlFreeFr.py
@@ -35,16 +35,16 @@ class CustomBrowser(Browser):
 
 
 class DlFreeFr(SimpleHoster):
-    __name__    = "DlFreeFr"
-    __type__    = "hoster"
-    __version__ = "0.28"
+    __name    = "DlFreeFr"
+    __type    = "hoster"
+    __version = "0.28"
 
-    __pattern__ = r'http://(?:www\.)?dl\.free\.fr/(\w+|getfile\.pl\?file=/\w+)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?dl\.free\.fr/(\w+|getfile\.pl\?file=/\w+)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Dl.free.fr hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("the-razer", "daniel_ AT gmx DOT net"),
+    __description = """Dl.free.fr hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("the-razer", "daniel_ AT gmx DOT net"),
                        ("zoidberg", "zoidberg@mujmail.cz"),
                        ("Toilal", "toilal.dev@gmail.com")]
 
@@ -103,7 +103,7 @@ class DlFreeFr(SimpleHoster):
         headers = self.getLastHeaders()
         if headers.get("code") == 302 and "set-cookie" in headers and "location" in headers:
             m = re.search("(.*?)=(.*?); path=(.*?); domain=(.*?)", headers.get("set-cookie"))
-            cj = CookieJar(__name__)
+            cj = CookieJar(__name)
             if m:
                 cj.setCookie(m.group(4), m.group(1), m.group(2), m.group(3))
             else:
diff --git a/pyload/plugin/hoster/DodanePl.py b/pyload/plugin/hoster/DodanePl.py
index 9bd5e45a9..8edbb64c0 100644
--- a/pyload/plugin/hoster/DodanePl.py
+++ b/pyload/plugin/hoster/DodanePl.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class DodanePl(DeadHoster):
-    __name__    = "DodanePl"
-    __type__    = "hoster"
-    __version__ = "0.03"
+    __name    = "DodanePl"
+    __type    = "hoster"
+    __version = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?dodane\.pl/file/\d+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?dodane\.pl/file/\d+'
+    __config  = []
 
-    __description__ = """Dodane.pl hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("z00nx", "z00nx0@gmail.com")]
+    __description = """Dodane.pl hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("z00nx", "z00nx0@gmail.com")]
diff --git a/pyload/plugin/hoster/DuploadOrg.py b/pyload/plugin/hoster/DuploadOrg.py
index 6b7574eee..decd1a7ff 100644
--- a/pyload/plugin/hoster/DuploadOrg.py
+++ b/pyload/plugin/hoster/DuploadOrg.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class DuploadOrg(DeadHoster):
-    __name__    = "DuploadOrg"
-    __type__    = "hoster"
-    __version__ = "0.02"
+    __name    = "DuploadOrg"
+    __type    = "hoster"
+    __version = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?dupload\.org/\w{12}'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?dupload\.org/\w{12}'
+    __config  = []
 
-    __description__ = """Dupload.grg hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Dupload.grg hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
diff --git a/pyload/plugin/hoster/EasybytezCom.py b/pyload/plugin/hoster/EasybytezCom.py
index 07e75714d..8dcb04b98 100644
--- a/pyload/plugin/hoster/EasybytezCom.py
+++ b/pyload/plugin/hoster/EasybytezCom.py
@@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class EasybytezCom(XFSHoster):
-    __name__    = "EasybytezCom"
-    __type__    = "hoster"
-    __version__ = "0.23"
+    __name    = "EasybytezCom"
+    __type    = "hoster"
+    __version = "0.23"
 
-    __pattern__ = r'http://(?:www\.)?easybytez\.com/\w{12}'
+    __pattern = r'http://(?:www\.)?easybytez\.com/\w{12}'
 
-    __description__ = """Easybytez.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """Easybytez.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/hoster/EdiskCz.py b/pyload/plugin/hoster/EdiskCz.py
index 2fd56eb82..1c5a25433 100644
--- a/pyload/plugin/hoster/EdiskCz.py
+++ b/pyload/plugin/hoster/EdiskCz.py
@@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class EdiskCz(SimpleHoster):
-    __name__    = "EdiskCz"
-    __type__    = "hoster"
-    __version__ = "0.23"
+    __name    = "EdiskCz"
+    __type    = "hoster"
+    __version = "0.23"
 
-    __pattern__ = r'http://(?:www\.)?edisk\.(cz|sk|eu)/(stahni|sk/stahni|en/download)/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?edisk\.(cz|sk|eu)/(stahni|sk/stahni|en/download)/.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Edisk.cz hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Edisk.cz hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     INFO_PATTERN = r'<span class="fl" title="(?P<N>[^"]+)">\s*.*?\((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)</h1></span>'
diff --git a/pyload/plugin/hoster/EgoFilesCom.py b/pyload/plugin/hoster/EgoFilesCom.py
index 150b8bc0c..f87c96dd1 100644
--- a/pyload/plugin/hoster/EgoFilesCom.py
+++ b/pyload/plugin/hoster/EgoFilesCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class EgoFilesCom(DeadHoster):
-    __name__    = "EgoFilesCom"
-    __type__    = "hoster"
-    __version__ = "0.16"
+    __name    = "EgoFilesCom"
+    __type    = "hoster"
+    __version = "0.16"
 
-    __pattern__ = r'https?://(?:www\.)?egofiles\.com/\w+'
-    __config__  = []
+    __pattern = r'https?://(?:www\.)?egofiles\.com/\w+'
+    __config  = []
 
-    __description__ = """Egofiles.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Egofiles.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
diff --git a/pyload/plugin/hoster/EnteruploadCom.py b/pyload/plugin/hoster/EnteruploadCom.py
index b3a736697..e64c284f6 100644
--- a/pyload/plugin/hoster/EnteruploadCom.py
+++ b/pyload/plugin/hoster/EnteruploadCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class EnteruploadCom(DeadHoster):
-    __name__    = "EnteruploadCom"
-    __type__    = "hoster"
-    __version__ = "0.02"
+    __name    = "EnteruploadCom"
+    __type    = "hoster"
+    __version = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?enterupload\.com/\w+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?enterupload\.com/\w+'
+    __config  = []
 
-    __description__ = """EnterUpload.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """EnterUpload.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/hoster/EpicShareNet.py b/pyload/plugin/hoster/EpicShareNet.py
index 0bab20afa..05a1aca40 100644
--- a/pyload/plugin/hoster/EpicShareNet.py
+++ b/pyload/plugin/hoster/EpicShareNet.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class EpicShareNet(DeadHoster):
-    __name__    = "EpicShareNet"
-    __type__    = "hoster"
-    __version__ = "0.02"
+    __name    = "EpicShareNet"
+    __type    = "hoster"
+    __version = "0.02"
 
-    __pattern__ = r'https?://(?:www\.)?epicshare\.net/\w{12}'
-    __config__  = []
+    __pattern = r'https?://(?:www\.)?epicshare\.net/\w{12}'
+    __config  = []
 
-    __description__ = """EpicShare.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]
+    __description = """EpicShare.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]
diff --git a/pyload/plugin/hoster/EuroshareEu.py b/pyload/plugin/hoster/EuroshareEu.py
index fa0f69d8f..ff7ca6661 100644
--- a/pyload/plugin/hoster/EuroshareEu.py
+++ b/pyload/plugin/hoster/EuroshareEu.py
@@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class EuroshareEu(SimpleHoster):
-    __name__    = "EuroshareEu"
-    __type__    = "hoster"
-    __version__ = "0.28"
+    __name    = "EuroshareEu"
+    __type    = "hoster"
+    __version = "0.28"
 
-    __pattern__ = r'http://(?:www\.)?euroshare\.(eu|sk|cz|hu|pl)/file/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?euroshare\.(eu|sk|cz|hu|pl)/file/.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Euroshare.eu hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Euroshare.eu hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     INFO_PATTERN    = r'<span style="float: left;"><strong>(?P<N>.+?)</strong> \((?P<S>.+?)\)</span>'
diff --git a/pyload/plugin/hoster/ExashareCom.py b/pyload/plugin/hoster/ExashareCom.py
index 504eef334..c7b876076 100644
--- a/pyload/plugin/hoster/ExashareCom.py
+++ b/pyload/plugin/hoster/ExashareCom.py
@@ -6,15 +6,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class ExashareCom(XFSHoster):
-    __name__    = "ExashareCom"
-    __type__    = "hoster"
-    __version__ = "0.01"
+    __name    = "ExashareCom"
+    __type    = "hoster"
+    __version = "0.01"
 
-    __pattern__ = r'http://(?:www\.)?exashare\.com/\w{12}'
+    __pattern = r'http://(?:www\.)?exashare\.com/\w{12}'
 
-    __description__ = """Exashare.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Exashare.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     INFO_PATTERN      = r'>(?P<NAME>.+?)<small>\( (?P<S>[\d.,]+) (?P<U>[\w^_]+)'
diff --git a/pyload/plugin/hoster/ExtabitCom.py b/pyload/plugin/hoster/ExtabitCom.py
index c0fa782fa..16f74c072 100644
--- a/pyload/plugin/hoster/ExtabitCom.py
+++ b/pyload/plugin/hoster/ExtabitCom.py
@@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster, secondsToMidnight
 
 
 class ExtabitCom(SimpleHoster):
-    __name__    = "ExtabitCom"
-    __type__    = "hoster"
-    __version__ = "0.65"
+    __name    = "ExtabitCom"
+    __type    = "hoster"
+    __version = "0.65"
 
-    __pattern__ = r'http://(?:www\.)?extabit\.com/(file|go|fid)/(?P<ID>\w+)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?extabit\.com/(file|go|fid)/(?P<ID>\w+)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Extabit.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Extabit.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     NAME_PATTERN = r'<th>File:</th>\s*<td class="col-fileinfo">\s*<div title="(?P<N>[^"]+)">'
@@ -41,7 +41,7 @@ class ExtabitCom(SimpleHoster):
             self.wait(secondsToMidnight(gmt=2), True)
 
         self.logDebug("URL: " + self.req.http.lastEffectiveURL)
-        m = re.match(self.__pattern__, self.req.http.lastEffectiveURL)
+        m = re.match(self.__pattern, self.req.http.lastEffectiveURL)
         fileID = m.group('ID') if m else self.info['pattern']['ID']
 
         m = re.search(r'recaptcha/api/challenge\?k=(\w+)', self.html)
diff --git a/pyload/plugin/hoster/FastixRu.py b/pyload/plugin/hoster/FastixRu.py
index 679194969..8fa6bb386 100644
--- a/pyload/plugin/hoster/FastixRu.py
+++ b/pyload/plugin/hoster/FastixRu.py
@@ -10,16 +10,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster
 
 
 class FastixRu(MultiHoster):
-    __name__    = "FastixRu"
-    __type__    = "hoster"
-    __version__ = "0.11"
+    __name    = "FastixRu"
+    __type    = "hoster"
+    __version = "0.11"
 
-    __pattern__ = r'http://(?:www\.)?fastix\.(ru|it)/file/\w{24}'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?fastix\.(ru|it)/file/\w{24}'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Fastix multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Massimo Rosamilia", "max@spiritix.eu")]
+    __description = """Fastix multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Massimo Rosamilia", "max@spiritix.eu")]
 
 
     def setup(self):
diff --git a/pyload/plugin/hoster/FastshareCz.py b/pyload/plugin/hoster/FastshareCz.py
index fba0e0479..a98a7de31 100644
--- a/pyload/plugin/hoster/FastshareCz.py
+++ b/pyload/plugin/hoster/FastshareCz.py
@@ -8,16 +8,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class FastshareCz(SimpleHoster):
-    __name__    = "FastshareCz"
-    __type__    = "hoster"
-    __version__ = "0.29"
+    __name    = "FastshareCz"
+    __type    = "hoster"
+    __version = "0.29"
 
-    __pattern__ = r'http://(?:www\.)?fastshare\.cz/\d+/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?fastshare\.cz/\d+/.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """FastShare.cz hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """FastShare.cz hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
     URL_REPLACEMENTS = [("#.*", "")]
 
diff --git a/pyload/plugin/hoster/FileApeCom.py b/pyload/plugin/hoster/FileApeCom.py
index 4dc1442c5..87d995817 100644
--- a/pyload/plugin/hoster/FileApeCom.py
+++ b/pyload/plugin/hoster/FileApeCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class FileApeCom(DeadHoster):
-    __name__    = "FileApeCom"
-    __type__    = "hoster"
-    __version__ = "0.12"
+    __name    = "FileApeCom"
+    __type    = "hoster"
+    __version = "0.12"
 
-    __pattern__ = r'http://(?:www\.)?fileape\.com/(index\.php\?act=download\&id=|dl/)\w+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?fileape\.com/(index\.php\?act=download\&id=|dl/)\w+'
+    __config  = []
 
-    __description__ = """FileApe.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("espes", "")]
+    __description = """FileApe.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("espes", "")]
diff --git a/pyload/plugin/hoster/FileSharkPl.py b/pyload/plugin/hoster/FileSharkPl.py
index ab28ac144..d3e3675ab 100644
--- a/pyload/plugin/hoster/FileSharkPl.py
+++ b/pyload/plugin/hoster/FileSharkPl.py
@@ -8,16 +8,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class FileSharkPl(SimpleHoster):
-    __name__    = "FileSharkPl"
-    __type__    = "hoster"
-    __version__ = "0.09"
+    __name    = "FileSharkPl"
+    __type    = "hoster"
+    __version = "0.09"
 
-    __pattern__ = r'http://(?:www\.)?fileshark\.pl/pobierz/\d+/\w+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?fileshark\.pl/pobierz/\d+/\w+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """FileShark.pl hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("prOq", ""),
+    __description = """FileShark.pl hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("prOq", ""),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/hoster/FileStoreTo.py b/pyload/plugin/hoster/FileStoreTo.py
index 10d24c1b0..6315f208d 100644
--- a/pyload/plugin/hoster/FileStoreTo.py
+++ b/pyload/plugin/hoster/FileStoreTo.py
@@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class FileStoreTo(SimpleHoster):
-    __name__    = "FileStoreTo"
-    __type__    = "hoster"
-    __version__ = "0.05"
+    __name    = "FileStoreTo"
+    __type    = "hoster"
+    __version = "0.05"
 
-    __pattern__ = r'http://(?:www\.)?filestore\.to/\?d=(?P<ID>\w+)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?filestore\.to/\?d=(?P<ID>\w+)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """FileStore.to hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com"),
+    __description = """FileStore.to hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/hoster/FilebeerInfo.py b/pyload/plugin/hoster/FilebeerInfo.py
index 34f3969c2..a929a0787 100644
--- a/pyload/plugin/hoster/FilebeerInfo.py
+++ b/pyload/plugin/hoster/FilebeerInfo.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class FilebeerInfo(DeadHoster):
-    __name__    = "FilebeerInfo"
-    __type__    = "hoster"
-    __version__ = "0.03"
+    __name    = "FilebeerInfo"
+    __type    = "hoster"
+    __version = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?filebeer\.info/(?!\d*~f)(?P<ID>\w+)'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?filebeer\.info/(?!\d*~f)(?P<ID>\w+)'
+    __config  = []
 
-    __description__ = """Filebeer.info plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Filebeer.info plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/hoster/FilecloudIo.py b/pyload/plugin/hoster/FilecloudIo.py
index 5068ad8c9..07a743292 100644
--- a/pyload/plugin/hoster/FilecloudIo.py
+++ b/pyload/plugin/hoster/FilecloudIo.py
@@ -8,16 +8,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class FilecloudIo(SimpleHoster):
-    __name__    = "FilecloudIo"
-    __type__    = "hoster"
-    __version__ = "0.08"
+    __name    = "FilecloudIo"
+    __type    = "hoster"
+    __version = "0.08"
 
-    __pattern__ = r'http://(?:www\.)?(?:filecloud\.io|ifile\.it|mihd\.net)/(?P<ID>\w+)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?(?:filecloud\.io|ifile\.it|mihd\.net)/(?P<ID>\w+)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Filecloud.io hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """Filecloud.io hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/hoster/FilefactoryCom.py b/pyload/plugin/hoster/FilefactoryCom.py
index c6b857307..85d014e1e 100644
--- a/pyload/plugin/hoster/FilefactoryCom.py
+++ b/pyload/plugin/hoster/FilefactoryCom.py
@@ -12,23 +12,23 @@ def getInfo(urls):
     for url in urls:
         h = getURL(url, just_header=True)
         m = re.search(r'Location: (.+)\r\n', h)
-        if m and not re.match(m.group(1), FilefactoryCom.__pattern__):  #: It's a direct link! Skipping
+        if m and not re.match(m.group(1), FilefactoryCom.__pattern):  #: It's a direct link! Skipping
             yield (url, 0, 3, url)
         else:  #: It's a standard html page
             yield parseFileInfo(FilefactoryCom, url, getURL(url))
 
 
 class FilefactoryCom(SimpleHoster):
-    __name__    = "FilefactoryCom"
-    __type__    = "hoster"
-    __version__ = "0.54"
+    __name    = "FilefactoryCom"
+    __type    = "hoster"
+    __version = "0.54"
 
-    __pattern__ = r'https?://(?:www\.)?filefactory\.com/(file|trafficshare/\w+)/\w+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?filefactory\.com/(file|trafficshare/\w+)/\w+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Filefactory.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it"),
+    __description = """Filefactory.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/hoster/FilejungleCom.py b/pyload/plugin/hoster/FilejungleCom.py
index cd890778b..c8ccbbb25 100644
--- a/pyload/plugin/hoster/FilejungleCom.py
+++ b/pyload/plugin/hoster/FilejungleCom.py
@@ -5,15 +5,15 @@ from pyload.plugin.Plugin import chunks
 
 
 class FilejungleCom(FileserveCom):
-    __name__    = "FilejungleCom"
-    __type__    = "hoster"
-    __version__ = "0.51"
+    __name    = "FilejungleCom"
+    __type    = "hoster"
+    __version = "0.51"
 
-    __pattern__ = r'http://(?:www\.)?filejungle\.com/f/(?P<ID>[^/]+)'
+    __pattern = r'http://(?:www\.)?filejungle\.com/f/(?P<ID>[^/]+)'
 
-    __description__ = """Filejungle.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Filejungle.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     URLS = ["http://www.filejungle.com/f/", "http://www.filejungle.com/check_links.php",
diff --git a/pyload/plugin/hoster/FileomCom.py b/pyload/plugin/hoster/FileomCom.py
index cdfc15dd9..bac912c56 100644
--- a/pyload/plugin/hoster/FileomCom.py
+++ b/pyload/plugin/hoster/FileomCom.py
@@ -7,15 +7,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class FileomCom(XFSHoster):
-    __name__    = "FileomCom"
-    __type__    = "hoster"
-    __version__ = "0.05"
+    __name    = "FileomCom"
+    __type    = "hoster"
+    __version = "0.05"
 
-    __pattern__ = r'https?://(?:www\.)?fileom\.com/\w{12}'
+    __pattern = r'https?://(?:www\.)?fileom\.com/\w{12}'
 
-    __description__ = """Fileom.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Fileom.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     NAME_PATTERN = r'Filename: <span>(?P<N>.+?)<'
diff --git a/pyload/plugin/hoster/FilepostCom.py b/pyload/plugin/hoster/FilepostCom.py
index 45187a972..883c001ab 100644
--- a/pyload/plugin/hoster/FilepostCom.py
+++ b/pyload/plugin/hoster/FilepostCom.py
@@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class FilepostCom(SimpleHoster):
-    __name__    = "FilepostCom"
-    __type__    = "hoster"
-    __version__ = "0.33"
+    __name    = "FilepostCom"
+    __type    = "hoster"
+    __version = "0.33"
 
-    __pattern__ = r'https?://(?:www\.)?(?:filepost\.com/files|fp\.io)/(?P<ID>[^/]+)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?(?:filepost\.com/files|fp\.io)/(?P<ID>[^/]+)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Filepost.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Filepost.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     INFO_PATTERN = r'<input type="text" id="url" value=\'<a href[^>]*>(?P<N>[^>]+?) - (?P<S>[\d.,]+) (?P<U>[\w^_]+)</a>\' class="inp_text"/>'
diff --git a/pyload/plugin/hoster/FilepupNet.py b/pyload/plugin/hoster/FilepupNet.py
index 80f4fc1c8..72237285c 100644
--- a/pyload/plugin/hoster/FilepupNet.py
+++ b/pyload/plugin/hoster/FilepupNet.py
@@ -10,16 +10,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class FilepupNet(SimpleHoster):
-    __name__    = "FilepupNet"
-    __type__    = "hoster"
-    __version__ = "0.03"
+    __name    = "FilepupNet"
+    __type    = "hoster"
+    __version = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?filepup\.net/files/\w+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?filepup\.net/files/\w+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Filepup.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de"),
+    __description = """Filepup.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/hoster/FilerNet.py b/pyload/plugin/hoster/FilerNet.py
index 138e728ff..3138780e4 100644
--- a/pyload/plugin/hoster/FilerNet.py
+++ b/pyload/plugin/hoster/FilerNet.py
@@ -14,16 +14,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class FilerNet(SimpleHoster):
-    __name__    = "FilerNet"
-    __type__    = "hoster"
-    __version__ = "0.19"
+    __name    = "FilerNet"
+    __type    = "hoster"
+    __version = "0.19"
 
-    __pattern__ = r'https?://(?:www\.)?filer\.net/get/\w+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?filer\.net/get/\w+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Filer.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it"),
+    __description = """Filer.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/hoster/FilerioCom.py b/pyload/plugin/hoster/FilerioCom.py
index 9290bee84..c55fd2c0b 100644
--- a/pyload/plugin/hoster/FilerioCom.py
+++ b/pyload/plugin/hoster/FilerioCom.py
@@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class FilerioCom(XFSHoster):
-    __name__    = "FilerioCom"
-    __type__    = "hoster"
-    __version__ = "0.07"
+    __name    = "FilerioCom"
+    __type    = "hoster"
+    __version = "0.07"
 
-    __pattern__ = r'http://(?:www\.)?(filerio\.(in|com)|filekeen\.com)/\w{12}'
+    __pattern = r'http://(?:www\.)?(filerio\.(in|com)|filekeen\.com)/\w{12}'
 
-    __description__ = """FileRio.in hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """FileRio.in hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     URL_REPLACEMENTS = [(r'filekeen\.com', "filerio.in")]
diff --git a/pyload/plugin/hoster/FilesMailRu.py b/pyload/plugin/hoster/FilesMailRu.py
index 09da46b01..024da64cd 100644
--- a/pyload/plugin/hoster/FilesMailRu.py
+++ b/pyload/plugin/hoster/FilesMailRu.py
@@ -30,15 +30,15 @@ def getInfo(urls):
 
 
 class FilesMailRu(Hoster):
-    __name__    = "FilesMailRu"
-    __type__    = "hoster"
-    __version__ = "0.32"
+    __name    = "FilesMailRu"
+    __type    = "hoster"
+    __version = "0.32"
 
-    __pattern__ = r'http://(?:www\.)?files\.mail\.ru/.+'
+    __pattern = r'http://(?:www\.)?files\.mail\.ru/.+'
 
-    __description__ = """Files.mail.ru hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("oZiRiz", "ich@oziriz.de")]
+    __description = """Files.mail.ru hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("oZiRiz", "ich@oziriz.de")]
 
 
     def setup(self):
diff --git a/pyload/plugin/hoster/FileserveCom.py b/pyload/plugin/hoster/FileserveCom.py
index eb80889b1..2742d33ee 100644
--- a/pyload/plugin/hoster/FileserveCom.py
+++ b/pyload/plugin/hoster/FileserveCom.py
@@ -31,15 +31,15 @@ def checkFile(plugin, urls):
 
 
 class FileserveCom(Hoster):
-    __name__    = "FileserveCom"
-    __type__    = "hoster"
-    __version__ = "0.54"
+    __name    = "FileserveCom"
+    __type    = "hoster"
+    __version = "0.54"
 
-    __pattern__ = r'http://(?:www\.)?fileserve\.com/file/(?P<ID>[^/]+)'
+    __pattern = r'http://(?:www\.)?fileserve\.com/file/(?P<ID>[^/]+)'
 
-    __description__ = """Fileserve.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("jeix", "jeix@hasnomail.de"),
+    __description = """Fileserve.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("jeix", "jeix@hasnomail.de"),
                        ("mkaay", "mkaay@mkaay.de"),
                        ("Paul King", ""),
                        ("zoidberg", "zoidberg@mujmail.cz")]
@@ -59,7 +59,7 @@ class FileserveCom(Hoster):
 
     def setup(self):
         self.resumeDownload = self.multiDL = self.premium
-        self.file_id = re.match(self.__pattern__, self.pyfile.url).group('ID')
+        self.file_id = re.match(self.__pattern, self.pyfile.url).group('ID')
         self.url     = "%s%s" % (self.URLS[0], self.file_id)
 
         self.logDebug("File ID: %s URL: %s" % (self.file_id, self.url))
@@ -144,7 +144,7 @@ class FileserveCom(Hoster):
         if "fail" in res:
             self.fail(_("Failed getting wait time"))
 
-        if self.__name__ == "FilejungleCom":
+        if self.__name == "FilejungleCom":
             m = re.search(r'"waitTime":(\d+)', res)
             if m is None:
                 self.fail(_("Cannot get wait time"))
@@ -184,7 +184,7 @@ class FileserveCom(Hoster):
 
     def handlePremium(self, pyfile):
         premium_url = None
-        if self.__name__ == "FileserveCom":
+        if self.__name == "FileserveCom":
             #try api download
             res = self.load("http://app.fileserve.com/api/download/premium/",
                             post={"username": self.user,
diff --git a/pyload/plugin/hoster/FileshareInUa.py b/pyload/plugin/hoster/FileshareInUa.py
index afda590c0..8b09a086a 100644
--- a/pyload/plugin/hoster/FileshareInUa.py
+++ b/pyload/plugin/hoster/FileshareInUa.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class FileshareInUa(DeadHoster):
-    __name__    = "FileshareInUa"
-    __type__    = "hoster"
-    __version__ = "0.02"
+    __name    = "FileshareInUa"
+    __type    = "hoster"
+    __version = "0.02"
 
-    __pattern__ = r'https?://(?:www\.)?fileshare\.in\.ua/\w{7}'
-    __config__  = []
+    __pattern = r'https?://(?:www\.)?fileshare\.in\.ua/\w{7}'
+    __config  = []
 
-    __description__ = """Fileshare.in.ua hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("fwannmacher", "felipe@warhammerproject.com")]
+    __description = """Fileshare.in.ua hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("fwannmacher", "felipe@warhammerproject.com")]
diff --git a/pyload/plugin/hoster/FilesonicCom.py b/pyload/plugin/hoster/FilesonicCom.py
index 4ba0f3e50..f02f7bff6 100644
--- a/pyload/plugin/hoster/FilesonicCom.py
+++ b/pyload/plugin/hoster/FilesonicCom.py
@@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class FilesonicCom(DeadHoster):
-    __name__    = "FilesonicCom"
-    __type__    = "hoster"
-    __version__ = "0.35"
+    __name    = "FilesonicCom"
+    __type    = "hoster"
+    __version = "0.35"
 
-    __pattern__ = r'http://(?:www\.)?filesonic\.com/file/\w+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?filesonic\.com/file/\w+'
+    __config  = []
 
-    __description__ = """Filesonic.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("jeix", "jeix@hasnomail.de"),
+    __description = """Filesonic.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("jeix", "jeix@hasnomail.de"),
                        ("paulking", "")]
diff --git a/pyload/plugin/hoster/FilezyNet.py b/pyload/plugin/hoster/FilezyNet.py
index 0ed326a22..bd6ac5984 100644
--- a/pyload/plugin/hoster/FilezyNet.py
+++ b/pyload/plugin/hoster/FilezyNet.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class FilezyNet(DeadHoster):
-    __name__    = "FilezyNet"
-    __type__    = "hoster"
-    __version__ = "0.20"
+    __name    = "FilezyNet"
+    __type    = "hoster"
+    __version = "0.20"
 
-    __pattern__ = r'http://(?:www\.)?filezy\.net/\w{12}'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?filezy\.net/\w{12}'
+    __config  = []
 
-    __description__ = """Filezy.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = []
+    __description = """Filezy.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = []
diff --git a/pyload/plugin/hoster/FiredriveCom.py b/pyload/plugin/hoster/FiredriveCom.py
index 5879c4848..a5e56191f 100644
--- a/pyload/plugin/hoster/FiredriveCom.py
+++ b/pyload/plugin/hoster/FiredriveCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class FiredriveCom(DeadHoster):
-    __name__    = "FiredriveCom"
-    __type__    = "hoster"
-    __version__ = "0.05"
+    __name    = "FiredriveCom"
+    __type    = "hoster"
+    __version = "0.05"
 
-    __pattern__ = r'https?://(?:www\.)?(firedrive|putlocker)\.com/(mobile/)?(file|embed)/(?P<ID>\w+)'
-    __config__  = []
+    __pattern = r'https?://(?:www\.)?(firedrive|putlocker)\.com/(mobile/)?(file|embed)/(?P<ID>\w+)'
+    __config  = []
 
-    __description__ = """Firedrive.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Firedrive.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
diff --git a/pyload/plugin/hoster/FlyFilesNet.py b/pyload/plugin/hoster/FlyFilesNet.py
index 612de14bd..5ecfb5604 100644
--- a/pyload/plugin/hoster/FlyFilesNet.py
+++ b/pyload/plugin/hoster/FlyFilesNet.py
@@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class FlyFilesNet(SimpleHoster):
-    __name__    = "FlyFilesNet"
-    __type__    = "hoster"
-    __version__ = "0.10"
+    __name    = "FlyFilesNet"
+    __type    = "hoster"
+    __version = "0.10"
 
-    __pattern__ = r'http://(?:www\.)?flyfiles\.net/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?flyfiles\.net/.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """FlyFiles.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = []
+    __description = """FlyFiles.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = []
 
     SESSION_PATTERN = r'flyfiles\.net/(.*)/.*'
     NAME_PATTERN = r'flyfiles\.net/.*/(.*)'
diff --git a/pyload/plugin/hoster/FourSharedCom.py b/pyload/plugin/hoster/FourSharedCom.py
index 8c15c5954..7ea5e55b8 100644
--- a/pyload/plugin/hoster/FourSharedCom.py
+++ b/pyload/plugin/hoster/FourSharedCom.py
@@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class FourSharedCom(SimpleHoster):
-    __name__    = "FourSharedCom"
-    __type__    = "hoster"
-    __version__ = "0.31"
+    __name    = "FourSharedCom"
+    __type    = "hoster"
+    __version = "0.31"
 
-    __pattern__ = r'https?://(?:www\.)?4shared(\-china)?\.com/(account/)?(download|get|file|document|photo|video|audio|mp3|office|rar|zip|archive|music)/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?4shared(\-china)?\.com/(account/)?(download|get|file|document|photo|video|audio|mp3|office|rar|zip|archive|music)/.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """4Shared.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("jeix", "jeix@hasnomail.de"),
+    __description = """4Shared.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("jeix", "jeix@hasnomail.de"),
                        ("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/pyload/plugin/hoster/FreakshareCom.py b/pyload/plugin/hoster/FreakshareCom.py
index 53eb10e55..06f524cb9 100644
--- a/pyload/plugin/hoster/FreakshareCom.py
+++ b/pyload/plugin/hoster/FreakshareCom.py
@@ -8,15 +8,15 @@ from pyload.plugin.internal.SimpleHoster import secondsToMidnight
 
 
 class FreakshareCom(Hoster):
-    __name__    = "FreakshareCom"
-    __type__    = "hoster"
-    __version__ = "0.40"
+    __name    = "FreakshareCom"
+    __type    = "hoster"
+    __version = "0.40"
 
-    __pattern__ = r'http://(?:www\.)?freakshare\.(net|com)/files/\S*?/'
+    __pattern = r'http://(?:www\.)?freakshare\.(net|com)/files/\S*?/'
 
-    __description__ = """Freakshare.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("sitacuisses", "sitacuisses@yahoo.de"),
+    __description = """Freakshare.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("sitacuisses", "sitacuisses@yahoo.de"),
                        ("spoob", "spoob@pyload.org"),
                        ("mkaay", "mkaay@mkaay.de"),
                        ("Toilal", "toilal.dev@gmail.com")]
diff --git a/pyload/plugin/hoster/FreeWayMe.py b/pyload/plugin/hoster/FreeWayMe.py
index 560275eba..2406ed031 100644
--- a/pyload/plugin/hoster/FreeWayMe.py
+++ b/pyload/plugin/hoster/FreeWayMe.py
@@ -4,16 +4,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster
 
 
 class FreeWayMe(MultiHoster):
-    __name__    = "FreeWayMe"
-    __type__    = "hoster"
-    __version__ = "0.16"
+    __name    = "FreeWayMe"
+    __type    = "hoster"
+    __version = "0.16"
 
-    __pattern__ = r'https://(?:www\.)?free-way\.me/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https://(?:www\.)?free-way\.me/.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """FreeWayMe multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Nicolas Giese", "james@free-way.me")]
+    __description = """FreeWayMe multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Nicolas Giese", "james@free-way.me")]
 
 
     def setup(self):
diff --git a/pyload/plugin/hoster/FreevideoCz.py b/pyload/plugin/hoster/FreevideoCz.py
index af238c564..f616097f2 100644
--- a/pyload/plugin/hoster/FreevideoCz.py
+++ b/pyload/plugin/hoster/FreevideoCz.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class FreevideoCz(DeadHoster):
-    __name__    = "FreevideoCz"
-    __type__    = "hoster"
-    __version__ = "0.30"
+    __name    = "FreevideoCz"
+    __type    = "hoster"
+    __version = "0.30"
 
-    __pattern__ = r'http://(?:www\.)?freevideo\.cz/vase-videa/.+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?freevideo\.cz/vase-videa/.+'
+    __config  = []
 
-    __description__ = """Freevideo.cz hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Freevideo.cz hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/hoster/FshareVn.py b/pyload/plugin/hoster/FshareVn.py
index 73ce4e254..47348f753 100644
--- a/pyload/plugin/hoster/FshareVn.py
+++ b/pyload/plugin/hoster/FshareVn.py
@@ -23,16 +23,16 @@ def doubleDecode(m):
 
 
 class FshareVn(SimpleHoster):
-    __name__    = "FshareVn"
-    __type__    = "hoster"
-    __version__ = "0.20"
+    __name    = "FshareVn"
+    __type    = "hoster"
+    __version = "0.20"
 
-    __pattern__ = r'http://(?:www\.)?fshare\.vn/file/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?fshare\.vn/file/.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """FshareVn hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """FshareVn hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     INFO_PATTERN = r'<p>(?P<N>[^<]+)<\\/p>[\\trn\s]*<p>(?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)<\\/p>'
diff --git a/pyload/plugin/hoster/Ftp.py b/pyload/plugin/hoster/Ftp.py
index 6924c5910..b6808811c 100644
--- a/pyload/plugin/hoster/Ftp.py
+++ b/pyload/plugin/hoster/Ftp.py
@@ -10,15 +10,15 @@ from pyload.plugin.Hoster import Hoster
 
 
 class Ftp(Hoster):
-    __name__    = "Ftp"
-    __type__    = "hoster"
-    __version__ = "0.46"
+    __name    = "Ftp"
+    __type    = "hoster"
+    __version = "0.46"
 
-    __pattern__ = r'(?:ftps?|sftp)://([\w.-]+(:[\w.-]+)?@)?[\w.-]+(:\d+)?/.+'
+    __pattern = r'(?:ftps?|sftp)://([\w.-]+(:[\w.-]+)?@)?[\w.-]+(:\d+)?/.+'
 
-    __description__ = """Download from ftp directory"""
-    __license__     = "GPLv3"
-    __authors__     = [("jeix", "jeix@hasnomail.com"),
+    __description = """Download from ftp directory"""
+    __license     = "GPLv3"
+    __authors     = [("jeix", "jeix@hasnomail.com"),
                        ("mkaay", "mkaay@mkaay.de"),
                        ("zoidberg", "zoidberg@mujmail.cz")]
 
diff --git a/pyload/plugin/hoster/GamefrontCom.py b/pyload/plugin/hoster/GamefrontCom.py
index 89e188010..81568e376 100644
--- a/pyload/plugin/hoster/GamefrontCom.py
+++ b/pyload/plugin/hoster/GamefrontCom.py
@@ -8,15 +8,15 @@ from pyload.utils import parseFileSize
 
 
 class GamefrontCom(Hoster):
-    __name__    = "GamefrontCom"
-    __type__    = "hoster"
-    __version__ = "0.04"
+    __name    = "GamefrontCom"
+    __type    = "hoster"
+    __version = "0.04"
 
-    __pattern__ = r'http://(?:www\.)?gamefront\.com/files/\w+'
+    __pattern = r'http://(?:www\.)?gamefront\.com/files/\w+'
 
-    __description__ = """Gamefront.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("fwannmacher", "felipe@warhammerproject.com")]
+    __description = """Gamefront.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("fwannmacher", "felipe@warhammerproject.com")]
 
 
     PATTERN_FILENAME = r'<title>(.*?) | Game Front'
diff --git a/pyload/plugin/hoster/GigapetaCom.py b/pyload/plugin/hoster/GigapetaCom.py
index 6397882f8..003a846b5 100644
--- a/pyload/plugin/hoster/GigapetaCom.py
+++ b/pyload/plugin/hoster/GigapetaCom.py
@@ -8,16 +8,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class GigapetaCom(SimpleHoster):
-    __name__    = "GigapetaCom"
-    __type__    = "hoster"
-    __version__ = "0.03"
+    __name    = "GigapetaCom"
+    __type    = "hoster"
+    __version = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?gigapeta\.com/dl/\w+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?gigapeta\.com/dl/\w+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """GigaPeta.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """GigaPeta.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     NAME_PATTERN = r'<img src=".*" alt="file" />-->\s*(?P<N>.*?)\s*</td>'
diff --git a/pyload/plugin/hoster/GooIm.py b/pyload/plugin/hoster/GooIm.py
index 0556e9804..60acc958a 100644
--- a/pyload/plugin/hoster/GooIm.py
+++ b/pyload/plugin/hoster/GooIm.py
@@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class GooIm(SimpleHoster):
-    __name__    = "GooIm"
-    __type__    = "hoster"
-    __version__ = "0.04"
+    __name    = "GooIm"
+    __type    = "hoster"
+    __version = "0.04"
 
-    __pattern__ = r'https?://(?:www\.)?goo\.im/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?goo\.im/.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Goo.im hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]
+    __description = """Goo.im hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
     NAME_PATTERN = r'You will be redirected to .*(?P<N>[^/ ]+)  in'
diff --git a/pyload/plugin/hoster/GoogledriveCom.py b/pyload/plugin/hoster/GoogledriveCom.py
index 8ae3664a3..609d7aa02 100644
--- a/pyload/plugin/hoster/GoogledriveCom.py
+++ b/pyload/plugin/hoster/GoogledriveCom.py
@@ -10,16 +10,16 @@ from pyload.utils import html_unescape
 
 
 class GoogledriveCom(SimpleHoster):
-    __name__    = "GoogledriveCom"
-    __type__    = "hoster"
-    __version__ = "0.03"
+    __name    = "GoogledriveCom"
+    __type    = "hoster"
+    __version = "0.03"
 
-    __pattern__ = r'https?://(?:www\.)?drive\.google\.com/file/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?drive\.google\.com/file/.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Drive.google.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]
+    __description = """Drive.google.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
     DISPOSITION = False
diff --git a/pyload/plugin/hoster/HellshareCz.py b/pyload/plugin/hoster/HellshareCz.py
index 06dbe2178..f7e95d273 100644
--- a/pyload/plugin/hoster/HellshareCz.py
+++ b/pyload/plugin/hoster/HellshareCz.py
@@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class HellshareCz(SimpleHoster):
-    __name__    = "HellshareCz"
-    __type__    = "hoster"
-    __version__ = "0.85"
+    __name    = "HellshareCz"
+    __type    = "hoster"
+    __version = "0.85"
 
-    __pattern__ = r'http://(?:www\.)?hellshare\.(?:cz|com|sk|hu|pl)/[^?]*/\d+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?hellshare\.(?:cz|com|sk|hu|pl)/[^?]*/\d+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Hellshare.cz hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Hellshare.cz hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     CHECK_TRAFFIC = True
diff --git a/pyload/plugin/hoster/HellspyCz.py b/pyload/plugin/hoster/HellspyCz.py
index f8d05cfe8..b64becf9c 100644
--- a/pyload/plugin/hoster/HellspyCz.py
+++ b/pyload/plugin/hoster/HellspyCz.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class HellspyCz(DeadHoster):
-    __name__    = "HellspyCz"
-    __type__    = "hoster"
-    __version__ = "0.28"
+    __name    = "HellspyCz"
+    __type    = "hoster"
+    __version = "0.28"
 
-    __pattern__ = r'http://(?:www\.)?(?:hellspy\.(?:cz|com|sk|hu|pl)|sciagaj\.pl)(/\S+/\d+)'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?(?:hellspy\.(?:cz|com|sk|hu|pl)|sciagaj\.pl)(/\S+/\d+)'
+    __config  = []
 
-    __description__ = """HellSpy.cz hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """HellSpy.cz hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/hoster/HotfileCom.py b/pyload/plugin/hoster/HotfileCom.py
index 9491669b0..743c24e23 100644
--- a/pyload/plugin/hoster/HotfileCom.py
+++ b/pyload/plugin/hoster/HotfileCom.py
@@ -4,16 +4,16 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class HotfileCom(DeadHoster):
-    __name__    = "HotfileCom"
-    __type__    = "hoster"
-    __version__ = "0.37"
+    __name    = "HotfileCom"
+    __type    = "hoster"
+    __version = "0.37"
 
-    __pattern__ = r'https?://(?:www\.)?hotfile\.com/dl/\d+/\w+'
-    __config__  = []
+    __pattern = r'https?://(?:www\.)?hotfile\.com/dl/\d+/\w+'
+    __config  = []
 
-    __description__ = """Hotfile.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("sitacuisses", "sitacuisses@yhoo.de"),
+    __description = """Hotfile.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("sitacuisses", "sitacuisses@yhoo.de"),
                        ("spoob", "spoob@pyload.org"),
                        ("mkaay", "mkaay@mkaay.de"),
                        ("JoKoT3", "jokot3@gmail.com")]
diff --git a/pyload/plugin/hoster/HugefilesNet.py b/pyload/plugin/hoster/HugefilesNet.py
index 413191c52..2a591c7fd 100644
--- a/pyload/plugin/hoster/HugefilesNet.py
+++ b/pyload/plugin/hoster/HugefilesNet.py
@@ -6,15 +6,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class HugefilesNet(XFSHoster):
-    __name__    = "HugefilesNet"
-    __type__    = "hoster"
-    __version__ = "0.05"
+    __name    = "HugefilesNet"
+    __type    = "hoster"
+    __version = "0.05"
 
-    __pattern__ = r'http://(?:www\.)?hugefiles\.net/\w{12}'
+    __pattern = r'http://(?:www\.)?hugefiles\.net/\w{12}'
 
-    __description__ = """Hugefiles.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Hugefiles.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     SIZE_PATTERN = r'File Size:</span>\s*<span[^>]*>(?P<S>[^<]+)</span></div>'
diff --git a/pyload/plugin/hoster/HundredEightyUploadCom.py b/pyload/plugin/hoster/HundredEightyUploadCom.py
index 1abdf7212..de312245e 100644
--- a/pyload/plugin/hoster/HundredEightyUploadCom.py
+++ b/pyload/plugin/hoster/HundredEightyUploadCom.py
@@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class HundredEightyUploadCom(XFSHoster):
-    __name__    = "HundredEightyUploadCom"
-    __type__    = "hoster"
-    __version__ = "0.05"
+    __name    = "HundredEightyUploadCom"
+    __type    = "hoster"
+    __version = "0.05"
 
-    __pattern__ = r'http://(?:www\.)?180upload\.com/\w{12}'
+    __pattern = r'http://(?:www\.)?180upload\.com/\w{12}'
 
-    __description__ = """180upload.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """180upload.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     OFFLINE_PATTERN = r'>File Not Found'
diff --git a/pyload/plugin/hoster/IFileWs.py b/pyload/plugin/hoster/IFileWs.py
index 62b83fe25..57c86d490 100644
--- a/pyload/plugin/hoster/IFileWs.py
+++ b/pyload/plugin/hoster/IFileWs.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class IFileWs(DeadHoster):
-    __name__    = "IFileWs"
-    __type__    = "hoster"
-    __version__ = "0.02"
+    __name    = "IFileWs"
+    __type    = "hoster"
+    __version = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?ifile\.ws/\w{12}'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?ifile\.ws/\w{12}'
+    __config  = []
 
-    __description__ = """Ifile.ws hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("z00nx", "z00nx0@gmail.com")]
+    __description = """Ifile.ws hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("z00nx", "z00nx0@gmail.com")]
diff --git a/pyload/plugin/hoster/IcyFilesCom.py b/pyload/plugin/hoster/IcyFilesCom.py
index 48ce78ff5..88ec57a98 100644
--- a/pyload/plugin/hoster/IcyFilesCom.py
+++ b/pyload/plugin/hoster/IcyFilesCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class IcyFilesCom(DeadHoster):
-    __name__    = "IcyFilesCom"
-    __type__    = "hoster"
-    __version__ = "0.06"
+    __name    = "IcyFilesCom"
+    __type    = "hoster"
+    __version = "0.06"
 
-    __pattern__ = r'http://(?:www\.)?icyfiles\.com/(.+)'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?icyfiles\.com/(.+)'
+    __config  = []
 
-    __description__ = """IcyFiles.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("godofdream", "soilfiction@gmail.com")]
+    __description = """IcyFiles.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("godofdream", "soilfiction@gmail.com")]
diff --git a/pyload/plugin/hoster/IfileIt.py b/pyload/plugin/hoster/IfileIt.py
index 1b851477a..647e06c01 100644
--- a/pyload/plugin/hoster/IfileIt.py
+++ b/pyload/plugin/hoster/IfileIt.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class IfileIt(DeadHoster):
-    __name__    = "IfileIt"
-    __type__    = "hoster"
-    __version__ = "0.29"
+    __name    = "IfileIt"
+    __type    = "hoster"
+    __version = "0.29"
 
-    __pattern__ = r'^unmatchable$'
-    __config__  = []
+    __pattern = r'^unmatchable$'
+    __config  = []
 
-    __description__ = """Ifile.it"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Ifile.it"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/hoster/IfolderRu.py b/pyload/plugin/hoster/IfolderRu.py
index 04c19ace5..0b54dbfae 100644
--- a/pyload/plugin/hoster/IfolderRu.py
+++ b/pyload/plugin/hoster/IfolderRu.py
@@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class IfolderRu(SimpleHoster):
-    __name__    = "IfolderRu"
-    __type__    = "hoster"
-    __version__ = "0.39"
+    __name    = "IfolderRu"
+    __type    = "hoster"
+    __version = "0.39"
 
-    __pattern__ = r'http://(?:www\.)?(?:ifolder\.ru|rusfolder\.(?:com|net|ru))/(?:files/)?(?P<ID>\d+)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?(?:ifolder\.ru|rusfolder\.(?:com|net|ru))/(?:files/)?(?P<ID>\d+)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Ifolder.ru hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Ifolder.ru hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     SIZE_REPLACEMENTS = [(u'Кб', 'KB'), (u'Мб', 'MB'), (u'Гб', 'GB')]
diff --git a/pyload/plugin/hoster/JumbofilesCom.py b/pyload/plugin/hoster/JumbofilesCom.py
index 380e94a4b..69e2c645a 100644
--- a/pyload/plugin/hoster/JumbofilesCom.py
+++ b/pyload/plugin/hoster/JumbofilesCom.py
@@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class JumbofilesCom(SimpleHoster):
-    __name__    = "JumbofilesCom"
-    __type__    = "hoster"
-    __version__ = "0.03"
+    __name    = "JumbofilesCom"
+    __type    = "hoster"
+    __version = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?jumbofiles\.com/(?P<ID>\w{12})'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?jumbofiles\.com/(?P<ID>\w{12})'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """JumboFiles.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("godofdream", "soilfiction@gmail.com")]
+    __description = """JumboFiles.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("godofdream", "soilfiction@gmail.com")]
 
 
     INFO_PATTERN = r'<TR><TD>(?P<N>[^<]+?)\s*<small>\((?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)'
diff --git a/pyload/plugin/hoster/JunocloudMe.py b/pyload/plugin/hoster/JunocloudMe.py
index 4fc6457d7..9054734fb 100644
--- a/pyload/plugin/hoster/JunocloudMe.py
+++ b/pyload/plugin/hoster/JunocloudMe.py
@@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class JunocloudMe(XFSHoster):
-    __name__    = "JunocloudMe"
-    __type__    = "hoster"
-    __version__ = "0.05"
+    __name    = "JunocloudMe"
+    __type    = "hoster"
+    __version = "0.05"
 
-    __pattern__ = r'http://(?:\w+\.)?junocloud\.me/\w{12}'
+    __pattern = r'http://(?:\w+\.)?junocloud\.me/\w{12}'
 
-    __description__ = """Junocloud.me hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
+    __description = """Junocloud.me hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
     URL_REPLACEMENTS = [(r'//(www\.)?junocloud', "//dl3.junocloud")]
diff --git a/pyload/plugin/hoster/Keep2ShareCc.py b/pyload/plugin/hoster/Keep2ShareCc.py
index 67af087b7..c621b82fe 100644
--- a/pyload/plugin/hoster/Keep2ShareCc.py
+++ b/pyload/plugin/hoster/Keep2ShareCc.py
@@ -9,20 +9,20 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class Keep2ShareCc(SimpleHoster):
-    __name__    = "Keep2ShareCc"
-    __type__    = "hoster"
-    __version__ = "0.21"
+    __name    = "Keep2ShareCc"
+    __type    = "hoster"
+    __version = "0.21"
 
-    __pattern__ = r'https?://(?:www\.)?(keep2share|k2s|keep2s)\.cc/file/(?P<ID>\w+)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?(keep2share|k2s|keep2s)\.cc/file/(?P<ID>\w+)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Keep2Share.cc hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it"),
+    __description = """Keep2Share.cc hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    URL_REPLACEMENTS = [(__pattern__ + ".*", "http://k2s.cc/file/\g<ID>")]
+    URL_REPLACEMENTS = [(__pattern + ".*", "http://k2s.cc/file/\g<ID>")]
 
     NAME_PATTERN = r'File: <span>(?P<N>.+)</span>'
     SIZE_PATTERN = r'Size: (?P<S>[^<]+)</div>'
diff --git a/pyload/plugin/hoster/KickloadCom.py b/pyload/plugin/hoster/KickloadCom.py
index d0acb7636..11c79cef9 100644
--- a/pyload/plugin/hoster/KickloadCom.py
+++ b/pyload/plugin/hoster/KickloadCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class KickloadCom(DeadHoster):
-    __name__    = "KickloadCom"
-    __type__    = "hoster"
-    __version__ = "0.21"
+    __name    = "KickloadCom"
+    __type    = "hoster"
+    __version = "0.21"
 
-    __pattern__ = r'http://(?:www\.)?kickload\.com/get/.+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?kickload\.com/get/.+'
+    __config  = []
 
-    __description__ = """Kickload.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("mkaay", "mkaay@mkaay.de")]
+    __description = """Kickload.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("mkaay", "mkaay@mkaay.de")]
diff --git a/pyload/plugin/hoster/KingfilesNet.py b/pyload/plugin/hoster/KingfilesNet.py
index 711051e70..a47defebc 100644
--- a/pyload/plugin/hoster/KingfilesNet.py
+++ b/pyload/plugin/hoster/KingfilesNet.py
@@ -7,16 +7,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class KingfilesNet(SimpleHoster):
-    __name__    = "KingfilesNet"
-    __type__    = "hoster"
-    __version__ = "0.07"
+    __name    = "KingfilesNet"
+    __type    = "hoster"
+    __version = "0.07"
 
-    __pattern__ = r'http://(?:www\.)?kingfiles\.net/(?P<ID>\w{12})'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?kingfiles\.net/(?P<ID>\w{12})'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Kingfiles.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de"),
+    __description = """Kingfiles.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/hoster/LemUploadsCom.py b/pyload/plugin/hoster/LemUploadsCom.py
index c7f2e8045..c43867a99 100644
--- a/pyload/plugin/hoster/LemUploadsCom.py
+++ b/pyload/plugin/hoster/LemUploadsCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class LemUploadsCom(DeadHoster):
-    __name__    = "LemUploadsCom"
-    __type__    = "hoster"
-    __version__ = "0.02"
+    __name    = "LemUploadsCom"
+    __type    = "hoster"
+    __version = "0.02"
 
-    __pattern__ = r'https?://(?:www\.)?lemuploads\.com/\w{12}'
-    __config__  = []
+    __pattern = r'https?://(?:www\.)?lemuploads\.com/\w{12}'
+    __config  = []
 
-    __description__ = """LemUploads.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]
+    __description = """LemUploads.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]
diff --git a/pyload/plugin/hoster/LetitbitNet.py b/pyload/plugin/hoster/LetitbitNet.py
index 545cde27c..fd55a9ad0 100644
--- a/pyload/plugin/hoster/LetitbitNet.py
+++ b/pyload/plugin/hoster/LetitbitNet.py
@@ -34,16 +34,16 @@ def getInfo(urls):
 
 
 class LetitbitNet(SimpleHoster):
-    __name__    = "LetitbitNet"
-    __type__    = "hoster"
-    __version__ = "0.30"
+    __name    = "LetitbitNet"
+    __type    = "hoster"
+    __version = "0.30"
 
-    __pattern__ = r'https?://(?:www\.)?(letitbit|shareflare)\.net/download/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?(letitbit|shareflare)\.net/download/.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Letitbit.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """Letitbit.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("z00nx", "z00nx0@gmail.com")]
 
 
diff --git a/pyload/plugin/hoster/LinksnappyCom.py b/pyload/plugin/hoster/LinksnappyCom.py
index a898b21b9..2cb14dd51 100644
--- a/pyload/plugin/hoster/LinksnappyCom.py
+++ b/pyload/plugin/hoster/LinksnappyCom.py
@@ -9,16 +9,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster
 
 
 class LinksnappyCom(MultiHoster):
-    __name__    = "LinksnappyCom"
-    __type__    = "hoster"
-    __version__ = "0.08"
+    __name    = "LinksnappyCom"
+    __type    = "hoster"
+    __version = "0.08"
 
-    __pattern__ = r'https?://(?:[^/]+\.)?linksnappy\.com'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:[^/]+\.)?linksnappy\.com'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Linksnappy.com multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Linksnappy.com multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     SINGLE_CHUNK_HOSTERS = ["easybytez.com"]
diff --git a/pyload/plugin/hoster/LoadTo.py b/pyload/plugin/hoster/LoadTo.py
index a1421714a..6616114e3 100644
--- a/pyload/plugin/hoster/LoadTo.py
+++ b/pyload/plugin/hoster/LoadTo.py
@@ -11,16 +11,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class LoadTo(SimpleHoster):
-    __name__    = "LoadTo"
-    __type__    = "hoster"
-    __version__ = "0.22"
+    __name    = "LoadTo"
+    __type    = "hoster"
+    __version = "0.22"
 
-    __pattern__ = r'http://(?:www\.)?load\.to/\w+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?load\.to/\w+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Load.to hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("halfman", "Pulpan3@gmail.com"),
+    __description = """Load.to hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("halfman", "Pulpan3@gmail.com"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/hoster/LomafileCom.py b/pyload/plugin/hoster/LomafileCom.py
index 678c93ea7..de56d2d58 100644
--- a/pyload/plugin/hoster/LomafileCom.py
+++ b/pyload/plugin/hoster/LomafileCom.py
@@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class LomafileCom(DeadHoster):
-    __name__    = "LomafileCom"
-    __type__    = "hoster"
-    __version__ = "0.52"
+    __name    = "LomafileCom"
+    __type    = "hoster"
+    __version = "0.52"
 
-    __pattern__ = r'http://lomafile\.com/\w{12}'
-    __config__  = []
+    __pattern = r'http://lomafile\.com/\w{12}'
+    __config  = []
 
-    __description__ = """Lomafile.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("nath_schwarz", "nathan.notwhite@gmail.com"),
+    __description = """Lomafile.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("nath_schwarz", "nathan.notwhite@gmail.com"),
                        ("guidobelix", "guidobelix@hotmail.it")]
diff --git a/pyload/plugin/hoster/LuckyShareNet.py b/pyload/plugin/hoster/LuckyShareNet.py
index a0385f620..3300f989c 100644
--- a/pyload/plugin/hoster/LuckyShareNet.py
+++ b/pyload/plugin/hoster/LuckyShareNet.py
@@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class LuckyShareNet(SimpleHoster):
-    __name__    = "LuckyShareNet"
-    __type__    = "hoster"
-    __version__ = "0.06"
+    __name    = "LuckyShareNet"
+    __type    = "hoster"
+    __version = "0.06"
 
-    __pattern__ = r'https?://(?:www\.)?luckyshare\.net/(?P<ID>\d{10,})'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?luckyshare\.net/(?P<ID>\d{10,})'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """LuckyShare.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """LuckyShare.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     INFO_PATTERN = r'<h1 class=\'file_name\'>(?P<N>\S+)</h1>\s*<span class=\'file_size\'>Filesize: (?P<S>[\d.,]+)(?P<U>[\w^_]+)</span>'
diff --git a/pyload/plugin/hoster/MediafireCom.py b/pyload/plugin/hoster/MediafireCom.py
index 8b05a95ec..0af531c76 100644
--- a/pyload/plugin/hoster/MediafireCom.py
+++ b/pyload/plugin/hoster/MediafireCom.py
@@ -5,16 +5,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class MediafireCom(SimpleHoster):
-    __name__    = "MediafireCom"
-    __type__    = "hoster"
-    __version__ = "0.85"
+    __name    = "MediafireCom"
+    __type    = "hoster"
+    __version = "0.85"
 
-    __pattern__ = r'https?://(?:www\.)?mediafire\.com/(file/|view/\??|download(\.php\?|/))\w+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?mediafire\.com/(file/|view/\??|download(\.php\?|/))\w+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Mediafire.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """Mediafire.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
diff --git a/pyload/plugin/hoster/MegaCoNz.py b/pyload/plugin/hoster/MegaCoNz.py
index e2506ee3f..496d4503f 100644
--- a/pyload/plugin/hoster/MegaCoNz.py
+++ b/pyload/plugin/hoster/MegaCoNz.py
@@ -46,15 +46,15 @@ from pyload.utils import decode, fs_decode, fs_encode
 
 
 class MegaCoNz(Hoster):
-    __name__    = "MegaCoNz"
-    __type__    = "hoster"
-    __version__ = "0.26"
+    __name    = "MegaCoNz"
+    __type    = "hoster"
+    __version = "0.26"
 
-    __pattern__ = r'(?:https?://(?:www\.)?mega\.co\.nz/|mega:|chrome:.+?)#(?P<TYPE>N|)!(?P<ID>[\w^_]+)!(?P<KEY>[\w,-]+)'
+    __pattern = r'(?:https?://(?:www\.)?mega\.co\.nz/|mega:|chrome:.+?)#(?P<TYPE>N|)!(?P<ID>[\w^_]+)!(?P<KEY>[\w,-]+)'
 
-    __description__ = """Mega.co.nz hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "ranan@pyload.org"),
+    __description = """Mega.co.nz hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "ranan@pyload.org"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
@@ -183,7 +183,7 @@ class MegaCoNz(Hoster):
 
 
     def process(self, pyfile):
-        pattern = re.match(self.__pattern__, pyfile.url).groupdict()
+        pattern = re.match(self.__pattern, pyfile.url).groupdict()
         id      = pattern['ID']
         key     = pattern['KEY']
         public  = pattern['TYPE'] == ''
diff --git a/pyload/plugin/hoster/MegaDebridEu.py b/pyload/plugin/hoster/MegaDebridEu.py
index 28707ce6f..57290e903 100644
--- a/pyload/plugin/hoster/MegaDebridEu.py
+++ b/pyload/plugin/hoster/MegaDebridEu.py
@@ -9,16 +9,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster
 
 
 class MegaDebridEu(MultiHoster):
-    __name__    = "MegaDebridEu"
-    __type__    = "hoster"
-    __version__ = "0.47"
+    __name    = "MegaDebridEu"
+    __type    = "hoster"
+    __version = "0.47"
 
-    __pattern__ = r'http://((?:www\d+\.|s\d+\.)?mega-debrid\.eu|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/download/file/[\w^_]+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://((?:www\d+\.|s\d+\.)?mega-debrid\.eu|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/download/file/[\w^_]+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """mega-debrid.eu multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("D.Ducatel", "dducatel@je-geek.fr")]
+    __description = """mega-debrid.eu multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("D.Ducatel", "dducatel@je-geek.fr")]
 
 
     API_URL = "https://www.mega-debrid.eu/api.php"
diff --git a/pyload/plugin/hoster/MegaFilesSe.py b/pyload/plugin/hoster/MegaFilesSe.py
index 6a1a24beb..51667c786 100644
--- a/pyload/plugin/hoster/MegaFilesSe.py
+++ b/pyload/plugin/hoster/MegaFilesSe.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class MegaFilesSe(DeadHoster):
-    __name__    = "MegaFilesSe"
-    __type__    = "hoster"
-    __version__ = "0.02"
+    __name    = "MegaFilesSe"
+    __type    = "hoster"
+    __version = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?megafiles\.se/\w{12}'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?megafiles\.se/\w{12}'
+    __config  = []
 
-    __description__ = """MegaFiles.se hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]
+    __description = """MegaFiles.se hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]
diff --git a/pyload/plugin/hoster/MegaRapidCz.py b/pyload/plugin/hoster/MegaRapidCz.py
index 9d639555f..910a20300 100644
--- a/pyload/plugin/hoster/MegaRapidCz.py
+++ b/pyload/plugin/hoster/MegaRapidCz.py
@@ -21,16 +21,16 @@ def getInfo(urls):
 
 
 class MegaRapidCz(SimpleHoster):
-    __name__    = "MegaRapidCz"
-    __type__    = "hoster"
-    __version__ = "0.56"
+    __name    = "MegaRapidCz"
+    __type    = "hoster"
+    __version = "0.56"
 
-    __pattern__ = r'http://(?:www\.)?(share|mega)rapid\.cz/soubor/\d+/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?(share|mega)rapid\.cz/soubor/\d+/.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """MegaRapid.cz hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("MikyWoW", "mikywow@seznam.cz"),
+    __description = """MegaRapid.cz hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("MikyWoW", "mikywow@seznam.cz"),
                        ("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
diff --git a/pyload/plugin/hoster/MegaRapidoNet.py b/pyload/plugin/hoster/MegaRapidoNet.py
index 938b201d5..90ae7b30f 100644
--- a/pyload/plugin/hoster/MegaRapidoNet.py
+++ b/pyload/plugin/hoster/MegaRapidoNet.py
@@ -21,16 +21,16 @@ def random_with_N_digits(n):
 
 
 class MegaRapidoNet(MultiHoster):
-    __name__    = "MegaRapidoNet"
-    __type__    = "hoster"
-    __version__ = "0.02"
+    __name    = "MegaRapidoNet"
+    __type    = "hoster"
+    __version = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?\w+\.megarapido\.net/\?file=\w+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?\w+\.megarapido\.net/\?file=\w+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """MegaRapido.net multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")]
+    __description = """MegaRapido.net multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Kagenoshin", "kagenoshin@gmx.ch")]
 
 
     LINK_PREMIUM_PATTERN = r'<\s*?a[^>]*?title\s*?=\s*?["\'][^"\']*?download["\'][^>]*?href=["\']([^"\']*)'
diff --git a/pyload/plugin/hoster/MegacrypterCom.py b/pyload/plugin/hoster/MegacrypterCom.py
index f8fcb97fe..264ad958d 100644
--- a/pyload/plugin/hoster/MegacrypterCom.py
+++ b/pyload/plugin/hoster/MegacrypterCom.py
@@ -8,15 +8,15 @@ from pyload.plugin.hoster.MegaCoNz import MegaCoNz
 
 
 class MegacrypterCom(MegaCoNz):
-    __name__    = "MegacrypterCom"
-    __type__    = "hoster"
-    __version__ = "0.22"
+    __name    = "MegacrypterCom"
+    __type    = "hoster"
+    __version = "0.22"
 
-    __pattern__ = r'https?://\w{0,10}\.?megacrypter\.com/[\w!-]+'
+    __pattern = r'https?://\w{0,10}\.?megacrypter\.com/[\w!-]+'
 
-    __description__ = """Megacrypter.com decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("GonzaloSR", "gonzalo@gonzalosr.com")]
+    __description = """Megacrypter.com decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("GonzaloSR", "gonzalo@gonzalosr.com")]
 
 
     API_URL = "http://megacrypter.com/api"
@@ -33,7 +33,7 @@ class MegacrypterCom(MegaCoNz):
 
     def process(self, pyfile):
         # match is guaranteed because plugin was chosen to handle url
-        node = re.match(self.__pattern__, pyfile.url).group(0)
+        node = re.match(self.__pattern, pyfile.url).group(0)
 
         # get Mega.co.nz link info
         info = self.api_response(link=node, m="info")
diff --git a/pyload/plugin/hoster/MegareleaseOrg.py b/pyload/plugin/hoster/MegareleaseOrg.py
index 541a1823c..65f1242a9 100644
--- a/pyload/plugin/hoster/MegareleaseOrg.py
+++ b/pyload/plugin/hoster/MegareleaseOrg.py
@@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class MegareleaseOrg(DeadHoster):
-    __name__    = "MegareleaseOrg"
-    __type__    = "hoster"
-    __version__ = "0.02"
+    __name    = "MegareleaseOrg"
+    __type    = "hoster"
+    __version = "0.02"
 
-    __pattern__ = r'https?://(?:www\.)?megarelease\.org/\w{12}'
-    __config__  = []
+    __pattern = r'https?://(?:www\.)?megarelease\.org/\w{12}'
+    __config  = []
 
-    __description__ = """Megarelease.org hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("derek3x", "derek3x@vmail.me"),
+    __description = """Megarelease.org hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("derek3x", "derek3x@vmail.me"),
                        ("stickell", "l.stickell@yahoo.it")]
diff --git a/pyload/plugin/hoster/MegasharesCom.py b/pyload/plugin/hoster/MegasharesCom.py
index ed07f373b..71d86d16c 100644
--- a/pyload/plugin/hoster/MegasharesCom.py
+++ b/pyload/plugin/hoster/MegasharesCom.py
@@ -7,16 +7,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class MegasharesCom(SimpleHoster):
-    __name__    = "MegasharesCom"
-    __type__    = "hoster"
-    __version__ = "0.28"
+    __name    = "MegasharesCom"
+    __type    = "hoster"
+    __version = "0.28"
 
-    __pattern__ = r'http://(?:www\.)?(d\d{2}\.)?megashares\.com/((index\.php)?\?d\d{2}=|dl/)\w+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?(d\d{2}\.)?megashares\.com/((index\.php)?\?d\d{2}=|dl/)\w+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Megashares.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """Megashares.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/hoster/MegauploadCom.py b/pyload/plugin/hoster/MegauploadCom.py
index 2e26b630d..20acad9a6 100644
--- a/pyload/plugin/hoster/MegauploadCom.py
+++ b/pyload/plugin/hoster/MegauploadCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class MegauploadCom(DeadHoster):
-    __name__    = "MegauploadCom"
-    __type__    = "hoster"
-    __version__ = "0.31"
+    __name    = "MegauploadCom"
+    __type    = "hoster"
+    __version = "0.31"
 
-    __pattern__ = r'http://(?:www\.)?megaupload\.com/\?.*&?(d|v)=\w+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?megaupload\.com/\?.*&?(d|v)=\w+'
+    __config  = []
 
-    __description__ = """Megaupload.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("spoob", "spoob@pyload.org")]
+    __description = """Megaupload.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("spoob", "spoob@pyload.org")]
diff --git a/pyload/plugin/hoster/MegavideoCom.py b/pyload/plugin/hoster/MegavideoCom.py
index d87967cd9..f50ce4365 100644
--- a/pyload/plugin/hoster/MegavideoCom.py
+++ b/pyload/plugin/hoster/MegavideoCom.py
@@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class MegavideoCom(DeadHoster):
-    __name__    = "MegavideoCom"
-    __type__    = "hoster"
-    __version__ = "0.21"
+    __name    = "MegavideoCom"
+    __type    = "hoster"
+    __version = "0.21"
 
-    __pattern__ = r'http://(?:www\.)?megavideo\.com/\?.*&?(d|v)=\w+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?megavideo\.com/\?.*&?(d|v)=\w+'
+    __config  = []
 
-    __description__ = """Megavideo.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("jeix", "jeix@hasnomail.de"),
+    __description = """Megavideo.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("jeix", "jeix@hasnomail.de"),
                        ("mkaay", "mkaay@mkaay.de")]
diff --git a/pyload/plugin/hoster/MovReelCom.py b/pyload/plugin/hoster/MovReelCom.py
index f273d623a..1d9cf90bc 100644
--- a/pyload/plugin/hoster/MovReelCom.py
+++ b/pyload/plugin/hoster/MovReelCom.py
@@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class MovReelCom(XFSHoster):
-    __name__    = "MovReelCom"
-    __type__    = "hoster"
-    __version__ = "1.24"
+    __name    = "MovReelCom"
+    __type    = "hoster"
+    __version = "1.24"
 
-    __pattern__ = r'http://(?:www\.)?movreel\.com/\w{12}'
+    __pattern = r'http://(?:www\.)?movreel\.com/\w{12}'
 
-    __description__ = """MovReel.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("JorisV83", "jorisv83-pyload@yahoo.com")]
+    __description = """MovReel.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("JorisV83", "jorisv83-pyload@yahoo.com")]
 
 
     LINK_PATTERN = r'<a href="([^"]+)">Download Link'
diff --git a/pyload/plugin/hoster/MultihostersCom.py b/pyload/plugin/hoster/MultihostersCom.py
index 3c9e81242..1bb2452bb 100644
--- a/pyload/plugin/hoster/MultihostersCom.py
+++ b/pyload/plugin/hoster/MultihostersCom.py
@@ -4,12 +4,12 @@ from pyload.plugin.hoster.ZeveraCom import ZeveraCom
 
 
 class MultihostersCom(ZeveraCom):
-    __name__    = "MultihostersCom"
-    __type__    = "hoster"
-    __version__ = "0.03"
+    __name    = "MultihostersCom"
+    __type    = "hoster"
+    __version = "0.03"
 
-    __pattern__ = r'https?://(?:www\.)multihosters\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+'
+    __pattern = r'https?://(?:www\.)multihosters\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+'
 
-    __description__ = """Multihosters.com multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("tjeh", "tjeh@gmx.net")]
+    __description = """Multihosters.com multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("tjeh", "tjeh@gmx.net")]
diff --git a/pyload/plugin/hoster/MultishareCz.py b/pyload/plugin/hoster/MultishareCz.py
index 2444a1675..4ee747043 100644
--- a/pyload/plugin/hoster/MultishareCz.py
+++ b/pyload/plugin/hoster/MultishareCz.py
@@ -8,16 +8,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class MultishareCz(SimpleHoster):
-    __name__    = "MultishareCz"
-    __type__    = "hoster"
-    __version__ = "0.40"
+    __name    = "MultishareCz"
+    __type    = "hoster"
+    __version = "0.40"
 
-    __pattern__ = r'http://(?:www\.)?multishare\.cz/stahnout/(?P<ID>\d+)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?multishare\.cz/stahnout/(?P<ID>\d+)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """MultiShare.cz hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """MultiShare.cz hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     SIZE_REPLACEMENTS = [('&nbsp;', '')]
diff --git a/pyload/plugin/hoster/MyfastfileCom.py b/pyload/plugin/hoster/MyfastfileCom.py
index 81f2ffa78..c6bf4c227 100644
--- a/pyload/plugin/hoster/MyfastfileCom.py
+++ b/pyload/plugin/hoster/MyfastfileCom.py
@@ -7,16 +7,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster
 
 
 class MyfastfileCom(MultiHoster):
-    __name__    = "MyfastfileCom"
-    __type__    = "hoster"
-    __version__ = "0.08"
+    __name    = "MyfastfileCom"
+    __type    = "hoster"
+    __version = "0.08"
 
-    __pattern__ = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/dl/'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/dl/'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Myfastfile.com multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Myfastfile.com multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
 
diff --git a/pyload/plugin/hoster/MystoreTo.py b/pyload/plugin/hoster/MystoreTo.py
index 4791d0096..581dec612 100644
--- a/pyload/plugin/hoster/MystoreTo.py
+++ b/pyload/plugin/hoster/MystoreTo.py
@@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class MystoreTo(SimpleHoster):
-    __name__    = "MystoreTo"
-    __type__    = "hoster"
-    __version__ = "0.03"
+    __name    = "MystoreTo"
+    __type    = "hoster"
+    __version = "0.03"
 
-    __pattern__ = r'https?://(?:www\.)?mystore\.to/dl/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?mystore\.to/dl/.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Mystore.to hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zapp-brannigan", "")]
+    __description = """Mystore.to hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zapp-brannigan", "")]
 
 
     NAME_PATTERN    = r'<h1>(?P<N>.+?)<'
diff --git a/pyload/plugin/hoster/MyvideoDe.py b/pyload/plugin/hoster/MyvideoDe.py
index 4b5fa99ca..08652cdc9 100644
--- a/pyload/plugin/hoster/MyvideoDe.py
+++ b/pyload/plugin/hoster/MyvideoDe.py
@@ -7,15 +7,15 @@ from pyload.utils import html_unescape
 
 
 class MyvideoDe(Hoster):
-    __name__    = "MyvideoDe"
-    __type__    = "hoster"
-    __version__ = "0.90"
+    __name    = "MyvideoDe"
+    __type    = "hoster"
+    __version = "0.90"
 
-    __pattern__ = r'http://(?:www\.)?myvideo\.de/watch/'
+    __pattern = r'http://(?:www\.)?myvideo\.de/watch/'
 
-    __description__ = """Myvideo.de hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("spoob", "spoob@pyload.org")]
+    __description = """Myvideo.de hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("spoob", "spoob@pyload.org")]
 
 
     def process(self, pyfile):
diff --git a/pyload/plugin/hoster/NahrajCz.py b/pyload/plugin/hoster/NahrajCz.py
index 5e594ce64..14f041e17 100644
--- a/pyload/plugin/hoster/NahrajCz.py
+++ b/pyload/plugin/hoster/NahrajCz.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class NahrajCz(DeadHoster):
-    __name__    = "NahrajCz"
-    __type__    = "hoster"
-    __version__ = "0.21"
+    __name    = "NahrajCz"
+    __type    = "hoster"
+    __version = "0.21"
 
-    __pattern__ = r'http://(?:www\.)?nahraj\.cz/content/download/.+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?nahraj\.cz/content/download/.+'
+    __config  = []
 
-    __description__ = """Nahraj.cz hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Nahraj.cz hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/hoster/NarodRu.py b/pyload/plugin/hoster/NarodRu.py
index 6cd9d57cc..b68f219e2 100644
--- a/pyload/plugin/hoster/NarodRu.py
+++ b/pyload/plugin/hoster/NarodRu.py
@@ -8,16 +8,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class NarodRu(SimpleHoster):
-    __name__    = "NarodRu"
-    __type__    = "hoster"
-    __version__ = "0.12"
+    __name    = "NarodRu"
+    __type    = "hoster"
+    __version = "0.12"
 
-    __pattern__ = r'http://(?:www\.)?narod(\.yandex)?\.ru/(disk|start/\d+\.\w+-narod\.yandex\.ru)/(?P<ID>\d+)/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?narod(\.yandex)?\.ru/(disk|start/\d+\.\w+-narod\.yandex\.ru)/(?P<ID>\d+)/.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Narod.ru hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Narod.ru hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     NAME_PATTERN = r'<dt class="name">(?:<[^<]*>)*(?P<N>[^<]+)</dt>'
diff --git a/pyload/plugin/hoster/NetloadIn.py b/pyload/plugin/hoster/NetloadIn.py
index 5178c684c..5a982a055 100644
--- a/pyload/plugin/hoster/NetloadIn.py
+++ b/pyload/plugin/hoster/NetloadIn.py
@@ -15,7 +15,7 @@ def getInfo(urls):
     ##  returns list of tupels (name, size (in bytes), status (see database.File), url)
 
     apiurl = "http://api.netload.in/info.php"
-    id_regex = re.compile(NetloadIn.__pattern__)
+    id_regex = re.compile(NetloadIn.__pattern)
     urls_per_query = 80
 
     for chunk in chunks(urls, urls_per_query):
@@ -60,15 +60,15 @@ def getInfo(urls):
 
 
 class NetloadIn(Hoster):
-    __name__    = "NetloadIn"
-    __type__    = "hoster"
-    __version__ = "0.49"
+    __name    = "NetloadIn"
+    __type    = "hoster"
+    __version = "0.49"
 
-    __pattern__ = r'https?://(?:www\.)?netload\.in/(?P<PATH>datei|index\.php\?id=10&file_id=)(?P<ID>\w+)'
+    __pattern = r'https?://(?:www\.)?netload\.in/(?P<PATH>datei|index\.php\?id=10&file_id=)(?P<ID>\w+)'
 
-    __description__ = """Netload.in hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("spoob", "spoob@pyload.org"),
+    __description = """Netload.in hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("spoob", "spoob@pyload.org"),
                        ("RaNaN", "ranan@pyload.org"),
                        ("Gregy", "gregy@gregy.cz")]
 
@@ -116,7 +116,7 @@ class NetloadIn(Hoster):
 
     def api_load(self, n=0):
         url      = self.url
-        id_regex = re.compile(self.__pattern__)
+        id_regex = re.compile(self.__pattern)
         match    = id_regex.search(url)
 
         if match:
diff --git a/pyload/plugin/hoster/NitroflareCom.py b/pyload/plugin/hoster/NitroflareCom.py
index d2bcd871d..a93ff67ec 100644
--- a/pyload/plugin/hoster/NitroflareCom.py
+++ b/pyload/plugin/hoster/NitroflareCom.py
@@ -7,16 +7,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class NitroflareCom(SimpleHoster):
-    __name__    = "NitroflareCom"
-    __type__    = "hoster"
-    __version__ = "0.09"
+    __name    = "NitroflareCom"
+    __type    = "hoster"
+    __version = "0.09"
 
-    __pattern__ = r'https?://(?:www\.)?nitroflare\.com/view/(?P<ID>[\w^_]+)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?nitroflare\.com/view/(?P<ID>[\w^_]+)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Nitroflare.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("sahil", "sahilshekhawat01@gmail.com"),
+    __description = """Nitroflare.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("sahil", "sahilshekhawat01@gmail.com"),
                        ("Walter Purcaro", "vuolter@gmail.com"),
                        ("Stickell", "l.stickell@yahoo.it")]
 
diff --git a/pyload/plugin/hoster/NoPremiumPl.py b/pyload/plugin/hoster/NoPremiumPl.py
index c80d2ef6c..701ca6a6d 100644
--- a/pyload/plugin/hoster/NoPremiumPl.py
+++ b/pyload/plugin/hoster/NoPremiumPl.py
@@ -5,16 +5,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster
 
 
 class NoPremiumPl(MultiHoster):
-    __name__    = "NoPremiumPl"
-    __type__    = "hoster"
-    __version__ = "0.02"
+    __name    = "NoPremiumPl"
+    __type    = "hoster"
+    __version = "0.02"
 
-    __pattern__ = r'https?://direct\.nopremium\.pl.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://direct\.nopremium\.pl.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """NoPremium.pl multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("goddie", "dev@nopremium.pl")]
+    __description = """NoPremium.pl multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("goddie", "dev@nopremium.pl")]
 
 
     API_URL = "http://crypt.nopremium.pl"
@@ -79,7 +79,7 @@ class NoPremiumPl(MultiHoster):
         if "errno" in parsed.keys():
             if parsed["errno"] in self.ERROR_CODES:
                 # error code in known
-                self.fail(self.ERROR_CODES[parsed["errno"]] % self.__name__)
+                self.fail(self.ERROR_CODES[parsed["errno"]] % self.__name)
             else:
                 # error code isn't yet added to plugin
                 self.fail(
diff --git a/pyload/plugin/hoster/NosuploadCom.py b/pyload/plugin/hoster/NosuploadCom.py
index 3d785dd90..af79da22b 100644
--- a/pyload/plugin/hoster/NosuploadCom.py
+++ b/pyload/plugin/hoster/NosuploadCom.py
@@ -6,15 +6,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class NosuploadCom(XFSHoster):
-    __name__    = "NosuploadCom"
-    __type__    = "hoster"
-    __version__ = "0.31"
+    __name    = "NosuploadCom"
+    __type    = "hoster"
+    __version = "0.31"
 
-    __pattern__ = r'http://(?:www\.)?nosupload\.com/\?d=\w{12}'
+    __pattern = r'http://(?:www\.)?nosupload\.com/\?d=\w{12}'
 
-    __description__ = """Nosupload.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("igel", "igelkun@myopera.com")]
+    __description = """Nosupload.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("igel", "igelkun@myopera.com")]
 
 
     SIZE_PATTERN = r'<p><strong>Size:</strong> (?P<S>[\d.,]+) (?P<U>[\w^_]+)</p>'
diff --git a/pyload/plugin/hoster/NovafileCom.py b/pyload/plugin/hoster/NovafileCom.py
index e79ba5980..f81d21932 100644
--- a/pyload/plugin/hoster/NovafileCom.py
+++ b/pyload/plugin/hoster/NovafileCom.py
@@ -8,15 +8,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class NovafileCom(XFSHoster):
-    __name__    = "NovafileCom"
-    __type__    = "hoster"
-    __version__ = "0.05"
+    __name    = "NovafileCom"
+    __type    = "hoster"
+    __version = "0.05"
 
-    __pattern__ = r'http://(?:www\.)?novafile\.com/\w{12}'
+    __pattern = r'http://(?:www\.)?novafile\.com/\w{12}'
 
-    __description__ = """Novafile.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """Novafile.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/hoster/NowDownloadSx.py b/pyload/plugin/hoster/NowDownloadSx.py
index 1cc009b30..8355fdc44 100644
--- a/pyload/plugin/hoster/NowDownloadSx.py
+++ b/pyload/plugin/hoster/NowDownloadSx.py
@@ -7,16 +7,16 @@ from pyload.utils import fixup
 
 
 class NowDownloadSx(SimpleHoster):
-    __name__    = "NowDownloadSx"
-    __type__    = "hoster"
-    __version__ = "0.09"
+    __name    = "NowDownloadSx"
+    __type    = "hoster"
+    __version = "0.09"
 
-    __pattern__ = r'http://(?:www\.)?(nowdownload\.[a-zA-Z]{2,}/(dl/|download\.php.+?id=|mobile/(#/files/|.+?id=))|likeupload\.org/)\w+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?(nowdownload\.[a-zA-Z]{2,}/(dl/|download\.php.+?id=|mobile/(#/files/|.+?id=))|likeupload\.org/)\w+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """NowDownload.sx hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("godofdream", "soilfiction@gmail.com"),
+    __description = """NowDownload.sx hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("godofdream", "soilfiction@gmail.com"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/hoster/NowVideoSx.py b/pyload/plugin/hoster/NowVideoSx.py
index 3501c5219..9032cea87 100644
--- a/pyload/plugin/hoster/NowVideoSx.py
+++ b/pyload/plugin/hoster/NowVideoSx.py
@@ -6,19 +6,19 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class NowVideoSx(SimpleHoster):
-    __name__    = "NowVideoSx"
-    __type__    = "hoster"
-    __version__ = "0.12"
+    __name    = "NowVideoSx"
+    __type    = "hoster"
+    __version = "0.12"
 
-    __pattern__ = r'http://(?:www\.)?nowvideo\.[a-zA-Z]{2,}/(video/|mobile/(#/videos/|.+?id=))(?P<ID>\w+)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?nowvideo\.[a-zA-Z]{2,}/(video/|mobile/(#/videos/|.+?id=))(?P<ID>\w+)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """NowVideo.sx hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """NowVideo.sx hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    URL_REPLACEMENTS = [(__pattern__ + ".*", r'http://www.nowvideo.sx/video/\g<ID>')]
+    URL_REPLACEMENTS = [(__pattern + ".*", r'http://www.nowvideo.sx/video/\g<ID>')]
 
     NAME_PATTERN = r'<h4>(?P<N>.+?)<'
     OFFLINE_PATTERN = r'>This file no longer exists'
diff --git a/pyload/plugin/hoster/OboomCom.py b/pyload/plugin/hoster/OboomCom.py
index 43d41c538..f8a9fb8bb 100644
--- a/pyload/plugin/hoster/OboomCom.py
+++ b/pyload/plugin/hoster/OboomCom.py
@@ -11,15 +11,15 @@ from pyload.plugin.internal.captcha import ReCaptcha
 
 
 class OboomCom(Hoster):
-    __name__    = "OboomCom"
-    __type__    = "hoster"
-    __version__ = "0.31"
+    __name    = "OboomCom"
+    __type    = "hoster"
+    __version = "0.31"
 
-    __pattern__ = r'https?://(?:www\.)?oboom\.com/(#(id=|/)?)?(?P<ID>\w{8})'
+    __pattern = r'https?://(?:www\.)?oboom\.com/(#(id=|/)?)?(?P<ID>\w{8})'
 
-    __description__ = """oboom.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stanley", "stanley.foerster@gmail.com")]
+    __description = """oboom.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stanley", "stanley.foerster@gmail.com")]
 
 
     RECAPTCHA_KEY = "6LdqpO0SAAAAAJGHXo63HyalP7H4qlRs_vff0kJX"
@@ -51,7 +51,7 @@ class OboomCom(Hoster):
 
 
     def getFileId(self, url):
-        self.fileId = re.match(OboomCom.__pattern__, url).group('ID')
+        self.fileId = re.match(OboomCom.__pattern, url).group('ID')
 
 
     def getSessionToken(self):
diff --git a/pyload/plugin/hoster/OneFichierCom.py b/pyload/plugin/hoster/OneFichierCom.py
index dd8064585..808074510 100644
--- a/pyload/plugin/hoster/OneFichierCom.py
+++ b/pyload/plugin/hoster/OneFichierCom.py
@@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class OneFichierCom(SimpleHoster):
-    __name__    = "OneFichierCom"
-    __type__    = "hoster"
-    __version__ = "0.79"
+    __name    = "OneFichierCom"
+    __type    = "hoster"
+    __version = "0.79"
 
-    __pattern__ = r'https?://(?:www\.)?(?:(?P<ID1>\w+)\.)?(?P<HOST>1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?(?P<ID2>\w+))?'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?(?:(?P<ID1>\w+)\.)?(?P<HOST>1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?(?P<ID2>\w+))?'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """1fichier.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("fragonib", "fragonib[AT]yahoo[DOT]es"),
+    __description = """1fichier.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("fragonib", "fragonib[AT]yahoo[DOT]es"),
                        ("the-razer", "daniel_ AT gmx DOT net"),
                        ("zoidberg", "zoidberg@mujmail.cz"),
                        ("imclem", ""),
diff --git a/pyload/plugin/hoster/OronCom.py b/pyload/plugin/hoster/OronCom.py
index 9a5207367..29ca267a0 100644
--- a/pyload/plugin/hoster/OronCom.py
+++ b/pyload/plugin/hoster/OronCom.py
@@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class OronCom(DeadHoster):
-    __name__    = "OronCom"
-    __type__    = "hoster"
-    __version__ = "0.14"
+    __name    = "OronCom"
+    __type    = "hoster"
+    __version = "0.14"
 
-    __pattern__ = r'https?://(?:www\.)?oron\.com/\w{12}'
-    __config__  = []
+    __pattern = r'https?://(?:www\.)?oron\.com/\w{12}'
+    __config  = []
 
-    __description__ = """Oron.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("chrox", "chrox@pyload.org"),
+    __description = """Oron.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("chrox", "chrox@pyload.org"),
                        ("DHMH", "DHMH@pyload.org")]
diff --git a/pyload/plugin/hoster/OverLoadMe.py b/pyload/plugin/hoster/OverLoadMe.py
index 4bec0b0db..ca365549a 100644
--- a/pyload/plugin/hoster/OverLoadMe.py
+++ b/pyload/plugin/hoster/OverLoadMe.py
@@ -11,16 +11,16 @@ from pyload.utils import parseFileSize
 
 
 class OverLoadMe(MultiHoster):
-    __name__    = "OverLoadMe"
-    __type__    = "hoster"
-    __version__ = "0.11"
+    __name    = "OverLoadMe"
+    __type    = "hoster"
+    __version = "0.11"
 
-    __pattern__ = r'https?://.*overload\.me/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://.*overload\.me/.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Over-Load.me multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("marley", "marley@over-load.me")]
+    __description = """Over-Load.me multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("marley", "marley@over-load.me")]
 
 
     def setup(self):
diff --git a/pyload/plugin/hoster/PandaplaNet.py b/pyload/plugin/hoster/PandaplaNet.py
index 2a61a69c4..dc23ef6a0 100644
--- a/pyload/plugin/hoster/PandaplaNet.py
+++ b/pyload/plugin/hoster/PandaplaNet.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class PandaplaNet(DeadHoster):
-    __name__    = "PandaplaNet"
-    __type__    = "hoster"
-    __version__ = "0.03"
+    __name    = "PandaplaNet"
+    __type    = "hoster"
+    __version = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?pandapla\.net/\w{12}'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?pandapla\.net/\w{12}'
+    __config  = []
 
-    __description__ = """Pandapla.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]
+    __description = """Pandapla.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]
diff --git a/pyload/plugin/hoster/PornhostCom.py b/pyload/plugin/hoster/PornhostCom.py
index 70ce4f32e..819612fcf 100644
--- a/pyload/plugin/hoster/PornhostCom.py
+++ b/pyload/plugin/hoster/PornhostCom.py
@@ -6,15 +6,15 @@ from pyload.plugin.Hoster import Hoster
 
 
 class PornhostCom(Hoster):
-    __name__    = "PornhostCom"
-    __type__    = "hoster"
-    __version__ = "0.20"
+    __name    = "PornhostCom"
+    __type    = "hoster"
+    __version = "0.20"
 
-    __pattern__ = r'http://(?:www\.)?pornhost\.com/(\d+/\d+\.html|\d+)'
+    __pattern = r'http://(?:www\.)?pornhost\.com/(\d+/\d+\.html|\d+)'
 
-    __description__ = """Pornhost.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("jeix", "jeix@hasnomail.de")]
+    __description = """Pornhost.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("jeix", "jeix@hasnomail.de")]
 
 
     def process(self, pyfile):
diff --git a/pyload/plugin/hoster/PornhubCom.py b/pyload/plugin/hoster/PornhubCom.py
index 9f8a5eec2..48fd82871 100644
--- a/pyload/plugin/hoster/PornhubCom.py
+++ b/pyload/plugin/hoster/PornhubCom.py
@@ -6,15 +6,15 @@ from pyload.plugin.Hoster import Hoster
 
 
 class PornhubCom(Hoster):
-    __name__    = "PornhubCom"
-    __type__    = "hoster"
-    __version__ = "0.50"
+    __name    = "PornhubCom"
+    __type    = "hoster"
+    __version = "0.50"
 
-    __pattern__ = r'http://(?:www\.)?pornhub\.com/view_video\.php\?viewkey=\w+'
+    __pattern = r'http://(?:www\.)?pornhub\.com/view_video\.php\?viewkey=\w+'
 
-    __description__ = """Pornhub.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("jeix", "jeix@hasnomail.de")]
+    __description = """Pornhub.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("jeix", "jeix@hasnomail.de")]
 
 
     def process(self, pyfile):
diff --git a/pyload/plugin/hoster/PotloadCom.py b/pyload/plugin/hoster/PotloadCom.py
index c1e96ff77..b6b86b689 100644
--- a/pyload/plugin/hoster/PotloadCom.py
+++ b/pyload/plugin/hoster/PotloadCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class PotloadCom(DeadHoster):
-    __name__    = "PotloadCom"
-    __type__    = "hoster"
-    __version__ = "0.02"
+    __name    = "PotloadCom"
+    __type    = "hoster"
+    __version = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?potload\.com/\w{12}'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?potload\.com/\w{12}'
+    __config  = []
 
-    __description__ = """Potload.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Potload.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
diff --git a/pyload/plugin/hoster/PremiumTo.py b/pyload/plugin/hoster/PremiumTo.py
index 46ecf0b36..c7ee09565 100644
--- a/pyload/plugin/hoster/PremiumTo.py
+++ b/pyload/plugin/hoster/PremiumTo.py
@@ -9,16 +9,16 @@ from pyload.utils import fs_encode
 
 
 class PremiumTo(MultiHoster):
-    __name__    = "PremiumTo"
-    __type__    = "hoster"
-    __version__ = "0.22"
+    __name    = "PremiumTo"
+    __type    = "hoster"
+    __version = "0.22"
 
-    __pattern__ = r'^unmatchable$'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'^unmatchable$'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Premium.to multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+    __description = """Premium.to multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org"),
                        ("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
diff --git a/pyload/plugin/hoster/PremiumizeMe.py b/pyload/plugin/hoster/PremiumizeMe.py
index c6dcfa794..809d27624 100644
--- a/pyload/plugin/hoster/PremiumizeMe.py
+++ b/pyload/plugin/hoster/PremiumizeMe.py
@@ -5,16 +5,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster
 
 
 class PremiumizeMe(MultiHoster):
-    __name__    = "PremiumizeMe"
-    __type__    = "hoster"
-    __version__ = "0.16"
+    __name    = "PremiumizeMe"
+    __type    = "hoster"
+    __version = "0.16"
 
-    __pattern__ = r'^unmatchable$'  #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.activate
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'^unmatchable$'  #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.activate
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Premiumize.me multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Florian Franzen", "FlorianFranzen@gmail.com")]
+    __description = """Premiumize.me multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Florian Franzen", "FlorianFranzen@gmail.com")]
 
 
     def handlePremium(self, pyfile):
diff --git a/pyload/plugin/hoster/PromptfileCom.py b/pyload/plugin/hoster/PromptfileCom.py
index f550fa573..e947ac602 100644
--- a/pyload/plugin/hoster/PromptfileCom.py
+++ b/pyload/plugin/hoster/PromptfileCom.py
@@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class PromptfileCom(SimpleHoster):
-    __name__    = "PromptfileCom"
-    __type__    = "hoster"
-    __version__ = "0.13"
+    __name    = "PromptfileCom"
+    __type    = "hoster"
+    __version = "0.13"
 
-    __pattern__ = r'https?://(?:www\.)?promptfile\.com/'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?promptfile\.com/'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Promptfile.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("igel", "igelkun@myopera.com")]
+    __description = """Promptfile.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("igel", "igelkun@myopera.com")]
 
 
     INFO_PATTERN = r'<span style="[^"]*" title="[^"]*">(?P<N>.*?) \((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)</span>'
diff --git a/pyload/plugin/hoster/PrzeklejPl.py b/pyload/plugin/hoster/PrzeklejPl.py
index d6437e82e..f4781abb9 100644
--- a/pyload/plugin/hoster/PrzeklejPl.py
+++ b/pyload/plugin/hoster/PrzeklejPl.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class PrzeklejPl(DeadHoster):
-    __name__    = "PrzeklejPl"
-    __type__    = "hoster"
-    __version__ = "0.11"
+    __name    = "PrzeklejPl"
+    __type    = "hoster"
+    __version = "0.11"
 
-    __pattern__ = r'http://(?:www\.)?przeklej\.pl/plik/.+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?przeklej\.pl/plik/.+'
+    __config  = []
 
-    __description__ = """Przeklej.pl hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Przeklej.pl hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/hoster/PutdriveCom.py b/pyload/plugin/hoster/PutdriveCom.py
index 562951e81..051da9473 100644
--- a/pyload/plugin/hoster/PutdriveCom.py
+++ b/pyload/plugin/hoster/PutdriveCom.py
@@ -4,12 +4,12 @@ from pyload.plugin.hoster.ZeveraCom import ZeveraCom
 
 
 class PutdriveCom(ZeveraCom):
-    __name__    = "PutdriveCom"
-    __type__    = "hoster"
-    __version__ = "0.02"
+    __name    = "PutdriveCom"
+    __type    = "hoster"
+    __version = "0.02"
 
-    __pattern__ = r'https?://(?:www\.)putdrive\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+'
+    __pattern = r'https?://(?:www\.)putdrive\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+'
 
-    __description__ = """Multihosters.com multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Multihosters.com multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
diff --git a/pyload/plugin/hoster/QuickshareCz.py b/pyload/plugin/hoster/QuickshareCz.py
index 570c9f876..3ae4f05cf 100644
--- a/pyload/plugin/hoster/QuickshareCz.py
+++ b/pyload/plugin/hoster/QuickshareCz.py
@@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class QuickshareCz(SimpleHoster):
-    __name__    = "QuickshareCz"
-    __type__    = "hoster"
-    __version__ = "0.56"
+    __name    = "QuickshareCz"
+    __type    = "hoster"
+    __version = "0.56"
 
-    __pattern__ = r'http://(?:[^/]*\.)?quickshare\.cz/stahnout-soubor/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:[^/]*\.)?quickshare\.cz/stahnout-soubor/.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Quickshare.cz hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Quickshare.cz hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     NAME_PATTERN = r'<th width="145px">Název:</th>\s*<td style="word-wrap:break-word;">(?P<N>[^<]+)</td>'
diff --git a/pyload/plugin/hoster/RPNetBiz.py b/pyload/plugin/hoster/RPNetBiz.py
index 5e393ecb9..6788eebce 100644
--- a/pyload/plugin/hoster/RPNetBiz.py
+++ b/pyload/plugin/hoster/RPNetBiz.py
@@ -7,16 +7,16 @@ from pyload.utils import json_loads
 
 
 class RPNetBiz(MultiHoster):
-    __name__    = "RPNetBiz"
-    __type__    = "hoster"
-    __version__ = "0.14"
+    __name    = "RPNetBiz"
+    __type    = "hoster"
+    __version = "0.14"
 
-    __pattern__ = r'https?://.+rpnet\.biz'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://.+rpnet\.biz'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """RPNet.biz multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Dman", "dmanugm@gmail.com")]
+    __description = """RPNet.biz multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Dman", "dmanugm@gmail.com")]
 
 
     def setup(self):
diff --git a/pyload/plugin/hoster/RapideoPl.py b/pyload/plugin/hoster/RapideoPl.py
index 86dfad5f0..88a596dc7 100644
--- a/pyload/plugin/hoster/RapideoPl.py
+++ b/pyload/plugin/hoster/RapideoPl.py
@@ -5,16 +5,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster
 
 
 class RapideoPl(MultiHoster):
-    __name__    = "RapideoPl"
-    __type__    = "hoster"
-    __version__ = "0.02"
+    __name    = "RapideoPl"
+    __type    = "hoster"
+    __version = "0.02"
 
-    __pattern__ = r'^unmatchable$'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'^unmatchable$'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Rapideo.pl multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("goddie", "dev@rapideo.pl")]
+    __description = """Rapideo.pl multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("goddie", "dev@rapideo.pl")]
 
 
     API_URL = "http://enc.rapideo.pl"
@@ -79,7 +79,7 @@ class RapideoPl(MultiHoster):
         if "errno" in parsed.keys():
             if parsed["errno"] in self.ERROR_CODES:
                 # error code in known
-                self.fail(self.ERROR_CODES[parsed["errno"]] % self.__name__)
+                self.fail(self.ERROR_CODES[parsed["errno"]] % self.__name)
             else:
                 # error code isn't yet added to plugin
                 self.fail(
diff --git a/pyload/plugin/hoster/RapidfileshareNet.py b/pyload/plugin/hoster/RapidfileshareNet.py
index 1b1895b39..8252b49e7 100644
--- a/pyload/plugin/hoster/RapidfileshareNet.py
+++ b/pyload/plugin/hoster/RapidfileshareNet.py
@@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class RapidfileshareNet(XFSHoster):
-    __name__    = "RapidfileshareNet"
-    __type__    = "hoster"
-    __version__ = "0.03"
+    __name    = "RapidfileshareNet"
+    __type    = "hoster"
+    __version = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?rapidfileshare\.net/\w{12}'
+    __pattern = r'http://(?:www\.)?rapidfileshare\.net/\w{12}'
 
-    __description__ = """Rapidfileshare.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
+    __description = """Rapidfileshare.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
     NAME_PATTERN = r'<input type="hidden" name="fname" value="(?P<N>.+?)">'
diff --git a/pyload/plugin/hoster/RapidgatorNet.py b/pyload/plugin/hoster/RapidgatorNet.py
index 98a8b97c9..1f68e13a4 100644
--- a/pyload/plugin/hoster/RapidgatorNet.py
+++ b/pyload/plugin/hoster/RapidgatorNet.py
@@ -13,16 +13,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster, secondsToMidnight
 
 
 class RapidgatorNet(SimpleHoster):
-    __name__    = "RapidgatorNet"
-    __type__    = "hoster"
-    __version__ = "0.33"
+    __name    = "RapidgatorNet"
+    __type    = "hoster"
+    __version = "0.33"
 
-    __pattern__ = r'http://(?:www\.)?(rapidgator\.net|rg\.to)/file/\w+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?(rapidgator\.net|rg\.to)/file/\w+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Rapidgator.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """Rapidgator.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("chrox", ""),
                        ("stickell", "l.stickell@yahoo.it"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
diff --git a/pyload/plugin/hoster/RapiduNet.py b/pyload/plugin/hoster/RapiduNet.py
index e11114a4a..858e5fd09 100644
--- a/pyload/plugin/hoster/RapiduNet.py
+++ b/pyload/plugin/hoster/RapiduNet.py
@@ -11,16 +11,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class RapiduNet(SimpleHoster):
-    __name__    = "RapiduNet"
-    __type__    = "hoster"
-    __version__ = "0.07"
+    __name    = "RapiduNet"
+    __type    = "hoster"
+    __version = "0.07"
 
-    __pattern__ = r'https?://(?:www\.)?rapidu\.net/(?P<ID>\d{10})'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?rapidu\.net/(?P<ID>\d{10})'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Rapidu.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("prOq", "")]
+    __description = """Rapidu.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("prOq", "")]
 
 
     COOKIES = [("rapidu.net", "rapidu_lang", "en")]
diff --git a/pyload/plugin/hoster/RarefileNet.py b/pyload/plugin/hoster/RarefileNet.py
index 1010c92ca..f89708282 100644
--- a/pyload/plugin/hoster/RarefileNet.py
+++ b/pyload/plugin/hoster/RarefileNet.py
@@ -6,15 +6,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class RarefileNet(XFSHoster):
-    __name__    = "RarefileNet"
-    __type__    = "hoster"
-    __version__ = "0.09"
+    __name    = "RarefileNet"
+    __type    = "hoster"
+    __version = "0.09"
 
-    __pattern__ = r'http://(?:www\.)?rarefile\.net/\w{12}'
+    __pattern = r'http://(?:www\.)?rarefile\.net/\w{12}'
 
-    __description__ = """Rarefile.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Rarefile.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     LINK_PATTERN = r'<a href="(.+?)">\1</a>'
diff --git a/pyload/plugin/hoster/RealdebridCom.py b/pyload/plugin/hoster/RealdebridCom.py
index ca303cf88..a2712aa35 100644
--- a/pyload/plugin/hoster/RealdebridCom.py
+++ b/pyload/plugin/hoster/RealdebridCom.py
@@ -12,16 +12,16 @@ from pyload.utils import parseFileSize
 
 
 class RealdebridCom(MultiHoster):
-    __name__    = "RealdebridCom"
-    __type__    = "hoster"
-    __version__ = "0.67"
+    __name    = "RealdebridCom"
+    __type    = "hoster"
+    __version = "0.67"
 
-    __pattern__ = r'https?://((?:www\.|s\d+\.)?real-debrid\.com/dl/|[\w^_]\.rdb\.so/d/)[\w^_]+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://((?:www\.|s\d+\.)?real-debrid\.com/dl/|[\w^_]\.rdb\.so/d/)[\w^_]+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Real-Debrid.com multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Devirex Hazzard", "naibaf_11@yahoo.de")]
+    __description = """Real-Debrid.com multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Devirex Hazzard", "naibaf_11@yahoo.de")]
 
 
     def setup(self):
diff --git a/pyload/plugin/hoster/RedtubeCom.py b/pyload/plugin/hoster/RedtubeCom.py
index 1f18d09c7..4ab976fdd 100644
--- a/pyload/plugin/hoster/RedtubeCom.py
+++ b/pyload/plugin/hoster/RedtubeCom.py
@@ -7,15 +7,15 @@ from pyload.utils import html_unescape
 
 
 class RedtubeCom(Hoster):
-    __name__    = "RedtubeCom"
-    __type__    = "hoster"
-    __version__ = "0.20"
+    __name    = "RedtubeCom"
+    __type    = "hoster"
+    __version = "0.20"
 
-    __pattern__ = r'http://(?:www\.)?redtube\.com/\d+'
+    __pattern = r'http://(?:www\.)?redtube\.com/\d+'
 
-    __description__ = """Redtube.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("jeix", "jeix@hasnomail.de")]
+    __description = """Redtube.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("jeix", "jeix@hasnomail.de")]
 
 
     def process(self, pyfile):
diff --git a/pyload/plugin/hoster/RehostTo.py b/pyload/plugin/hoster/RehostTo.py
index 36bdb54b5..c707a866f 100644
--- a/pyload/plugin/hoster/RehostTo.py
+++ b/pyload/plugin/hoster/RehostTo.py
@@ -6,16 +6,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster
 
 
 class RehostTo(MultiHoster):
-    __name__    = "RehostTo"
-    __type__    = "hoster"
-    __version__ = "0.21"
+    __name    = "RehostTo"
+    __type    = "hoster"
+    __version = "0.21"
 
-    __pattern__ = r'https?://.*rehost\.to\..+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://.*rehost\.to\..+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Rehost.com multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
+    __description = """Rehost.com multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org")]
 
 
     def handlePremium(self, pyfile):
diff --git a/pyload/plugin/hoster/RemixshareCom.py b/pyload/plugin/hoster/RemixshareCom.py
index 1df62bbba..19c1c9706 100644
--- a/pyload/plugin/hoster/RemixshareCom.py
+++ b/pyload/plugin/hoster/RemixshareCom.py
@@ -14,16 +14,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class RemixshareCom(SimpleHoster):
-    __name__    = "RemixshareCom"
-    __type__    = "hoster"
-    __version__ = "0.03"
+    __name    = "RemixshareCom"
+    __type    = "hoster"
+    __version = "0.03"
 
-    __pattern__ = r'https?://remixshare\.com/(download|dl)/\w+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://remixshare\.com/(download|dl)/\w+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Remixshare.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de"),
+    __description = """Remixshare.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/hoster/RgHostNet.py b/pyload/plugin/hoster/RgHostNet.py
index 2552b5091..abdccdf68 100644
--- a/pyload/plugin/hoster/RgHostNet.py
+++ b/pyload/plugin/hoster/RgHostNet.py
@@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class RgHostNet(SimpleHoster):
-    __name__    = "RgHostNet"
-    __type__    = "hoster"
-    __version__ = "0.03"
+    __name    = "RgHostNet"
+    __type    = "hoster"
+    __version = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?rghost\.net/\d+(?:r=\d+)?'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?rghost\.net/\d+(?:r=\d+)?'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """RgHost.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("z00nx", "z00nx0@gmail.com")]
+    __description = """RgHost.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("z00nx", "z00nx0@gmail.com")]
 
 
     INFO_PATTERN    = r'<h1>\s+(<a[^>]+>)?(?P<N>[^<]+)(</a>)?\s+<small[^>]+>\s+\((?P<S>[^)]+)\)\s+</small>\s+</h1>'
diff --git a/pyload/plugin/hoster/SafesharingEu.py b/pyload/plugin/hoster/SafesharingEu.py
index af046af62..0676015a2 100644
--- a/pyload/plugin/hoster/SafesharingEu.py
+++ b/pyload/plugin/hoster/SafesharingEu.py
@@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class SafesharingEu(XFSHoster):
-    __name__    = "SafesharingEu"
-    __type__    = "hoster"
-    __version__ = "0.05"
+    __name    = "SafesharingEu"
+    __type    = "hoster"
+    __version = "0.05"
 
-    __pattern__ = r'https?://(?:www\.)?safesharing\.eu/\w{12}'
+    __pattern = r'https?://(?:www\.)?safesharing\.eu/\w{12}'
 
-    __description__ = """Safesharing.eu hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]
+    __description = """Safesharing.eu hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
     ERROR_PATTERN = r'(?:<div class="alert alert-danger">)(.+?)(?:</div>)'
diff --git a/pyload/plugin/hoster/SecureUploadEu.py b/pyload/plugin/hoster/SecureUploadEu.py
index 4db413c90..8cd310c2c 100644
--- a/pyload/plugin/hoster/SecureUploadEu.py
+++ b/pyload/plugin/hoster/SecureUploadEu.py
@@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class SecureUploadEu(XFSHoster):
-    __name__    = "SecureUploadEu"
-    __type__    = "hoster"
-    __version__ = "0.05"
+    __name    = "SecureUploadEu"
+    __type    = "hoster"
+    __version = "0.05"
 
-    __pattern__ = r'https?://(?:www\.)?secureupload\.eu/\w{12}'
+    __pattern = r'https?://(?:www\.)?secureupload\.eu/\w{12}'
 
-    __description__ = """SecureUpload.eu hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("z00nx", "z00nx0@gmail.com")]
+    __description = """SecureUpload.eu hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("z00nx", "z00nx0@gmail.com")]
 
 
     INFO_PATTERN = r'<h3>Downloading (?P<N>[^<]+) \((?P<S>[^<]+)\)</h3>'
diff --git a/pyload/plugin/hoster/SendspaceCom.py b/pyload/plugin/hoster/SendspaceCom.py
index 5faf2a870..163ca3dff 100644
--- a/pyload/plugin/hoster/SendspaceCom.py
+++ b/pyload/plugin/hoster/SendspaceCom.py
@@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class SendspaceCom(SimpleHoster):
-    __name__    = "SendspaceCom"
-    __type__    = "hoster"
-    __version__ = "0.17"
+    __name    = "SendspaceCom"
+    __type    = "hoster"
+    __version = "0.17"
 
-    __pattern__ = r'https?://(?:www\.)?sendspace\.com/file/\w+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?sendspace\.com/file/\w+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Sendspace.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Sendspace.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     NAME_PATTERN    = r'<h2 class="bgray">\s*<(?:b|strong)>(?P<N>[^<]+)</'
diff --git a/pyload/plugin/hoster/Share4WebCom.py b/pyload/plugin/hoster/Share4WebCom.py
index f2b4e49e9..72e3e4a02 100644
--- a/pyload/plugin/hoster/Share4WebCom.py
+++ b/pyload/plugin/hoster/Share4WebCom.py
@@ -4,15 +4,15 @@ from pyload.plugin.hoster.UnibytesCom import UnibytesCom
 
 
 class Share4WebCom(UnibytesCom):
-    __name__    = "Share4WebCom"
-    __type__    = "hoster"
-    __version__ = "0.11"
+    __name    = "Share4WebCom"
+    __type    = "hoster"
+    __version = "0.11"
 
-    __pattern__ = r'https?://(?:www\.)?share4web\.com/get/\w+'
+    __pattern = r'https?://(?:www\.)?share4web\.com/get/\w+'
 
-    __description__ = """Share4web.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Share4web.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     HOSTER_DOMAIN = "share4web.com"
diff --git a/pyload/plugin/hoster/Share76Com.py b/pyload/plugin/hoster/Share76Com.py
index e826b4e2d..fda983401 100644
--- a/pyload/plugin/hoster/Share76Com.py
+++ b/pyload/plugin/hoster/Share76Com.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class Share76Com(DeadHoster):
-    __name__    = "Share76Com"
-    __type__    = "hoster"
-    __version__ = "0.04"
+    __name    = "Share76Com"
+    __type    = "hoster"
+    __version = "0.04"
 
-    __pattern__ = r'http://(?:www\.)?share76\.com/\w{12}'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?share76\.com/\w{12}'
+    __config  = []
 
-    __description__ = """Share76.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = []
+    __description = """Share76.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = []
diff --git a/pyload/plugin/hoster/ShareFilesCo.py b/pyload/plugin/hoster/ShareFilesCo.py
index 946b6a423..37e386034 100644
--- a/pyload/plugin/hoster/ShareFilesCo.py
+++ b/pyload/plugin/hoster/ShareFilesCo.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class ShareFilesCo(DeadHoster):
-    __name__    = "ShareFilesCo"
-    __type__    = "hoster"
-    __version__ = "0.02"
+    __name    = "ShareFilesCo"
+    __type    = "hoster"
+    __version = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?sharefiles\.co/\w{12}'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?sharefiles\.co/\w{12}'
+    __config  = []
 
-    __description__ = """Sharefiles.co hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Sharefiles.co hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
diff --git a/pyload/plugin/hoster/SharebeesCom.py b/pyload/plugin/hoster/SharebeesCom.py
index 405fab050..5b5017fc2 100644
--- a/pyload/plugin/hoster/SharebeesCom.py
+++ b/pyload/plugin/hoster/SharebeesCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class SharebeesCom(DeadHoster):
-    __name__    = "SharebeesCom"
-    __type__    = "hoster"
-    __version__ = "0.02"
+    __name    = "SharebeesCom"
+    __type    = "hoster"
+    __version = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?sharebees\.com/\w{12}'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?sharebees\.com/\w{12}'
+    __config  = []
 
-    __description__ = """ShareBees hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """ShareBees hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/hoster/ShareonlineBiz.py b/pyload/plugin/hoster/ShareonlineBiz.py
index 2d8b6d925..5d671c77a 100644
--- a/pyload/plugin/hoster/ShareonlineBiz.py
+++ b/pyload/plugin/hoster/ShareonlineBiz.py
@@ -12,22 +12,22 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class ShareonlineBiz(SimpleHoster):
-    __name__    = "ShareonlineBiz"
-    __type__    = "hoster"
-    __version__ = "0.49"
+    __name    = "ShareonlineBiz"
+    __type    = "hoster"
+    __version = "0.49"
 
-    __pattern__ = r'https?://(?:www\.)?(share-online\.biz|egoshare\.com)/(download\.php\?id=|dl/)(?P<ID>\w+)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?(share-online\.biz|egoshare\.com)/(download\.php\?id=|dl/)(?P<ID>\w+)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Shareonline.biz hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("spoob", "spoob@pyload.org"),
+    __description = """Shareonline.biz hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("spoob", "spoob@pyload.org"),
                        ("mkaay", "mkaay@mkaay.de"),
                        ("zoidberg", "zoidberg@mujmail.cz"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    URL_REPLACEMENTS = [(__pattern__ + ".*", "http://www.share-online.biz/dl/\g<ID>")]
+    URL_REPLACEMENTS = [(__pattern + ".*", "http://www.share-online.biz/dl/\g<ID>")]
 
     CHECK_TRAFFIC = True
 
@@ -41,7 +41,7 @@ class ShareonlineBiz(SimpleHoster):
         info = {'name': urlparse(unquote(url)).path.split('/')[-1] or _("Unknown"), 'size': 0, 'status': 3 if url else 1, 'url': url}
 
         if url:
-            info['pattern'] = re.match(cls.__pattern__, url).groupdict()
+            info['pattern'] = re.match(cls.__pattern, url).groupdict()
 
             field = getURL("http://api.share-online.biz/linkcheck.php",
                            get={'md5': "1"},
diff --git a/pyload/plugin/hoster/ShareplaceCom.py b/pyload/plugin/hoster/ShareplaceCom.py
index 61e0f8723..5fa6ce4c1 100644
--- a/pyload/plugin/hoster/ShareplaceCom.py
+++ b/pyload/plugin/hoster/ShareplaceCom.py
@@ -8,15 +8,15 @@ from pyload.plugin.Hoster import Hoster
 
 
 class ShareplaceCom(Hoster):
-    __name__    = "ShareplaceCom"
-    __type__    = "hoster"
-    __version__ = "0.12"
+    __name    = "ShareplaceCom"
+    __type    = "hoster"
+    __version = "0.12"
 
-    __pattern__ = r'http://(?:www\.)?shareplace\.(com|org)/\?\w+'
+    __pattern = r'http://(?:www\.)?shareplace\.(com|org)/\?\w+'
 
-    __description__ = """Shareplace.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("ACCakut", "")]
+    __description = """Shareplace.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("ACCakut", "")]
 
 
     def process(self, pyfile):
diff --git a/pyload/plugin/hoster/SharingmatrixCom.py b/pyload/plugin/hoster/SharingmatrixCom.py
index 81c371c98..c4938f9bc 100644
--- a/pyload/plugin/hoster/SharingmatrixCom.py
+++ b/pyload/plugin/hoster/SharingmatrixCom.py
@@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class SharingmatrixCom(DeadHoster):
-    __name__    = "SharingmatrixCom"
-    __type__    = "hoster"
-    __version__ = "0.01"
+    __name    = "SharingmatrixCom"
+    __type    = "hoster"
+    __version = "0.01"
 
-    __pattern__ = r'http://(?:www\.)?sharingmatrix\.com/file/\w+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?sharingmatrix\.com/file/\w+'
+    __config  = []
 
-    __description__ = """Sharingmatrix.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("jeix", "jeix@hasnomail.de"),
+    __description = """Sharingmatrix.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("jeix", "jeix@hasnomail.de"),
                        ("paulking", "")]
diff --git a/pyload/plugin/hoster/ShragleCom.py b/pyload/plugin/hoster/ShragleCom.py
index 7f06e2424..c435d01a7 100644
--- a/pyload/plugin/hoster/ShragleCom.py
+++ b/pyload/plugin/hoster/ShragleCom.py
@@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class ShragleCom(DeadHoster):
-    __name__    = "ShragleCom"
-    __type__    = "hoster"
-    __version__ = "0.22"
+    __name    = "ShragleCom"
+    __type    = "hoster"
+    __version = "0.22"
 
-    __pattern__ = r'http://(?:www\.)?(cloudnator|shragle)\.com/files/(?P<ID>.+?)/'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?(cloudnator|shragle)\.com/files/(?P<ID>.+?)/'
+    __config  = []
 
-    __description__ = """Cloudnator.com (Shragle.com) hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+    __description = """Cloudnator.com (Shragle.com) hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org"),
                        ("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/hoster/SimplyPremiumCom.py b/pyload/plugin/hoster/SimplyPremiumCom.py
index 83640bcd5..51b5ac577 100644
--- a/pyload/plugin/hoster/SimplyPremiumCom.py
+++ b/pyload/plugin/hoster/SimplyPremiumCom.py
@@ -7,16 +7,16 @@ from pyload.plugin.internal.SimpleHoster import secondsToMidnight
 
 
 class SimplyPremiumCom(MultiHoster):
-    __name__    = "SimplyPremiumCom"
-    __type__    = "hoster"
-    __version__ = "0.08"
+    __name    = "SimplyPremiumCom"
+    __type    = "hoster"
+    __version = "0.08"
 
-    __pattern__ = r'https?://.+simply-premium\.com'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://.+simply-premium\.com'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Simply-Premium.com multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("EvolutionClip", "evolutionclip@live.de")]
+    __description = """Simply-Premium.com multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("EvolutionClip", "evolutionclip@live.de")]
 
 
     def setup(self):
diff --git a/pyload/plugin/hoster/SimplydebridCom.py b/pyload/plugin/hoster/SimplydebridCom.py
index 0605bb4f3..2fa68b508 100644
--- a/pyload/plugin/hoster/SimplydebridCom.py
+++ b/pyload/plugin/hoster/SimplydebridCom.py
@@ -6,16 +6,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster, replace_patterns
 
 
 class SimplydebridCom(MultiHoster):
-    __name__    = "SimplydebridCom"
-    __type__    = "hoster"
-    __version__ = "0.17"
+    __name    = "SimplydebridCom"
+    __type    = "hoster"
+    __version = "0.17"
 
-    __pattern__ = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/sd\.php'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/sd\.php'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Simply-debrid.com multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")]
+    __description = """Simply-debrid.com multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Kagenoshin", "kagenoshin@gmx.ch")]
 
 
     def handlePremium(self, pyfile):
diff --git a/pyload/plugin/hoster/SmoozedCom.py b/pyload/plugin/hoster/SmoozedCom.py
index b321fee03..6d62cef23 100644
--- a/pyload/plugin/hoster/SmoozedCom.py
+++ b/pyload/plugin/hoster/SmoozedCom.py
@@ -5,16 +5,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster
 
 
 class SmoozedCom(MultiHoster):
-    __name__    = "SmoozedCom"
-    __type__    = "hoster"
-    __version__ = "0.04"
+    __name    = "SmoozedCom"
+    __type    = "hoster"
+    __version = "0.04"
 
-    __pattern__ = r'^unmatchable$'  #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.activate
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'^unmatchable$'  #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.activate
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Smoozed.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("", "")]
+    __description = """Smoozed.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("", "")]
 
 
     def handlePremium(self, pyfile):
diff --git a/pyload/plugin/hoster/SockshareCom.py b/pyload/plugin/hoster/SockshareCom.py
index 3881278e1..f6cff5858 100644
--- a/pyload/plugin/hoster/SockshareCom.py
+++ b/pyload/plugin/hoster/SockshareCom.py
@@ -4,15 +4,15 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class SockshareCom(DeadHoster):
-    __name__    = "SockshareCom"
-    __type__    = "hoster"
-    __version__ = "0.05"
+    __name    = "SockshareCom"
+    __type    = "hoster"
+    __version = "0.05"
 
-    __pattern__ = r'http://(?:www\.)?sockshare\.com/(mobile/)?(file|embed)/(?P<ID>\w+)'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?sockshare\.com/(mobile/)?(file|embed)/(?P<ID>\w+)'
+    __config  = []
 
-    __description__ = """Sockshare.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("jeix", "jeix@hasnomail.de"),
+    __description = """Sockshare.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("jeix", "jeix@hasnomail.de"),
                        ("stickell", "l.stickell@yahoo.it"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
diff --git a/pyload/plugin/hoster/SoundcloudCom.py b/pyload/plugin/hoster/SoundcloudCom.py
index 524fb6e13..7ce0e3787 100644
--- a/pyload/plugin/hoster/SoundcloudCom.py
+++ b/pyload/plugin/hoster/SoundcloudCom.py
@@ -7,17 +7,17 @@ from pyload.utils import json_loads
 
 
 class SoundcloudCom(SimpleHoster):
-    __name__    = "SoundcloudCom"
-    __type__    = "hoster"
-    __version__ = "0.11"
+    __name    = "SoundcloudCom"
+    __type    = "hoster"
+    __version = "0.11"
 
-    __pattern__ = r'https?://(?:www\.)?soundcloud\.com/[\w-]+/[\w-]+'
-    __config__  = [("use_premium", "bool"        , "Use premium account if available", True    ),
+    __pattern = r'https?://(?:www\.)?soundcloud\.com/[\w-]+/[\w-]+'
+    __config  = [("use_premium", "bool"        , "Use premium account if available", True    ),
                    ("quality"    , "Lower;Higher", "Quality"                         , "Higher")]
 
-    __description__ = """SoundCloud.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """SoundCloud.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     NAME_PATTERN    = r'title" content="(?P<N>.+?)"'
diff --git a/pyload/plugin/hoster/SpeedLoadOrg.py b/pyload/plugin/hoster/SpeedLoadOrg.py
index 5642987d2..383d60817 100644
--- a/pyload/plugin/hoster/SpeedLoadOrg.py
+++ b/pyload/plugin/hoster/SpeedLoadOrg.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class SpeedLoadOrg(DeadHoster):
-    __name__    = "SpeedLoadOrg"
-    __type__    = "hoster"
-    __version__ = "1.02"
+    __name    = "SpeedLoadOrg"
+    __type    = "hoster"
+    __version = "1.02"
 
-    __pattern__ = r'http://(?:www\.)?speedload\.org/(?P<ID>\w+)'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?speedload\.org/(?P<ID>\w+)'
+    __config  = []
 
-    __description__ = """Speedload.org hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Speedload.org hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
diff --git a/pyload/plugin/hoster/SpeedfileCz.py b/pyload/plugin/hoster/SpeedfileCz.py
index f9df09d08..bb1b2c527 100644
--- a/pyload/plugin/hoster/SpeedfileCz.py
+++ b/pyload/plugin/hoster/SpeedfileCz.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class SpeedfileCz(DeadHoster):
-    __name__    = "SpeedFileCz"
-    __type__    = "hoster"
-    __version__ = "0.32"
+    __name    = "SpeedFileCz"
+    __type    = "hoster"
+    __version = "0.32"
 
-    __pattern__ = r'http://(?:www\.)?speedfile\.cz/.+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?speedfile\.cz/.+'
+    __config  = []
 
-    __description__ = """Speedfile.cz hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Speedfile.cz hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/hoster/SpeedyshareCom.py b/pyload/plugin/hoster/SpeedyshareCom.py
index 541e41b96..99626c765 100644
--- a/pyload/plugin/hoster/SpeedyshareCom.py
+++ b/pyload/plugin/hoster/SpeedyshareCom.py
@@ -11,16 +11,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class SpeedyshareCom(SimpleHoster):
-    __name__    = "SpeedyshareCom"
-    __type__    = "hoster"
-    __version__ = "0.05"
+    __name    = "SpeedyshareCom"
+    __type    = "hoster"
+    __version = "0.05"
 
-    __pattern__ = r'https?://(?:www\.)?(speedyshare\.com|speedy\.sh)/\w+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?(speedyshare\.com|speedy\.sh)/\w+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Speedyshare.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]
+    __description = """Speedyshare.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
     NAME_PATTERN = r'class=downloadfilename>(?P<N>.*)</span></td>'
diff --git a/pyload/plugin/hoster/StorageTo.py b/pyload/plugin/hoster/StorageTo.py
index 835666b45..8c0cc046e 100644
--- a/pyload/plugin/hoster/StorageTo.py
+++ b/pyload/plugin/hoster/StorageTo.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class StorageTo(DeadHoster):
-    __name__    = "StorageTo"
-    __type__    = "hoster"
-    __version__ = "0.01"
+    __name    = "StorageTo"
+    __type    = "hoster"
+    __version = "0.01"
 
-    __pattern__ = r'http://(?:www\.)?storage\.to/get/.+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?storage\.to/get/.+'
+    __config  = []
 
-    __description__ = """Storage.to hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("mkaay", "mkaay@mkaay.de")]
+    __description = """Storage.to hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("mkaay", "mkaay@mkaay.de")]
diff --git a/pyload/plugin/hoster/StreamCz.py b/pyload/plugin/hoster/StreamCz.py
index 95e69abf4..b0fb2cfe9 100644
--- a/pyload/plugin/hoster/StreamCz.py
+++ b/pyload/plugin/hoster/StreamCz.py
@@ -21,15 +21,15 @@ def getInfo(urls):
 
 
 class StreamCz(Hoster):
-    __name__    = "StreamCz"
-    __type__    = "hoster"
-    __version__ = "0.20"
+    __name    = "StreamCz"
+    __type    = "hoster"
+    __version = "0.20"
 
-    __pattern__ = r'https?://(?:www\.)?stream\.cz/[^/]+/\d+'
+    __pattern = r'https?://(?:www\.)?stream\.cz/[^/]+/\d+'
 
-    __description__ = """Stream.cz hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Stream.cz hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     NAME_PATTERN = r'<link rel="video_src" href="http://www\.stream\.cz/\w+/(\d+)-([^"]+)" />'
diff --git a/pyload/plugin/hoster/StreamcloudEu.py b/pyload/plugin/hoster/StreamcloudEu.py
index 01e334491..cdf244539 100644
--- a/pyload/plugin/hoster/StreamcloudEu.py
+++ b/pyload/plugin/hoster/StreamcloudEu.py
@@ -6,15 +6,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class StreamcloudEu(XFSHoster):
-    __name__    = "StreamcloudEu"
-    __type__    = "hoster"
-    __version__ = "0.10"
+    __name    = "StreamcloudEu"
+    __type    = "hoster"
+    __version = "0.10"
 
-    __pattern__ = r'http://(?:www\.)?streamcloud\.eu/\w{12}'
+    __pattern = r'http://(?:www\.)?streamcloud\.eu/\w{12}'
 
-    __description__ = """Streamcloud.eu hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("seoester", "seoester@googlemail.com")]
+    __description = """Streamcloud.eu hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("seoester", "seoester@googlemail.com")]
 
 
     WAIT_PATTERN = r'var count = (\d+)'
diff --git a/pyload/plugin/hoster/TurbobitNet.py b/pyload/plugin/hoster/TurbobitNet.py
index e1c7eeee6..d8daf79f7 100644
--- a/pyload/plugin/hoster/TurbobitNet.py
+++ b/pyload/plugin/hoster/TurbobitNet.py
@@ -15,20 +15,20 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster, timestamp
 
 
 class TurbobitNet(SimpleHoster):
-    __name__    = "TurbobitNet"
-    __type__    = "hoster"
-    __version__ = "0.19"
+    __name    = "TurbobitNet"
+    __type    = "hoster"
+    __version = "0.19"
 
-    __pattern__ = r'http://(?:www\.)?turbobit\.net/(?:download/free/)?(?P<ID>\w+)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?turbobit\.net/(?:download/free/)?(?P<ID>\w+)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Turbobit.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """Turbobit.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("prOq", "")]
 
 
-    URL_REPLACEMENTS = [(__pattern__ + ".*", "http://turbobit.net/\g<ID>.html")]
+    URL_REPLACEMENTS = [(__pattern + ".*", "http://turbobit.net/\g<ID>.html")]
 
     COOKIES = [("turbobit.net", "user_lang", "en")]
 
@@ -99,7 +99,7 @@ class TurbobitNet(SimpleHoster):
     def getRtUpdate(self):
         rtUpdate = self.getStorage("rtUpdate")
         if not rtUpdate:
-            if self.getStorage("version") != self.__version__ \
+            if self.getStorage("version") != self.__version \
                or int(self.getStorage("timestamp", 0)) + 86400000 < timestamp():
                 # that's right, we are even using jdownloader updates
                 rtUpdate = getURL("http://update0.jdownloader.org/pluginstuff/tbupdate.js")
@@ -111,7 +111,7 @@ class TurbobitNet(SimpleHoster):
 
                 self.setStorage("rtUpdate", rtUpdate)
                 self.setStorage("timestamp", timestamp())
-                self.setStorage("version", self.__version__)
+                self.setStorage("version", self.__version)
             else:
                 self.logError(_("Unable to download, wait for update..."))
                 self.tempOffline()
diff --git a/pyload/plugin/hoster/TurbouploadCom.py b/pyload/plugin/hoster/TurbouploadCom.py
index 20ae8bb04..1452f05be 100644
--- a/pyload/plugin/hoster/TurbouploadCom.py
+++ b/pyload/plugin/hoster/TurbouploadCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class TurbouploadCom(DeadHoster):
-    __name__    = "TurbouploadCom"
-    __type__    = "hoster"
-    __version__ = "0.03"
+    __name    = "TurbouploadCom"
+    __type    = "hoster"
+    __version = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?turboupload\.com/(\w+)'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?turboupload\.com/(\w+)'
+    __config  = []
 
-    __description__ = """Turboupload.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Turboupload.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/hoster/TusfilesNet.py b/pyload/plugin/hoster/TusfilesNet.py
index 20a948925..d13938586 100644
--- a/pyload/plugin/hoster/TusfilesNet.py
+++ b/pyload/plugin/hoster/TusfilesNet.py
@@ -5,15 +5,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class TusfilesNet(XFSHoster):
-    __name__    = "TusfilesNet"
-    __type__    = "hoster"
-    __version__ = "0.09"
+    __name    = "TusfilesNet"
+    __type    = "hoster"
+    __version = "0.09"
 
-    __pattern__ = r'https?://(?:www\.)?tusfiles\.net/\w{12}'
+    __pattern = r'https?://(?:www\.)?tusfiles\.net/\w{12}'
 
-    __description__ = """Tusfiles.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com"),
+    __description = """Tusfiles.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com"),
                        ("guidobelix", "guidobelix@hotmail.it")]
 
 
diff --git a/pyload/plugin/hoster/TwoSharedCom.py b/pyload/plugin/hoster/TwoSharedCom.py
index 854c46979..f116abfc1 100644
--- a/pyload/plugin/hoster/TwoSharedCom.py
+++ b/pyload/plugin/hoster/TwoSharedCom.py
@@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class TwoSharedCom(SimpleHoster):
-    __name__    = "TwoSharedCom"
-    __type__    = "hoster"
-    __version__ = "0.13"
+    __name    = "TwoSharedCom"
+    __type    = "hoster"
+    __version = "0.13"
 
-    __pattern__ = r'http://(?:www\.)?2shared\.com/(account/)?(download|get|file|document|photo|video|audio)/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?2shared\.com/(account/)?(download|get|file|document|photo|video|audio)/.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """2Shared.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """2Shared.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     NAME_PATTERN    = r'<h1>(?P<N>.*)</h1>'
diff --git a/pyload/plugin/hoster/UlozTo.py b/pyload/plugin/hoster/UlozTo.py
index fbbe21f3e..08b6059bd 100644
--- a/pyload/plugin/hoster/UlozTo.py
+++ b/pyload/plugin/hoster/UlozTo.py
@@ -13,16 +13,16 @@ def convertDecimalPrefix(m):
 
 
 class UlozTo(SimpleHoster):
-    __name__    = "UlozTo"
-    __type__    = "hoster"
-    __version__ = "1.04"
+    __name    = "UlozTo"
+    __type    = "hoster"
+    __version = "1.04"
 
-    __pattern__ = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(?:live/)?(?P<ID>\w+/[^/?]*)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(?:live/)?(?P<ID>\w+/[^/?]*)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Uloz.to hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Uloz.to hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     INFO_PATTERN    = r'<p>File <strong>(?P<N>[^<]+)</strong> is password protected</p>'
diff --git a/pyload/plugin/hoster/UloziskoSk.py b/pyload/plugin/hoster/UloziskoSk.py
index 506ceecb1..135d38b88 100644
--- a/pyload/plugin/hoster/UloziskoSk.py
+++ b/pyload/plugin/hoster/UloziskoSk.py
@@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class UloziskoSk(SimpleHoster):
-    __name__    = "UloziskoSk"
-    __type__    = "hoster"
-    __version__ = "0.25"
+    __name    = "UloziskoSk"
+    __type    = "hoster"
+    __version = "0.25"
 
-    __pattern__ = r'http://(?:www\.)?ulozisko\.sk/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?ulozisko\.sk/.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Ulozisko.sk hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Ulozisko.sk hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     NAME_PATTERN = r'<div class="down1">(?P<N>[^<]+)</div>'
diff --git a/pyload/plugin/hoster/UnibytesCom.py b/pyload/plugin/hoster/UnibytesCom.py
index a02d5b8c7..9ac8b77e4 100644
--- a/pyload/plugin/hoster/UnibytesCom.py
+++ b/pyload/plugin/hoster/UnibytesCom.py
@@ -8,16 +8,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class UnibytesCom(SimpleHoster):
-    __name__    = "UnibytesCom"
-    __type__    = "hoster"
-    __version__ = "0.12"
+    __name    = "UnibytesCom"
+    __type    = "hoster"
+    __version = "0.12"
 
-    __pattern__ = r'https?://(?:www\.)?unibytes\.com/[\w .-]{11}B'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?unibytes\.com/[\w .-]{11}B'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """UniBytes.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """UniBytes.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     HOSTER_DOMAIN = "unibytes.com"
diff --git a/pyload/plugin/hoster/UnrestrictLi.py b/pyload/plugin/hoster/UnrestrictLi.py
index fa77d15e8..4f719eae4 100644
--- a/pyload/plugin/hoster/UnrestrictLi.py
+++ b/pyload/plugin/hoster/UnrestrictLi.py
@@ -8,16 +8,16 @@ from pyload.plugin.internal.SimpleHoster import secondsToMidnight
 
 
 class UnrestrictLi(MultiHoster):
-    __name__    = "UnrestrictLi"
-    __type__    = "hoster"
-    __version__ = "0.22"
+    __name    = "UnrestrictLi"
+    __type    = "hoster"
+    __version = "0.22"
 
-    __pattern__ = r'https?://(?:www\.)?(unrestrict|unr)\.li/dl/[\w^_]+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?(unrestrict|unr)\.li/dl/[\w^_]+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Unrestrict.li multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Unrestrict.li multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     LOGIN_ACCOUNT = False
diff --git a/pyload/plugin/hoster/UpleaCom.py b/pyload/plugin/hoster/UpleaCom.py
index 855d9ed65..46462e94a 100644
--- a/pyload/plugin/hoster/UpleaCom.py
+++ b/pyload/plugin/hoster/UpleaCom.py
@@ -8,15 +8,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class UpleaCom(XFSHoster):
-    __name__    = "UpleaCom"
-    __type__    = "hoster"
-    __version__ = "0.06"
+    __name    = "UpleaCom"
+    __type    = "hoster"
+    __version = "0.06"
 
-    __pattern__ = r'https?://(?:www\.)?uplea\.com/dl/\w{15}'
+    __pattern = r'https?://(?:www\.)?uplea\.com/dl/\w{15}'
 
-    __description__ = """Uplea.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Redleon", "")]
+    __description = """Uplea.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Redleon", "")]
 
 
     NAME_PATTERN = r'class="agmd size18">(?P<N>.+?)<'
diff --git a/pyload/plugin/hoster/UploadStationCom.py b/pyload/plugin/hoster/UploadStationCom.py
index decde08ab..ab55c71d4 100644
--- a/pyload/plugin/hoster/UploadStationCom.py
+++ b/pyload/plugin/hoster/UploadStationCom.py
@@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class UploadStationCom(DeadHoster):
-    __name__    = "UploadStationCom"
-    __type__    = "hoster"
-    __version__ = "0.52"
+    __name    = "UploadStationCom"
+    __type    = "hoster"
+    __version = "0.52"
 
-    __pattern__ = r'http://(?:www\.)?uploadstation\.com/file/(?P<ID>\w+)'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?uploadstation\.com/file/(?P<ID>\w+)'
+    __config  = []
 
-    __description__ = """UploadStation.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("fragonib", "fragonib[AT]yahoo[DOT]es"),
+    __description = """UploadStation.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("fragonib", "fragonib[AT]yahoo[DOT]es"),
                        ("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/hoster/UploadableCh.py b/pyload/plugin/hoster/UploadableCh.py
index af3022594..9037b0250 100644
--- a/pyload/plugin/hoster/UploadableCh.py
+++ b/pyload/plugin/hoster/UploadableCh.py
@@ -7,20 +7,20 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class UploadableCh(SimpleHoster):
-    __name__    = "UploadableCh"
-    __type__    = "hoster"
-    __version__ = "0.09"
+    __name    = "UploadableCh"
+    __type    = "hoster"
+    __version = "0.09"
 
-    __pattern__ = r'http://(?:www\.)?uploadable\.ch/file/(?P<ID>\w+)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?uploadable\.ch/file/(?P<ID>\w+)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Uploadable.ch hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de"),
+    __description = """Uploadable.ch hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    URL_REPLACEMENTS = [(__pattern__ + ".*", r'http://www.uploadable.ch/file/\g<ID>')]
+    URL_REPLACEMENTS = [(__pattern + ".*", r'http://www.uploadable.ch/file/\g<ID>')]
 
     INFO_PATTERN = r'div id=\"file_name\" title=.*>(?P<N>.+)<span class=\"filename_normal\">\((?P<S>[\d.]+) (?P<U>\w+)\)</span><'
 
diff --git a/pyload/plugin/hoster/UploadboxCom.py b/pyload/plugin/hoster/UploadboxCom.py
index 33b81b97e..eb769919e 100644
--- a/pyload/plugin/hoster/UploadboxCom.py
+++ b/pyload/plugin/hoster/UploadboxCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class UploadboxCom(DeadHoster):
-    __name__    = "Uploadbox"
-    __type__    = "hoster"
-    __version__ = "0.05"
+    __name    = "Uploadbox"
+    __type    = "hoster"
+    __version = "0.05"
 
-    __pattern__ = r'http://(?:www\.)?uploadbox\.com/files/.+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?uploadbox\.com/files/.+'
+    __config  = []
 
-    __description__ = """UploadBox.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """UploadBox.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/hoster/UploadedTo.py b/pyload/plugin/hoster/UploadedTo.py
index 207817122..2cd4d84c4 100644
--- a/pyload/plugin/hoster/UploadedTo.py
+++ b/pyload/plugin/hoster/UploadedTo.py
@@ -9,21 +9,21 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class UploadedTo(SimpleHoster):
-    __name__    = "UploadedTo"
-    __type__    = "hoster"
-    __version__ = "0.85"
+    __name    = "UploadedTo"
+    __type    = "hoster"
+    __version = "0.85"
 
-    __pattern__ = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Uploaded.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Uploaded.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     API_KEY = "lhF2IeeprweDfu9ccWlxXVVypA5nA3EL"
 
-    URL_REPLACEMENTS = [(__pattern__ + ".*", r'http://uploaded.net/file/\g<ID>')]
+    URL_REPLACEMENTS = [(__pattern + ".*", r'http://uploaded.net/file/\g<ID>')]
 
     LINK_PREMIUM_PATTERN = r'<div class="tfree".*\s*<form method="post" action="(.+?)"'
 
@@ -37,7 +37,7 @@ class UploadedTo(SimpleHoster):
 
         for _i in xrange(5):
             html = getURL("http://uploaded.net/api/filemultiple",
-                          get={"apikey": cls.API_KEY, 'id_0': re.match(cls.__pattern__, url).group('ID')},
+                          get={"apikey": cls.API_KEY, 'id_0': re.match(cls.__pattern, url).group('ID')},
                           decode=True)
 
             if html != "can't find request":
diff --git a/pyload/plugin/hoster/UploadhereCom.py b/pyload/plugin/hoster/UploadhereCom.py
index 259b53dc1..789f5e9f7 100644
--- a/pyload/plugin/hoster/UploadhereCom.py
+++ b/pyload/plugin/hoster/UploadhereCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class UploadhereCom(DeadHoster):
-    __name__    = "UploadhereCom"
-    __type__    = "hoster"
-    __version__ = "0.12"
+    __name    = "UploadhereCom"
+    __type    = "hoster"
+    __version = "0.12"
 
-    __pattern__ = r'http://(?:www\.)?uploadhere\.com/\w{10}'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?uploadhere\.com/\w{10}'
+    __config  = []
 
-    __description__ = """Uploadhere.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Uploadhere.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/hoster/UploadheroCom.py b/pyload/plugin/hoster/UploadheroCom.py
index 2def499d9..912f4c505 100644
--- a/pyload/plugin/hoster/UploadheroCom.py
+++ b/pyload/plugin/hoster/UploadheroCom.py
@@ -11,16 +11,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class UploadheroCom(SimpleHoster):
-    __name__    = "UploadheroCom"
-    __type__    = "hoster"
-    __version__ = "0.18"
+    __name    = "UploadheroCom"
+    __type    = "hoster"
+    __version = "0.18"
 
-    __pattern__ = r'http://(?:www\.)?uploadhero\.com?/dl/\w+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?uploadhero\.com?/dl/\w+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """UploadHero.co plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("mcmyst", "mcmyst@hotmail.fr"),
+    __description = """UploadHero.co plugin"""
+    __license     = "GPLv3"
+    __authors     = [("mcmyst", "mcmyst@hotmail.fr"),
                        ("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/pyload/plugin/hoster/UploadingCom.py b/pyload/plugin/hoster/UploadingCom.py
index 461b0113a..db719ee4c 100644
--- a/pyload/plugin/hoster/UploadingCom.py
+++ b/pyload/plugin/hoster/UploadingCom.py
@@ -9,15 +9,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster, timestamp
 
 
 class UploadingCom(SimpleHoster):
-    __name__    = "UploadingCom"
-    __type__    = "hoster"
-    __version__ = "0.40"
+    __name    = "UploadingCom"
+    __type    = "hoster"
+    __version = "0.40"
 
-    __pattern__ = r'http://(?:www\.)?uploading\.com/files/(?:get/)?(?P<ID>\w+)'
+    __pattern = r'http://(?:www\.)?uploading\.com/files/(?:get/)?(?P<ID>\w+)'
 
-    __description__ = """Uploading.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("jeix", "jeix@hasnomail.de"),
+    __description = """Uploading.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("jeix", "jeix@hasnomail.de"),
                        ("mkaay", "mkaay@mkaay.de"),
                        ("zoidberg", "zoidberg@mujmail.cz")]
 
diff --git a/pyload/plugin/hoster/UploadkingCom.py b/pyload/plugin/hoster/UploadkingCom.py
index 33ecfd574..31d8874d8 100644
--- a/pyload/plugin/hoster/UploadkingCom.py
+++ b/pyload/plugin/hoster/UploadkingCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class UploadkingCom(DeadHoster):
-    __name__    = "UploadkingCom"
-    __type__    = "hoster"
-    __version__ = "0.14"
+    __name    = "UploadkingCom"
+    __type    = "hoster"
+    __version = "0.14"
 
-    __pattern__ = r'http://(?:www\.)?uploadking\.com/\w{10}'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?uploadking\.com/\w{10}'
+    __config  = []
 
-    __description__ = """UploadKing.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """UploadKing.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/pyload/plugin/hoster/UpstoreNet.py b/pyload/plugin/hoster/UpstoreNet.py
index 20c207a70..f022ef2dd 100644
--- a/pyload/plugin/hoster/UpstoreNet.py
+++ b/pyload/plugin/hoster/UpstoreNet.py
@@ -7,16 +7,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class UpstoreNet(SimpleHoster):
-    __name__    = "UpstoreNet"
-    __type__    = "hoster"
-    __version__ = "0.05"
+    __name    = "UpstoreNet"
+    __type    = "hoster"
+    __version = "0.05"
 
-    __pattern__ = r'https?://(?:www\.)?upstore\.net/'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?upstore\.net/'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Upstore.Net File Download Hoster"""
-    __license__     = "GPLv3"
-    __authors__     = [("igel", "igelkun@myopera.com")]
+    __description = """Upstore.Net File Download Hoster"""
+    __license     = "GPLv3"
+    __authors     = [("igel", "igelkun@myopera.com")]
 
 
     INFO_PATTERN = r'<div class="comment">.*?</div>\s*\n<h2 style="margin:0">(?P<N>.*?)</h2>\s*\n<div class="comment">\s*\n\s*(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
diff --git a/pyload/plugin/hoster/UptoboxCom.py b/pyload/plugin/hoster/UptoboxCom.py
index de23d4ad0..a2d1e8fcc 100644
--- a/pyload/plugin/hoster/UptoboxCom.py
+++ b/pyload/plugin/hoster/UptoboxCom.py
@@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class UptoboxCom(XFSHoster):
-    __name__    = "UptoboxCom"
-    __type__    = "hoster"
-    __version__ = "0.18"
+    __name    = "UptoboxCom"
+    __type    = "hoster"
+    __version = "0.18"
 
-    __pattern__ = r'https?://(?:www\.)?(uptobox|uptostream)\.com/\w{12}'
+    __pattern = r'https?://(?:www\.)?(uptobox|uptostream)\.com/\w{12}'
 
-    __description__ = """Uptobox.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Uptobox.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     INFO_PATTERN         = r'"para_title">(?P<N>.+) \((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)'
diff --git a/pyload/plugin/hoster/VeehdCom.py b/pyload/plugin/hoster/VeehdCom.py
index f9756662c..2c8a34a95 100644
--- a/pyload/plugin/hoster/VeehdCom.py
+++ b/pyload/plugin/hoster/VeehdCom.py
@@ -6,17 +6,17 @@ from pyload.plugin.Hoster import Hoster
 
 
 class VeehdCom(Hoster):
-    __name__    = "VeehdCom"
-    __type__    = "hoster"
-    __version__ = "0.23"
+    __name    = "VeehdCom"
+    __type    = "hoster"
+    __version = "0.23"
 
-    __pattern__ = r'http://veehd\.com/video/\d+_\S+'
-    __config__  = [("filename_spaces", "bool", "Allow spaces in filename", False),
+    __pattern = r'http://veehd\.com/video/\d+_\S+'
+    __config  = [("filename_spaces", "bool", "Allow spaces in filename", False),
                    ("replacement_char", "str", "Filename replacement character", "_")]
 
-    __description__ = """Veehd.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("cat", "cat@pyload")]
+    __description = """Veehd.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("cat", "cat@pyload")]
 
 
     def setup(self):
diff --git a/pyload/plugin/hoster/VeohCom.py b/pyload/plugin/hoster/VeohCom.py
index 0fa118355..2571bf800 100644
--- a/pyload/plugin/hoster/VeohCom.py
+++ b/pyload/plugin/hoster/VeohCom.py
@@ -6,23 +6,23 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class VeohCom(SimpleHoster):
-    __name__    = "VeohCom"
-    __type__    = "hoster"
-    __version__ = "0.22"
+    __name    = "VeohCom"
+    __type    = "hoster"
+    __version = "0.22"
 
-    __pattern__ = r'http://(?:www\.)?veoh\.com/(tv/)?(watch|videos)/(?P<ID>v\w+)'
-    __config__  = [("use_premium", "bool"         , "Use premium account if available", True  ),
+    __pattern = r'http://(?:www\.)?veoh\.com/(tv/)?(watch|videos)/(?P<ID>v\w+)'
+    __config  = [("use_premium", "bool"         , "Use premium account if available", True  ),
                    ("quality"    , "Low;High;Auto", "Quality"                         , "Auto")]
 
-    __description__ = """Veoh.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Veoh.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     NAME_PATTERN    = r'<meta name="title" content="(?P<N>.*?)"'
     OFFLINE_PATTERN = r'>Sorry, we couldn\'t find the video you were looking for'
 
-    URL_REPLACEMENTS = [(__pattern__ + ".*", r'http://www.veoh.com/watch/\g<ID>')]
+    URL_REPLACEMENTS = [(__pattern + ".*", r'http://www.veoh.com/watch/\g<ID>')]
 
     COOKIES = [("veoh.com", "lassieLocale", "en")]
 
diff --git a/pyload/plugin/hoster/VidPlayNet.py b/pyload/plugin/hoster/VidPlayNet.py
index 094da09bd..ab571f9ea 100644
--- a/pyload/plugin/hoster/VidPlayNet.py
+++ b/pyload/plugin/hoster/VidPlayNet.py
@@ -7,15 +7,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class VidPlayNet(XFSHoster):
-    __name__    = "VidPlayNet"
-    __type__    = "hoster"
-    __version__ = "0.04"
+    __name    = "VidPlayNet"
+    __type    = "hoster"
+    __version = "0.04"
 
-    __pattern__ = r'https?://(?:www\.)?vidplay\.net/\w{12}'
+    __pattern = r'https?://(?:www\.)?vidplay\.net/\w{12}'
 
-    __description__ = """VidPlay.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]
+    __description = """VidPlay.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]
 
 
     NAME_PATTERN = r'<b>Password:</b></div>\s*<h[1-6]>(?P<N>[^<]+)</h[1-6]>'
diff --git a/pyload/plugin/hoster/VimeoCom.py b/pyload/plugin/hoster/VimeoCom.py
index fb6ea094a..d64c5ad43 100644
--- a/pyload/plugin/hoster/VimeoCom.py
+++ b/pyload/plugin/hoster/VimeoCom.py
@@ -6,25 +6,25 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class VimeoCom(SimpleHoster):
-    __name__    = "VimeoCom"
-    __type__    = "hoster"
-    __version__ = "0.04"
+    __name    = "VimeoCom"
+    __type    = "hoster"
+    __version = "0.04"
 
-    __pattern__ = r'https?://(?:www\.)?(player\.)?vimeo\.com/(video/)?(?P<ID>\d+)'
-    __config__  = [("use_premium", "bool"                       , "Use premium account if available" , True     ),
+    __pattern = r'https?://(?:www\.)?(player\.)?vimeo\.com/(video/)?(?P<ID>\d+)'
+    __config  = [("use_premium", "bool"                       , "Use premium account if available" , True     ),
                    ("quality"    , "Lowest;Mobile;SD;HD;Highest", "Quality"                          , "Highest"),
                    ("original"   , "bool"                       , "Try to download the original file", True     )]
 
-    __description__ = """Vimeo.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Vimeo.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     NAME_PATTERN         = r'<title>(?P<N>.+) on Vimeo<'
     OFFLINE_PATTERN      = r'class="exception_header"'
     TEMP_OFFLINE_PATTERN = r'Please try again in a few minutes.<'
 
-    URL_REPLACEMENTS = [(__pattern__ + ".*", r'https://www.vimeo.com/\g<ID>')]
+    URL_REPLACEMENTS = [(__pattern + ".*", r'https://www.vimeo.com/\g<ID>')]
 
     COOKIES = [("vimeo.com", "language", "en")]
 
diff --git a/pyload/plugin/hoster/Vipleech4UCom.py b/pyload/plugin/hoster/Vipleech4UCom.py
index 0550f5c77..cd68410f0 100644
--- a/pyload/plugin/hoster/Vipleech4UCom.py
+++ b/pyload/plugin/hoster/Vipleech4UCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class Vipleech4UCom(DeadHoster):
-    __name__    = "Vipleech4UCom"
-    __type__    = "hoster"
-    __version__ = "0.20"
+    __name    = "Vipleech4UCom"
+    __type    = "hoster"
+    __version = "0.20"
 
-    __pattern__ = r'http://(?:www\.)?vipleech4u\.com/manager\.php'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?vipleech4u\.com/manager\.php'
+    __config  = []
 
-    __description__ = """Vipleech4u.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")]
+    __description = """Vipleech4u.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Kagenoshin", "kagenoshin@gmx.ch")]
diff --git a/pyload/plugin/hoster/WarserverCz.py b/pyload/plugin/hoster/WarserverCz.py
index bedda34a7..2556a1393 100644
--- a/pyload/plugin/hoster/WarserverCz.py
+++ b/pyload/plugin/hoster/WarserverCz.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class WarserverCz(DeadHoster):
-    __name__    = "WarserverCz"
-    __type__    = "hoster"
-    __version__ = "0.13"
+    __name    = "WarserverCz"
+    __type    = "hoster"
+    __version = "0.13"
 
-    __pattern__ = r'http://(?:www\.)?warserver\.cz/stahnout/\d+'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?warserver\.cz/stahnout/\d+'
+    __config  = []
 
-    __description__ = """Warserver.cz hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Warserver.cz hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
diff --git a/pyload/plugin/hoster/WebshareCz.py b/pyload/plugin/hoster/WebshareCz.py
index baeecfc94..11b7b37b0 100644
--- a/pyload/plugin/hoster/WebshareCz.py
+++ b/pyload/plugin/hoster/WebshareCz.py
@@ -7,16 +7,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class WebshareCz(SimpleHoster):
-    __name__    = "WebshareCz"
-    __type__    = "hoster"
-    __version__ = "0.16"
+    __name    = "WebshareCz"
+    __type    = "hoster"
+    __version = "0.16"
 
-    __pattern__ = r'https?://(?:www\.)?webshare\.cz/(?:#/)?file/(?P<ID>\w+)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?webshare\.cz/(?:#/)?file/(?P<ID>\w+)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """WebShare.cz hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it"),
+    __description = """WebShare.cz hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it"),
                        ("rush", "radek.senfeld@gmail.com")]
 
 
@@ -25,7 +25,7 @@ class WebshareCz(SimpleHoster):
         info = super(WebshareCz, cls).getInfo(url, html)
 
         if url:
-            info['pattern'] = re.match(cls.__pattern__, url).groupdict()
+            info['pattern'] = re.match(cls.__pattern, url).groupdict()
 
             api_data = getURL("https://webshare.cz/api/file_info/",
                               post={'ident': info['pattern']['ID']},
diff --git a/pyload/plugin/hoster/WrzucTo.py b/pyload/plugin/hoster/WrzucTo.py
index 88eb38789..066af4f1b 100644
--- a/pyload/plugin/hoster/WrzucTo.py
+++ b/pyload/plugin/hoster/WrzucTo.py
@@ -8,16 +8,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class WrzucTo(SimpleHoster):
-    __name__    = "WrzucTo"
-    __type__    = "hoster"
-    __version__ = "0.03"
+    __name    = "WrzucTo"
+    __type    = "hoster"
+    __version = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?wrzuc\.to/(\w+(\.wt|\.html)|(\w+/?linki/\w+))'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?wrzuc\.to/(\w+(\.wt|\.html)|(\w+/?linki/\w+))'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Wrzuc.to hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Wrzuc.to hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     NAME_PATTERN = r'id="file_info">\s*<strong>(?P<N>.*?)</strong>'
diff --git a/pyload/plugin/hoster/WuploadCom.py b/pyload/plugin/hoster/WuploadCom.py
index 0b4411a5b..2af68ced7 100644
--- a/pyload/plugin/hoster/WuploadCom.py
+++ b/pyload/plugin/hoster/WuploadCom.py
@@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class WuploadCom(DeadHoster):
-    __name__    = "WuploadCom"
-    __type__    = "hoster"
-    __version__ = "0.23"
+    __name    = "WuploadCom"
+    __type    = "hoster"
+    __version = "0.23"
 
-    __pattern__ = r'http://(?:www\.)?wupload\..+?/file/((\w+/)?\d+)(/.*)?'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?wupload\..+?/file/((\w+/)?\d+)(/.*)?'
+    __config  = []
 
-    __description__ = """Wupload.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("jeix", "jeix@hasnomail.de"),
+    __description = """Wupload.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("jeix", "jeix@hasnomail.de"),
                        ("Paul King", "")]
diff --git a/pyload/plugin/hoster/X7To.py b/pyload/plugin/hoster/X7To.py
index f8700ba67..865fc4b45 100644
--- a/pyload/plugin/hoster/X7To.py
+++ b/pyload/plugin/hoster/X7To.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class X7To(DeadHoster):
-    __name__    = "X7To"
-    __type__    = "hoster"
-    __version__ = "0.41"
+    __name    = "X7To"
+    __type    = "hoster"
+    __version = "0.41"
 
-    __pattern__ = r'http://(?:www\.)?x7\.to/'
-    __config__  = []
+    __pattern = r'http://(?:www\.)?x7\.to/'
+    __config  = []
 
-    __description__ = """X7.to hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("ernieb", "ernieb")]
+    __description = """X7.to hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("ernieb", "ernieb")]
diff --git a/pyload/plugin/hoster/XFileSharingPro.py b/pyload/plugin/hoster/XFileSharingPro.py
index e90826536..0696674df 100644
--- a/pyload/plugin/hoster/XFileSharingPro.py
+++ b/pyload/plugin/hoster/XFileSharingPro.py
@@ -6,15 +6,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 
 
 class XFileSharingPro(XFSHoster):
-    __name__    = "XFileSharingPro"
-    __type__    = "hoster"
-    __version__ = "0.45"
+    __name    = "XFileSharingPro"
+    __type    = "hoster"
+    __version = "0.45"
 
-    __pattern__ = r'^unmatchable$'
+    __pattern = r'^unmatchable$'
 
-    __description__ = """XFileSharingPro dummy hoster plugin for hook"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """XFileSharingPro dummy hoster plugin for hook"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     URL_REPLACEMENTS = [("/embed-", "/")]
@@ -23,15 +23,15 @@ class XFileSharingPro(XFSHoster):
     def _log(self, type, args):
         msg = " | ".join(str(a).strip() for a in args if a)
         logger = getattr(self.log, type)
-        logger("%s: %s: %s" % (self.__name__, self.HOSTER_NAME, msg or _("%s MARK" % type.upper())))
+        logger("%s: %s: %s" % (self.__name, self.HOSTER_NAME, msg or _("%s MARK" % type.upper())))
 
 
     def init(self):
         super(XFileSharingPro, self).init()
 
-        self.__pattern__ = self.core.pluginManager.hosterPlugins[self.__name__]['pattern']
+        self.__pattern = self.core.pluginManager.hosterPlugins[self.__name]['pattern']
 
-        self.HOSTER_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group("DOMAIN").lower()
+        self.HOSTER_DOMAIN = re.match(self.__pattern, self.pyfile.url).group("DOMAIN").lower()
         self.HOSTER_NAME   = "".join(part.capitalize() for part in re.split(r'(\.|\d+)', self.HOSTER_DOMAIN) if part != '.')
 
         account = self.core.accountManager.getAccountPlugin(self.HOSTER_NAME)
diff --git a/pyload/plugin/hoster/XHamsterCom.py b/pyload/plugin/hoster/XHamsterCom.py
index 73944a61b..adc16e233 100644
--- a/pyload/plugin/hoster/XHamsterCom.py
+++ b/pyload/plugin/hoster/XHamsterCom.py
@@ -17,16 +17,16 @@ def clean_json(json_expr):
 
 
 class XHamsterCom(Hoster):
-    __name__    = "XHamsterCom"
-    __type__    = "hoster"
-    __version__ = "0.12"
+    __name    = "XHamsterCom"
+    __type    = "hoster"
+    __version = "0.12"
 
-    __pattern__ = r'http://(?:www\.)?xhamster\.com/movies/.+'
-    __config__  = [("type", ".mp4;.flv", "Preferred type", ".mp4")]
+    __pattern = r'http://(?:www\.)?xhamster\.com/movies/.+'
+    __config  = [("type", ".mp4;.flv", "Preferred type", ".mp4")]
 
-    __description__ = """XHamster.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = []
+    __description = """XHamster.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = []
 
 
     def process(self, pyfile):
diff --git a/pyload/plugin/hoster/XVideosCom.py b/pyload/plugin/hoster/XVideosCom.py
index c5e2921cb..ae4d0637f 100644
--- a/pyload/plugin/hoster/XVideosCom.py
+++ b/pyload/plugin/hoster/XVideosCom.py
@@ -8,21 +8,21 @@ from pyload.plugin.Hoster import Hoster
 
 
 class XVideosCom(Hoster):
-    __name__    = "XVideos.com"
-    __type__    = "hoster"
-    __version__ = "0.10"
+    __name    = "XVideos.com"
+    __type    = "hoster"
+    __version = "0.10"
 
-    __pattern__ = r'http://(?:www\.)?xvideos\.com/video(\d+)'
+    __pattern = r'http://(?:www\.)?xvideos\.com/video(\d+)'
 
-    __description__ = """XVideos.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = []
+    __description = """XVideos.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = []
 
 
     def process(self, pyfile):
         site = self.load(pyfile.url)
         pyfile.name = "%s (%s).flv" % (
             re.search(r"<h2>([^<]+)<span", site).group(1),
-            re.match(self.__pattern__, pyfile.url).group(1),
+            re.match(self.__pattern, pyfile.url).group(1),
         )
         self.download(unquote(re.search(r"flv_url=([^&]+)&", site).group(1)))
diff --git a/pyload/plugin/hoster/XdadevelopersCom.py b/pyload/plugin/hoster/XdadevelopersCom.py
index 8ef79657f..488d29c44 100644
--- a/pyload/plugin/hoster/XdadevelopersCom.py
+++ b/pyload/plugin/hoster/XdadevelopersCom.py
@@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class XdadevelopersCom(SimpleHoster):
-    __name__    = "XdadevelopersCom"
-    __type__    = "hoster"
-    __version__ = "0.03"
+    __name    = "XdadevelopersCom"
+    __type    = "hoster"
+    __version = "0.03"
 
-    __pattern__ = r'https?://(?:www\.)?forum\.xda-developers\.com/devdb/project/dl/\?id=\d+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)?forum\.xda-developers\.com/devdb/project/dl/\?id=\d+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Xda-developers.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]
+    __description = """Xda-developers.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
     NAME_PATTERN    = r'<label>Filename:</label>\s*<div>\s*(?P<N>.*?)\n'
diff --git a/pyload/plugin/hoster/Xdcc.py b/pyload/plugin/hoster/Xdcc.py
index 10d50369f..ff8d2c3b8 100644
--- a/pyload/plugin/hoster/Xdcc.py
+++ b/pyload/plugin/hoster/Xdcc.py
@@ -15,17 +15,17 @@ from pyload.utils import fs_join
 
 
 class Xdcc(Hoster):
-    __name__    = "Xdcc"
-    __type__    = "hoster"
-    __version__ = "0.32"
+    __name    = "Xdcc"
+    __type    = "hoster"
+    __version = "0.32"
 
-    __config__ = [("nick", "str", "Nickname", "pyload"),
+    __config = [("nick", "str", "Nickname", "pyload"),
                 ("ident", "str", "Ident", "pyloadident"),
                 ("realname", "str", "Realname", "pyloadreal")]
 
-    __description__ = """Download from IRC XDCC bot"""
-    __license__     = "GPLv3"
-    __authors__     = [("jeix", "jeix@hasnomail.com")]
+    __description = """Download from IRC XDCC bot"""
+    __license     = "GPLv3"
+    __authors     = [("jeix", "jeix@hasnomail.com")]
 
 
     def setup(self):
@@ -36,7 +36,7 @@ class Xdcc(Hoster):
 
     def process(self, pyfile):
         # change request type
-        self.req = pyfile.m.core.requestFactory.getRequest(self.__name__, type="XDCC")
+        self.req = pyfile.m.core.requestFactory.getRequest(self.__name, type="XDCC")
 
         self.pyfile = pyfile
         for _i in xrange(0, 3):
diff --git a/pyload/plugin/hoster/YibaishiwuCom.py b/pyload/plugin/hoster/YibaishiwuCom.py
index 9f90dbe5e..6b6ee1fda 100644
--- a/pyload/plugin/hoster/YibaishiwuCom.py
+++ b/pyload/plugin/hoster/YibaishiwuCom.py
@@ -7,16 +7,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class YibaishiwuCom(SimpleHoster):
-    __name__    = "YibaishiwuCom"
-    __type__    = "hoster"
-    __version__ = "0.14"
+    __name    = "YibaishiwuCom"
+    __type    = "hoster"
+    __version = "0.14"
 
-    __pattern__ = r'http://(?:www\.)?(?:u\.)?115\.com/file/(?P<ID>\w+)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://(?:www\.)?(?:u\.)?115\.com/file/(?P<ID>\w+)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """115.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """115.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     NAME_PATTERN = r'file_name: \'(?P<N>.+?)\''
diff --git a/pyload/plugin/hoster/YoupornCom.py b/pyload/plugin/hoster/YoupornCom.py
index 75606935d..8f77a15dd 100644
--- a/pyload/plugin/hoster/YoupornCom.py
+++ b/pyload/plugin/hoster/YoupornCom.py
@@ -6,15 +6,15 @@ from pyload.plugin.Hoster import Hoster
 
 
 class YoupornCom(Hoster):
-    __name__    = "YoupornCom"
-    __type__    = "hoster"
-    __version__ = "0.20"
+    __name    = "YoupornCom"
+    __type    = "hoster"
+    __version = "0.20"
 
-    __pattern__ = r'http://(?:www\.)?youporn\.com/watch/.+'
+    __pattern = r'http://(?:www\.)?youporn\.com/watch/.+'
 
-    __description__ = """Youporn.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("willnix", "willnix@pyload.org")]
+    __description = """Youporn.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("willnix", "willnix@pyload.org")]
 
 
     def process(self, pyfile):
diff --git a/pyload/plugin/hoster/YourfilesTo.py b/pyload/plugin/hoster/YourfilesTo.py
index a600d822f..640d67173 100644
--- a/pyload/plugin/hoster/YourfilesTo.py
+++ b/pyload/plugin/hoster/YourfilesTo.py
@@ -8,15 +8,15 @@ from pyload.plugin.Hoster import Hoster
 
 
 class YourfilesTo(Hoster):
-    __name__    = "YourfilesTo"
-    __type__    = "hoster"
-    __version__ = "0.22"
+    __name    = "YourfilesTo"
+    __type    = "hoster"
+    __version = "0.22"
 
-    __pattern__ = r'http://(?:www\.)?yourfiles\.(to|biz)/\?d=\w+'
+    __pattern = r'http://(?:www\.)?yourfiles\.(to|biz)/\?d=\w+'
 
-    __description__ = """Youfiles.to hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("jeix", "jeix@hasnomail.de"),
+    __description = """Youfiles.to hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("jeix", "jeix@hasnomail.de"),
                        ("skydancer", "skydancer@hasnomail.de")]
 
 
diff --git a/pyload/plugin/hoster/YoutubeCom.py b/pyload/plugin/hoster/YoutubeCom.py
index 260b1ba3d..14503be03 100644
--- a/pyload/plugin/hoster/YoutubeCom.py
+++ b/pyload/plugin/hoster/YoutubeCom.py
@@ -31,12 +31,12 @@ def which(program):
 
 
 class YoutubeCom(Hoster):
-    __name__    = "YoutubeCom"
-    __type__    = "hoster"
-    __version__ = "0.41"
+    __name    = "YoutubeCom"
+    __type    = "hoster"
+    __version = "0.41"
 
-    __pattern__ = r'https?://(?:[^/]*\.)?(youtube\.com|youtu\.be)/watch\?(?:.*&)?v=.+'
-    __config__  = [("quality", "sd;hd;fullhd;240p;360p;480p;720p;1080p;3072p", "Quality Setting"             , "hd" ),
+    __pattern = r'https?://(?:[^/]*\.)?(youtube\.com|youtu\.be)/watch\?(?:.*&)?v=.+'
+    __config  = [("quality", "sd;hd;fullhd;240p;360p;480p;720p;1080p;3072p", "Quality Setting"             , "hd" ),
                    ("fmt"    , "int"                                         , "FMT/ITAG Number (0 for auto)", 0    ),
                    (".mp4"   , "bool"                                        , "Allow .mp4"                  , True ),
                    (".flv"   , "bool"                                        , "Allow .flv"                  , True ),
@@ -44,9 +44,9 @@ class YoutubeCom(Hoster):
                    (".3gp"   , "bool"                                        , "Allow .3gp"                  , False),
                    ("3d"     , "bool"                                        , "Prefer 3D"                   , False)]
 
-    __description__ = """Youtube.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("spoob", "spoob@pyload.org"),
+    __description = """Youtube.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("spoob", "spoob@pyload.org"),
                        ("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/pyload/plugin/hoster/ZDF.py b/pyload/plugin/hoster/ZDF.py
index da6d6448e..c02eadc23 100644
--- a/pyload/plugin/hoster/ZDF.py
+++ b/pyload/plugin/hoster/ZDF.py
@@ -9,15 +9,15 @@ from pyload.plugin.Hoster import Hoster
 
 # Based on zdfm by Roland Beermann (http://github.com/enkore/zdfm/)
 class ZDF(Hoster):
-    __name__    = "ZDF Mediathek"
-    __type__    = "hoster"
-    __version__ = "0.80"
+    __name    = "ZDF Mediathek"
+    __type    = "hoster"
+    __version = "0.80"
 
-    __pattern__ = r'http://(?:www\.)?zdf\.de/ZDFmediathek/\D*(\d+)\D*'
+    __pattern = r'http://(?:www\.)?zdf\.de/ZDFmediathek/\D*(\d+)\D*'
 
-    __description__ = """ZDF.de hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = []
+    __description = """ZDF.de hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = []
 
     XML_API = "http://www.zdf.de/ZDFmediathek/xmlservice/web/beitragsDetails?id=%i"
 
diff --git a/pyload/plugin/hoster/ZShareNet.py b/pyload/plugin/hoster/ZShareNet.py
index fb02370f5..a2461fb6a 100644
--- a/pyload/plugin/hoster/ZShareNet.py
+++ b/pyload/plugin/hoster/ZShareNet.py
@@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster
 
 
 class ZShareNet(DeadHoster):
-    __name__    = "ZShareNet"
-    __type__    = "hoster"
-    __version__ = "0.21"
+    __name    = "ZShareNet"
+    __type    = "hoster"
+    __version = "0.21"
 
-    __pattern__ = r'https?://(?:ww[2w]\.)?zshares?\.net/.+'
-    __config__  = []
+    __pattern = r'https?://(?:ww[2w]\.)?zshares?\.net/.+'
+    __config  = []
 
-    __description__ = """ZShare.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("espes", ""),
+    __description = """ZShare.net hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("espes", ""),
                        ("Cptn Sandwich", "")]
diff --git a/pyload/plugin/hoster/ZeveraCom.py b/pyload/plugin/hoster/ZeveraCom.py
index 96bbf3455..c5defeff7 100644
--- a/pyload/plugin/hoster/ZeveraCom.py
+++ b/pyload/plugin/hoster/ZeveraCom.py
@@ -8,16 +8,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster
 
 
 class ZeveraCom(MultiHoster):
-    __name__    = "ZeveraCom"
-    __type__    = "hoster"
-    __version__ = "0.29"
+    __name    = "ZeveraCom"
+    __type    = "hoster"
+    __version = "0.29"
 
-    __pattern__ = r'https?://(?:www\.)zevera\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'https?://(?:www\.)zevera\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Zevera.com multi-hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description = """Zevera.com multi-hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/hoster/ZippyshareCom.py b/pyload/plugin/hoster/ZippyshareCom.py
index 9b1d432cc..7aaa9ec70 100644
--- a/pyload/plugin/hoster/ZippyshareCom.py
+++ b/pyload/plugin/hoster/ZippyshareCom.py
@@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 
 
 class ZippyshareCom(SimpleHoster):
-    __name__    = "ZippyshareCom"
-    __type__    = "hoster"
-    __version__ = "0.77"
+    __name    = "ZippyshareCom"
+    __type    = "hoster"
+    __version = "0.77"
 
-    __pattern__ = r'http://www\d{0,2}\.zippyshare\.com/v(/|iew\.jsp.*key=)(?P<KEY>[\w^_]+)'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'http://www\d{0,2}\.zippyshare\.com/v(/|iew\.jsp.*key=)(?P<KEY>[\w^_]+)'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Zippyshare.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com"),
+    __description = """Zippyshare.com hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com"),
                        ("sebdelsol", "seb.morin@gmail.com")]
 
 
diff --git a/pyload/plugin/internal/BasePlugin.py b/pyload/plugin/internal/BasePlugin.py
index 0b6e8f102..947c0fb3b 100644
--- a/pyload/plugin/internal/BasePlugin.py
+++ b/pyload/plugin/internal/BasePlugin.py
@@ -11,15 +11,15 @@ from pyload.plugin.Hoster import Hoster
 
 
 class BasePlugin(Hoster):
-    __name__    = "BasePlugin"
-    __type__    = "hoster"
-    __version__ = "0.38"
+    __name    = "BasePlugin"
+    __type    = "hoster"
+    __version = "0.38"
 
-    __pattern__ = r'^unmatchable$'
+    __pattern = r'^unmatchable$'
 
-    __description__ = """Base plugin when any other didnt fit"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+    __description = """Base plugin when any other didnt fit"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/internal/DeadCrypter.py b/pyload/plugin/internal/DeadCrypter.py
index ddeb0431d..daa7e1a0d 100644
--- a/pyload/plugin/internal/DeadCrypter.py
+++ b/pyload/plugin/internal/DeadCrypter.py
@@ -4,15 +4,15 @@ from pyload.plugin.Crypter import Crypter as _Crypter
 
 
 class DeadCrypter(_Crypter):
-    __name__    = "DeadCrypter"
-    __type__    = "crypter"
-    __version__ = "0.04"
+    __name    = "DeadCrypter"
+    __type    = "crypter"
+    __version = "0.04"
 
-    __pattern__ = r'^unmatchable$'
+    __pattern = r'^unmatchable$'
 
-    __description__ = """Crypter is no longer available"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
+    __description = """Crypter is no longer available"""
+    __license     = "GPLv3"
+    __authors     = [("stickell", "l.stickell@yahoo.it")]
 
 
     @classmethod
diff --git a/pyload/plugin/internal/DeadHoster.py b/pyload/plugin/internal/DeadHoster.py
index 1596943ae..2e57decdb 100644
--- a/pyload/plugin/internal/DeadHoster.py
+++ b/pyload/plugin/internal/DeadHoster.py
@@ -4,15 +4,15 @@ from pyload.plugin.Hoster import Hoster as _Hoster
 
 
 class DeadHoster(_Hoster):
-    __name__    = "DeadHoster"
-    __type__    = "hoster"
-    __version__ = "0.14"
+    __name    = "DeadHoster"
+    __type    = "hoster"
+    __version = "0.14"
 
-    __pattern__ = r'^unmatchable$'
+    __pattern = r'^unmatchable$'
 
-    __description__ = """Hoster is no longer available"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description = """Hoster is no longer available"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     @classmethod
diff --git a/pyload/plugin/internal/MultiHook.py b/pyload/plugin/internal/MultiHook.py
index ab96d30ca..5e828cd5e 100644
--- a/pyload/plugin/internal/MultiHook.py
+++ b/pyload/plugin/internal/MultiHook.py
@@ -8,18 +8,18 @@ from pyload.utils import decode, remove_chars
 
 
 class MultiHook(Hook):
-    __name__    = "MultiHook"
-    __type__    = "hook"
-    __version__ = "0.40"
+    __name    = "MultiHook"
+    __type    = "hook"
+    __version = "0.40"
 
-    __config__  = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"              , "all"),
+    __config  = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"              , "all"),
                    ("pluginlist"    , "str"                , "Plugin list (comma separated)", ""   ),
                    ("reload"        , "bool"               , "Reload plugin list"           , True ),
                    ("reloadinterval", "int"                , "Reload interval in hours"     , 12   )]
 
-    __description__ = """Hook plugin for multi hoster/crypter"""
-    __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team"   , "admin@pyload.org" ),
+    __description = """Hook plugin for multi hoster/crypter"""
+    __license     = "GPLv3"
+    __authors     = [("pyLoad Team"   , "admin@pyload.org" ),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
@@ -68,16 +68,16 @@ class MultiHook(Hook):
 
 
     def _initPlugin(self):
-        plugin, type = self.core.pluginManager.findPlugin(self.__name__)
+        plugin, type = self.core.pluginManager.findPlugin(self.__name)
 
         if not plugin:
             self.logWarning("Hook plugin will be deactivated due missing plugin reference")
             self.setConfig('activated', False)
         else:
-            self.pluginname   = self.__name__
+            self.pluginname   = self.__name
             self.plugintype   = type
-            self.pluginmodule = self.core.pluginManager.loadModule(type, self.__name__)
-            self.pluginclass  = getattr(self.pluginmodule, self.__name__)
+            self.pluginmodule = self.core.pluginManager.loadModule(type, self.__name)
+            self.pluginclass  = getattr(self.pluginmodule, self.__name)
 
 
     def loadAccount(self):
@@ -252,8 +252,8 @@ class MultiHook(Hook):
 
             # create new regexp
             regexp = r'.*(?P<DOMAIN>%s).*' % "|".join(x.replace('.', '\.') for x in plugins)
-            if hasattr(self.pluginclass, "__pattern__") and isinstance(self.pluginclass.__pattern__, basestring) and '://' in self.pluginclass.__pattern__:
-                regexp = r'%s|%s' % (self.pluginclass.__pattern__, regexp)
+            if hasattr(self.pluginclass, "__pattern") and isinstance(self.pluginclass.__pattern, basestring) and '://' in self.pluginclass.__pattern:
+                regexp = r'%s|%s' % (self.pluginclass.__pattern, regexp)
 
             self.logDebug("Regexp: %s" % regexp)
 
@@ -280,5 +280,5 @@ class MultiHook(Hook):
         # reset pattern
         hdict = self.core.pluginManager.plugins[self.plugintype][self.pluginname]
 
-        hdict['pattern'] = getattr(self.pluginclass, "__pattern__", r'^unmatchable$')
+        hdict['pattern'] = getattr(self.pluginclass, "__pattern", r'^unmatchable$')
         hdict['re']      = re.compile(hdict['pattern'])
diff --git a/pyload/plugin/internal/MultiHoster.py b/pyload/plugin/internal/MultiHoster.py
index e9bb483da..a38da9bdb 100644
--- a/pyload/plugin/internal/MultiHoster.py
+++ b/pyload/plugin/internal/MultiHoster.py
@@ -7,17 +7,17 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster, replace_patterns,
 
 
 class MultiHoster(SimpleHoster):
-    __name__    = "MultiHoster"
-    __type__    = "hoster"
-    __version__ = "0.39"
+    __name    = "MultiHoster"
+    __type    = "hoster"
+    __version = "0.39"
 
-    __pattern__ = r'^unmatchable$'
-    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+    __pattern = r'^unmatchable$'
+    __config  = [("use_premium" , "bool", "Use premium account if available"    , True),
                    ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
-    __description__ = """Multi hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Multi hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     LOGIN_ACCOUNT = True
@@ -47,7 +47,7 @@ class MultiHoster(SimpleHoster):
             set_cookies(self.req.cj, self.COOKIES)
 
         if self.DIRECT_LINK is None:
-            self.directDL = self.__pattern__ != r'^unmatchable$' and re.match(self.__pattern__, self.pyfile.url)
+            self.directDL = self.__pattern != r'^unmatchable$' and re.match(self.__pattern, self.pyfile.url)
         else:
             self.directDL = self.DIRECT_LINK
 
@@ -86,8 +86,8 @@ class MultiHoster(SimpleHoster):
                 self.retryFree()
 
             elif self.getConfig('revertfailed', True) \
-                 and "new_module" in self.core.pluginManager.hosterPlugins[self.__name__]:
-                hdict = self.core.pluginManager.hosterPlugins[self.__name__]
+                 and "new_module" in self.core.pluginManager.hosterPlugins[self.__name]:
+                hdict = self.core.pluginManager.hosterPlugins[self.__name]
 
                 tmp_module = hdict['new_module']
                 tmp_name   = hdict['new_name']
diff --git a/pyload/plugin/internal/SimpleCrypter.py b/pyload/plugin/internal/SimpleCrypter.py
index 472488268..4c19270fd 100644
--- a/pyload/plugin/internal/SimpleCrypter.py
+++ b/pyload/plugin/internal/SimpleCrypter.py
@@ -10,17 +10,17 @@ from pyload.utils import fixup
 
 
 class SimpleCrypter(Crypter, SimpleHoster):
-    __name__    = "SimpleCrypter"
-    __type__    = "crypter"
-    __version__ = "0.43"
+    __name    = "SimpleCrypter"
+    __type    = "crypter"
+    __version = "0.43"
 
-    __pattern__ = r'^unmatchable$'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),  #: Overrides core.config['general']['folder_per_package']
+    __pattern = r'^unmatchable$'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),  #: Overrides core.config['general']['folder_per_package']
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Simple decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com"  )]
+    __description = """Simple decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com"  )]
 
 
     """
diff --git a/pyload/plugin/internal/SimpleDereferer.py b/pyload/plugin/internal/SimpleDereferer.py
index e24a7b836..fc50db153 100644
--- a/pyload/plugin/internal/SimpleDereferer.py
+++ b/pyload/plugin/internal/SimpleDereferer.py
@@ -9,17 +9,17 @@ from pyload.plugin.internal.SimpleHoster import getFileURL, set_cookies
 
 
 class SimpleDereferer(Crypter):
-    __name__    = "SimpleDereferer"
-    __type__    = "crypter"
-    __version__ = "0.08"
+    __name    = "SimpleDereferer"
+    __type    = "crypter"
+    __version = "0.08"
 
-    __pattern__ = r'^unmatchable$'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern = r'^unmatchable$'
+    __config  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """Simple dereferer plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """Simple dereferer plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     """
@@ -49,7 +49,7 @@ class SimpleDereferer(Crypter):
 
         if not link:
             try:
-                link = unquote(re.match(self.__pattern__, pyfile.url).group('LINK'))
+                link = unquote(re.match(self.__pattern, pyfile.url).group('LINK'))
 
             except Exception:
                 self.prepare()
diff --git a/pyload/plugin/internal/SimpleHoster.py b/pyload/plugin/internal/SimpleHoster.py
index 75f54c767..d07eca2a1 100644
--- a/pyload/plugin/internal/SimpleHoster.py
+++ b/pyload/plugin/internal/SimpleHoster.py
@@ -244,16 +244,16 @@ def secondsToMidnight(gmt=0):
 
 
 class SimpleHoster(Hoster):
-    __name__    = "SimpleHoster"
-    __type__    = "hoster"
-    __version__ = "1.31"
+    __name    = "SimpleHoster"
+    __type    = "hoster"
+    __version = "1.31"
 
-    __pattern__ = r'^unmatchable$'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __pattern = r'^unmatchable$'
+    __config  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Simple hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com"  )]
+    __description = """Simple hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com"  )]
 
 
     """
@@ -338,7 +338,7 @@ class SimpleHoster(Hoster):
         online = False if info['status'] != 2 else True
 
         try:
-            info['pattern'] = re.match(cls.__pattern__, url).groupdict()  #: pattern groups will be saved here
+            info['pattern'] = re.match(cls.__pattern, url).groupdict()  #: pattern groups will be saved here
 
         except Exception:
             info['pattern'] = {}
@@ -437,8 +437,8 @@ class SimpleHoster(Hoster):
             set_cookies(self.req.cj, self.COOKIES)
 
         if (self.MULTI_HOSTER
-            and (self.__pattern__ != self.core.pluginManager.hosterPlugins[self.__name__]['pattern']
-                 or re.match(self.__pattern__, self.pyfile.url) is None)):
+            and (self.__pattern != self.core.pluginManager.hosterPlugins[self.__name]['pattern']
+                 or re.match(self.__pattern, self.pyfile.url) is None)):
             self.multihost = True
             return
 
@@ -750,7 +750,7 @@ class SimpleHoster(Hoster):
             return
         self.premium = False
         self.account = None
-        self.req     = self.core.requestFactory.getRequest(self.__name__)
+        self.req     = self.core.requestFactory.getRequest(self.__name)
         self.retries = 0
         raise Retry(_("Fallback to free download"))
 
diff --git a/pyload/plugin/internal/XFSAccount.py b/pyload/plugin/internal/XFSAccount.py
index 1f2d2b180..13c2351ce 100644
--- a/pyload/plugin/internal/XFSAccount.py
+++ b/pyload/plugin/internal/XFSAccount.py
@@ -10,13 +10,13 @@ from pyload.plugin.internal.SimpleHoster import parseHtmlForm, set_cookies
 
 
 class XFSAccount(Account):
-    __name__    = "XFSAccount"
-    __type__    = "account"
-    __version__ = "0.36"
+    __name    = "XFSAccount"
+    __type    = "account"
+    __version = "0.36"
 
-    __description__ = """XFileSharing account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg"      , "zoidberg@mujmail.cz"),
+    __description = """XFileSharing account plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg"      , "zoidberg@mujmail.cz"),
                        ("Walter Purcaro", "vuolter@gmail.com"  )]
 
 
diff --git a/pyload/plugin/internal/XFSCrypter.py b/pyload/plugin/internal/XFSCrypter.py
index 1a03b69d0..44b4ed724 100644
--- a/pyload/plugin/internal/XFSCrypter.py
+++ b/pyload/plugin/internal/XFSCrypter.py
@@ -4,15 +4,15 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class XFSCrypter(SimpleCrypter):
-    __name__    = "XFSCrypter"
-    __type__    = "crypter"
-    __version__ = "0.06"
+    __name    = "XFSCrypter"
+    __type    = "crypter"
+    __version = "0.06"
 
-    __pattern__ = r'^unmatchable$'
+    __pattern = r'^unmatchable$'
 
-    __description__ = """XFileSharing decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description = """XFileSharing decrypter plugin"""
+    __license     = "GPLv3"
+    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = None
@@ -31,7 +31,7 @@ class XFSCrypter(SimpleCrypter):
             if self.account:
                 account      = self.account
             else:
-                account_name = (self.__name__ + ".py").replace("Folder.py", "").replace(".py", "")
+                account_name = (self.__name + ".py").replace("Folder.py", "").replace(".py", "")
                 account      = self.pyfile.m.core.accountManager.getAccountPlugin(account_name)
 
             if account and hasattr(account, "HOSTER_DOMAIN") and account.HOSTER_DOMAIN:
diff --git a/pyload/plugin/internal/XFSHoster.py b/pyload/plugin/internal/XFSHoster.py
index fc48d6229..05b26bebe 100644
--- a/pyload/plugin/internal/XFSHoster.py
+++ b/pyload/plugin/internal/XFSHoster.py
@@ -12,15 +12,15 @@ from pyload.utils import html_unescape
 
 
 class XFSHoster(SimpleHoster):
-    __name__    = "XFSHoster"
-    __type__    = "hoster"
-    __version__ = "0.45"
+    __name    = "XFSHoster"
+    __type    = "hoster"
+    __version = "0.45"
 
-    __pattern__ = r'^unmatchable$'
+    __pattern = r'^unmatchable$'
 
-    __description__ = """XFileSharing hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg"      , "zoidberg@mujmail.cz"),
+    __description = """XFileSharing hoster plugin"""
+    __license     = "GPLv3"
+    __authors     = [("zoidberg"      , "zoidberg@mujmail.cz"),
                        ("stickell"      , "l.stickell@yahoo.it"),
                        ("Walter Purcaro", "vuolter@gmail.com"  )]
 
@@ -64,7 +64,7 @@ class XFSHoster(SimpleHoster):
             if self.account:
                 account = self.account
             else:
-                account = self.pyfile.m.core.accountManager.getAccountPlugin(self.__name__)
+                account = self.pyfile.m.core.accountManager.getAccountPlugin(self.__name)
 
             if account and hasattr(account, "HOSTER_DOMAIN") and account.HOSTER_DOMAIN:
                 self.HOSTER_DOMAIN = account.HOSTER_DOMAIN
diff --git a/pyload/plugin/ocr/GigasizeCom.py b/pyload/plugin/ocr/GigasizeCom.py
index efa513a7e..0c15b03e7 100644
--- a/pyload/plugin/ocr/GigasizeCom.py
+++ b/pyload/plugin/ocr/GigasizeCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.OCR import OCR
 
 
 class GigasizeCom(OCR):
-    __name__    = "GigasizeCom"
-    __type__    = "ocr"
-    __version__ = "0.11"
+    __name    = "GigasizeCom"
+    __type    = "ocr"
+    __version = "0.11"
 
-    __description__ = """Gigasize.com ocr plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team", "admin@pyload.org")]
+    __description = """Gigasize.com ocr plugin"""
+    __license     = "GPLv3"
+    __authors     = [("pyLoad Team", "admin@pyload.org")]
 
 
     def __init__(self):
diff --git a/pyload/plugin/ocr/LinksaveIn.py b/pyload/plugin/ocr/LinksaveIn.py
index ddffb190a..449a24755 100644
--- a/pyload/plugin/ocr/LinksaveIn.py
+++ b/pyload/plugin/ocr/LinksaveIn.py
@@ -13,13 +13,13 @@ from pyload.plugin.OCR import OCR
 
 
 class LinksaveIn(OCR):
-    __name__    = "LinksaveIn"
-    __type__    = "ocr"
-    __version__ = "0.11"
+    __name    = "LinksaveIn"
+    __type    = "ocr"
+    __version = "0.11"
 
-    __description__ = """Linksave.in ocr plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team", "admin@pyload.org")]
+    __description = """Linksave.in ocr plugin"""
+    __license     = "GPLv3"
+    __authors     = [("pyLoad Team", "admin@pyload.org")]
 
 
     def __init__(self):
diff --git a/pyload/plugin/ocr/NetloadIn.py b/pyload/plugin/ocr/NetloadIn.py
index bc5c4d882..9e31d18d5 100644
--- a/pyload/plugin/ocr/NetloadIn.py
+++ b/pyload/plugin/ocr/NetloadIn.py
@@ -4,13 +4,13 @@ from pyload.plugin.OCR import OCR
 
 
 class NetloadIn(OCR):
-    __name__    = "NetloadIn"
-    __type__    = "ocr"
-    __version__ = "0.11"
+    __name    = "NetloadIn"
+    __type    = "ocr"
+    __version = "0.11"
 
-    __description__ = """Netload.in ocr plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team", "admin@pyload.org")]
+    __description = """Netload.in ocr plugin"""
+    __license     = "GPLv3"
+    __authors     = [("pyLoad Team", "admin@pyload.org")]
 
 
     def __init__(self):
diff --git a/pyload/plugin/ocr/ShareonlineBiz.py b/pyload/plugin/ocr/ShareonlineBiz.py
index dc0894d4f..b07653279 100644
--- a/pyload/plugin/ocr/ShareonlineBiz.py
+++ b/pyload/plugin/ocr/ShareonlineBiz.py
@@ -4,13 +4,13 @@ from pyload.plugin.OCR import OCR
 
 
 class ShareonlineBiz(OCR):
-    __name__    = "ShareonlineBiz"
-    __type__    = "ocr"
-    __version__ = "0.11"
+    __name    = "ShareonlineBiz"
+    __type    = "ocr"
+    __version = "0.11"
 
-    __description__ = """Shareonline.biz ocr plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
+    __description = """Shareonline.biz ocr plugin"""
+    __license     = "GPLv3"
+    __authors     = [("RaNaN", "RaNaN@pyload.org")]
 
 
     def __init__(self):
-- 
cgit v1.2.3