diff --git a/mapping-tools/v1/apc/2018/apc-2018-doi.ini b/mapping-tools/v1/apc/2018/apc-2018-doi.ini
new file mode 100644
index 0000000..91e5334
--- /dev/null
+++ b/mapping-tools/v1/apc/2018/apc-2018-doi.ini
@@ -0,0 +1,20 @@
+append = dump?indent=true
+# Lit le fichier TSV, et renvoie du JSON [{id, value}]
+[use]
+plugin = basics
+plugin = analytics
+
+[URLStream]
+path = false
+
+[CSVParse]
+separator = ,
+
+[CSVObject]
+
+[replace]
+path = id
+value = get("DOI_C")
+
+path = value
+value = get("Montant def")
diff --git a/mapping-tools/v1/apc/2018/cout-par-doi.ini b/mapping-tools/v1/apc/2018/cout-par-doi.ini
deleted file mode 100644
index 91e5334..0000000
--- a/mapping-tools/v1/apc/2018/cout-par-doi.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-append = dump?indent=true
-# Lit le fichier TSV, et renvoie du JSON [{id, value}]
-[use]
-plugin = basics
-plugin = analytics
-
-[URLStream]
-path = false
-
-[CSVParse]
-separator = ,
-
-[CSVObject]
-
-[replace]
-path = id
-value = get("DOI_C")
-
-path = value
-value = get("Montant def")
diff --git a/mapping-tools/v1/apc/2018/doi.ini b/mapping-tools/v1/apc/2018/doi.ini
index 049fe12..b75ec4e 100644
--- a/mapping-tools/v1/apc/2018/doi.ini
+++ b/mapping-tools/v1/apc/2018/doi.ini
@@ -34,7 +34,7 @@
 path = value
 default = n/a
 primer = https://inist-wsdata.dboard.inist.fr/apc-2018-doi.csv
-file = ./cout-par-doi.ini
+file = ./apc-2018-doi.ini
 
 [assign]
 path = value
diff --git a/mapping-tools/v1/halAuthorId/idRef/halauthorid-idref-json.ini b/mapping-tools/v1/halAuthorId/idRef/halauthorid-idref-json.ini
new file mode 100644
index 0000000..7c55837
--- /dev/null
+++ b/mapping-tools/v1/halAuthorId/idRef/halauthorid-idref-json.ini
@@ -0,0 +1,17 @@
+# Lit le fichier CSV, et renvoie du JSON [{id, value}]
+[use]
+plugin = basics
+plugin = analytics
+
+[URLStream]
+path = false
+
+[CSVParse]
+separator = fix("\t")
+[CSVObject]
+[replace]
+path = id
+value = get("Halauthorid")
+
+path = value
+value = get("Idref")
diff --git a/mapping-tools/v1/halAuthorId/idRef/halauthorid2idref.ini b/mapping-tools/v1/halAuthorId/idRef/halauthorid2idref.ini
deleted file mode 100644
index 7c55837..0000000
--- a/mapping-tools/v1/halAuthorId/idRef/halauthorid2idref.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# Lit le fichier CSV, et renvoie du JSON [{id, value}]
-[use]
-plugin = basics
-plugin = analytics
-
-[URLStream]
-path = false
-
-[CSVParse]
-separator = fix("\t")
-[CSVObject]
-[replace]
-path = id
-value = get("Halauthorid")
-
-path = value
-value = get("Idref")
diff --git a/mapping-tools/v1/halAuthorId/idRef/json.ini b/mapping-tools/v1/halAuthorId/idRef/json.ini
index 882b54a..d1c8050 100644
--- a/mapping-tools/v1/halAuthorId/idRef/json.ini
+++ b/mapping-tools/v1/halAuthorId/idRef/json.ini
@@ -33,7 +33,7 @@
 path = value
 default = n/a
 primer = https://inist-wsdata.dboard.inist.fr/halauthorid-idref-json.tsv
-file = ./halauthorid2idref.ini
+file = ./halauthorid-idref-json.ini
 
 [assign]
 path = value
