diff --git a/htdocs/install/mysql/tables/llx_bom_bom.key.sql b/htdocs/install/mysql/tables/llx_bom_bom-bom.key.sql
similarity index 99%
rename from htdocs/install/mysql/tables/llx_bom_bom.key.sql
rename to htdocs/install/mysql/tables/llx_bom_bom-bom.key.sql
index cd2e4e6487c..c1e6982153a 100644
--- a/htdocs/install/mysql/tables/llx_bom_bom.key.sql
+++ b/htdocs/install/mysql/tables/llx_bom_bom-bom.key.sql
@@ -25,4 +25,3 @@ ALTER TABLE llx_bom_bom ADD INDEX idx_bom_bom_fk_product (fk_product);
 ALTER TABLE llx_bom_bom ADD UNIQUE INDEX uk_bom_bom_ref(ref, entity);
 
 --ALTER TABLE llx_bom_bom ADD CONSTRAINT llx_bom_bom_fk_field FOREIGN KEY (fk_field) REFERENCES llx_bom_myotherobject(rowid);
-
diff --git a/htdocs/install/mysql/tables/llx_bom_bom.sql b/htdocs/install/mysql/tables/llx_bom_bom-bom.sql
similarity index 83%
rename from htdocs/install/mysql/tables/llx_bom_bom.sql
rename to htdocs/install/mysql/tables/llx_bom_bom-bom.sql
index 01ec2e63a3e..6b2efad15bc 100644
--- a/htdocs/install/mysql/tables/llx_bom_bom.sql
+++ b/htdocs/install/mysql/tables/llx_bom_bom-bom.sql
@@ -19,24 +19,24 @@ CREATE TABLE llx_bom_bom(
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
 	entity integer DEFAULT 1 NOT NULL,
 	ref varchar(128) NOT NULL,
-	bomtype integer DEFAULT 0,                  -- 0 for a BOM to manufacture, 1 for a BOM to dismantle 
-	label varchar(255), 
-	fk_product integer, 
-	description text, 
-	note_public text, 
-	note_private text, 
+	bomtype integer DEFAULT 0,                  -- 0 for a BOM to manufacture, 1 for a BOM to dismantle
+	label varchar(255),
+	fk_product integer,
+	description text,
+	note_public text,
+	note_private text,
 	fk_warehouse integer,
 	qty double(24,8),
 	efficiency double(24,8) DEFAULT 1,
 	duration double(24,8) DEFAULT NULL,
 	date_creation datetime NOT NULL,
 	date_valid datetime,
-	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_creat integer NOT NULL,
-	fk_user_modif integer, 
-	fk_user_valid integer, 
+	fk_user_modif integer,
+	fk_user_valid integer,
 	import_key varchar(14),
-	model_pdf varchar(255), 
-	status integer NOT NULL 
+	model_pdf varchar(255),
+	status integer NOT NULL
 	-- END MODULEBUILDER FIELDS
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_bom_bom_extrafields.key.sql b/htdocs/install/mysql/tables/llx_bom_bom_extrafields-bom.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_bom_bom_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_bom_bom_extrafields-bom.key.sql
diff --git a/htdocs/install/mysql/tables/llx_bom_bom_extrafields.sql b/htdocs/install/mysql/tables/llx_bom_bom_extrafields-bom.sql
similarity index 99%
rename from htdocs/install/mysql/tables/llx_bom_bom_extrafields.sql
rename to htdocs/install/mysql/tables/llx_bom_bom_extrafields-bom.sql
index 15210546fda..3fb82b26055 100644
--- a/htdocs/install/mysql/tables/llx_bom_bom_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_bom_bom_extrafields-bom.sql
@@ -20,4 +20,3 @@ create table llx_bom_bom_extrafields
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
-
diff --git a/htdocs/install/mysql/tables/llx_bom_bomline.key.sql b/htdocs/install/mysql/tables/llx_bom_bomline-bom.key.sql
similarity index 99%
rename from htdocs/install/mysql/tables/llx_bom_bomline.key.sql
rename to htdocs/install/mysql/tables/llx_bom_bomline-bom.key.sql
index c5e52844c47..4e86cf5cdf8 100644
--- a/htdocs/install/mysql/tables/llx_bom_bomline.key.sql
+++ b/htdocs/install/mysql/tables/llx_bom_bomline-bom.key.sql
@@ -23,4 +23,3 @@ ALTER TABLE llx_bom_bomline ADD INDEX idx_bom_bomline_fk_bom (fk_bom);
 --ALTER TABLE llx_bom_bomline ADD UNIQUE INDEX uk_bom_bomline_fieldxy(fieldx, fieldy);
 
 ALTER TABLE llx_bom_bomline ADD CONSTRAINT llx_bom_bomline_fk_bom FOREIGN KEY (fk_bom) REFERENCES llx_bom_bom(rowid);
-
diff --git a/htdocs/install/mysql/tables/llx_bom_bomline.sql b/htdocs/install/mysql/tables/llx_bom_bomline-bom.sql
similarity index 84%
rename from htdocs/install/mysql/tables/llx_bom_bomline.sql
rename to htdocs/install/mysql/tables/llx_bom_bomline-bom.sql
index 54eb738ad94..bb0834fb9be 100644
--- a/htdocs/install/mysql/tables/llx_bom_bomline.sql
+++ b/htdocs/install/mysql/tables/llx_bom_bomline-bom.sql
@@ -15,16 +15,16 @@
 
 CREATE TABLE llx_bom_bomline(
 	-- BEGIN MODULEBUILDER FIELDS
-	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
-	fk_bom integer NOT NULL, 
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+	fk_bom integer NOT NULL,
 	fk_product integer NOT NULL,
 	fk_bom_child integer NULL,
-	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
-	description text, 
-	import_key varchar(14), 
-	qty double(24,8) NOT NULL, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+	description text,
+	import_key varchar(14),
+	qty double(24,8) NOT NULL,
     qty_frozen smallint DEFAULT 0,
-    disable_stock_change smallint DEFAULT 0, 
+    disable_stock_change smallint DEFAULT 0,
 	efficiency double(24,8) NOT NULL DEFAULT 1,
 	fk_unit integer NULL,
 	position integer NOT NULL DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_bom_bomline_extrafields.sql b/htdocs/install/mysql/tables/llx_bom_bomline_extrafields-bom.sql
similarity index 99%
rename from htdocs/install/mysql/tables/llx_bom_bomline_extrafields.sql
rename to htdocs/install/mysql/tables/llx_bom_bomline_extrafields-bom.sql
index 8ed3e96bd11..65a1fbe1b52 100644
--- a/htdocs/install/mysql/tables/llx_bom_bomline_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_bom_bomline_extrafields-bom.sql
@@ -20,4 +20,3 @@ create table llx_bom_bomline_extrafields
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
-
diff --git a/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.key.sql b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus-productbatch.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.key.sql
rename to htdocs/install/mysql/tables/llx_c_productbatch_qcstatus-productbatch.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus-productbatch.sql
similarity index 96%
rename from htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
rename to htdocs/install/mysql/tables/llx_c_productbatch_qcstatus-productbatch.sql
index 06a2a76220d..97e77c96046 100644
--- a/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
+++ b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus-productbatch.sql
@@ -23,5 +23,5 @@ CREATE TABLE llx_c_productbatch_qcstatus
   entity 	 integer NOT NULL DEFAULT 1,
   code     varchar(16)        NOT NULL,
   label    varchar(128)        NOT NULL,
-  active   integer  DEFAULT 1 NOT NULL  
+  active   integer  DEFAULT 1 NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_ticket_category.key.sql b/htdocs/install/mysql/tables/llx_c_ticket_category-ticket.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_ticket_category.key.sql
rename to htdocs/install/mysql/tables/llx_c_ticket_category-ticket.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_ticket_category.sql b/htdocs/install/mysql/tables/llx_c_ticket_category-ticket.sql
similarity index 90%
rename from htdocs/install/mysql/tables/llx_c_ticket_category.sql
rename to htdocs/install/mysql/tables/llx_c_ticket_category-ticket.sql
index 8477b455796..971fb844ce3 100644
--- a/htdocs/install/mysql/tables/llx_c_ticket_category.sql
+++ b/htdocs/install/mysql/tables/llx_c_ticket_category-ticket.sql
@@ -15,8 +15,9 @@
 -- along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 --
--- Table with the custom category tree for the category of a ticket
--- 
+-- Table with the custom group tree for the group of a ticket.
+-- This is for classification. It is different of the tag/category table.
+--
 
 create table llx_c_ticket_category
 (
diff --git a/htdocs/install/mysql/tables/llx_c_ticket_resolution.key.sql b/htdocs/install/mysql/tables/llx_c_ticket_resolution-ticket.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_ticket_resolution.key.sql
rename to htdocs/install/mysql/tables/llx_c_ticket_resolution-ticket.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_ticket_resolution.sql b/htdocs/install/mysql/tables/llx_c_ticket_resolution-ticket.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_ticket_resolution.sql
rename to htdocs/install/mysql/tables/llx_c_ticket_resolution-ticket.sql
diff --git a/htdocs/install/mysql/tables/llx_c_ticket_severity.key.sql b/htdocs/install/mysql/tables/llx_c_ticket_severity-ticket.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_ticket_severity.key.sql
rename to htdocs/install/mysql/tables/llx_c_ticket_severity-ticket.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_ticket_severity.sql b/htdocs/install/mysql/tables/llx_c_ticket_severity-ticket.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_ticket_severity.sql
rename to htdocs/install/mysql/tables/llx_c_ticket_severity-ticket.sql
diff --git a/htdocs/install/mysql/tables/llx_c_ticket_type.key.sql b/htdocs/install/mysql/tables/llx_c_ticket_type-ticket.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_ticket_type.key.sql
rename to htdocs/install/mysql/tables/llx_c_ticket_type-ticket.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_ticket_type.sql b/htdocs/install/mysql/tables/llx_c_ticket_type-ticket.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_ticket_type.sql
rename to htdocs/install/mysql/tables/llx_c_ticket_type-ticket.sql
diff --git a/htdocs/install/mysql/tables/llx_mrp_mo.key.sql b/htdocs/install/mysql/tables/llx_mrp_mo-mrp.key.sql
similarity index 99%
rename from htdocs/install/mysql/tables/llx_mrp_mo.key.sql
rename to htdocs/install/mysql/tables/llx_mrp_mo-mrp.key.sql
index 5c218763ff6..0bf20b1b48e 100644
--- a/htdocs/install/mysql/tables/llx_mrp_mo.key.sql
+++ b/htdocs/install/mysql/tables/llx_mrp_mo-mrp.key.sql
@@ -30,4 +30,3 @@ ALTER TABLE llx_mrp_mo ADD INDEX idx_mrp_mo_fk_project (fk_project);
 --ALTER TABLE llx_mrp_mo ADD UNIQUE INDEX uk_mrp_mo_fieldxy(fieldx, fieldy);
 
 --ALTER TABLE llx_mrp_mo ADD CONSTRAINT llx_mrp_mo_fk_field FOREIGN KEY (fk_field) REFERENCES llx_mrp_myotherobject(rowid);
-
diff --git a/htdocs/install/mysql/tables/llx_mrp_mo.sql b/htdocs/install/mysql/tables/llx_mrp_mo-mrp.sql
similarity index 72%
rename from htdocs/install/mysql/tables/llx_mrp_mo.sql
rename to htdocs/install/mysql/tables/llx_mrp_mo-mrp.sql
index 14cfdf36c1e..fd97ee2a0ea 100644
--- a/htdocs/install/mysql/tables/llx_mrp_mo.sql
+++ b/htdocs/install/mysql/tables/llx_mrp_mo-mrp.sql
@@ -16,29 +16,29 @@
 
 CREATE TABLE llx_mrp_mo(
 	-- BEGIN MODULEBUILDER FIELDS
-	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
-	entity integer DEFAULT 1 NOT NULL, 
-	ref varchar(128) DEFAULT '(PROV)' NOT NULL, 
-	mrptype integer DEFAULT 0,                  -- 0 for a manufacture MO, 1 for a dismantle MO 
-	label varchar(255), 
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+	entity integer DEFAULT 1 NOT NULL,
+	ref varchar(128) DEFAULT '(PROV)' NOT NULL,
+	mrptype integer DEFAULT 0,                  -- 0 for a manufacture MO, 1 for a dismantle MO
+	label varchar(255),
 	qty real NOT NULL,
 	fk_warehouse integer,
-	fk_soc integer, 
-	note_public text, 
-	note_private text, 
-	date_creation datetime NOT NULL, 
+	fk_soc integer,
+	note_public text,
+	note_private text,
+	date_creation datetime NOT NULL,
 	date_valid datetime NULL,
-	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
-	fk_user_creat integer NOT NULL, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+	fk_user_creat integer NOT NULL,
 	fk_user_modif integer,
 	fk_user_valid integer,
 	import_key varchar(14),
 	model_pdf varchar(255),
-	status integer NOT NULL, 
-	fk_product integer NOT NULL, 
-	date_start_planned datetime, 
-	date_end_planned datetime, 
-	fk_bom integer, 
+	status integer NOT NULL,
+	fk_product integer NOT NULL,
+	date_start_planned datetime,
+	date_end_planned datetime,
+	fk_bom integer,
 	fk_project integer,
 	last_main_doc varchar(255),
     fk_parent_line integer
diff --git a/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.key.sql b/htdocs/install/mysql/tables/llx_mrp_mo_extrafields-mrp.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_mrp_mo_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_mrp_mo_extrafields-mrp.key.sql
diff --git a/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.sql b/htdocs/install/mysql/tables/llx_mrp_mo_extrafields-mrp.sql
similarity index 99%
rename from htdocs/install/mysql/tables/llx_mrp_mo_extrafields.sql
rename to htdocs/install/mysql/tables/llx_mrp_mo_extrafields-mrp.sql
index 517c269cf0f..96dc828134e 100644
--- a/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_mrp_mo_extrafields-mrp.sql
@@ -20,4 +20,3 @@ create table llx_mrp_mo_extrafields
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
-
diff --git a/htdocs/install/mysql/tables/llx_mrp_production.key.sql b/htdocs/install/mysql/tables/llx_mrp_production-mrp.key.sql
similarity index 99%
rename from htdocs/install/mysql/tables/llx_mrp_production.key.sql
rename to htdocs/install/mysql/tables/llx_mrp_production-mrp.key.sql
index d77ef297e82..b231cec924b 100644
--- a/htdocs/install/mysql/tables/llx_mrp_production.key.sql
+++ b/htdocs/install/mysql/tables/llx_mrp_production-mrp.key.sql
@@ -18,4 +18,3 @@ ALTER TABLE llx_mrp_production ADD CONSTRAINT fk_mrp_production_product FOREIGN
 ALTER TABLE llx_mrp_production ADD CONSTRAINT fk_mrp_production_stock_movement FOREIGN KEY (fk_stock_movement) REFERENCES llx_stock_mouvement (rowid);
 
 ALTER TABLE llx_mrp_production ADD INDEX idx_mrp_production_fk_mo (fk_mo);
-
diff --git a/htdocs/install/mysql/tables/llx_mrp_production.sql b/htdocs/install/mysql/tables/llx_mrp_production-mrp.sql
similarity index 89%
rename from htdocs/install/mysql/tables/llx_mrp_production.sql
rename to htdocs/install/mysql/tables/llx_mrp_production-mrp.sql
index ce3ad263e87..d6e2b781453 100644
--- a/htdocs/install/mysql/tables/llx_mrp_production.sql
+++ b/htdocs/install/mysql/tables/llx_mrp_production-mrp.sql
@@ -15,12 +15,12 @@
 
 
 CREATE TABLE llx_mrp_production(
-	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
 	fk_mo integer NOT NULL,
 	origin_id integer,
 	origin_type varchar(10),		-- 'bom' bom production line or 'free' free production line added after Mo creation from bom
 	position integer NOT NULL DEFAULT 0,
-	fk_product integer NOT NULL, 
+	fk_product integer NOT NULL,
 	fk_warehouse integer,
 	qty real NOT NULL DEFAULT 1,
 	qty_frozen smallint DEFAULT 0,
@@ -29,12 +29,11 @@ CREATE TABLE llx_mrp_production(
 	role varchar(10),				-- 'toconsume' or 'toproduce' (initialized at MO creation), 'consumed' or 'produced' (added after MO validation)
 	fk_mrp_production integer,		-- if role = 'consumed', id of line with role 'toconsume', if role = 'produced' id of line with role 'toproduce'
 	fk_stock_movement integer,		-- id of stock movement when movements are validated
-	date_creation datetime NOT NULL, 
-	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
-	fk_user_creat integer NOT NULL, 
-	fk_user_modif integer, 
+	date_creation datetime NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+	fk_user_creat integer NOT NULL,
+	fk_user_modif integer,
 	import_key varchar(14),
 	fk_default_workstation integer DEFAULT NULL,
 	fk_unit integer DEFAULT NULL
 ) ENGINE=innodb;
-
diff --git a/htdocs/install/mysql/tables/llx_mrp_production_extrafields.key.sql b/htdocs/install/mysql/tables/llx_mrp_production_extrafields-mrp.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_mrp_production_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_mrp_production_extrafields-mrp.key.sql
diff --git a/htdocs/install/mysql/tables/llx_mrp_production_extrafields.sql b/htdocs/install/mysql/tables/llx_mrp_production_extrafields-mrp.sql
similarity index 98%
rename from htdocs/install/mysql/tables/llx_mrp_production_extrafields.sql
rename to htdocs/install/mysql/tables/llx_mrp_production_extrafields-mrp.sql
index 1bc20db8c47..8ba83c7747b 100644
--- a/htdocs/install/mysql/tables/llx_mrp_production_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_mrp_production_extrafields-mrp.sql
@@ -19,4 +19,4 @@ create table llx_mrp_production_extrafields
     tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_object                 integer NOT NULL,
     import_key                varchar(14)                          		-- import key
-) ENGINE=innodb;
\ No newline at end of file
+) ENGINE=innodb;