Spare code fixes

44 files changed, 90 insertions, 91 deletions

diff --git a/module/plugins/crypter/BitshareComFolder.py b/module/plugins/crypter/BitshareComFolder.py
index fc5e6705d..fbd60d6c5 100644
--- a/module/plugins/crypter/BitshareComFolder.py
+++ b/module/plugins/crypter/BitshareComFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
 class BitshareComFolder(SimpleCrypter):
-    __name__    = "BitshareCom"
+    __name__    = "BitshareComFolder"
     __type__    = "crypter"
-    __version__ = "0.06"
+    __version__ = "0.07"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?bitshare\.com/\?d=\w+'
diff --git a/module/plugins/crypter/CloudzillaToFolder.py b/module/plugins/crypter/CloudzillaToFolder.py
index 583667b6d..c497dbe01 100644
--- a/module/plugins/crypter/CloudzillaToFolder.py
+++ b/module/plugins/crypter/CloudzillaToFolder.py
@@ -6,9 +6,9 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
 class CloudzillaToFolder(SimpleHoster):
-    __name__    = "CloudzillaTo"
+    __name__    = "CloudzillaToFolder"
     __type__    = "crypter"
-    __version__ = "0.05"
+    __version__ = "0.06"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?cloudzilla\.to/share/folder/(?P<ID>[\w^_]+)'
diff --git a/module/plugins/crypter/CrockoComFolder.py b/module/plugins/crypter/CrockoComFolder.py
index ec4cf9c7a..89e5e0fc3 100644
--- a/module/plugins/crypter/CrockoComFolder.py
+++ b/module/plugins/crypter/CrockoComFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
 class CrockoComFolder(SimpleCrypter):
-    __name__    = "CrockoCom"
+    __name__    = "CrockoComFolder"
     __type__    = "crypter"
-    __version__ = "0.03"
+    __version__ = "0.04"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?crocko\.com/f/.+'
diff --git a/module/plugins/crypter/CzshareComFolder.py b/module/plugins/crypter/CzshareComFolder.py
index f77c4b19c..29cecee1f 100644
--- a/module/plugins/crypter/CzshareComFolder.py
+++ b/module/plugins/crypter/CzshareComFolder.py
@@ -6,9 +6,9 @@ from module.plugins.internal.Crypter import Crypter, create_getInfo
 
 
 class CzshareComFolder(Crypter):
-    __name__    = "CzshareCom"
+    __name__    = "CzshareComFolder"
     __type__    = "crypter"
-    __version__ = "0.23"
+    __version__ = "0.24"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/folders/.+'
diff --git a/module/plugins/crypter/DailymotionComFolder.py b/module/plugins/crypter/DailymotionComFolder.py
index 71338b4c4..bb14d90ab 100644
--- a/module/plugins/crypter/DailymotionComFolder.py
+++ b/module/plugins/crypter/DailymotionComFolder.py
@@ -8,9 +8,9 @@ from module.plugins.internal.utils import fs_join, json
 
 
 class DailymotionComFolder(Crypter):
-    __name__    = "DailymotionCom"
+    __name__    = "DailymotionComFolder"
     __type__    = "crypter"