diff --git a/mapping-tools/v1/homogenize/documentType/homogenize-document-type.ini b/mapping-tools/v1/homogenize/documentType/homogenize-document-type.ini
deleted file mode 100644
index 4566b94..0000000
--- a/mapping-tools/v1/homogenize/documentType/homogenize-document-type.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# Lit le fichier TSV, et renvoie du JSON [{id, value}]
-[use]
-plugin = basics
-plugin = analytics
-
-[URLStream]
-path = false
-
-[CSVParse]
-separator = fix("\t")
-[CSVObject]
-[replace]
-path = id
-value = get('From')
-
-path = value
-value = get("To")
diff --git a/mapping-tools/v1/homogenize/documentType/homogenize-documenttype-json.ini b/mapping-tools/v1/homogenize/documentType/homogenize-documenttype-json.ini
new file mode 100644
index 0000000..4566b94
--- /dev/null
+++ b/mapping-tools/v1/homogenize/documentType/homogenize-documenttype-json.ini
@@ -0,0 +1,17 @@
+# Lit le fichier TSV, et renvoie du JSON [{id, value}]
+[use]
+plugin = basics
+plugin = analytics
+
+[URLStream]
+path = false
+
+[CSVParse]
+separator = fix("\t")
+[CSVObject]
+[replace]
+path = id
+value = get('From')
+
+path = value
+value = get("To")
diff --git a/mapping-tools/v1/homogenize/documentType/json.ini b/mapping-tools/v1/homogenize/documentType/json.ini
index d1062d2..8369a27 100644
--- a/mapping-tools/v1/homogenize/documentType/json.ini
+++ b/mapping-tools/v1/homogenize/documentType/json.ini
@@ -28,7 +28,7 @@
 path = value
 default = n/a
 primer = https://inist-wsdata.dboard.inist.fr/homogenize-documenttype-json.tsv
-file = ./homogenize-document-type.ini
+file = ./homogenize-documenttype-json.ini
 
 [assign]
 path = value
diff --git a/mapping-tools/v1/homogenize/publisher/homogenize-publisher-json.ini b/mapping-tools/v1/homogenize/publisher/homogenize-publisher-json.ini
new file mode 100644
index 0000000..4566b94
--- /dev/null
+++ b/mapping-tools/v1/homogenize/publisher/homogenize-publisher-json.ini
@@ -0,0 +1,17 @@
+# Lit le fichier TSV, et renvoie du JSON [{id, value}]
+[use]
+plugin = basics
+plugin = analytics
+
+[URLStream]
+path = false
+
+[CSVParse]
+separator = fix("\t")
+[CSVObject]
+[replace]
+path = id
+value = get('From')
+
+path = value
+value = get("To")
diff --git a/mapping-tools/v1/homogenize/publisher/homogenize-publisher.ini b/mapping-tools/v1/homogenize/publisher/homogenize-publisher.ini
deleted file mode 100644
index 4566b94..0000000
--- a/mapping-tools/v1/homogenize/publisher/homogenize-publisher.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# Lit le fichier TSV, et renvoie du JSON [{id, value}]
-[use]
-plugin = basics
-plugin = analytics
-
-[URLStream]
-path = false
-
-[CSVParse]
-separator = fix("\t")
-[CSVObject]
-[replace]
-path = id
-value = get('From')
-
-path = value
-value = get("To")
diff --git a/mapping-tools/v1/homogenize/publisher/json.ini b/mapping-tools/v1/homogenize/publisher/json.ini
index 868bdc8..5a0b63f 100644
--- a/mapping-tools/v1/homogenize/publisher/json.ini
+++ b/mapping-tools/v1/homogenize/publisher/json.ini
@@ -28,7 +28,7 @@
 path = value
 default = n/a
 primer = https://inist-wsdata.dboard.inist.fr/homogenize-publisher-json.tsv
-file = ./homogenize-publisher.ini
+file = ./homogenize-publisher-json.ini
 
 [assign]
 path = value
diff --git a/mapping-tools/v1/homogenize/source/homogenize-source-json.ini b/mapping-tools/v1/homogenize/source/homogenize-source-json.ini
new file mode 100644
index 0000000..4566b94
--- /dev/null
+++ b/mapping-tools/v1/homogenize/source/homogenize-source-json.ini
@@ -0,0 +1,17 @@
+# Lit le fichier TSV, et renvoie du JSON [{id, value}]
+[use]
+plugin = basics
+plugin = analytics
+
+[URLStream]
+path = false
+
+[CSVParse]
+separator = fix("\t")
+[CSVObject]
+[replace]
+path = id
+value = get('From')
+
+path = value
+value = get("To")
diff --git a/mapping-tools/v1/homogenize/source/homogenize-source.ini b/mapping-tools/v1/homogenize/source/homogenize-source.ini
deleted file mode 100644
index 4566b94..0000000
--- a/mapping-tools/v1/homogenize/source/homogenize-source.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# Lit le fichier TSV, et renvoie du JSON [{id, value}]
-[use]
-plugin = basics
-plugin = analytics
-
-[URLStream]
-path = false
-
-[CSVParse]
-separator = fix("\t")
-[CSVObject]
-[replace]
-path = id
-value = get('From')
-
-path = value
-value = get("To")
diff --git a/mapping-tools/v1/homogenize/source/json.ini b/mapping-tools/v1/homogenize/source/json.ini
index b6d0276..fca9f08 100644
--- a/mapping-tools/v1/homogenize/source/json.ini
+++ b/mapping-tools/v1/homogenize/source/json.ini
@@ -28,7 +28,7 @@
 path = value
 default = n/a
 primer = https://inist-wsdata.dboard.inist.fr/homogenize-source-json.tsv
