37 files changed, 74 insertions, 74 deletions
diff --git a/pyload/plugins/crypter/BitshareComFolder.py b/pyload/plugins/crypter/BitshareCom.py
index 4dbeafdb3..723faf594 100644
--- a/pyload/plugins/crypter/BitshareComFolder.py
+++ b/pyload/plugins/crypter/BitshareCom.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
-class BitshareComFolder(SimpleCrypter):
-    __name__    = "BitshareComFolder"
+class BitshareCom(SimpleCrypter):
+    __name__    = "BitshareCom"
     __type__    = "crypter"
     __version__ = "0.03"
 
diff --git a/pyload/plugins/crypter/CrockoComFolder.py b/pyload/plugins/crypter/CrockoCom.py
index 7c96161a5..c959fa70a 100644
--- a/pyload/plugins/crypter/CrockoComFolder.py
+++ b/pyload/plugins/crypter/CrockoCom.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
-class CrockoComFolder(SimpleCrypter):
-    __name__    = "CrockoComFolder"
+class CrockoCom(SimpleCrypter):
+    __name__    = "CrockoCom"
     __type__    = "crypter"
     __version__ = "0.01"
 
diff --git a/pyload/plugins/crypter/CzshareComFolder.py b/pyload/plugins/crypter/CzshareCom.py
index bfca84360..b79f540ff 100644
--- a/pyload/plugins/crypter/CzshareComFolder.py
+++ b/pyload/plugins/crypter/CzshareCom.py
@@ -4,8 +4,8 @@ import re
 from pyload.plugins.internal.Crypter import Crypter
 
 
-class CzshareComFolder(Crypter):
-    __name__    = "CzshareComFolder"
+class CzshareCom(Crypter):
+    __name__    = "CzshareCom"
     __type__    = "crypter"
     __version__ = "0.2"
 
diff --git a/pyload/plugins/crypter/DataHuFolder.py b/pyload/plugins/crypter/DataHu.py
index b65c39904..2a02e03c8 100644
--- a/pyload/plugins/crypter/DataHuFolder.py
+++ b/pyload/plugins/crypter/DataHu.py
@@ -5,8 +5,8 @@ import re
 from pyload.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
-class DataHuFolder(SimpleCrypter):
-    __name__    = "DataHuFolder"
+class DataHu(SimpleCrypter):
+    __name__    = "DataHu"
     __type__    = "crypter"
     __version__ = "0.06"
 
@@ -25,7 +25,7 @@ class DataHuFolder(SimpleCrypter):
 
 
     def prepare(self):
-        super(DataHuFolder, self).prepare()
+        super(DataHu, self).prepare()
 
         if u'K\xe9rlek add meg a jelsz\xf3t' in self.html:  # Password protected
             password = self.getPassword()
diff --git a/pyload/plugins/crypter/DdlstorageComFolder.py b/pyload/plugins/crypter/DdlstorageCom.py
index 9851f92c1..b4a8d07b4 100644
--- a/pyload/plugins/crypter/DdlstorageComFolder.py
+++ b/pyload/plugins/crypter/DdlstorageCom.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
-class DdlstorageComFolder(DeadCrypter):
-    __name__    = "DdlstorageComFolder"
+class DdlstorageCom(DeadCrypter):
+    __name__    = "DdlstorageCom"
     __type__    = "crypter"
     __version__ = "0.03"
 
diff --git a/pyload/plugins/crypter/DepositfilesComFolder.py b/pyload/plugins/crypter/DepositfilesCom.py
index 65d73afa8..9ba211607 100644
--- a/pyload/plugins/crypter/DepositfilesComFolder.py
+++ b/pyload/plugins/crypter/DepositfilesCom.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
-class DepositfilesComFolder(SimpleCrypter):
-    __name__    = "DepositfilesComFolder"
+class DepositfilesCom(SimpleCrypter):
+    __name__    = "DepositfilesCom"
     __type__    = "crypter"
     __version__ = "0.01"
 
