diff --git a/miracl-v1.0-ar/qrels/ar.qrels.dev.tsv b/miracl-v1.0-ar/qrels/qrels.miracl-v1.0-ar-dev.tsv
similarity index 100%
rename from miracl-v1.0-ar/qrels/ar.qrels.dev.tsv
rename to miracl-v1.0-ar/qrels/qrels.miracl-v1.0-ar-dev.tsv
diff --git a/miracl-v1.0-ar/qrels/ar.qrels.train.tsv b/miracl-v1.0-ar/qrels/qrels.miracl-v1.0-ar-train.tsv
similarity index 100%
rename from miracl-v1.0-ar/qrels/ar.qrels.train.tsv
rename to miracl-v1.0-ar/qrels/qrels.miracl-v1.0-ar-train.tsv
diff --git a/miracl-v1.0-ar/topics/ar.topic.dev.tsv b/miracl-v1.0-ar/topics/topics.miracl-v1.0-ar-dev.tsv
similarity index 100%
rename from miracl-v1.0-ar/topics/ar.topic.dev.tsv
rename to miracl-v1.0-ar/topics/topics.miracl-v1.0-ar-dev.tsv
diff --git a/miracl-v1.0-ar/topics/ar.topic.train.tsv b/miracl-v1.0-ar/topics/topics.miracl-v1.0-ar-train.tsv
similarity index 100%
rename from miracl-v1.0-ar/topics/ar.topic.train.tsv
rename to miracl-v1.0-ar/topics/topics.miracl-v1.0-ar-train.tsv
diff --git a/miracl-v1.0-bn/qrels/bn.qrels.dev.tsv b/miracl-v1.0-bn/qrels/qrels.miracl-v1.0-bn-dev.tsv
similarity index 100%
rename from miracl-v1.0-bn/qrels/bn.qrels.dev.tsv
rename to miracl-v1.0-bn/qrels/qrels.miracl-v1.0-bn-dev.tsv
diff --git a/miracl-v1.0-bn/qrels/bn.qrels.train.tsv b/miracl-v1.0-bn/qrels/qrels.miracl-v1.0-bn-train.tsv
similarity index 100%
rename from miracl-v1.0-bn/qrels/bn.qrels.train.tsv
rename to miracl-v1.0-bn/qrels/qrels.miracl-v1.0-bn-train.tsv
diff --git a/miracl-v1.0-bn/topics/bn.topic.dev.tsv b/miracl-v1.0-bn/topics/topics.miracl-v1.0-bn-dev.tsv
similarity index 100%
rename from miracl-v1.0-bn/topics/bn.topic.dev.tsv
rename to miracl-v1.0-bn/topics/topics.miracl-v1.0-bn-dev.tsv
diff --git a/miracl-v1.0-bn/topics/bn.topic.train.tsv b/miracl-v1.0-bn/topics/topics.miracl-v1.0-bn-train.tsv
similarity index 100%
rename from miracl-v1.0-bn/topics/bn.topic.train.tsv
rename to miracl-v1.0-bn/topics/topics.miracl-v1.0-bn-train.tsv
diff --git a/miracl-v1.0-en/qrels/en.qrels.dev.tsv b/miracl-v1.0-en/qrels/qrels.miracl-v1.0-en-dev.tsv
similarity index 100%
rename from miracl-v1.0-en/qrels/en.qrels.dev.tsv
rename to miracl-v1.0-en/qrels/qrels.miracl-v1.0-en-dev.tsv
diff --git a/miracl-v1.0-en/qrels/en.qrels.train.tsv b/miracl-v1.0-en/qrels/qrels.miracl-v1.0-en-train.tsv
similarity index 100%
rename from miracl-v1.0-en/qrels/en.qrels.train.tsv
rename to miracl-v1.0-en/qrels/qrels.miracl-v1.0-en-train.tsv
diff --git a/miracl-v1.0-en/topics/en.topic.dev.tsv b/miracl-v1.0-en/topics/topics.miracl-v1.0-en-dev.tsv
similarity index 100%
rename from miracl-v1.0-en/topics/en.topic.dev.tsv
rename to miracl-v1.0-en/topics/topics.miracl-v1.0-en-dev.tsv
diff --git a/miracl-v1.0-en/topics/en.topic.train.tsv b/miracl-v1.0-en/topics/topics.miracl-v1.0-en-train.tsv
similarity index 100%
rename from miracl-v1.0-en/topics/en.topic.train.tsv
rename to miracl-v1.0-en/topics/topics.miracl-v1.0-en-train.tsv
diff --git a/miracl-v1.0-es/qrels/es.qrels.dev.tsv b/miracl-v1.0-es/qrels/qrels.miracl-v1.0-es-dev.tsv
similarity index 100%
rename from miracl-v1.0-es/qrels/es.qrels.dev.tsv
rename to miracl-v1.0-es/qrels/qrels.miracl-v1.0-es-dev.tsv
diff --git a/miracl-v1.0-es/qrels/es.qrels.train.tsv b/miracl-v1.0-es/qrels/qrels.miracl-v1.0-es-train.tsv
similarity index 100%
rename from miracl-v1.0-es/qrels/es.qrels.train.tsv
rename to miracl-v1.0-es/qrels/qrels.miracl-v1.0-es-train.tsv
diff --git a/miracl-v1.0-es/topics/es.topic.dev.tsv b/miracl-v1.0-es/topics/topics.miracl-v1.0-es-dev.tsv
similarity index 100%
rename from miracl-v1.0-es/topics/es.topic.dev.tsv
rename to miracl-v1.0-es/topics/topics.miracl-v1.0-es-dev.tsv
diff --git a/miracl-v1.0-es/topics/es.topic.train.tsv b/miracl-v1.0-es/topics/topics.miracl-v1.0-es-train.tsv
similarity index 100%
rename from miracl-v1.0-es/topics/es.topic.train.tsv
rename to miracl-v1.0-es/topics/topics.miracl-v1.0-es-train.tsv
diff --git a/miracl-v1.0-fa/qrels/fa.qrels.dev.tsv b/miracl-v1.0-fa/qrels/qrels.miracl-v1.0-fa-dev.tsv
similarity index 100%
rename from miracl-v1.0-fa/qrels/fa.qrels.dev.tsv
rename to miracl-v1.0-fa/qrels/qrels.miracl-v1.0-fa-dev.tsv
diff --git a/miracl-v1.0-fa/qrels/fa.qrels.train.tsv b/miracl-v1.0-fa/qrels/qrels.miracl-v1.0-fa-train.tsv
similarity index 100%
rename from miracl-v1.0-fa/qrels/fa.qrels.train.tsv
rename to miracl-v1.0-fa/qrels/qrels.miracl-v1.0-fa-train.tsv
diff --git a/miracl-v1.0-fa/topics/fa.topic.dev.tsv b/miracl-v1.0-fa/topics/topics.miracl-v1.0-fa-dev.tsv
similarity index 100%
rename from miracl-v1.0-fa/topics/fa.topic.dev.tsv
rename to miracl-v1.0-fa/topics/topics.miracl-v1.0-fa-dev.tsv
diff --git a/miracl-v1.0-fa/topics/fa.topic.train.tsv b/miracl-v1.0-fa/topics/topics.miracl-v1.0-fa-train.tsv
similarity index 100%
rename from miracl-v1.0-fa/topics/fa.topic.train.tsv
rename to miracl-v1.0-fa/topics/topics.miracl-v1.0-fa-train.tsv
diff --git a/miracl-v1.0-fi/qrels/fi.qrels.dev.tsv b/miracl-v1.0-fi/qrels/qrels.miracl-v1.0-fi-dev.tsv
similarity index 100%
rename from miracl-v1.0-fi/qrels/fi.qrels.dev.tsv
rename to miracl-v1.0-fi/qrels/qrels.miracl-v1.0-fi-dev.tsv
diff --git a/miracl-v1.0-fi/qrels/fi.qrels.train.tsv b/miracl-v1.0-fi/qrels/qrels.miracl-v1.0-fi-train.tsv
similarity index 100%
rename from miracl-v1.0-fi/qrels/fi.qrels.train.tsv
rename to miracl-v1.0-fi/qrels/qrels.miracl-v1.0-fi-train.tsv
diff --git a/miracl-v1.0-fi/topics/fi.topic.dev.tsv b/miracl-v1.0-fi/topics/topics.miracl-v1.0-fi-dev.tsv
similarity index 100%
rename from miracl-v1.0-fi/topics/fi.topic.dev.tsv
rename to miracl-v1.0-fi/topics/topics.miracl-v1.0-fi-dev.tsv
diff --git a/miracl-v1.0-fi/topics/fi.topic.train.tsv b/miracl-v1.0-fi/topics/topics.miracl-v1.0-fi-train.tsv
similarity index 100%
rename from miracl-v1.0-fi/topics/fi.topic.train.tsv
rename to miracl-v1.0-fi/topics/topics.miracl-v1.0-fi-train.tsv
diff --git a/miracl-v1.0-fr/qrels/fr.qrels.dev.tsv b/miracl-v1.0-fr/qrels/qrels.miracl-v1.0-fr-dev.tsv
similarity index 100%
rename from miracl-v1.0-fr/qrels/fr.qrels.dev.tsv
rename to miracl-v1.0-fr/qrels/qrels.miracl-v1.0-fr-dev.tsv
diff --git a/miracl-v1.0-fr/qrels/fr.qrels.train.tsv b/miracl-v1.0-fr/qrels/qrels.miracl-v1.0-fr-train.tsv
similarity index 100%
rename from miracl-v1.0-fr/qrels/fr.qrels.train.tsv
rename to miracl-v1.0-fr/qrels/qrels.miracl-v1.0-fr-train.tsv
diff --git a/miracl-v1.0-fr/topics/fr.topic.dev.tsv b/miracl-v1.0-fr/topics/topics.miracl-v1.0-fr-dev.tsv
similarity index 100%
rename from miracl-v1.0-fr/topics/fr.topic.dev.tsv
rename to miracl-v1.0-fr/topics/topics.miracl-v1.0-fr-dev.tsv
diff --git a/miracl-v1.0-fr/topics/fr.topic.train.tsv b/miracl-v1.0-fr/topics/topics.miracl-v1.0-fr-train.tsv
similarity index 100%
rename from miracl-v1.0-fr/topics/fr.topic.train.tsv
rename to miracl-v1.0-fr/topics/topics.miracl-v1.0-fr-train.tsv
diff --git a/miracl-v1.0-hi/qrels/hi.qrels.dev.tsv b/miracl-v1.0-hi/qrels/qrels.miracl-v1.0-hi-dev.tsv
similarity index 100%
rename from miracl-v1.0-hi/qrels/hi.qrels.dev.tsv
rename to miracl-v1.0-hi/qrels/qrels.miracl-v1.0-hi-dev.tsv
diff --git a/miracl-v1.0-hi/qrels/hi.qrels.train.tsv b/miracl-v1.0-hi/qrels/qrels.miracl-v1.0-hi-train.tsv
similarity index 100%
rename from miracl-v1.0-hi/qrels/hi.qrels.train.tsv
rename to miracl-v1.0-hi/qrels/qrels.miracl-v1.0-hi-train.tsv
diff --git a/miracl-v1.0-hi/topics/hi.topic.dev.tsv b/miracl-v1.0-hi/topics/topics.miracl-v1.0-hi-dev.tsv
similarity index 100%
rename from miracl-v1.0-hi/topics/hi.topic.dev.tsv
rename to miracl-v1.0-hi/topics/topics.miracl-v1.0-hi-dev.tsv
diff --git a/miracl-v1.0-hi/topics/hi.topic.train.tsv b/miracl-v1.0-hi/topics/topics.miracl-v1.0-hi-train.tsv
similarity index 100%
rename from miracl-v1.0-hi/topics/hi.topic.train.tsv
rename to miracl-v1.0-hi/topics/topics.miracl-v1.0-hi-train.tsv
diff --git a/miracl-v1.0-id/qrels/id.qrels.dev.tsv b/miracl-v1.0-id/qrels/qrels.miracl-v1.0-id-dev.tsv
similarity index 100%
rename from miracl-v1.0-id/qrels/id.qrels.dev.tsv
rename to miracl-v1.0-id/qrels/qrels.miracl-v1.0-id-dev.tsv
diff --git a/miracl-v1.0-id/qrels/id.qrels.train.tsv b/miracl-v1.0-id/qrels/qrels.miracl-v1.0-id-train.tsv
similarity index 100%
rename from miracl-v1.0-id/qrels/id.qrels.train.tsv
rename to miracl-v1.0-id/qrels/qrels.miracl-v1.0-id-train.tsv
diff --git a/miracl-v1.0-id/topics/id.topic.dev.tsv b/miracl-v1.0-id/topics/topics.miracl-v1.0-id-dev.tsv
similarity index 100%
rename from miracl-v1.0-id/topics/id.topic.dev.tsv
rename to miracl-v1.0-id/topics/topics.miracl-v1.0-id-dev.tsv
diff --git a/miracl-v1.0-id/topics/id.topic.train.tsv b/miracl-v1.0-id/topics/topics.miracl-v1.0-id-train.tsv
similarity index 100%
rename from miracl-v1.0-id/topics/id.topic.train.tsv
rename to miracl-v1.0-id/topics/topics.miracl-v1.0-id-train.tsv
diff --git a/miracl-v1.0-ja/qrels/ja.qrels.dev.tsv b/miracl-v1.0-ja/qrels/qrels.miracl-v1.0-ja-dev.tsv
similarity index 100%
rename from miracl-v1.0-ja/qrels/ja.qrels.dev.tsv
rename to miracl-v1.0-ja/qrels/qrels.miracl-v1.0-ja-dev.tsv
diff --git a/miracl-v1.0-ja/qrels/ja.qrels.train.tsv b/miracl-v1.0-ja/qrels/qrels.miracl-v1.0-ja-train.tsv
similarity index 100%
rename from miracl-v1.0-ja/qrels/ja.qrels.train.tsv
rename to miracl-v1.0-ja/qrels/qrels.miracl-v1.0-ja-train.tsv
diff --git a/miracl-v1.0-ja/topics/ja.topic.dev.tsv b/miracl-v1.0-ja/topics/topics.miracl-v1.0-ja-dev.tsv
similarity index 100%
rename from miracl-v1.0-ja/topics/ja.topic.dev.tsv
rename to miracl-v1.0-ja/topics/topics.miracl-v1.0-ja-dev.tsv
diff --git a/miracl-v1.0-ja/topics/ja.topic.train.tsv b/miracl-v1.0-ja/topics/topics.miracl-v1.0-ja-train.tsv
similarity index 100%
rename from miracl-v1.0-ja/topics/ja.topic.train.tsv
rename to miracl-v1.0-ja/topics/topics.miracl-v1.0-ja-train.tsv
diff --git a/miracl-v1.0-ko/qrels/ko.qrels.dev.tsv b/miracl-v1.0-ko/qrels/qrels.miracl-v1.0-ko-dev.tsv
similarity index 100%
rename from miracl-v1.0-ko/qrels/ko.qrels.dev.tsv
rename to miracl-v1.0-ko/qrels/qrels.miracl-v1.0-ko-dev.tsv
diff --git a/miracl-v1.0-ko/qrels/ko.qrels.train.tsv b/miracl-v1.0-ko/qrels/qrels.miracl-v1.0-ko-train.tsv
similarity index 100%
rename from miracl-v1.0-ko/qrels/ko.qrels.train.tsv
rename to miracl-v1.0-ko/qrels/qrels.miracl-v1.0-ko-train.tsv
diff --git a/miracl-v1.0-ko/topics/ko.topic.dev.tsv b/miracl-v1.0-ko/topics/topics.miracl-v1.0-ko-dev.tsv
similarity index 100%
rename from miracl-v1.0-ko/topics/ko.topic.dev.tsv
rename to miracl-v1.0-ko/topics/topics.miracl-v1.0-ko-dev.tsv
diff --git a/miracl-v1.0-ko/topics/ko.topic.train.tsv b/miracl-v1.0-ko/topics/topics.miracl-v1.0-ko-train.tsv
similarity index 100%
rename from miracl-v1.0-ko/topics/ko.topic.train.tsv
rename to miracl-v1.0-ko/topics/topics.miracl-v1.0-ko-train.tsv
diff --git a/miracl-v1.0-ru/qrels/ru.qrels.dev.tsv b/miracl-v1.0-ru/qrels/qrels.miracl-v1.0-ru-dev.tsv
similarity index 100%
rename from miracl-v1.0-ru/qrels/ru.qrels.dev.tsv
rename to miracl-v1.0-ru/qrels/qrels.miracl-v1.0-ru-dev.tsv
diff --git a/miracl-v1.0-ru/qrels/ru.qrels.train.tsv b/miracl-v1.0-ru/qrels/qrels.miracl-v1.0-ru-train.tsv
similarity index 100%
rename from miracl-v1.0-ru/qrels/ru.qrels.train.tsv
rename to miracl-v1.0-ru/qrels/qrels.miracl-v1.0-ru-train.tsv
diff --git a/miracl-v1.0-ru/topics/ru.topic.dev.tsv b/miracl-v1.0-ru/topics/topics.miracl-v1.0-ru-dev.tsv
similarity index 100%
rename from miracl-v1.0-ru/topics/ru.topic.dev.tsv
rename to miracl-v1.0-ru/topics/topics.miracl-v1.0-ru-dev.tsv
diff --git a/miracl-v1.0-ru/topics/ru.topic.train.tsv b/miracl-v1.0-ru/topics/topics.miracl-v1.0-ru-train.tsv
similarity index 100%
rename from miracl-v1.0-ru/topics/ru.topic.train.tsv
rename to miracl-v1.0-ru/topics/topics.miracl-v1.0-ru-train.tsv
diff --git a/miracl-v1.0-sw/qrels/sw.qrels.dev.tsv b/miracl-v1.0-sw/qrels/qrels.miracl-v1.0-sw-dev.tsv
similarity index 100%
rename from miracl-v1.0-sw/qrels/sw.qrels.dev.tsv
rename to miracl-v1.0-sw/qrels/qrels.miracl-v1.0-sw-dev.tsv
diff --git a/miracl-v1.0-sw/qrels/sw.qrels.train.tsv b/miracl-v1.0-sw/qrels/qrels.miracl-v1.0-sw-train.tsv
similarity index 100%
rename from miracl-v1.0-sw/qrels/sw.qrels.train.tsv
rename to miracl-v1.0-sw/qrels/qrels.miracl-v1.0-sw-train.tsv
diff --git a/miracl-v1.0-sw/topics/sw.topic.dev.tsv b/miracl-v1.0-sw/topics/topics.miracl-v1.0-sw-dev.tsv
similarity index 100%
rename from miracl-v1.0-sw/topics/sw.topic.dev.tsv
rename to miracl-v1.0-sw/topics/topics.miracl-v1.0-sw-dev.tsv
diff --git a/miracl-v1.0-sw/topics/sw.topic.train.tsv b/miracl-v1.0-sw/topics/topics.miracl-v1.0-sw-train.tsv
similarity index 100%
rename from miracl-v1.0-sw/topics/sw.topic.train.tsv
rename to miracl-v1.0-sw/topics/topics.miracl-v1.0-sw-train.tsv
diff --git a/miracl-v1.0-te/qrels/te.qrels.dev.tsv b/miracl-v1.0-te/qrels/qrels.miracl-v1.0-te-dev.tsv
similarity index 100%
rename from miracl-v1.0-te/qrels/te.qrels.dev.tsv
rename to miracl-v1.0-te/qrels/qrels.miracl-v1.0-te-dev.tsv
diff --git a/miracl-v1.0-te/qrels/te.qrels.train.tsv b/miracl-v1.0-te/qrels/qrels.miracl-v1.0-te-train.tsv
similarity index 100%
rename from miracl-v1.0-te/qrels/te.qrels.train.tsv
rename to miracl-v1.0-te/qrels/qrels.miracl-v1.0-te-train.tsv
diff --git a/miracl-v1.0-te/topics/te.topic.dev.tsv b/miracl-v1.0-te/topics/topics.miracl-v1.0-te-dev.tsv
similarity index 100%
rename from miracl-v1.0-te/topics/te.topic.dev.tsv
rename to miracl-v1.0-te/topics/topics.miracl-v1.0-te-dev.tsv
diff --git a/miracl-v1.0-te/topics/te.topic.train.tsv b/miracl-v1.0-te/topics/topics.miracl-v1.0-te-train.tsv
similarity index 100%
rename from miracl-v1.0-te/topics/te.topic.train.tsv
rename to miracl-v1.0-te/topics/topics.miracl-v1.0-te-train.tsv
diff --git a/miracl-v1.0-th/qrels/th.qrels.dev.tsv b/miracl-v1.0-th/qrels/qrels.miracl-v1.0-th-dev.tsv
similarity index 100%
rename from miracl-v1.0-th/qrels/th.qrels.dev.tsv
rename to miracl-v1.0-th/qrels/qrels.miracl-v1.0-th-dev.tsv
diff --git a/miracl-v1.0-th/qrels/th.qrels.train.tsv b/miracl-v1.0-th/qrels/qrels.miracl-v1.0-th-train.tsv
similarity index 100%
rename from miracl-v1.0-th/qrels/th.qrels.train.tsv
rename to miracl-v1.0-th/qrels/qrels.miracl-v1.0-th-train.tsv
diff --git a/miracl-v1.0-th/topics/th.topic.dev.tsv b/miracl-v1.0-th/topics/topics.miracl-v1.0-th-dev.tsv
similarity index 100%
rename from miracl-v1.0-th/topics/th.topic.dev.tsv
rename to miracl-v1.0-th/topics/topics.miracl-v1.0-th-dev.tsv
diff --git a/miracl-v1.0-th/topics/th.topic.train.tsv b/miracl-v1.0-th/topics/topics.miracl-v1.0-th-train.tsv
similarity index 100%
rename from miracl-v1.0-th/topics/th.topic.train.tsv
rename to miracl-v1.0-th/topics/topics.miracl-v1.0-th-train.tsv
diff --git a/miracl-v1.0-zh/qrels/zh.qrels.dev.tsv b/miracl-v1.0-zh/qrels/qrels.miracl-v1.0-zh-dev.tsv
similarity index 100%
rename from miracl-v1.0-zh/qrels/zh.qrels.dev.tsv
rename to miracl-v1.0-zh/qrels/qrels.miracl-v1.0-zh-dev.tsv
diff --git a/miracl-v1.0-zh/qrels/zh.qrels.train.tsv b/miracl-v1.0-zh/qrels/qrels.miracl-v1.0-zh-train.tsv
similarity index 100%
rename from miracl-v1.0-zh/qrels/zh.qrels.train.tsv
rename to miracl-v1.0-zh/qrels/qrels.miracl-v1.0-zh-train.tsv
diff --git a/miracl-v1.0-zh/topics/zh.topic.dev.tsv b/miracl-v1.0-zh/topics/topics.miracl-v1.0-zh-dev.tsv
similarity index 100%
rename from miracl-v1.0-zh/topics/zh.topic.dev.tsv
rename to miracl-v1.0-zh/topics/topics.miracl-v1.0-zh-dev.tsv
diff --git a/miracl-v1.0-zh/topics/zh.topic.train.tsv b/miracl-v1.0-zh/topics/topics.miracl-v1.0-zh-train.tsv
similarity index 100%
rename from miracl-v1.0-zh/topics/zh.topic.train.tsv
rename to miracl-v1.0-zh/topics/topics.miracl-v1.0-zh-train.tsv