-file = ./homogenize-source.ini
+file = ./homogenize-source-json.ini
 
 [assign]
 path = value
diff --git a/mapping-tools/v1/idRef/orcid/idref-orcid-json.ini b/mapping-tools/v1/idRef/orcid/idref-orcid-json.ini
new file mode 100644
index 0000000..be9cbb9
--- /dev/null
+++ b/mapping-tools/v1/idRef/orcid/idref-orcid-json.ini
@@ -0,0 +1,17 @@
+# Lit le fichier CSV, et renvoie du JSON [{id, value}]
+[use]
+plugin = basics
+plugin = analytics
+
+[URLStream]
+path = false
+
+[CSVParse]
+separator = fix("\t")
+[CSVObject]
+[replace]
+path = id
+value = get("idref")
+
+path = value
+value = get("orcid")
diff --git a/mapping-tools/v1/idRef/orcid/idref2orcid.ini b/mapping-tools/v1/idRef/orcid/idref2orcid.ini
deleted file mode 100644
index be9cbb9..0000000
--- a/mapping-tools/v1/idRef/orcid/idref2orcid.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# Lit le fichier CSV, et renvoie du JSON [{id, value}]
-[use]
-plugin = basics
-plugin = analytics
-
-[URLStream]
-path = false
-
-[CSVParse]
-separator = fix("\t")
-[CSVObject]
-[replace]
-path = id
-value = get("idref")
-
-path = value
-value = get("orcid")
diff --git a/mapping-tools/v1/idRef/orcid/json.ini b/mapping-tools/v1/idRef/orcid/json.ini
index f360fef..1f9b3a0 100644
--- a/mapping-tools/v1/idRef/orcid/json.ini
+++ b/mapping-tools/v1/idRef/orcid/json.ini
@@ -29,7 +29,7 @@
 path = value
 default = n/a
 primer = https://inist-wsdata.dboard.inist.fr/idref-orcid-json.tsv
-file = ./idref2orcid.ini
+file = ./idref-orcid-json.ini
 
 [assign]
 path = value
diff --git a/mapping-tools/v1/inspire-category/meta-category/inspire-category-meta-category-json.ini b/mapping-tools/v1/inspire-category/meta-category/inspire-category-meta-category-json.ini
new file mode 100644
index 0000000..a7b1f89
--- /dev/null
+++ b/mapping-tools/v1/inspire-category/meta-category/inspire-category-meta-category-json.ini
@@ -0,0 +1,17 @@
+# Lit le fichier TSV, et renvoie du JSON [{id, value}]
+[use]
+plugin = basics
+plugin = analytics
+
+[URLStream]
+path = false
+
+[CSVParse]
+separator = fix("\t")
+[CSVObject]
+[replace]
+path = id
+value = get("FROM")
+
+path = value
+value = get("TO")
diff --git a/mapping-tools/v1/inspire-category/meta-category/json.ini b/mapping-tools/v1/inspire-category/meta-category/json.ini
index 4c403e0..41d1ddd 100644
--- a/mapping-tools/v1/inspire-category/meta-category/json.ini
+++ b/mapping-tools/v1/inspire-category/meta-category/json.ini
@@ -34,7 +34,7 @@
 path = value
 default = n/a
 primer = https://inist-wsdata.dboard.inist.fr/inspire-category-meta-category-json.tsv
-file = ./regroupement-inspire-categories.ini
+file = ./inspire-category-meta-category-json.ini
 
 [assign]
 path = value
