diff --git a/src/nf_modules/BEDtools/bedtools.nf b/src/nf_modules/BEDtools/bedtools.nf
index 6d6bf089e141cae6c14d4c194ef7e3f1fc72042f..297fd9ef429ce83c601e96f9842e940da22266b5 100644
--- a/src/nf_modules/BEDtools/bedtools.nf
+++ b/src/nf_modules/BEDtools/bedtools.nf
@@ -1,7 +1,8 @@
 /*
 * bedtools :
-* Imputs : fastq files
-* Output : fastq files
+* Imputs : fasta files
+* Imputs : bed files
+* Output : fasta files
 */
 /*                      fasta extraction                                     */
 
diff --git a/src/nf_modules/Bowtie2/bowtie2.nf b/src/nf_modules/Bowtie2/bowtie2.nf
index 095d85ff62d70d14d204e09e6fb2eaf5244ea1b7..30b75312ceba63ba5df43fb2c17e7d2a73102e2a 100644
--- a/src/nf_modules/Bowtie2/bowtie2.nf
+++ b/src/nf_modules/Bowtie2/bowtie2.nf
@@ -66,7 +66,7 @@ process mapping_fastq {
   file index from index_files.toList()
 
   output:
-  file "*.bam" into bam_files
+  set pair_id, "*.bam" into bam_files
 
   script:
 """
diff --git a/src/nf_modules/Bowtie2/tests/mapping_paired.nf b/src/nf_modules/Bowtie2/tests/mapping_paired.nf
index 048db49b684e18326323621a7873b6db4b0c5071..835d0ca3c96e5f68c1650aeadff280eced9d5a11 100644
--- a/src/nf_modules/Bowtie2/tests/mapping_paired.nf
+++ b/src/nf_modules/Bowtie2/tests/mapping_paired.nf
@@ -23,7 +23,7 @@ process mapping_fastq {
   file index from index_files.toList()
 
   output:
-  file "*.bam" into bam_files
+  set pair_id, "*.bam" into bam_files
 
   script:
 """
@@ -37,3 +37,4 @@ if grep -q "Error" ${pair_id}_bowtie2_report.txt; then
 fi
 """
 }
+
diff --git a/src/nf_modules/Kallisto/kallisto.nf b/src/nf_modules/Kallisto/kallisto.nf
index 1f21a1faf508482267782e68ac0f09e8b94ca979..8867a0c3ab74393a43229e9bee4a39e71f4eddc2 100644
--- a/src/nf_modules/Kallisto/kallisto.nf
+++ b/src/nf_modules/Kallisto/kallisto.nf
@@ -58,7 +58,7 @@ process mapping_fastq {
   publishDir "results/mapping/quantification/", mode: 'copy'
 
   input:
-  file reads from fastq_files
+  set pair_id, file(reads) from fastq_files
   file index from index_files.toList()
 
   output:
@@ -68,8 +68,8 @@ process mapping_fastq {
 """
 mkdir ${reads[0].baseName}
 kallisto quant -i ${index} -t ${task.cpus} \
---bias --bootstrap-samples 100 -o ${reads[0].baseName} \
-${reads[0]} ${reads[1]} &> ${reads[0].baseName}_kallisto_report.txt
+--bias --bootstrap-samples 100 -o ${pair_id} \
+${reads[0]} ${reads[1]} &> ${pair_id}_kallisto_report.txt
 """
 }
 
diff --git a/src/nf_modules/Kallisto/tests/mapping_paired.nf b/src/nf_modules/Kallisto/tests/mapping_paired.nf
index 71b9f471968fb7cb6a73871d6c88e7a96c4d37d7..8e8f94c9172c409a5af3be0be02f3970e5983030 100644
--- a/src/nf_modules/Kallisto/tests/mapping_paired.nf
+++ b/src/nf_modules/Kallisto/tests/mapping_paired.nf
@@ -14,7 +14,7 @@ Channel
   .set { index_files }
 
 process mapping_fastq {
-  tag "$pair_id"
+  tag "$reads"
   cpus 4
   publishDir "results/mapping/quantification/", mode: 'copy'
 
@@ -27,7 +27,7 @@ process mapping_fastq {
 
   script:
 """
-mkdir ${pair_id}
+mkdir ${reads[0].baseName}
 kallisto quant -i ${index} -t ${task.cpus} \
 --bias --bootstrap-samples 100 -o ${pair_id} \
 ${reads[0]} ${reads[1]} &> ${pair_id}_kallisto_report.txt
diff --git a/src/nf_modules/UrQt/tests/trimming_paired.nf b/src/nf_modules/UrQt/tests/trimming_paired.nf
index 4c289c0e94c70fe9c621a716358b7526b0ce1a14..7720b12fa2739bda9e0b27e1968102c25298fbf1 100644
--- a/src/nf_modules/UrQt/tests/trimming_paired.nf
+++ b/src/nf_modules/UrQt/tests/trimming_paired.nf
@@ -6,14 +6,15 @@ Channel
   .set { fastq_files }
 
 process trimming {
-  tag "$pair_id"
+  tag "${reads}"
   cpus 4
+  publishDir "results/fastq/trimming/", mode: 'copy'
 
   input:
   set pair_id, file(reads) from fastq_files
 
   output:
-  file "*_trim_R{1,2}.fastq.gz" into fastq_files_cut
+  set pair_id, "*_trim_R{1,2}.fastq.gz" into fastq_files_trim
 
   script:
 """
@@ -23,3 +24,4 @@ UrQt --t 20 --m ${task.cpus} --gz \
 > ${pair_id}_trimming_report.txt
 """
 }
+
diff --git a/src/nf_modules/UrQt/urqt.nf b/src/nf_modules/UrQt/urqt.nf
index 165af95db819fa4b9c4e2f081a831336931f2143..d24033632011796fb1bb3d27185cf62a737444a9 100644
--- a/src/nf_modules/UrQt/urqt.nf
+++ b/src/nf_modules/UrQt/urqt.nf
@@ -24,17 +24,17 @@ process trimming {
   publishDir "results/fastq/trimming/", mode: 'copy'
 
   input:
-  file reads from fastq_files
+  set pair_id, file(reads) from fastq_files
 
   output:
-  file "*_trim_R{1,2}.fastq.gz" into fastq_files_trim
+  set pair_id, "*_trim_R{1,2}.fastq.gz" into fastq_files_trim
 
   script:
 """
 UrQt --t 20 --m ${task.cpus} --gz \
 --in ${reads[0]} --inpair ${reads[1]} \
---out ${reads[0].baseName}_trim_R1.fastq.gz --outpair ${reads[1].baseName}_trim_R2.fastq.gz \
-> ${reads[0].baseName}_trimming_report.txt
+--out ${pair_id}_trim_R1.fastq.gz --outpair ${pair_id}_trim_R2.fastq.gz \
+> ${pair_id}_trimming_report.txt
 """
 }
 
diff --git a/src/nf_modules/cutadapt/cutadapt.nf b/src/nf_modules/cutadapt/cutadapt.nf
index e2a0681a6e81c80a36fc51e5306f3e1828e87bee..204a9e5a5e34ecef5b47e1892bc0ac9e0f6a1760 100644
--- a/src/nf_modules/cutadapt/cutadapt.nf
+++ b/src/nf_modules/cutadapt/cutadapt.nf
@@ -27,7 +27,7 @@ process adaptor_removal {
   set pair_id, file(reads) from fastq_files
 
   output:
-  file "*_cut_R{1,2}.fastq.gz" into fastq_files_cut
+  set pair_id, "*_cut_R{1,2}.fastq.gz" into fastq_files_cut
 
   script:
   """
@@ -91,7 +91,7 @@ process trimming {
   set pair_id, file(reads) from fastq_files
 
   output:
-  file "*_trim_R{1,2}.fastq.gz" into fastq_files_trim
+  set pair_id, "*_trim_R{1,2}.fastq.gz" into fastq_files_trim
 
   script:
   """
diff --git a/src/nf_modules/cutadapt/tests/adaptor_removal_paired.nf b/src/nf_modules/cutadapt/tests/adaptor_removal_paired.nf
index d665d236a9321751ca70bc4dbe22664f04519eec..f78d5c2dab0c8a83fd105c5eaddbbc1fd8c4e13e 100644
--- a/src/nf_modules/cutadapt/tests/adaptor_removal_paired.nf
+++ b/src/nf_modules/cutadapt/tests/adaptor_removal_paired.nf
@@ -7,12 +7,13 @@ Channel
 
 process adaptor_removal {
   tag "$pair_id"
+  publishDir "results/fastq/adaptor_removal/", mode: 'copy'
 
   input:
   set pair_id, file(reads) from fastq_files
 
   output:
-  file "*_cut_R{1,2}.fastq.gz" into fastq_files_cut
+  set pair_id, "*_cut_R{1,2}.fastq.gz" into fastq_files_cut
 
   script:
   """
@@ -21,4 +22,3 @@ process adaptor_removal {
   ${reads[0]} ${reads[1]} > ${pair_id}_report.txt
   """
 }
-
diff --git a/src/nf_modules/cutadapt/tests/trimming_paired.nf b/src/nf_modules/cutadapt/tests/trimming_paired.nf
index d0b83e1c8de4ff149d5d686b1808fa2db7300353..704240f46818b79a540e71273fc1512216d109e6 100644
--- a/src/nf_modules/cutadapt/tests/trimming_paired.nf
+++ b/src/nf_modules/cutadapt/tests/trimming_paired.nf
@@ -7,12 +7,13 @@ Channel
 
 process trimming {
   tag "$pair_id"
+  publishDir "results/fastq/trimming/", mode: 'copy'
 
   input:
   set pair_id, file(reads) from fastq_files
 
   output:
-  file "*_trim_R{1,2}.fastq.gz" into fastq_files_cut
+  set pair_id, "*_trim_R{1,2}.fastq.gz" into fastq_files_trim
 
   script:
   """
@@ -21,4 +22,3 @@ process trimming {
   ${reads[0]} ${reads[1]} > ${pair_id}_report.txt
   """
 }
-