-    __version__ = "0.04"
+    __version__ = "0.05"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?dailymotion\.com/((playlists/)?(?P<TYPE>playlist|user)/)?(?P<ID>[\w^_]+)(?(TYPE)|#)'
diff --git a/module/plugins/crypter/DataHuFolder.py b/module/plugins/crypter/DataHuFolder.py
index df1ea0c37..233c5750a 100644
--- a/module/plugins/crypter/DataHuFolder.py
+++ b/module/plugins/crypter/DataHuFolder.py
@@ -6,9 +6,9 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
 class DataHuFolder(SimpleCrypter):
-    __name__    = "DataHu"
+    __name__    = "DataHuFolder"
     __type__    = "crypter"
-    __version__ = "0.09"
+    __version__ = "0.10"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?data\.hu/dir/\w+'
diff --git a/module/plugins/crypter/DdlstorageComFolder.py b/module/plugins/crypter/DdlstorageComFolder.py
index 475e1e8ac..81eb29ca4 100644
--- a/module/plugins/crypter/DdlstorageComFolder.py
+++ b/module/plugins/crypter/DdlstorageComFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class DdlstorageComFolder(DeadCrypter):
-    __name__    = "DdlstorageCom"
+    __name__    = "DdlstorageComFolder"
     __type__    = "crypter"
-    __version__ = "0.05"
+    __version__ = "0.06"
     __status__  = "stable"
 
     __pattern__ = r'https?://(?:www\.)?ddlstorage\.com/folder/\w+'
diff --git a/module/plugins/crypter/DepositfilesComFolder.py b/module/plugins/crypter/DepositfilesComFolder.py
index 1b6cc5bff..cb4f435df 100644
--- a/module/plugins/crypter/DepositfilesComFolder.py
+++ b/module/plugins/crypter/DepositfilesComFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
 class DepositfilesComFolder(SimpleCrypter):
-    __name__    = "DepositfilesCom"
+    __name__    = "DepositfilesComFolder"
     __type__    = "crypter"
-    __version__ = "0.03"
+    __version__ = "0.04"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?depositfiles\.com/folders/\w+'
diff --git a/module/plugins/crypter/DevhostStFolder.py b/module/plugins/crypter/DevhostStFolder.py
index ba7f07076..271ae3985 100644
--- a/module/plugins/crypter/DevhostStFolder.py
+++ b/module/plugins/crypter/DevhostStFolder.py
@@ -10,9 +10,9 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
 class DevhostStFolder(SimpleCrypter):
-    __name__    = "DevhostSt"
+    __name__    = "DevhostStFolder"
     __type__    = "crypter"
-    __version__ = "0.07"
+    __version__ = "0.08"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?d-h\.st/users/(?P<USER>\w+)(/\?fld_id=(?P<ID>\d+))?'
diff --git a/module/plugins/crypter/DuploadOrgFolder.py b/module/plugins/crypter/DuploadOrgFolder.py
index ad417c41f..62ddd88d1 100644
--- a/module/plugins/crypter/DuploadOrgFolder.py
+++ b/module/plugins/crypter/DuploadOrgFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class DuploadOrgFolder(DeadCrypter):
-    __name__    = "DuploadOrg"
+    __name__    = "DuploadOrgFolder"
     __type__    = "crypter"
-    __version__ = "0.04"
+    __version__ = "0.05"
     __status__  = "stable"
 
     __pattern__ = r'http://(?:www\.)?dupload\.org/folder/\d+'
diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py
index 22bd34f8b..47f7797b2 100644
--- a/module/plugins/crypter/EasybytezComFolder.py
+++ b/module/plugins/crypter/EasybytezComFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo
 
 
 class EasybytezComFolder(XFSCrypter):
-    __name__    = "EasybytezCom"
+    __name__    = "EasybytezComFolder"
     __type__    = "crypter"
-    __version__ = "0.12"
+    __version__ = "0.13"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?easybytez\.com/users/\d+/\d+'
diff --git a/module/plugins/crypter/FilebeerInfoFolder.py b/module/plugins/crypter/FilebeerInfoFolder.py
index 67fc881f4..b6d318684 100644
--- a/module/plugins/crypter/FilebeerInfoFolder.py
+++ b/module/plugins/crypter/FilebeerInfoFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class FilebeerInfoFolder(DeadCrypter):
-    __name__    = "FilebeerInfo"
+    __name__    = "FilebeerInfoFolder"
     __type__    = "crypter"
-    __version__ = "0.04"
+    __version__ = "0.05"
     __status__  = "stable"
 
     __pattern__ = r'http://(?:www\.)?filebeer\.info/\d*~f\w+'
diff --git a/module/plugins/crypter/FilecloudIoFolder.py b/module/plugins/crypter/FilecloudIoFolder.py
index bee8fd7f1..d056084fd 100644
--- a/module/plugins/crypter/FilecloudIoFolder.py
+++ b/module/plugins/crypter/FilecloudIoFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
 class FilecloudIoFolder(SimpleCrypter):
-    __name__    = "FilecloudIo"
+    __name__    = "FilecloudIoFolder"
     __type__    = "crypter"
-    __version__ = "0.05"
+    __version__ = "0.06"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?(filecloud\.io|ifile\.it)/_\w+'
diff --git a/module/plugins/crypter/FilefactoryComFolder.py b/module/plugins/crypter/FilefactoryComFolder.py
index b8578f5e1..ddd7cebba 100644
--- a/module/plugins/crypter/FilefactoryComFolder.py
+++ b/module/plugins/crypter/FilefactoryComFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
 class FilefactoryComFolder(SimpleCrypter):
-    __name__    = "FilefactoryCom"
+    __name__    = "FilefactoryComFolder"
     __type__    = "crypter"
-    __version__ = "0.34"
+    __version__ = "0.35"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?filefactory\.com/(?:f|folder)/\w+'
diff --git a/module/plugins/crypter/FilerNetFolder.py b/module/plugins/crypter/FilerNetFolder.py
index 39c582a66..58bc86990 100644
--- a/module/plugins/crypter/FilerNetFolder.py
+++ b/module/plugins/crypter/FilerNetFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
 class FilerNetFolder(SimpleCrypter):
-    __name__    = "FilerNet"
+    __name__    = "FilerNetFolder"
     __type__    = "crypter"
-    __version__ = "0.44"
+    __version__ = "0.45"
     __status__  = "testing"
 
     __pattern__ = r'https?://filer\.net/folder/\w{16}'
diff --git a/module/plugins/crypter/FileserveComFolder.py b/module/plugins/crypter/FileserveComFolder.py
index 8f672ddb8..f792eb715 100644
--- a/module/plugins/crypter/FileserveComFolder.py
+++ b/module/plugins/crypter/FileserveComFolder.py
@@ -6,9 +6,9 @@ from module.plugins.internal.Crypter import Crypter, create_getInfo
 
 
 class FileserveComFolder(Crypter):
-    __name__    = "FileserveCom"
+    __name__    = "FileserveComFolder"
     __type__    = "crypter"
-    __version__ = "0.14"
+    __version__ = "0.15"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?fileserve\.com/list/\w+'
diff --git a/module/plugins/crypter/FilesonicComFolder.py b/module/plugins/crypter/FilesonicComFolder.py
index e90096102..f377d2265 100644
--- a/module/plugins/crypter/FilesonicComFolder.py
+++ b/module/plugins/crypter/FilesonicComFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class FilesonicComFolder(DeadCrypter):
-    __name__    = "FilesonicCom"
+    __name__    = "FilesonicComFolder"
     __type__    = "crypter"
-    __version__ = "0.14"
+    __version__ = "0.15"
     __status__  = "stable"
 
     __pattern__ = r'http://(?:www\.)?filesonic\.com/folder/\w+'
diff --git a/module/plugins/crypter/FiredriveComFolder.py b/module/plugins/crypter/FiredriveComFolder.py
index 8c94dc390..a9279879e 100644
--- a/module/plugins/crypter/FiredriveComFolder.py
+++ b/module/plugins/crypter/FiredriveComFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class FiredriveComFolder(DeadCrypter):
-    __name__    = "FiredriveCom"
+    __name__    = "FiredriveComFolder"
     __type__    = "crypter"
-    __version__ = "0.05"
+    __version__ = "0.06"
     __status__  = "stable"
 
     __pattern__ = r'https?://(?:www\.)?(firedrive|putlocker)\.com/share/.+'
diff --git a/module/plugins/crypter/FreakhareComFolder.py b/module/plugins/crypter/FreakhareComFolder.py
index a614fba4a..8f839bad0 100644
--- a/module/plugins/crypter/FreakhareComFolder.py
+++ b/module/plugins/crypter/FreakhareComFolder.py
@@ -6,9 +6,9 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
 class FreakhareComFolder(SimpleCrypter):
-    __name__    = "FreakhareCom"
+    __name__    = "FreakhareComFolder"
     __type__    = "crypter"
-    __version__ = "0.05"
+    __version__ = "0.06"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?freakshare\.com/folder/.+'
diff --git a/module/plugins/crypter/FshareVnFolder.py b/module/plugins/crypter/FshareVnFolder.py
index e74799ee7..1cb65367d 100644
--- a/module/plugins/crypter/FshareVnFolder.py
+++ b/module/plugins/crypter/FshareVnFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
 class FshareVnFolder(SimpleCrypter):
-    __name__    = "FshareVn"
+    __name__    = "FshareVnFolder"
     __type__    = "crypter"
-    __version__ = "0.03"
+    __version__ = "0.04"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?fshare\.vn/folder/.+'
diff --git a/module/plugins/crypter/GoogledriveComFolder.py b/module/plugins/crypter/GoogledriveComFolder.py
index 3657f4102..ddd81f077 100644
--- a/module/plugins/crypter/GoogledriveComFolder.py
+++ b/module/plugins/crypter/GoogledriveComFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
 class GoogledriveComFolder(SimpleCrypter):
-    __name__    = "GoogledriveCom"
+    __name__    = "GoogledriveComFolder"
     __type__    = "crypter"
-    __version__ = "0.04"
+    __version__ = "0.05"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?drive\.google\.com/folderview\?.*id=\w+'
diff --git a/module/plugins/crypter/HotfileComFolder.py b/module/plugins/crypter/HotfileComFolder.py
index 24e401e81..8a9ba9029 100644
--- a/module/plugins/crypter/HotfileComFolder.py
+++ b/module/plugins/crypter/HotfileComFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class HotfileComFolder(DeadCrypter):
-    __name__    = "HotfileCom"
+    __name__    = "HotfileComFolder"
     __type__    = "crypter"
-    __version__ = "0.32"
+    __version__ = "0.33"
     __status__  = "stable"
 
     __pattern__ = r'https?://(?:www\.)?hotfile\.com/list/\w+/\w+'
diff --git a/module/plugins/crypter/MediafireComFolder.py b/module/plugins/crypter/MediafireComFolder.py
index 2d3efad42..2bbaee37d 100644
--- a/module/plugins/crypter/MediafireComFolder.py
+++ b/module/plugins/crypter/MediafireComFolder.py
@@ -8,9 +8,9 @@ from module.plugins.internal.utils import json
 
 
 class MediafireComFolder(Crypter):
-    __name__    = "MediafireCom"
+    __name__    = "MediafireComFolder"
     __type__    = "crypter"
-    __version__ = "0.17"
+    __version__ = "0.18"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))'
diff --git a/module/plugins/crypter/MegaCoNzFolder.py b/module/plugins/crypter/MegaCoNzFolder.py
index 45e026d44..8e58461ad 100644
--- a/module/plugins/crypter/MegaCoNzFolder.py
+++ b/module/plugins/crypter/MegaCoNzFolder.py
@@ -6,9 +6,9 @@ from module.plugins.internal.Crypter import Crypter, create_getInfo
 
 
 class MegaCoNzFolder(Crypter):
