diff --git a/core/htmlsanitizer.class.inc.php b/core/htmlsanitizer.class.inc.php
index fbc94a4f6..5a062abb7 100644
--- a/core/htmlsanitizer.class.inc.php
+++ b/core/htmlsanitizer.class.inc.php
@@ -134,7 +134,7 @@ abstract class DOMSanitizer extends HTMLSanitizer
 	public function DoSanitize($sHTML)
 	{
 		$this->oDoc = new DOMDocument();
-		$this->oDoc->preserveWhitespace = true;
+		$this->oDoc->preserveWhiteSpace = true;
 
 		// MS outlook implements empty lines by the mean of <p><o:p></o:p></p>
 		// We have to transform that into <p><br></p> (which is how Thunderbird implements empty lines)
@@ -402,7 +402,7 @@ class HTMLDOMSanitizer extends DOMSanitizer
 	public function LoadDoc($sHTML)
 	{
 		@$this->oDoc->loadHTML('<?xml encoding="UTF-8"?>'.$sHTML); // For loading HTML chunks where the character set is not specified
-		$this->oDoc->preserveWhitespace = true;
+		$this->oDoc->preserveWhiteSpace = true;
 	}
 
 	public function PrintDoc()
diff --git a/core/templatestring.class.inc.php b/core/templatestring.class.inc.php
index 8978ff66b..03bd20d67 100644
--- a/core/templatestring.class.inc.php
+++ b/core/templatestring.class.inc.php
@@ -42,7 +42,7 @@ class TemplateStringPlaceholder
 	public function __construct($sToken)
 	{
 		$this->sToken = $sToken;
-		$this->sAttcode = '';
+		$this->sAttCode = '';
 		$this->sFunction = '';
 		$this->sParamName = '';
 		$this->bIsValid = false; // Validity may be false in general, but it can work anyway (thanks to specialization) when rendering
@@ -90,9 +90,9 @@ class TemplateString
 						$oPlaceholder->sFunction = '';
 
 						$oPlaceholder->sParamName = $sParamName;
-						$sAttcode = substr($sPlaceholder, strlen($sParamPrefix));
-						$oPlaceholder->sAttcode = $sAttcode;
-						$oPlaceholder->bIsValid = MetaModel::IsValidAttCode($sClass, $sAttcode, true /* extended */);
+						$sAttCode = substr($sPlaceholder, strlen($sParamPrefix));
+						$oPlaceholder->sAttCode = $sAttCode;
+						$oPlaceholder->bIsValid = MetaModel::IsValidAttCode($sClass, $sAttCode, true /* extended */);
 					}
 				}
 
@@ -164,7 +164,7 @@ class TemplateString
 				$oRef = $aParamValues[$oPlaceholder->sParamName];
 				try
 				{
-					$value = $oRef->Get($oPlaceholder->sAttcode);
+					$value = $oRef->Get($oPlaceholder->sAttCode);
 					$aSearch[] = '$'.$oPlaceholder->sToken.'$';
 					$aReplace[] = $value;
 					$oPlaceholder->bIsValid = true;
diff --git a/sources/Core/Email/EmailLaminas.php b/sources/Core/Email/EmailLaminas.php
index 80ff41faa..89289c2d1 100644
--- a/sources/Core/Email/EmailLaminas.php
+++ b/sources/Core/Email/EmailLaminas.php
@@ -250,7 +250,7 @@ class EMailLaminas extends Email
 	protected function EmbedInlineImages(string &$sBody)
 	{
 		$oDOMDoc = new DOMDocument();
-		$oDOMDoc->preserveWhitespace = true;
+		$oDOMDoc->preserveWhiteSpace = true;
 		@$oDOMDoc->loadHTML('<?xml encoding="UTF-8"?>'.$sBody); // For loading HTML chunks where the character set is not specified
 
 		$oXPath = new DOMXPath($oDOMDoc);