diff --git a/class.phpmaileroauth.php b/class.phpmaileroauth.php
index f9cd7b42..b1bb09f0 100644
--- a/class.phpmaileroauth.php
+++ b/class.phpmaileroauth.php
@@ -80,6 +80,7 @@ class PHPMailerOAuth extends PHPMailer
      * @uses SMTP
      * @access public
      * @return bool
+     * @throws phpmailerException
      */
     public function smtpConnect($options = array())
     {
diff --git a/class.smtp.php b/class.smtp.php
index f259df6d..9bb970d8 100644
--- a/class.smtp.php
+++ b/class.smtp.php
@@ -477,7 +477,7 @@ class SMTP
                 $temp = new stdClass;
                 $ntlm_client = new ntlm_sasl_client_class;
                 //Check that functions are available
-                if (!$ntlm_client->Initialize($temp)) {
+                if (!$ntlm_client->initialize($temp)) {
                     $this->setError($temp->error);
                     $this->edebug(
                         'You need to enable some modules in your php.ini file: '
@@ -487,7 +487,7 @@ class SMTP
                     return false;
                 }
                 //msg1
-                $msg1 = $ntlm_client->TypeMsg1($realm, $workstation); //msg1
+                $msg1 = $ntlm_client->typeMsg1($realm, $workstation); //msg1
 
                 if (!$this->sendCommand(
                     'AUTH NTLM',
@@ -506,7 +506,7 @@ class SMTP
                     $password
                 );
                 //msg3
-                $msg3 = $ntlm_client->TypeMsg3(
+                $msg3 = $ntlm_client->typeMsg3(
                     $ntlm_res,
                     $username,
                     $realm,
diff --git a/extras/htmlfilter.php b/extras/htmlfilter.php
index 5ac7d13c..102e848c 100644
--- a/extras/htmlfilter.php
+++ b/extras/htmlfilter.php
@@ -901,7 +901,7 @@ function tln_sanitize(
                 }
                 $trusted .= tln_tagprint($tagname, $attary, $tagtype);
                 $trusted .= $free_content;
-                $trusted .= tln_tagprint($tagname, false, 2);
+                $trusted .= tln_tagprint($tagname, null, 2);
             }
             continue;
         }
diff --git a/extras/ntlm_sasl_client.php b/extras/ntlm_sasl_client.php
index 4a085614..3fd53924 100644
--- a/extras/ntlm_sasl_client.php
+++ b/extras/ntlm_sasl_client.php
@@ -160,12 +160,12 @@ class ntlm_sasl_client_class
     {
         switch ($this->state) {
             case SASL_NTLM_STATE_IDENTIFY_DOMAIN:
-                $message = $this->TypeMsg1($this->credentials["realm"], $this->credentials["workstation"]);
+                $message = $this->typeMsg1($this->credentials["realm"], $this->credentials["workstation"]);
                 $this->state = SASL_NTLM_STATE_RESPOND_CHALLENGE;
                 break;
             case SASL_NTLM_STATE_RESPOND_CHALLENGE:
                 $ntlm_response = $this->NTLMResponse(substr($response, 24, 8), $this->credentials["password"]);
-                $message = $this->TypeMsg3(
+                $message = $this->typeMsg3(
                     $ntlm_response,
                     $this->credentials["user"],
                     $this->credentials["realm"],
diff --git a/test/phpmailerTest.php b/test/phpmailerTest.php
index 50450749..87575b88 100644
--- a/test/phpmailerTest.php
+++ b/test/phpmailerTest.php
@@ -1264,12 +1264,12 @@ EOT;
         //Only run if we have qmail installed
         if (file_exists('/var/qmail/bin/qmail-inject')) {
             $this->Mail->Body = 'Sending via qmail';
-            $this->BuildBody();
+            $this->buildBody();
             $subject = $this->Mail->Subject;
 
             $this->Mail->Subject = $subject . ': qmail';
-            $this->Mail->IsQmail();
-            $this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
+            $this->Mail->isQmail();
+            $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
         } else {
             $this->markTestSkipped('Qmail is not installed');
         }