-    __name__    = "MegaCoNz"
+    __name__    = "MegaCoNzFolder"
     __type__    = "crypter"
-    __version__ = "0.07"
+    __version__ = "0.08"
     __status__  = "broken"
 
     __pattern__ = r'(https?://(?:www\.)?mega(\.co)?\.nz/|mega:|chrome:.+?)#F!(?P<ID>[\w^_]+)!(?P<KEY>[\w,\\-]+)'
diff --git a/module/plugins/crypter/MegaRapidCzFolder.py b/module/plugins/crypter/MegaRapidCzFolder.py
index b3c4bc153..3c3272906 100644
--- a/module/plugins/crypter/MegaRapidCzFolder.py
+++ b/module/plugins/crypter/MegaRapidCzFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
 class MegaRapidCzFolder(SimpleCrypter):
-    __name__    = "MegaRapidCz"
+    __name__    = "MegaRapidCzFolder"
     __type__    = "crypter"
-    __version__ = "0.04"
+    __version__ = "0.05"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?(share|mega)rapid\.cz/slozka/\d+/\w+'
diff --git a/module/plugins/crypter/MegauploadComFolder.py b/module/plugins/crypter/MegauploadComFolder.py
index 249892fa7..6494bf8ba 100644
--- a/module/plugins/crypter/MegauploadComFolder.py
+++ b/module/plugins/crypter/MegauploadComFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class MegauploadComFolder(DeadCrypter):
-    __name__    = "MegauploadCom"
+    __name__    = "MegauploadComFolder"
     __type__    = "crypter"
