diff --git a/equipment_history.html b/equipment_history.html
index 7f5c096..9bb584d 100644
--- a/equipment_history.html
+++ b/equipment_history.html
@@ -145,9 +145,9 @@
 	{{#select
 		mvt.key AS mvt_key,
 		json_extract(mvt.document, '$.amount') - IFNULL(SUM(json_extract(mvt2.document, '$.amount')), 0) AS reste
-		FROM module_data_equipment AS mvt
-		LEFT JOIN module_data_equipment AS link ON mvt.key = json_extract(link.document, '$.temp_key')
-		LEFT JOIN module_data_equipment AS mvt2 ON mvt2.key = json_extract(link.document, '$.return')
+		FROM {!$module.table} AS mvt
+		LEFT JOIN {!$module.table} AS link ON mvt.key = json_extract(link.document, '$.temp_key')
+		LEFT JOIN {!$module.table} AS mvt2 ON mvt2.key = json_extract(link.document, '$.return')
 		WHERE
 			json_extract(mvt.document, '$.operation') IN !op
 		AND json_extract(mvt.document, '$.equipment') = :eqpmt_key
@@ -248,9 +248,9 @@
 	{{#select
 		mvt.key AS mvt_key,
 		json_extract(mvt.document, '$.amount') - IFNULL(SUM(json_extract(mvt2.document, '$.amount')), 0) AS present
-		FROM module_data_equipment AS mvt
-		LEFT JOIN module_data_equipment AS link ON mvt.key = json_extract(link.document, '$.temp_key')
-		LEFT JOIN module_data_equipment AS mvt2 ON mvt2.key = json_extract(link.document, '$.return')
+		FROM {!$module.table} AS mvt
+		LEFT JOIN {!$module.table} AS link ON mvt.key = json_extract(link.document, '$.temp_key')
+		LEFT JOIN {!$module.table} AS mvt2 ON mvt2.key = json_extract(link.document, '$.return')
 		WHERE
 			json_extract(mvt.document, '$.operation') IN !op
 		AND json_extract(mvt.document, '$.equipment') = :eqpmt_key
diff --git a/movements/input_return.html b/movements/input_return.html
index 03e567b..4683205 100644
--- a/movements/input_return.html
+++ b/movements/input_return.html
@@ -32,9 +32,9 @@
 
 {{#select
 	json_extract(mvt.document, '$.amount') - IFNULL(SUM(json_extract(mvt2.document, '$.amount')), 0) AS present
-	FROM module_data_equipment AS mvt
-	LEFT JOIN module_data_equipment AS link ON mvt.key = json_extract(link.document, '$.temp_key')
-	LEFT JOIN module_data_equipment AS mvt2 ON mvt2.key = json_extract(link.document, '$.return')
+	FROM {!$module.table} AS mvt
+	LEFT JOIN {!$module.table} AS link ON mvt.key = json_extract(link.document, '$.temp_key')
+	LEFT JOIN {!$module.table} AS mvt2 ON mvt2.key = json_extract(link.document, '$.return')
 	WHERE
 	json_extract(mvt.document, '$.operation') IN !op
 	AND mvt.key = :mvt_key
diff --git a/movements/output_return.html b/movements/output_return.html
index 679de12..7f5b0af 100644
--- a/movements/output_return.html
+++ b/movements/output_return.html
@@ -32,9 +32,9 @@
 
 {{#select
 	json_extract(mvt.document, '$.amount') - IFNULL(SUM(json_extract(mvt2.document, '$.amount')), 0) AS exterieur
-	FROM module_data_equipment AS mvt
-	LEFT JOIN module_data_equipment AS link ON mvt.key = json_extract(link.document, '$.temp_key')
-	LEFT JOIN module_data_equipment AS mvt2 ON mvt2.key = json_extract(link.document, '$.return')
+	FROM {!$module.table} AS mvt
+	LEFT JOIN {!$module.table} AS link ON mvt.key = json_extract(link.document, '$.temp_key')
+	LEFT JOIN {!$module.table} AS mvt2 ON mvt2.key = json_extract(link.document, '$.return')
 	WHERE
 	json_extract(mvt.document, '$.operation') IN !op
 	AND mvt.key = :mvt_key