diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 07072fb8c44b5d18b536a39f9bf392ef5638821c..9af1f2c6459e99bb4921a19dba78afb587188735 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -76,7 +76,7 @@ class Hooks {
 				&& $encLegacyKey = $userView->file_get_contents( 'encryption.key' )
 			) {
 			
-				$plainLegacyKey = Crypt::legacyDecrypt( $encLegacyKey, $params['password'] );
+				$plainLegacyKey = Crypt::legacyBlockDecrypt( $encLegacyKey, $params['password'] );
 				
 				$session->setLegacyKey( $plainLegacyKey );
 			
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 009a648016bb636383e4f726465370e5766fc04b..9345712a455f7c433d872e387c2bf7afd1a75592 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -607,7 +607,7 @@ class Crypt
 	 *
 	 * This function decrypts an content
 	 */
-	public static function legacyDecrypt( $content, $passphrase = '' ) {
+	private static function legacyDecrypt( $content, $passphrase = '' ) {
 
 		$bf = self::getBlowfish( $passphrase );
 
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index eaaeae9b61951bccf39895bfaa7e64ba743b805b..d9520810bf4a891eeb45751379747cebb9cae29d 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -223,7 +223,7 @@ class Proxy extends \OC_FileProxy
 			&& isset( $_SESSION['legacyenckey'] )
 			&& Crypt::isEncryptedMeta( $path )
 		) {
-			$plainData = Crypt::legacyDecrypt( $data, $session->getLegacyKey() );
+			$plainData = Crypt::legacyBlockDecrypt( $data, $session->getLegacyKey() );
 		}
 
 		\OC_FileProxy::$enabled = $proxyStatus;
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 74b4252a1d46f0bcbcfb5b863df66e9427cfbad9..e9f155e2649cc8ede6d0f61b5dde28abfe6addf4 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -515,7 +515,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	 */
 	function testLegacyDecryptShort($crypted) {
 
-		$decrypted = Encryption\Crypt::legacyDecrypt($crypted, $this->pass);
+		$decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass);
 
 		$this->assertEquals($this->dataShort, $decrypted);
 
@@ -543,7 +543,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	 */
 	function testLegacyDecryptLong($crypted) {
 
-		$decrypted = Encryption\Crypt::legacyDecrypt($crypted, $this->pass);
+		$decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass);
 
 		$this->assertEquals($this->dataLong, $decrypted);
 
@@ -560,7 +560,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 		$encKey = Encryption\Crypt::legacyCreateKey($this->pass);
 
 		// Decrypt key
-		$key = Encryption\Crypt::legacyDecrypt($encKey, $this->pass);
+		$key = Encryption\Crypt::legacyBlockDecrypt($encKey, $this->pass);
 
 		$this->assertTrue(is_numeric($key));