-    __version__ = "0.04"
+    __version__ = "0.05"
     __status__  = "stable"
 
     __pattern__ = r'http://(?:www\.)?megaupload\.com/(\?f|xml/folderfiles\.php\?.*&?folderid)=\w+'
diff --git a/module/plugins/crypter/NitroflareComFolder.py b/module/plugins/crypter/NitroflareComFolder.py
index 86fbb7030..a8e0bbbc5 100644
--- a/module/plugins/crypter/NitroflareComFolder.py
+++ b/module/plugins/crypter/NitroflareComFolder.py
@@ -5,9 +5,9 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
 class NitroflareComFolder(SimpleCrypter):
-    __name__    = "NitroflareCom"
+    __name__    = "NitroflareComFolder"
     __type__    = "crypter"
-    __version__ = "0.04"
+    __version__ = "0.05"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?nitroflare\.com/folder/(?P<USER>\d+)/(?P<ID>[\w=]+)'
diff --git a/module/plugins/crypter/OronComFolder.py b/module/plugins/crypter/OronComFolder.py
index 501a171b5..d2053c9a1 100644
--- a/module/plugins/crypter/OronComFolder.py
+++ b/module/plugins/crypter/OronComFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class OronComFolder(DeadCrypter):
-    __name__    = "OronCom"
+    __name__    = "OronComFolder"
     __type__    = "crypter"
