diff --git a/core/src/core/classes/class.AjxpRole.php b/core/src/core/classes/class.AjxpRole.php
index 8800d5df7a..15a859f818 100644
--- a/core/src/core/classes/class.AjxpRole.php
+++ b/core/src/core/classes/class.AjxpRole.php
@@ -41,7 +41,7 @@ class AjxpRole implements AjxpGroupPathProvider
      * @param string $id
      * @return void
      */
-    public function AjxpRole($id)
+    public function __construct($id)
     {
         $this->id = $id;
     }
diff --git a/core/src/core/classes/class.HttpClient.php b/core/src/core/classes/class.HttpClient.php
index 66606acf73..234942b12e 100644
--- a/core/src/core/classes/class.HttpClient.php
+++ b/core/src/core/classes/class.HttpClient.php
@@ -58,7 +58,7 @@ class HttpClient
 
     public $collectHeaders;
 
-    public function HttpClient($host, $port=80)
+    public function __construct($host, $port=80)
     {
         $this->host = $host;
         $this->port = $port;
diff --git a/core/src/core/classes/pclzip.lib.php b/core/src/core/classes/pclzip.lib.php
index ea33824a8e..c33ce2c02e 100644
--- a/core/src/core/classes/pclzip.lib.php
+++ b/core/src/core/classes/pclzip.lib.php
@@ -212,7 +212,7 @@ class PclZip
   //   Note that no real action is taken, if the archive does not exist it is not
   //   created. Use create() for that.
   // --------------------------------------------------------------------------------
-  function PclZip($p_zipname)
+  function __construct($p_zipname)
   {
 
     // ----- Tests the zlib
diff --git a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/AES.php b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/AES.php
index a00b2a9b4c..606f228077 100644
--- a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/AES.php
+++ b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/AES.php
@@ -164,9 +164,9 @@ class Crypt_AES extends Crypt_Rijndael
      * @param optional Integer $mode
      * @access public
      */
-    function Crypt_AES($mode = CRYPT_AES_MODE_CBC)
+    function __construct($mode = CRYPT_AES_MODE_CBC)
     {
-        parent::Crypt_Rijndael($mode);
+        parent::__construct($mode);
     }
 
     /**
diff --git a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/Base.php b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/Base.php
index c458f26764..58ae1ba41e 100644
--- a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/Base.php
+++ b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/Base.php
@@ -445,7 +445,7 @@ class Crypt_Base
      * @param optional Integer $mode
      * @access public
      */
-    function Crypt_Base($mode = CRYPT_MODE_CBC)
+    function __construct($mode = CRYPT_MODE_CBC)
     {
         $const_crypt_mode = 'CRYPT_' . $this->const_namespace . '_MODE';
 
diff --git a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/Blowfish.php b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/Blowfish.php
index 67593e5aca..9f35b9fa22 100644
--- a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/Blowfish.php
+++ b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/Blowfish.php
@@ -392,9 +392,9 @@ class Crypt_Blowfish extends Crypt_Base
      * @param optional Integer $mode
      * @access public
      */
-    function Crypt_Blowfish($mode = CRYPT_BLOWFISH_MODE_CBC)
+    function __construct($mode = CRYPT_BLOWFISH_MODE_CBC)
     {
-        parent::Crypt_Base($mode);
+        parent::__construct($mode);
     }
 
     /**
diff --git a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/DES.php b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/DES.php
index 465f251260..672cbcc006 100644
--- a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/DES.php
+++ b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/DES.php
@@ -685,9 +685,9 @@ class Crypt_DES extends Crypt_Base
      * @param optional Integer $mode
      * @access public
      */
-    function Crypt_DES($mode = CRYPT_DES_MODE_CBC)
+    function __construct($mode = CRYPT_DES_MODE_CBC)
     {
-        parent::Crypt_Base($mode);
+        parent::__construct($mode);
     }
 
     /**
diff --git a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/Hash.php b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/Hash.php
index 06e475715e..819285ba8b 100644
--- a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/Hash.php
+++ b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/Hash.php
@@ -152,7 +152,7 @@ class Crypt_Hash
      * @return Crypt_Hash
      * @access public
      */
-    function Crypt_Hash($hash = 'sha1')
+    function __construct($hash = 'sha1')
     {
         if ( !defined('CRYPT_HASH_MODE') ) {
             switch (true) {
diff --git a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/RC2.php b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/RC2.php
index 966a342d21..2e48a2c491 100644
--- a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/RC2.php
+++ b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/RC2.php
@@ -339,9 +339,9 @@ class Crypt_RC2 extends Crypt_Base
      * @param optional Integer $mode
      * @access public
      */
-    function Crypt_RC2($mode = CRYPT_RC2_MODE_CBC)
+    function __construct($mode = CRYPT_RC2_MODE_CBC)
     {
-        parent::Crypt_Base($mode);
+        parent::__construct($mode);
         $this->setKey('');
     }
 
diff --git a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/RC4.php b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/RC4.php
index 7e5a6c59f2..fa093471f6 100644
--- a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/RC4.php
+++ b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/RC4.php
@@ -178,9 +178,9 @@ class Crypt_RC4 extends Crypt_Base
      * @return Crypt_RC4
      * @access public
      */
-    function Crypt_RC4()
+    function __construct()
     {
-        parent::Crypt_Base(CRYPT_MODE_STREAM);
+        parent::__construct(CRYPT_MODE_STREAM);
     }
 
     /**
diff --git a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/RSA.php b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/RSA.php
index 4ce004567e..b796eab257 100644
--- a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/RSA.php
+++ b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/RSA.php
@@ -458,7 +458,7 @@ class Crypt_RSA
      * @return Crypt_RSA
      * @access public
      */
-    function Crypt_RSA()
+    function __construct()
     {
         if (!class_exists('Math_BigInteger')) {
             include_once 'Math/BigInteger.php';
diff --git a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/Rijndael.php b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/Rijndael.php
index 5a5579292f..e9f4e3329d 100644
--- a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/Rijndael.php
+++ b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/Rijndael.php
@@ -699,9 +699,9 @@ class Crypt_Rijndael extends Crypt_Base
      * @param optional Integer $mode
      * @access public
      */
-    function Crypt_Rijndael($mode = CRYPT_RIJNDAEL_MODE_CBC)
+    function __construct($mode = CRYPT_RIJNDAEL_MODE_CBC)
     {
-        parent::Crypt_Base($mode);
+        parent::__construct($mode);
     }
 
     /**
diff --git a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/TripleDES.php b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/TripleDES.php
index ba2908fbf2..638366f713 100644
--- a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/TripleDES.php
+++ b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/TripleDES.php
@@ -187,13 +187,13 @@ class Crypt_TripleDES extends Crypt_DES
      * @param optional Integer $mode
      * @access public
      */
-    function Crypt_TripleDES($mode = CRYPT_DES_MODE_CBC)
+    function __construct($mode = CRYPT_DES_MODE_CBC)
     {
         switch ($mode) {
             // In case of CRYPT_DES_MODE_3CBC, we init as CRYPT_DES_MODE_CBC
             // and additional flag us internally as 3CBC
             case CRYPT_DES_MODE_3CBC:
-                parent::Crypt_DES(CRYPT_DES_MODE_CBC);
+                parent::__construct(CRYPT_DES_MODE_CBC);
                 $this->mode_3cbc = true;
 
                 // This three $des'es will do the 3CBC work (if $key > 64bits)
@@ -210,7 +210,7 @@ function Crypt_TripleDES($mode = CRYPT_DES_MODE_CBC)
                 break;
             // If not 3CBC, we init as usual
             default:
-                parent::Crypt_DES($mode);
+                parent::__construct($mode);
         }
     }
 
diff --git a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/Twofish.php b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/Twofish.php
index 7dec037b9e..2bfde7474d 100644
--- a/core/src/plugins/access.sftp_psl/phpseclib/Crypt/Twofish.php
+++ b/core/src/plugins/access.sftp_psl/phpseclib/Crypt/Twofish.php
@@ -471,9 +471,9 @@ class Crypt_Twofish extends Crypt_Base
      * @param optional Integer $mode
      * @access public
      */
-    function Crypt_Twofish($mode = CRYPT_TWOFISH_MODE_CBC)
+    function __construct($mode = CRYPT_TWOFISH_MODE_CBC)
     {
-        parent::Crypt_Base($mode);
+        parent::__construct($mode);
     }
 
     /**
diff --git a/core/src/plugins/access.sftp_psl/phpseclib/Math/BigInteger.php b/core/src/plugins/access.sftp_psl/phpseclib/Math/BigInteger.php
index 9cc8f6f55a..3c95a07f86 100644
--- a/core/src/plugins/access.sftp_psl/phpseclib/Math/BigInteger.php
+++ b/core/src/plugins/access.sftp_psl/phpseclib/Math/BigInteger.php
@@ -256,7 +256,7 @@ class Math_BigInteger
      * @return Math_BigInteger
      * @access public
      */
-    function Math_BigInteger($x = 0, $base = 10)
+    function __construct($x = 0, $base = 10)
     {
         if ( !defined('MATH_BIGINTEGER_MODE') ) {
             switch (true) {
diff --git a/core/src/plugins/access.sftp_psl/phpseclib/SFTP.php b/core/src/plugins/access.sftp_psl/phpseclib/SFTP.php
index 23d73b50dc..58610d13ee 100644
--- a/core/src/plugins/access.sftp_psl/phpseclib/SFTP.php
+++ b/core/src/plugins/access.sftp_psl/phpseclib/SFTP.php
@@ -264,7 +264,7 @@ class Net_SFTP extends Net_SSH2
      * @return Net_SFTP
      * @access public
      */
-    function Net_SFTP($host, $port = 22, $timeout = 10)
+    function __construct($host, $port = 22, $timeout = 10)
     {
         parent::Net_SSH2($host, $port, $timeout);