diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index 9b82bd05b2a..3b9ef4cc447 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -5,7 +5,7 @@ in Dolibarr root.
 
 ALL:
 ----
-Check "DOL_CHANGE"
+Check "@CHANGE"
 
 
 CKEDITOR (4.6.2):
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 9fb119fa9e6..9e6250f9f8d 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -221,7 +221,7 @@ class SMTPs
 	var $_debug = false;
 
 
-	// DOL_CHANGE LDR
+	// @CHANGE LDR
 	var $log = '';
 	var $_errorsTo = '';
 	var $_deliveryReceipt = 0;
@@ -361,7 +361,7 @@ class SMTPs
 		$host=preg_replace('@tcp://@i','',$host);	// Remove prefix
 		$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
 
-		// DOL_CHANGE LDR
+		// @CHANGE LDR
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		if ( (! is_ip($host)) && ((gethostbyname($host)) == $host))
@@ -393,7 +393,7 @@ class SMTPs
 			// This connection attempt failed.
 			else
 			{
-				// DOL_CHANGE LDR
+				// @CHANGE LDR
 				if (empty($this->errstr)) $this->errstr='Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
 				$this->_setErr($this->errno, $this->errstr);
 				$_retVal = false;
@@ -1093,7 +1093,7 @@ class SMTPs
 					{
 						foreach ( $this->_msgRecipients[$_host][$_which] as $_addr => $_realName )
 						{
-							if ( $_realName )	// DOL_CHANGE LDR
+							if ( $_realName )	// @CHANGE LDR
 							{
 								$_realName = '"' . $_realName . '"';
 								$_RCPT_list[] = $_realName . ' <' . $_addr . '@' . $_host . '>';
@@ -1270,7 +1270,7 @@ class SMTPs
 		$_header .= $this->getPriority();
 
 
-		// DOL_CHANGE LDR
+		// @CHANGE LDR
 		if ( $this->getDeliveryReceipt() )
 		    $_header .= 'Disposition-Notification-To: '.$this->getFrom('addr') . "\r\n";
 		if ( $this->getErrorsTo() )
@@ -1414,7 +1414,7 @@ class SMTPs
 						$content .= "\r\n" .  $_data['data'] . "\r\n\r\n";
 					}
 				}
-				// DOL_CHANGE LDR
+				// @CHANGE LDR
 				else if ( $type == 'image' )
 				{
 					// loop through all images
@@ -1521,7 +1521,7 @@ class SMTPs
 	}
 
 
-	// DOL_CHANGE LDR
+	// @CHANGE LDR
 
 	/**
 	 * Image attachments are added to the content array as sub-arrays,
@@ -1546,7 +1546,7 @@ class SMTPs
 			$this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
 		}
 	}
-	// END DOL_CHANGE LDR
+	// END @CHANGE LDR
 
 
 	/**
@@ -1740,7 +1740,7 @@ class SMTPs
 	 */
 	function socket_send_str( $_strSend, $_returnCode = null, $CRLF = "\r\n" )
 	{
-		if ($this->_debug) $this->log.=$_strSend;	// DOL_CHANGE LDR for log
+		if ($this->_debug) $this->log.=$_strSend;	// @CHANGE LDR for log
 		fputs($this->socket, $_strSend . $CRLF);
 		if ($this->_debug) $this->log.=' ('.$_returnCode.')' . $CRLF;
 
diff --git a/htdocs/core/filemanagerdol/connectors/php/commands.php b/htdocs/core/filemanagerdol/connectors/php/commands.php
index 5c8e76a9522..5523708a3a0 100644
--- a/htdocs/core/filemanagerdol/connectors/php/commands.php
+++ b/htdocs/core/filemanagerdol/connectors/php/commands.php
@@ -183,7 +183,7 @@ function CreateFolder( $resourceType, $currentFolder )
 	echo '<Error number="' . $sErrorNumber . '" />' ;
 }
 
-// DOL_CHANGE
+// @CHANGE
 //function FileUpload( $resourceType, $currentFolder, $sCommand )
 /**
  * FileUpload
@@ -308,7 +308,7 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
 	$sFileUrl = CombinePaths($sFileUrl, $sFileName);
 
 
-	// DOL_CHANGE
+	// @CHANGE
 	//SendUploadResults( $sErrorNumber, $sFileUrl, $sFileName );
 	if($CKEcallback == '')
     {
diff --git a/htdocs/core/filemanagerdol/connectors/php/io.php b/htdocs/core/filemanagerdol/connectors/php/io.php
index 77c8c3ec253..66d024edce8 100644
--- a/htdocs/core/filemanagerdol/connectors/php/io.php
+++ b/htdocs/core/filemanagerdol/connectors/php/io.php
@@ -388,7 +388,7 @@ EOF;
 }
 
 
-// DOL_CHANGE
+// @CHANGE
 
 // This is the function that sends the results of the uploading process to CKE.
 /**
diff --git a/htdocs/core/filemanagerdol/connectors/php/upload.php b/htdocs/core/filemanagerdol/connectors/php/upload.php
index dc7235dc8a8..90230504705 100644
--- a/htdocs/core/filemanagerdol/connectors/php/upload.php
+++ b/htdocs/core/filemanagerdol/connectors/php/upload.php
@@ -60,7 +60,7 @@ if (! IsAllowedType($sType))
     SendUploadResults(1, '', '', 'Invalid type specified');
 
 
-// DOL_CHANGE
+// @CHANGE
 //FileUpload( $sType, $sCurrentFolder, $sCommand )
 
 // Get the CKEditor Callback
diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index 6fa6b55151e..b0849bb913e 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -37,7 +37,7 @@ $text_color=Array(0,0,0);
 /* ******************************************************************** */
 if (defined('DOL_DEFAULT_TTF_BOLD')) $font_loc=constant('DOL_DEFAULT_TTF_BOLD');
 // Automatic-Detection of Font if running Windows
-// DOL_CHANGE LDR
+// @CHANGE LDR
 if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])) $font_loc=$_SERVER['WINDIR'].'\Fonts\arialbd.ttf';
 if (empty($font_loc)) die('DOL_DEFAULT_TTF_BOLD must de defined with full path to a TTF font.');
 
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js b/htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
index 390f71cda16..795e4a7deb7 100644
--- a/htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
+++ b/htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
@@ -60,7 +60,7 @@ if(jQuery) (function($){
 				}
 				
 				function bindTree(t) {
-					/* DOL_CHANGE Replace LI A by LI A.jqft */
+					/* @CHANGE Replace LI A by LI A.jqft */
 					$(t).find('LI A.jqft').bind(o.folderEvent, function() {
 						if( $(this).parent().hasClass('directory') ) {
 							if( $(this).parent().hasClass('collapsed') ) {
@@ -85,7 +85,7 @@ if(jQuery) (function($){
 						return false;
 					});
 					// Prevent A from triggering the # on non-click events
-					/* DOL_CHANGE Replace LI A by LI A.jqft */
+					/* @CHANGE Replace LI A by LI A.jqft */
 					if( o.folderEvent.toLowerCase != 'click' ) $(t).find('LI A.jqft').bind('click', function() { return false; });
 				}
 				// Loading message
diff --git a/htdocs/includes/nusoap/lib/nusoap.php b/htdocs/includes/nusoap/lib/nusoap.php
index 3113a0ee513..56d1cf4c1a8 100644
--- a/htdocs/includes/nusoap/lib/nusoap.php
+++ b/htdocs/includes/nusoap/lib/nusoap.php
@@ -573,7 +573,7 @@ class nusoap_base {
 	                        }
 							$array_types[$tt] = 1;
 							// TODO: for literal, the name should be $name
-							// DOL_CHANGE This is to have tag name with name reported by wsdl and not "item"
+							// @CHANGE This is to have tag name with name reported by wsdl and not "item"
                             //$xml .= $this->serialize_val($v,'item',false,false,false,false,$use);
 							$tmp=preg_replace('/s$/i','',$name);
                             $xml .= $this->serialize_val($v,$tmp?$tmp:'item',false,false,false,false,$use);
@@ -6128,7 +6128,7 @@ class wsdl extends nusoap_base {
 					if (!in_array($typeDef['arrayType'],$this->typemap['http://www.w3.org/2001/XMLSchema'])) {
 					    $contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);
 					} else {
-                        // DOL_CHANGE This is to have tag name with name reported by wsdl and not "item"
+                        // @CHANGE This is to have tag name with name reported by wsdl and not "item"
                         //$contents .= $this->serialize_val($v, 'itemzzzz', $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);
                         $tmp=array_keys($typeDef['elements']);  //var_dump($tmp[0]);
 					    $contents .= $this->serialize_val($v, ($tmp[0]?$tmp[0]:'item'), $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
index 462cbcd4cc4..20a33ee3b70 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
@@ -263,7 +263,7 @@ class AutoLoader
      * @return bool false unless className now exists
      */
     private function loadLastResort($className, $loader = null) {
-        // DOL_CHANGE LDR Add protection to avoid conflict with other autoloader
+        // @CHANGE LDR Add protection to avoid conflict with other autoloader
         /*print 'Try to load '.$className."\n";
         if (in_array($className, array('Google_Client')))
         {
@@ -307,7 +307,7 @@ class AutoLoader
      */
     private function alias($className, $currentClass)
     {
-        // DOL_CHANGE LDR 
+        // @CHANGE LDR 
         if ($className == 'Luracast\Restler\string') return;
         if ($className == 'Luracast\Restler\mixed') return;
         
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html b/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
index c9b9fbff77b..0d73f19447e 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>Api Explorer</title>
-  <!-- DOL_CHANGE LDR Remove external links <link href='//fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'/>-->
+  <!-- @CHANGE LDR Remove external links <link href='//fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'/>-->
   <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
   <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
   <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
@@ -59,7 +59,7 @@
       var key = $('#input_apiKey')[0].value;
       log("key: " + key);
       if(key && key.trim() != "") {
-        /* DOL_CHANGE LDR We set DOLAPIKEY into header */
+        /* @CHANGE LDR We set DOLAPIKEY into header */
         log("added key " + key);
 
         /* Disabled for security reason. We keep only param in header
@@ -87,7 +87,7 @@
   <div class="swagger-ui-wrap">
     <a id="logo" href="#">API Explorer</a>
     <form id='api_selector'>
-      <!-- DOL_CHANGE LDR
+      <!-- @CHANGE LDR
       <div class='input icon-btn'>
         <img id="show-pet-store-icon" src="images/pet_store_api.png" title="Show Swagger Petstore Example Apis">
       </div>
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js
index c28bf145ab6..e73c242aaa5 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js
@@ -1539,7 +1539,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
       }
       $('.toggleEndpointList', this.el).click(this.callDocs.bind(this, 'toggleEndpointListForResource'));
       $('.collapseResource', this.el).click(this.callDocs.bind(this, 'collapseOperationsForResource'));
-      /* DOL_CHANGE LDR Fix typo error that break expand */
+      /* @CHANGE LDR Fix typo error that break expand */
       $('.expandResource', this.el).click(this.callDocs.bind(this, 'expandOperationsForResource'));
       return this;
     };