-    __version__ = "0.13"
+    __version__ = "0.14"
     __status__  = "stable"
 
     __pattern__ = r'http://(?:www\.)?oron\.com/folder/\w+'
diff --git a/module/plugins/crypter/QuickshareCzFolder.py b/module/plugins/crypter/QuickshareCzFolder.py
index 6d517983f..6f80a0dd4 100644
--- a/module/plugins/crypter/QuickshareCzFolder.py
+++ b/module/plugins/crypter/QuickshareCzFolder.py
@@ -6,9 +6,9 @@ from module.plugins.internal.Crypter import Crypter, create_getInfo
 
 
 class QuickshareCzFolder(Crypter):
-    __name__    = "QuickshareCz"
+    __name__    = "QuickshareCzFolder"
     __type__    = "crypter"
-    __version__ = "0.13"
+    __version__ = "0.14"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?quickshare\.cz/slozka-\d+'
diff --git a/module/plugins/crypter/SharingmatrixComFolder.py b/module/plugins/crypter/SharingmatrixComFolder.py
index 5b273346a..4d9935213 100644
--- a/module/plugins/crypter/SharingmatrixComFolder.py
+++ b/module/plugins/crypter/SharingmatrixComFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class SharingmatrixComFolder(DeadCrypter):
-    __name__    = "SharingmatrixCom"
+    __name__    = "SharingmatrixComFolder"
     __type__    = "crypter"
-    __version__ = "0.03"
+    __version__ = "0.04"
     __status__  = "stable"
 
     __pattern__ = r'http://(?:www\.)?sharingmatrix\.com/folder/\w+'
diff --git a/module/plugins/crypter/SpeedLoadOrgFolder.py b/module/plugins/crypter/SpeedLoadOrgFolder.py
index 6c13ddfe1..b4b9f3135 100644
--- a/module/plugins/crypter/SpeedLoadOrgFolder.py
+++ b/module/plugins/crypter/SpeedLoadOrgFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class SpeedLoadOrgFolder(DeadCrypter):
-    __name__    = "SpeedLoadOrg"
+    __name__    = "SpeedLoadOrgFolder"
     __type__    = "crypter"
-    __version__ = "0.32"
+    __version__ = "0.33"
     __status__  = "stable"
 
     __pattern__ = r'http://(?:www\.)?speedload\.org/(\d+~f$|folder/\d+/)'
diff --git a/module/plugins/crypter/TurbobitNetFolder.py b/module/plugins/crypter/TurbobitNetFolder.py
index dac274ea8..44a561a44 100644
--- a/module/plugins/crypter/TurbobitNetFolder.py
+++ b/module/plugins/crypter/TurbobitNetFolder.py
@@ -7,9 +7,9 @@ from module.plugins.internal.utils import json
 
 
 class TurbobitNetFolder(SimpleCrypter):
-    __name__    = "TurbobitNet"
+    __name__    = "TurbobitNetFolder"
     __type__    = "crypter"
-    __version__ = "0.07"
+    __version__ = "0.08"
     __status__  = "broken"
 
     __pattern__ = r'http://(?:www\.)?turbobit\.net/download/folder/(?P<ID>\w+)'
diff --git a/module/plugins/crypter/TusfilesNetFolder.py b/module/plugins/crypter/TusfilesNetFolder.py
index 7ee37b503..703061c76 100644
--- a/module/plugins/crypter/TusfilesNetFolder.py
+++ b/module/plugins/crypter/TusfilesNetFolder.py
@@ -8,9 +8,9 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo
 
 
 class TusfilesNetFolder(XFSCrypter):
-    __name__    = "TusfilesNet"
+    __name__    = "TusfilesNetFolder"
     __type__    = "crypter"