diff --git a/pyload/plugins/crypter/DuploadOrgFolder.py b/pyload/plugins/crypter/DuploadOrg.py
index 138db9f03..fdb51021b 100644
--- a/pyload/plugins/crypter/DuploadOrgFolder.py
+++ b/pyload/plugins/crypter/DuploadOrg.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.DeadCrypter import DeadCrypter
 
 
-class DuploadOrgFolder(DeadCrypter):
-    __name__    = "DuploadOrgFolder"
+class DuploadOrg(DeadCrypter):
+    __name__    = "DuploadOrg"
     __type__    = "crypter"
     __version__ = "0.02"
 
diff --git a/pyload/plugins/crypter/EasybytezComFolder.py b/pyload/plugins/crypter/EasybytezCom.py
index 482ce594b..4cd86e9b6 100644
--- a/pyload/plugins/crypter/EasybytezComFolder.py
+++ b/pyload/plugins/crypter/EasybytezCom.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.XFSCrypter import XFSCrypter
 
 
-class EasybytezComFolder(XFSCrypter):
-    __name__    = "EasybytezComFolder"
+class EasybytezCom(XFSCrypter):
+    __name__    = "EasybytezCom"
     __type__    = "crypter"
     __version__ = "0.10"
 
diff --git a/pyload/plugins/crypter/FilebeerInfoFolder.py b/pyload/plugins/crypter/FilebeerInfo.py
index e361b4e1d..75714c81a 100644
--- a/pyload/plugins/crypter/FilebeerInfoFolder.py
+++ b/pyload/plugins/crypter/FilebeerInfo.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.DeadCrypter import DeadCrypter
 
 
-class FilebeerInfoFolder(DeadCrypter):
-    __name__    = "FilebeerInfoFolder"
+class FilebeerInfo(DeadCrypter):
+    __name__    = "FilebeerInfo"
     __type__    = "crypter"
     __version__ = "0.02"
 
diff --git a/pyload/plugins/crypter/FilecloudIoFolder.py b/pyload/plugins/crypter/FilecloudIo.py
index c470cef03..6c8369925 100644
--- a/pyload/plugins/crypter/FilecloudIoFolder.py
+++ b/pyload/plugins/crypter/FilecloudIo.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
-class FilecloudIoFolder(SimpleCrypter):
-    __name__    = "FilecloudIoFolder"
+class FilecloudIo(SimpleCrypter):
+    __name__    = "FilecloudIo"
     __type__    = "crypter"
     __version__ = "0.03"
 
diff --git a/pyload/plugins/crypter/FilefactoryComFolder.py b/pyload/plugins/crypter/FilefactoryCom.py
index 8fb3efc72..9792bb9f1 100644
--- a/pyload/plugins/crypter/FilefactoryComFolder.py
+++ b/pyload/plugins/crypter/FilefactoryCom.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
-class FilefactoryComFolder(SimpleCrypter):
-    __name__    = "FilefactoryComFolder"
+class FilefactoryCom(SimpleCrypter):
+    __name__    = "FilefactoryCom"
     __type__    = "crypter"
     __version__ = "0.31"
 
diff --git a/pyload/plugins/crypter/FilerNetFolder.py b/pyload/plugins/crypter/FilerNet.py
index 5e43fda91..4d28dc0da 100644
--- a/pyload/plugins/crypter/FilerNetFolder.py
+++ b/pyload/plugins/crypter/FilerNet.py
@@ -3,8 +3,8 @@ import re
 from pyload.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
-class FilerNetFolder(SimpleCrypter):
-    __name__    = "FilerNetFolder"
+class FilerNet(SimpleCrypter):
+    __name__    = "FilerNet"
     __type__    = "crypter"
     __version__ = "0.41"
 
diff --git a/pyload/plugins/crypter/FileserveComFolder.py b/pyload/plugins/crypter/FileserveCom.py
index c08e174ed..5ccccfc16 100644
--- a/pyload/plugins/crypter/FileserveComFolder.py
+++ b/pyload/plugins/crypter/FileserveCom.py
@@ -5,8 +5,8 @@ import re
 from pyload.plugins.internal.Crypter import Crypter
 
 
