diff --git a/jobs/cosmo.py b/jobs/cosmo.py
index bb9f7732..a35f989c 100644
--- a/jobs/cosmo.py
+++ b/jobs/cosmo.py
@@ -20,8 +20,7 @@
 from datetime import datetime, timedelta
 
 
-def set_cfg_variables(cfg, model_cfg):
-
+def set_cfg_variables(startdate, enddate, cfg, model_cfg):
     setattr(cfg, 'cosmo_base', os.path.join(cfg.chain_root, 'cosmo'))
     setattr(cfg, 'cosmo_input', os.path.join(cfg.chain_root, 'cosmo', 'input'))
     setattr(cfg, 'cosmo_run', os.path.join(cfg.chain_root, 'cosmo', 'run'))
diff --git a/jobs/icon.py b/jobs/icon.py
index 0561644e..759ad536 100644
--- a/jobs/icon.py
+++ b/jobs/icon.py
@@ -18,7 +18,7 @@
 from datetime import timedelta
 
 
-def main(starttime, hstart, hstop, cfg, model_cfg):
+def main(startdate, enddate, cfg, model_cfg):
     """Setup the namelists for an **ICON** tracer run and submit the job to
     the queue
 
diff --git a/jobs/int2lm.py b/jobs/int2lm.py
index 429fce31..c969c33f 100644
--- a/jobs/int2lm.py
+++ b/jobs/int2lm.py
@@ -18,7 +18,7 @@
 from . import tools, prepare_data
 
 
-def set_cfg_variables(cfg, starttime, hstart):
+def set_cfg_variables(startdate, enddate, cfg, model_cfg):
 
     setattr(cfg, 'int2lm_run', os.path.join(cfg.chain_root, 'int2lm', 'run'))
     setattr(cfg, 'int2lm_output',
@@ -29,7 +29,7 @@ def set_cfg_variables(cfg, starttime, hstart):
     return cfg
 
 
-def main(starttime, hstart, hstop, cfg, model_cfg):
+def main(startdate, enddate, cfg, model_cfg):
     """Setup the namelist for **int2lm** and submit the job to the queue.
 
     Necessary for both **COSMO** and **COSMOART** simulations.
diff --git a/jobs/obs_nudging.py b/jobs/obs_nudging.py
index 7d217daa..d9562be7 100644
--- a/jobs/obs_nudging.py
+++ b/jobs/obs_nudging.py
@@ -9,7 +9,7 @@
 from . import tools
 
 
-def main(starttime, hstart, hstop, cfg, model_cfg):
+def main(startdate, enddate, cfg, model_cfg):
     """Copy and rename the obs_nudging files to the **COSMO** input directory.
 
     In the folder ``cfg.obs_nudging_dir``, the files are saved in the format
diff --git a/jobs/octe.py b/jobs/octe.py
index ed3963c8..e10a457e 100644
--- a/jobs/octe.py
+++ b/jobs/octe.py
@@ -161,7 +161,7 @@ def perturb_bgs_in_dir(lambdas_nc, directory):
                         entry.name))
 
 
-def main(starttime, hstart, hstop, cfg, model_cfg):
+def main(startdate, enddate, cfg, model_cfg):
     """Copy necessary input files for **COSMO** and perturb BG.
 
     Copies the NetCDF-files found at cfg.octe_maps and cfg.octe_lambdas to
diff --git a/jobs/prepare_data.py b/jobs/prepare_data.py
index cebf7daf..07410370 100644
--- a/jobs/prepare_data.py
+++ b/jobs/prepare_data.py
@@ -37,8 +37,7 @@
 from calendar import monthrange
 
 
-def set_cfg_variables(cfg, startdate, enddate):
-
+def set_cfg_variables(startdate, enddate, cfg, model_cfg):
     # TODO: Change setattr() to direct assignment
     if cfg.model.startswith('cosmo'):
         setattr(cfg, 'int2lm_root', os.path.join(cfg.chain_root, 'int2lm'))