-    __version__ = "0.10"
+    __version__ = "0.11"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?tusfiles\.net/go/(?P<ID>\w+)'
diff --git a/module/plugins/crypter/UlozToFolder.py b/module/plugins/crypter/UlozToFolder.py
index 37fd8892e..55b8bf4f6 100644
--- a/module/plugins/crypter/UlozToFolder.py
+++ b/module/plugins/crypter/UlozToFolder.py
@@ -6,9 +6,9 @@ from module.plugins.internal.Crypter import Crypter, create_getInfo
 
 
 class UlozToFolder(Crypter):
-    __name__    = "UlozTo"
+    __name__    = "UlozToFolder"
     __type__    = "crypter"
-    __version__ = "0.23"
+    __version__ = "0.24"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(m|soubory)/.+'
diff --git a/module/plugins/crypter/UploadableChFolder.py b/module/plugins/crypter/UploadableChFolder.py
index 5d1527952..abe411648 100644
--- a/module/plugins/crypter/UploadableChFolder.py
+++ b/module/plugins/crypter/UploadableChFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
 class UploadableChFolder(SimpleCrypter):
-    __name__    = "UploadableCh"
+    __name__    = "UploadableChFolder"
     __type__    = "crypter"
-    __version__ = "0.05"
+    __version__ = "0.06"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?uploadable\.ch/list/\w+'
diff --git a/module/plugins/crypter/UploadedToFolder.py b/module/plugins/crypter/UploadedToFolder.py
index 7decbd17a..24e339c07 100644
--- a/module/plugins/crypter/UploadedToFolder.py
+++ b/module/plugins/crypter/UploadedToFolder.py
@@ -6,9 +6,9 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
 class UploadedToFolder(SimpleCrypter):
-    __name__    = "UploadedTo"
+    __name__    = "UploadedToFolder"
     __type__    = "crypter"
-    __version__ = "0.45"
+    __version__ = "0.46"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/\w+'
diff --git a/module/plugins/crypter/WuploadComFolder.py b/module/plugins/crypter/WuploadComFolder.py
index 9f35cf41a..019b53b2c 100644
--- a/module/plugins/crypter/WuploadComFolder.py
+++ b/module/plugins/crypter/WuploadComFolder.py
@@ -4,9 +4,9 @@ from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class WuploadComFolder(DeadCrypter):
-    __name__    = "WuploadCom"
+    __name__    = "WuploadComFolder"
     __type__    = "crypter"
-    __version__ = "0.03"
+    __version__ = "0.04"
     __status__  = "stable"
 
     __pattern__ = r'http://(?:www\.)?wupload\.com/folder/\w+'
diff --git a/module/plugins/crypter/XFileSharingProFolder.py b/module/plugins/crypter/XFileSharingProFolder.py
index 1d47d59d6..527564293 100644
--- a/module/plugins/crypter/XFileSharingProFolder.py
+++ b/module/plugins/crypter/XFileSharingProFolder.py
@@ -6,9 +6,9 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo
 
 
 class XFileSharingProFolder(XFSCrypter):
-    __name__    = "XFileSharingPro"
+    __name__    = "XFileSharingProFolder"
     __type__    = "crypter"
