diff --git a/snakemake/Snakefile b/snakemake/Snakefile
index 4f83c6d5ae0c9106cbdf496146cf3cbf9f2a12d7..1e81a7e88645b3adf668692a4617ab6ec447856e 100644
--- a/snakemake/Snakefile
+++ b/snakemake/Snakefile
@@ -12,7 +12,11 @@ import pandas as pd
 
 samples_table = pd.read_csv(config["samples"], header=0, index_col=0, comment='#', engine='python', sep="\t")
 directionality = {"--fr": "fr-firststrand", "--rv": "fr-secondstrand"}
-
+rename_files = {"fr-firststrand": ("STAR_Signal.UniqueMultiple.out.plus.bg", 
+	"STAR_Signal.UniqueMultiple.out.minus.bg"),
+	"fr-secondstrand": ("STAR_Signal.UniqueMultiple.out.minus.bg", 
+	"STAR_Signal.UniqueMultiple.out.plus.bg")}
+	
 localrules: finish
 
 ##################################################################################
diff --git a/snakemake/paired_end.snakefile.smk b/snakemake/paired_end.snakefile.smk
index f733ca7e38d885bc1ed77687bcc554831e4cfb6a..61d830960a3419afec248a78d7de3b460b3301ce 100644
--- a/snakemake/paired_end.snakefile.smk
+++ b/snakemake/paired_end.snakefile.smk
@@ -401,7 +401,6 @@ rule star_rpm_paired_end:
 		--outFileNamePrefix {params.prefix}) &> {log}
 		"""
 
-
 rule alfa_bg_paired_end:
 	''' Run ALFA from stranded bedgraph files '''
 	input:
@@ -438,14 +437,14 @@ rule alfa_bg_paired_end:
 			"paired_end",
 			"{sample}",
 			"ALFA")),
+		orientation = lambda wildcards: directionality[samples_table.loc[wildcards.sample, "kallisto_directionality"]],
 		in_file_str1 = "STAR_Signal.UniqueMultiple.str1.out.bg",
-		rename_str1 = "STAR_Signal.UniqueMultiple.out.plus.bg",
+		rename_str1 = lambda wildcards: rename_files[directionality[samples_table.loc[wildcards.sample, "kallisto_directionality"]]][0],
 		in_file_str2 = "STAR_Signal.UniqueMultiple.str2.out.bg",
-		rename_str2 = "STAR_Signal.UniqueMultiple.out.minus.bg",
+		rename_str2 = lambda wildcards: rename_files[directionality[samples_table.loc[wildcards.sample, "kallisto_directionality"]]][1],
 		genome_index = lambda wildcards: os.path.abspath(os.path.join(config["alfa_indexes"], samples_table.loc[wildcards.sample, "organism"], 
 			str(samples_table.loc[wildcards.sample, "index_size"]), "ALFA", "sorted_genes")),
-		name = "{sample}",
-		orientation = lambda wildcards: directionality[samples_table.loc[wildcards.sample, "kallisto_directionality"]]
+		name = "{sample}"
 	singularity:
 		"docker://zavolab/alfa:1.1.1"
 	log: os.path.abspath(os.path.join(config["local_log"], "paired_end", "{sample}", "alfa_bg_paired_end.log"))
diff --git a/snakemake/single_end.snakefile.smk b/snakemake/single_end.snakefile.smk
index a51806fa13eb4804080734f7f5aeada96ea2a948..280d4ea7b0f7c6c86c624842444c64c6c2037bea 100644
--- a/snakemake/single_end.snakefile.smk
+++ b/snakemake/single_end.snakefile.smk
@@ -364,14 +364,14 @@ rule alfa_bg_single_end:
 			"single_end",
 			"{sample}",
 			"ALFA")),
+		orientation = lambda wildcards: directionality[samples_table.loc[wildcards.sample, "kallisto_directionality"]],
 		in_file_str1 = "STAR_Signal.UniqueMultiple.str1.out.bg",
-		rename_str1 = "STAR_Signal.UniqueMultiple.out.plus.bg",
+		rename_str1 = lambda wildcards: rename_files[directionality[samples_table.loc[wildcards.sample, "kallisto_directionality"]]][0],
 		in_file_str2 = "STAR_Signal.UniqueMultiple.str2.out.bg",
-		rename_str2 = "STAR_Signal.UniqueMultiple.out.minus.bg",
+		rename_str2 = lambda wildcards: rename_files[directionality[samples_table.loc[wildcards.sample, "kallisto_directionality"]]][1],
 		genome_index = lambda wildcards: os.path.abspath(os.path.join(config["alfa_indexes"], samples_table.loc[wildcards.sample, "organism"], 
 			str(samples_table.loc[wildcards.sample, "index_size"]), "ALFA", "sorted_genes")),
-		name = "{sample}",
-		orientation = lambda wildcards: directionality[samples_table.loc[wildcards.sample, "kallisto_directionality"]]
+		name = "{sample}"
 	singularity:
 		"docker://zavolab/alfa:1.1.1"
 	log: os.path.abspath(os.path.join(config["local_log"], "single_end", "{sample}", "alfa_bg_single_end.log"))