diff --git a/mapping-tools/v1/inspire-category/meta-category/regroupement-inspire-categories.ini b/mapping-tools/v1/inspire-category/meta-category/regroupement-inspire-categories.ini
deleted file mode 100644
index a7b1f89..0000000
--- a/mapping-tools/v1/inspire-category/meta-category/regroupement-inspire-categories.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# Lit le fichier TSV, et renvoie du JSON [{id, value}]
-[use]
-plugin = basics
-plugin = analytics
-
-[URLStream]
-path = false
-
-[CSVParse]
-separator = fix("\t")
-[CSVObject]
-[replace]
-path = id
-value = get("FROM")
-
-path = value
-value = get("TO")
diff --git a/mapping-tools/v1/inspire-labos/in2p3-labos/inspire-labos-in2p3-labos-json.ini b/mapping-tools/v1/inspire-labos/in2p3-labos/inspire-labos-in2p3-labos-json.ini
new file mode 100644
index 0000000..a7b1f89
--- /dev/null
+++ b/mapping-tools/v1/inspire-labos/in2p3-labos/inspire-labos-in2p3-labos-json.ini
@@ -0,0 +1,17 @@
+# Lit le fichier TSV, et renvoie du JSON [{id, value}]
+[use]
+plugin = basics
+plugin = analytics
+
+[URLStream]
+path = false
+
+[CSVParse]
+separator = fix("\t")
+[CSVObject]
+[replace]
+path = id
+value = get("FROM")
+
+path = value
+value = get("TO")
diff --git a/mapping-tools/v1/inspire-labos/in2p3-labos/json.ini b/mapping-tools/v1/inspire-labos/in2p3-labos/json.ini
index 5567b68..8de4dd3 100644
--- a/mapping-tools/v1/inspire-labos/in2p3-labos/json.ini
+++ b/mapping-tools/v1/inspire-labos/in2p3-labos/json.ini
@@ -34,7 +34,7 @@
 path = value
 default = n/a
 primer = https://inist-wsdata.dboard.inist.fr/inspire-labos-in2p3-labos-json.tsv
-file = ./regroupement-inspire-labos.ini
+file = ./inspire-labos-in2p3-labos-json.ini
 
 [assign]
 path = value
diff --git a/mapping-tools/v1/inspire-labos/in2p3-labos/regroupement-inspire-labos.ini b/mapping-tools/v1/inspire-labos/in2p3-labos/regroupement-inspire-labos.ini
deleted file mode 100644
index a7b1f89..0000000
--- a/mapping-tools/v1/inspire-labos/in2p3-labos/regroupement-inspire-labos.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# Lit le fichier TSV, et renvoie du JSON [{id, value}]
-[use]
-plugin = basics
-plugin = analytics
-
-[URLStream]
-path = false
-
-[CSVParse]
-separator = fix("\t")
-[CSVObject]
-[replace]
-path = id
-value = get("FROM")
-
-path = value
-value = get("TO")
diff --git a/mapping-tools/v1/rnsr/instituts-cnrs/instituts-cnrs.ini b/mapping-tools/v1/rnsr/instituts-cnrs/instituts-cnrs.ini
deleted file mode 100644
index ef836de..0000000
--- a/mapping-tools/v1/rnsr/instituts-cnrs/instituts-cnrs.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# Lit le fichier CSV, et renvoie du JSON [{id, value}]
-[use]
-plugin = basics
-plugin = analytics
-
-[URLStream]
-path = false
-
-[CSVParse]
-separator = fix("\t")
-[CSVObject]
-[replace]
-path = id
-value = get('From')
-
-path = value
-value = get("To")
diff --git a/mapping-tools/v1/rnsr/instituts-cnrs/json.ini b/mapping-tools/v1/rnsr/instituts-cnrs/json.ini
index cf880c1..66d3f37 100644
--- a/mapping-tools/v1/rnsr/instituts-cnrs/json.ini
+++ b/mapping-tools/v1/rnsr/instituts-cnrs/json.ini
@@ -24,7 +24,7 @@
 path = value
 default = n/a
 primer = https://inist-wsdata.dboard.inist.fr/rnsr-instituts-cnrs-json.tsv
-file = ./instituts-cnrs.ini
+file = ./rnsr-instituts-cnrs-json.ini
 
 [assign]
 path = value
diff --git a/mapping-tools/v1/rnsr/instituts-cnrs/rnsr-instituts-cnrs-json.ini b/mapping-tools/v1/rnsr/instituts-cnrs/rnsr-instituts-cnrs-json.ini
new file mode 100644
index 0000000..ef836de
--- /dev/null
+++ b/mapping-tools/v1/rnsr/instituts-cnrs/rnsr-instituts-cnrs-json.ini
@@ -0,0 +1,17 @@
+# Lit le fichier CSV, et renvoie du JSON [{id, value}]
+[use]
+plugin = basics
+plugin = analytics
+
+[URLStream]
+path = false
+
+[CSVParse]
+separator = fix("\t")
+[CSVObject]
+[replace]
+path = id
+value = get('From')
+
+path = value
+value = get("To")