-    __version__ = "0.16"
+    __version__ = "0.17"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?(?:\w+\.)*(?P<DOMAIN>(?:[\d.]+|[\w\-^_]{3,63}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/(?:user|folder)s?/\w+'
diff --git a/module/plugins/crypter/YoutubeComFolder.py b/module/plugins/crypter/YoutubeComFolder.py
index de00067b4..ad8721af6 100644
--- a/module/plugins/crypter/YoutubeComFolder.py
+++ b/module/plugins/crypter/YoutubeComFolder.py
@@ -8,9 +8,9 @@ from module.plugins.internal.utils import fs_join, json
 
 
 class YoutubeComFolder(Crypter):
-    __name__    = "YoutubeCom"
+    __name__    = "YoutubeComFolder"
     __type__    = "crypter"
-    __version__ = "1.04"
+    __version__ = "1.05"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.|m\.)?youtube\.com/(?P<TYPE>user|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P<ID>[\w\-]+)'
diff --git a/module/plugins/hooks/LinkdecrypterComHook.py b/module/plugins/hooks/LinkdecrypterComHook.py
index f9ab1f3ff..96c1b2b5e 100644
--- a/module/plugins/hooks/LinkdecrypterComHook.py
+++ b/module/plugins/hooks/LinkdecrypterComHook.py
@@ -6,10 +6,10 @@ from module.plugins.internal.Addon import Addon
 
 
 class LinkdecrypterComHook(Addon):
-    __name__    = "LinkdecrypterCom"
+    __name__    = "LinkdecrypterComHook"
     __type__    = "hook"
     __version__ = "1.09"
-    __status__  = "testing"
+    __status__  = "broken"
 
     __config__ = [("activated"     , "bool"               , "Activated"                    , False),
                   ("pluginmode"    , "all;listed;unlisted", "Use for plugins"              , "all"),
diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py
index 41c11ed98..2fed5dab3 100644
--- a/module/plugins/hooks/UpdateManager.py
+++ b/module/plugins/hooks/UpdateManager.py
@@ -16,7 +16,7 @@ from module.plugins.internal.utils import encode, fs_join
 class UpdateManager(Addon):
     __name__    = "UpdateManager"
     __type__    = "hook"
-    __version__ = "1.01"
+    __version__ = "1.02"
     __status__  = "testing"
 
     __config__ = [("activated"    , "bool", "Activated"                                , True ),
@@ -250,6 +250,7 @@ class UpdateManager(Addon):
         updatelist, blacklist = self.parse_list(updates)
 
         url = updates[1]
+        req = self.pyload.requestFactory.getRequest(self.classname)
 
         if blacklist:
             #@NOTE: Protect UpdateManager from self-removing
@@ -276,7 +277,6 @@ class UpdateManager(Addon):
                     'name': n,
                 })
 
-        req = self.pyload.requestFactory.getRequest(self.classname)
         for plugin in updatelist:
             name    = plugin['name']
             type    = plugin['type']
@@ -301,9 +301,9 @@ class UpdateManager(Addon):
             try:
                 content = self.load(url % plugin + ".py", decode=False, req=req)
 
-                if req.code == 404:
-                    raise Exception(_("Plugin URL not found (404)"))
-                
+                if req.code is 404:
+                    raise Exception(_("URL not found"))
+
                 m = self._VERSION.search(content)
                 if m and m.group(2) == version:
                     #@TODO: Remove in 0.4.10
@@ -317,7 +317,7 @@ class UpdateManager(Addon):
 
                     updated.append((type, name))
                 else:
-                    raise Exception(_("Plugin version mismatch"))
+                    raise Exception(_("Version mismatch"))
 
             except Exception, e:
                 self.log_error(_("Error updating plugin: %s %s") % (type.upper(), name), e)
@@ -374,7 +374,7 @@ class UpdateManager(Addon):
                         os.remove(filename)
 
                     except OSError, e:
-                        self.log_error(_("Error removing: %s") % filename, e)
+                        self.log_warning(_("Error removing: %s") % filename, e)
 
                     else:
                         id = (type, name)
diff --git a/module/plugins/hoster/Http.py b/module/plugins/hoster/Http.py
index ad5f36d43..4be6d4f11 100644
--- a/module/plugins/hoster/Http.py
+++ b/module/plugins/hoster/Http.py
@@ -19,8 +19,7 @@ class Http(Hoster):
 
     __description__ = """Download from http link"""
     __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
-                       ("Walter Purcaro", "vuolter@gmail.com")]
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     def setup(self):
diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py
index 59cfa8af0..8721aae3a 100644
--- a/module/plugins/hoster/XFileSharingPro.py
+++ b/module/plugins/hoster/XFileSharingPro.py
@@ -8,7 +8,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class XFileSharingPro(XFSHoster):
     __name__    = "XFileSharingPro"
     __type__    = "hoster"
-    __version__ = "0.56"
+    __version__ = "0.57"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?(?:\w+\.)*(?P<DOMAIN>(?:[\d.]+|[\w\-^_]{3,63}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/(?:embed-)?\w{12}(?:\W|$)'
diff --git a/module/plugins/internal/XFSCrypter.py b/module/plugins/internal/XFSCrypter.py
index 327834dab..d295d2e9a 100644
--- a/module/plugins/internal/XFSCrypter.py
+++ b/module/plugins/internal/XFSCrypter.py
@@ -7,7 +7,7 @@ from module.plugins.internal.utils import set_cookie
 class XFSCrypter(SimpleCrypter):
     __name__    = "XFSCrypter"
     __type__    = "crypter"
-    __version__ = "0.19"
+    __version__ = "0.20"
     __status__  = "testing"
 
     __pattern__ = r'^unmatchable$'