diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 6473a068672..6242e4f7e3c 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -680,7 +680,7 @@ class FormMail
 
 	/**
 	 *      Return template of email
-	 *      Search into table c_email_template
+	 *      Search into table c_email_templates
 	 *
 	 * 		@param	DoliDB		$db				Database handler
 	 * 		@param	string		$type_template	Get message for key module
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5f9c1c4f328..edf0b1b9dcd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3843,6 +3843,7 @@ function dol_string_is_good_iso($s)
  *	@param	string	$s			String to check
  * 	@param	int     $maxchar	Not yet used
  *	@return	int					Number of lines
+ *  @see	dol_nboflines_bis
  */
 function dol_nboflines($s,$maxchar=0)
 {
@@ -3861,6 +3862,7 @@ function dol_nboflines($s,$maxchar=0)
  *	@param	int		$maxlinesize  	Largeur de ligne en caracteres (ou 0 si pas de limite - defaut)
  * 	@param	string	$charset		Give the charset used to encode the $text variable in memory.
  *	@return int						Number of lines
+ *	@see	dol_nboflines
  */
 function dol_nboflines_bis($text,$maxlinesize=0,$charset='UTF-8')
 {
diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
index 19a8d888f43..5e633eb2660 100644
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -1088,8 +1088,8 @@ ALTER TABLE llx_usergroup_extrafields ADD INDEX idx_usergroup_extrafields (fk_ob
 
 ALTER TABLE llx_contrat ADD COLUMN model_pdf varchar(255) DEFAULT NULL AFTER note_public;
 
-ALTER TABLE llx_c_email_template ADD UNIQUE INDEX uk_c_email_template(label, lang);
-ALTER TABLE llx_c_email_template ADD INDEX idx_type(type_template);
+ALTER TABLE llx_c_email_templates ADD UNIQUE INDEX uk_c_email_templates(label, lang);
+ALTER TABLE llx_c_email_templates ADD INDEX idx_type(type_template);
 
 -- Remove OSC module
 DELETE FROM llx_const WHERE name = 'MAIN_MODULE_BOUTIQUE';
diff --git a/htdocs/install/mysql/tables/llx_c_email_template.key.sql b/htdocs/install/mysql/tables/llx_c_email_templates.key.sql
similarity index 85%
rename from htdocs/install/mysql/tables/llx_c_email_template.key.sql
rename to htdocs/install/mysql/tables/llx_c_email_templates.key.sql
index 3543d7448d1..f4a632e9afc 100644
--- a/htdocs/install/mysql/tables/llx_c_email_template.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_email_templates.key.sql
@@ -17,6 +17,6 @@
 -- Table with templates of emails
 -- ===================================================================
 
-ALTER TABLE llx_c_email_template ADD UNIQUE INDEX uk_c_email_template(label, lang);
-ALTER TABLE llx_c_email_template ADD INDEX idx_type(type_template);
+ALTER TABLE llx_c_email_templates ADD UNIQUE INDEX uk_c_email_templates(label, lang);
+ALTER TABLE llx_c_email_templates ADD INDEX idx_type(type_template);
 
diff --git a/htdocs/install/mysql/tables/llx_c_email_template.sql b/htdocs/install/mysql/tables/llx_c_email_templates.sql
similarity index 98%
rename from htdocs/install/mysql/tables/llx_c_email_template.sql
rename to htdocs/install/mysql/tables/llx_c_email_templates.sql
index ac424f31208..3a72690fb11 100644
--- a/htdocs/install/mysql/tables/llx_c_email_template.sql
+++ b/htdocs/install/mysql/tables/llx_c_email_templates.sql
@@ -17,7 +17,7 @@
 -- Table with templates of emails
 -- ===================================================================
 
-create table llx_c_email_template
+create table llx_c_email_templates
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   entity		  integer DEFAULT 1 NOT NULL,	  -- multi company id
diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql
index 04d7b445499..d96c5f48bfc 100644
--- a/htdocs/install/pgsql/functions/functions.sql
+++ b/htdocs/install/pgsql/functions/functions.sql
@@ -62,7 +62,7 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_adherent_type FOR EA
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_bank FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_bank_account FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_boxes_def FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_c_email_template FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_c_email_templates FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_c_field_list FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_c_shipment_mode FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_chargesociales FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();