-class FileserveComFolder(Crypter):
-    __name__    = "FileserveComFolder"
+class FileserveCom(Crypter):
+    __name__    = "FileserveCom"
     __type__    = "crypter"
     __version__ = "0.11"
 
diff --git a/pyload/plugins/crypter/FilesonicComFolder.py b/pyload/plugins/crypter/FilesonicCom.py
index 992915ab5..33a99f0d5 100644
--- a/pyload/plugins/crypter/FilesonicComFolder.py
+++ b/pyload/plugins/crypter/FilesonicCom.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.DeadCrypter import DeadCrypter
 
 
-class FilesonicComFolder(DeadCrypter):
-    __name__    = "FilesonicComFolder"
+class FilesonicCom(DeadCrypter):
+    __name__    = "FilesonicCom"
     __type__    = "crypter"
     __version__ = "0.12"
 
diff --git a/pyload/plugins/crypter/FiredriveComFolder.py b/pyload/plugins/crypter/FiredriveCom.py
index f6e6b8670..7ef84c8ff 100644
--- a/pyload/plugins/crypter/FiredriveComFolder.py
+++ b/pyload/plugins/crypter/FiredriveCom.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.DeadCrypter import DeadCrypter
 
 
-class FiredriveComFolder(DeadCrypter):
-    __name__    = "FiredriveComFolder"
+class FiredriveCom(DeadCrypter):
+    __name__    = "FiredriveCom"
     __type__    = "crypter"
     __version__ = "0.03"
 
diff --git a/pyload/plugins/crypter/FreakhareComFolder.py b/pyload/plugins/crypter/FreakhareCom.py
index f5e31ea42..792badeb4 100644
--- a/pyload/plugins/crypter/FreakhareComFolder.py
+++ b/pyload/plugins/crypter/FreakhareCom.py
@@ -5,8 +5,8 @@ import re
 from pyload.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
-class FreakhareComFolder(SimpleCrypter):
-    __name__    = "FreakhareComFolder"
+class FreakhareCom(SimpleCrypter):
+    __name__    = "FreakhareCom"
     __type__    = "crypter"
     __version__ = "0.03"
 
diff --git a/pyload/plugins/crypter/FshareVnFolder.py b/pyload/plugins/crypter/FshareVn.py
index 0c0a79495..8b22b8bf2 100644
--- a/pyload/plugins/crypter/FshareVnFolder.py
+++ b/pyload/plugins/crypter/FshareVn.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
-class FshareVnFolder(SimpleCrypter):
-    __name__    = "FshareVnFolder"
+class FshareVn(SimpleCrypter):
+    __name__    = "FshareVn"
     __type__    = "crypter"
     __version__ = "0.01"
 
diff --git a/pyload/plugins/crypter/HotfileComFolder.py b/pyload/plugins/crypter/HotfileCom.py
index 1ce901866..1c1dcb76b 100644
--- a/pyload/plugins/crypter/HotfileComFolder.py
+++ b/pyload/plugins/crypter/HotfileCom.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.DeadCrypter import DeadCrypter
 
 
-class HotfileComFolder(DeadCrypter):
-    __name__    = "HotfileComFolder"
+class HotfileCom(DeadCrypter):
+    __name__    = "HotfileCom"
     __type__    = "crypter"
     __version__ = "0.3"
 
diff --git a/pyload/plugins/crypter/JunocloudMeFolder.py b/pyload/plugins/crypter/JunocloudMe.py
index 2e529169f..3036be616 100644
--- a/pyload/plugins/crypter/JunocloudMeFolder.py
+++ b/pyload/plugins/crypter/JunocloudMe.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.XFSCrypter import XFSCrypter
 
 
-class JunocloudMeFolder(XFSCrypter):
-    __name__    = "JunocloudMeFolder"
+class JunocloudMe(XFSCrypter):
+    __name__    = "JunocloudMe"
     __type__    = "crypter"
     __version__ = "0.03"
 
