diff --git a/src/data_handling/data_preparation.py b/src/data_handling/data_preparation.py
index 9a006beb3b708445d568464606f510c8aa4e2140..89ebbe310a3dee7ac4d1d31d7e2435a57566660c 100644
--- a/src/data_handling/data_preparation.py
+++ b/src/data_handling/data_preparation.py
@@ -138,10 +138,12 @@ class DataPrep(object):
         return xarr, meta
 
     def _set_file_name(self):
-        return os.path.join(self.path, f"{''.join(self.station)}_{'_'.join(sorted(self.variables))}.nc")
+        all_vars = sorted(self.statistics_per_var.keys())
+        return os.path.join(self.path, f"{''.join(self.station)}_{'_'.join(all_vars)}.nc")
 
     def _set_meta_file_name(self):
-        return os.path.join(self.path, f"{''.join(self.station)}_{'_'.join(sorted(self.variables))}_meta.csv")
+        all_vars = sorted(self.statistics_per_var.keys())
+        return os.path.join(self.path, f"{''.join(self.station)}_{'_'.join(all_vars)}_meta.csv")
 
     def __repr__(self):
         return f"Dataprep(path='{self.path}', network='{self.network}', station={self.station}, " \