diff --git a/pyload/plugins/crypter/LetitbitNetFolder.py b/pyload/plugins/crypter/LetitbitNet.py
index 09e6c398d..6942aa3ca 100644
--- a/pyload/plugins/crypter/LetitbitNetFolder.py
+++ b/pyload/plugins/crypter/LetitbitNet.py
@@ -4,8 +4,8 @@ import re
 from pyload.plugins.internal.Crypter import Crypter
 
 
-class LetitbitNetFolder(Crypter):
-    __name__    = "LetitbitNetFolder"
+class LetitbitNet(Crypter):
+    __name__    = "LetitbitNet"
     __type__    = "crypter"
     __version__ = "0.1"
 
diff --git a/pyload/plugins/crypter/LinkSaveIn.py b/pyload/plugins/crypter/LinkSaveIn.py
index 44a31a1b1..b45904c2e 100644
--- a/pyload/plugins/crypter/LinkSaveIn.py
+++ b/pyload/plugins/crypter/LinkSaveIn.py
@@ -148,7 +148,7 @@ class LinkSaveIn(SimpleCrypter):
         if not self.js:
             self.logDebug("No JS -> skip Web links")
         else:
-        #@TODO: Gather paginated web links
+            #@TODO: Gather paginated web links
             pattern = r'<a href="http://linksave\.in/(\w{43})"'
             ids = re.findall(pattern, self.html)
             self.logDebug("Decrypting %d Web links" % len(ids))
diff --git a/pyload/plugins/crypter/MediafireComFolder.py b/pyload/plugins/crypter/MediafireCom.py
index a1cd84fa0..392f59c52 100644
--- a/pyload/plugins/crypter/MediafireComFolder.py
+++ b/pyload/plugins/crypter/MediafireCom.py
@@ -6,8 +6,8 @@ from pyload.plugins.hoster.MediafireCom import checkHTMLHeader
 from pyload.utils import json_loads
 
 
-class MediafireComFolder(Crypter):
-    __name__    = "MediafireComFolder"
+class MediafireCom(Crypter):
+    __name__    = "MediafireCom"
     __type__    = "crypter"
     __version__ = "0.14"
 
diff --git a/pyload/plugins/crypter/MegaRapidCzFolder.py b/pyload/plugins/crypter/MegaRapidCz.py
index 4a2344051..da797965e 100644
--- a/pyload/plugins/crypter/MegaRapidCzFolder.py
+++ b/pyload/plugins/crypter/MegaRapidCz.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
-class MegaRapidCzFolder(SimpleCrypter):
-    __name__    = "MegaRapidCzFolder"
+class MegaRapidCz(SimpleCrypter):
+    __name__    = "MegaRapidCz"
     __type__    = "crypter"
     __version__ = "0.02"
 
diff --git a/pyload/plugins/crypter/MegauploadComFolder.py b/pyload/plugins/crypter/MegauploadCom.py
index 7e79863d2..57c08bd53 100644
--- a/pyload/plugins/crypter/MegauploadComFolder.py
+++ b/pyload/plugins/crypter/MegauploadCom.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.DeadCrypter import DeadCrypter
 
 
-class MegauploadComFolder(DeadCrypter):
-    __name__    = "MegauploadComFolder"
+class MegauploadCom(DeadCrypter):
+    __name__    = "MegauploadCom"
     __type__    = "crypter"
     __version__ = "0.02"
 
diff --git a/pyload/plugins/crypter/MultiUpOrg.py b/pyload/plugins/crypter/MultiUpOrg.py
index 81e204c72..ba5549683 100644
--- a/pyload/plugins/crypter/MultiUpOrg.py
+++ b/pyload/plugins/crypter/MultiUpOrg.py
@@ -15,7 +15,7 @@ class MultiUpOrg(SimpleCrypter):
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """MultiUp.org crypter plugin"""
+    __description__ = """MultiUp.org decrypter plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
diff --git a/pyload/plugins/crypter/OronComFolder.py b/pyload/plugins/crypter/OronCom.py
index dad59099f..c92666a5b 100644
--- a/pyload/plugins/crypter/OronComFolder.py
+++ b/pyload/plugins/crypter/OronCom.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.DeadCrypter import DeadCrypter
 
 
-class OronComFolder(DeadCrypter):
-    __name__    = "OronComFolder"
+class OronCom(DeadCrypter):
+    __name__    = "OronCom"
     __type__    = "crypter"
     __version__ = "0.11"
 
diff --git a/pyload/plugins/crypter/QuickshareCzFolder.py b/pyload/plugins/crypter/QuickshareCz.py
index b3f3f2335..156c5feeb 100644
--- a/pyload/plugins/crypter/QuickshareCzFolder.py
+++ b/pyload/plugins/crypter/QuickshareCz.py
@@ -4,8 +4,8 @@ import re
 from pyload.plugins.internal.Crypter import Crypter
 
 
-class QuickshareCzFolder(Crypter):
-    __name__    = "QuickshareCzFolder"
+class QuickshareCz(Crypter):
+    __name__    = "QuickshareCz"
     __type__    = "crypter"
     __version__ = "0.1"
 
diff --git a/pyload/plugins/crypter/RapidfileshareNetFolder.py b/pyload/plugins/crypter/RapidfileshareNet.py
index daf4c1311..bc318a01e 100644
--- a/pyload/plugins/crypter/RapidfileshareNetFolder.py
+++ b/pyload/plugins/crypter/RapidfileshareNet.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.XFSCrypter import XFSCrypter
 
 
-class RapidfileshareNetFolder(XFSCrypter):
-    __name__    = "RapidfileshareNetFolder"
+class RapidfileshareNet(XFSCrypter):
+    __name__    = "RapidfileshareNet"
     __type__    = "crypter"
     __version__ = "0.03"
 
diff --git a/pyload/plugins/crypter/SharingmatrixComFolder.py b/pyload/plugins/crypter/SharingmatrixCom.py
index a8ab3226a..28906ae7b 100644
--- a/pyload/plugins/crypter/SharingmatrixComFolder.py
+++ b/pyload/plugins/crypter/SharingmatrixCom.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.DeadCrypter import DeadCrypter
 
 
-class SharingmatrixComFolder(DeadCrypter):
-    __name__    = "SharingmatrixComFolder"
+class SharingmatrixCom(DeadCrypter):
+    __name__    = "SharingmatrixCom"
     __type__    = "crypter"
     __version__ = "0.01"
 
diff --git a/pyload/plugins/crypter/SpeedLoadOrgFolder.py b/pyload/plugins/crypter/SpeedLoadOrg.py
index 5b66b7ea6..46c9b8552 100644
--- a/pyload/plugins/crypter/SpeedLoadOrgFolder.py
+++ b/pyload/plugins/crypter/SpeedLoadOrg.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.DeadCrypter import DeadCrypter
 
 
-class SpeedLoadOrgFolder(DeadCrypter):
-    __name__    = "SpeedLoadOrgFolder"
+class SpeedLoadOrg(DeadCrypter):
+    __name__    = "SpeedLoadOrg"
     __type__    = "crypter"
     __version__ = "0.3"
 
diff --git a/pyload/plugins/crypter/TurbobitNetFolder.py b/pyload/plugins/crypter/TurbobitNet.py
index 096cc92c0..e038b9a34 100644
--- a/pyload/plugins/crypter/TurbobitNetFolder.py
+++ b/pyload/plugins/crypter/TurbobitNet.py
@@ -6,8 +6,8 @@ from pyload.plugins.internal.SimpleCrypter import SimpleCrypter
 from pyload.utils import json_loads
 
 
-class TurbobitNetFolder(SimpleCrypter):
-    __name__    = "TurbobitNetFolder"
+class TurbobitNet(SimpleCrypter):
+    __name__    = "TurbobitNet"
     __type__    = "crypter"
     __version__ = "0.05"
 
diff --git a/pyload/plugins/crypter/TusfilesNetFolder.py b/pyload/plugins/crypter/TusfilesNet.py
index 8ca1ada00..d8f0b604a 100644
--- a/pyload/plugins/crypter/TusfilesNetFolder.py
+++ b/pyload/plugins/crypter/TusfilesNet.py
@@ -7,8 +7,8 @@ from urlparse import urljoin
 from pyload.plugins.internal.XFSCrypter import XFSCrypter
 
 
-class TusfilesNetFolder(XFSCrypter):
-    __name__    = "TusfilesNetFolder"
+class TusfilesNet(XFSCrypter):
+    __name__    = "TusfilesNet"
     __type__    = "crypter"
     __version__ = "0.06"
 
diff --git a/pyload/plugins/crypter/UlozToFolder.py b/pyload/plugins/crypter/UlozTo.py
index fe64d41bb..8538736ca 100644
--- a/pyload/plugins/crypter/UlozToFolder.py
+++ b/pyload/plugins/crypter/UlozTo.py
@@ -4,8 +4,8 @@ import re
 from pyload.plugins.internal.Crypter import Crypter
 
 
-class UlozToFolder(Crypter):
-    __name__    = "UlozToFolder"
+class UlozTo(Crypter):
+    __name__    = "UlozTo"
     __type__    = "crypter"
     __version__ = "0.2"
 
diff --git a/pyload/plugins/crypter/UploadableChFolder.py b/pyload/plugins/crypter/UploadableCh.py
index 8fff41c16..4edc08846 100644
--- a/pyload/plugins/crypter/UploadableChFolder.py
+++ b/pyload/plugins/crypter/UploadableCh.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
-class UploadableChFolder(SimpleCrypter):
-    __name__    = "UploadableChFolder"
+class UploadableCh(SimpleCrypter):
+    __name__    = "UploadableCh"
     __type__    = "crypter"
     __version__ = "0.03"
 
diff --git a/pyload/plugins/crypter/UploadedToFolder.py b/pyload/plugins/crypter/UploadedTo.py
index da1354f02..1fbed5f86 100644
--- a/pyload/plugins/crypter/UploadedToFolder.py
+++ b/pyload/plugins/crypter/UploadedTo.py
@@ -7,8 +7,8 @@ from urlparse import urljoin
 from pyload.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
-class UploadedToFolder(SimpleCrypter):
-    __name__    = "UploadedToFolder"
+class UploadedTo(SimpleCrypter):
+    __name__    = "UploadedTo"
     __type__    = "crypter"
     __version__ = "0.42"
 
diff --git a/pyload/plugins/crypter/WuploadComFolder.py b/pyload/plugins/crypter/WuploadCom.py
index 2626a0d13..dd1c4a168 100644
--- a/pyload/plugins/crypter/WuploadComFolder.py
+++ b/pyload/plugins/crypter/WuploadCom.py
@@ -3,8 +3,8 @@
 from pyload.plugins.internal.DeadCrypter import DeadCrypter
 
 
-class WuploadComFolder(DeadCrypter):
-    __name__    = "WuploadComFolder"
+class WuploadCom(DeadCrypter):
+    __name__    = "WuploadCom"
     __type__    = "crypter"
     __version__ = "0.01"
 
diff --git a/pyload/plugins/crypter/XFileSharingProFolder.py b/pyload/plugins/crypter/XFileSharingPro.py
index 89fac31ac..27de7f997 100644
--- a/pyload/plugins/crypter/XFileSharingProFolder.py
+++ b/pyload/plugins/crypter/XFileSharingPro.py
@@ -5,8 +5,8 @@ import re
 from pyload.plugins.internal.XFSCrypter import XFSCrypter
 
 
-class XFileSharingProFolder(XFSCrypter):
-    __name__    = "XFileSharingProFolder"
+class XFileSharingPro(XFSCrypter):
+    __name__    = "XFileSharingPro"
     __type__    = "crypter"
     __version__ = "0.03"
 
@@ -26,7 +26,7 @@ class XFileSharingProFolder(XFSCrypter):
 
 
     def init(self):
-        super(XFileSharingProFolder, self).init()
+        super(XFileSharingPro, self).init()
 
         self.__pattern__ = self.core.pluginManager.crypterPlugins[self.__name__]['pattern']