diff --git a/aiida/engine/processes/calcjobs/calcjob.py b/aiida/engine/processes/calcjobs/calcjob.py
index 92384572a3..2bdc4fa243 100644
--- a/aiida/engine/processes/calcjobs/calcjob.py
+++ b/aiida/engine/processes/calcjobs/calcjob.py
@@ -8,6 +8,7 @@
 # For further information please visit http://www.aiida.net               #
 ###########################################################################
 """Implementation of the CalcJob process."""
+import dataclasses
 import io
 import json
 import os
@@ -587,7 +588,7 @@ def presubmit(self, folder: Folder) -> CalcInfo:
         from aiida.common.exceptions import InputValidationError, InvalidOperation, PluginInternalError, ValidationError
         from aiida.common.utils import validate_list_of_string_tuples
         from aiida.orm import Code, Computer, load_node
-        from aiida.schedulers.datastructures import JobTemplate
+        from aiida.schedulers.datastructures import JobTemplate, JobTemplateCodeInfo
 
         inputs = self.node.get_incoming(link_type=LinkType.INPUT_CALC)
 
@@ -682,7 +683,7 @@ def presubmit(self, folder: Folder) -> CalcInfo:
         if not isinstance(calc_info.codes_info, (list, tuple)):
             raise PluginInternalError('codes_info passed to CalcInfo must be a list of CalcInfo objects')
 
-        codes_info = []
+        tmpl_codes_info = []
         for code_info in calc_info.codes_info:
 
             if not isinstance(code_info, CodeInfo):
@@ -713,11 +714,15 @@ def presubmit(self, folder: Folder) -> CalcInfo:
                 this_argv = [this_code.get_execname()
                              ] + (code_info.cmdline_params if code_info.cmdline_params is not None else [])
 
-            # overwrite the old cmdline_params and add codename and mpirun stuff
-            code_info.cmdline_params = this_argv
+            tmpl_code_info = JobTemplateCodeInfo()
+            tmpl_code_info.cmdline_params = this_argv
+            tmpl_code_info.stdin_name = code_info.stdin_name
+            tmpl_code_info.stdout_name = code_info.stdout_name
+            tmpl_code_info.stderr_name = code_info.stderr_name
+            tmpl_code_info.join_files = code_info.join_files
 
-            codes_info.append(code_info)
-        job_tmpl.codes_info = codes_info
+            tmpl_codes_info.append(tmpl_code_info)
+        job_tmpl.codes_info = tmpl_codes_info
 
         # set the codes execution mode, default set to `SERIAL`
         codes_run_mode = CodeRunMode.SERIAL
@@ -759,8 +764,15 @@ def presubmit(self, folder: Folder) -> CalcInfo:
         script_content = scheduler.get_submit_script(job_tmpl)
         folder.create_file_from_filelike(io.StringIO(script_content), submit_script_filename, 'w', encoding='utf8')
 
+        def encoder(obj):
+            if dataclasses.is_dataclass(obj):
+                return dataclasses.asdict(obj)
+            raise TypeError(f' {obj!r} is not JSON serializable')
+
         subfolder = folder.get_subfolder('.aiida', create=True)
-        subfolder.create_file_from_filelike(io.StringIO(json.dumps(job_tmpl)), 'job_tmpl.json', 'w', encoding='utf8')
+        subfolder.create_file_from_filelike(
+            io.StringIO(json.dumps(job_tmpl, default=encoder)), 'job_tmpl.json', 'w', encoding='utf8'
+        )
         subfolder.create_file_from_filelike(io.StringIO(json.dumps(calc_info)), 'calcinfo.json', 'w', encoding='utf8')
 
         if calc_info.local_copy_list is None:
diff --git a/aiida/schedulers/datastructures.py b/aiida/schedulers/datastructures.py
index b788724ed4..33a35e7007 100644
--- a/aiida/schedulers/datastructures.py
+++ b/aiida/schedulers/datastructures.py
@@ -14,7 +14,10 @@
 the data structure that is returned when querying for jobs in the scheduler
 (JobInfo).
 """
+from __future__ import annotations
+
 import abc
+from dataclasses import dataclass, field
 import enum
 import json
 
@@ -298,7 +301,7 @@ class JobTemplate(DefaultFieldsAttributeDict):  # pylint: disable=too-many-insta
       * ``append_text``: a (possibly multi-line) string to be inserted
         in the scheduler script after the main execution line
       * ``import_sys_environment``: import the system environment variables
-      * ``codes_info``: a list of aiida.common.datastructures.CalcInfo objects.
+      * ``codes_info``: a list of aiida.scheduler.datastructures.JobTemplateCodeInfo objects.
         Each contains the information necessary to run a single code. At the
         moment, it can contain:
 
@@ -357,6 +360,27 @@ class JobTemplate(DefaultFieldsAttributeDict):  # pylint: disable=too-many-insta
     )
 
 
+@dataclass
+class JobTemplateCodeInfo:
+    """
+    Data structure to communicate to a `Scheduler` how a code should be run in submit script.
+
+    `Scheduler.get_submit_script` will pass a list of these objects to `Scheduler._get_run_line` which
+    should build up the code execution line based on the parameters specified in this dataclass.
+
+    :param cmdline_params: list of unescaped command line parameters.
+    :param stdin_name: filename of the the stdin file descriptor.
+    :param stdout_name: filename of the the `stdout` file descriptor.
+    :param stderr_name: filename of the the `stderr` file descriptor.
+    :param join_files: boolean, if true, `stderr` should be redirected to `stdout`.
+    """
+    cmdline_params: list[str] = field(default_factory=list)
+    stdin_name: None | str = None
+    stdout_name: None | str = None
+    stderr_name: None | str = None
+    join_files: bool = False
+
+
 class MachineInfo(DefaultFieldsAttributeDict):
     """
     Similarly to what is defined in the DRMAA v.2 as SlotInfo; this identifies
diff --git a/aiida/schedulers/scheduler.py b/aiida/schedulers/scheduler.py
index 35f258070f..4b24887438 100644
--- a/aiida/schedulers/scheduler.py
+++ b/aiida/schedulers/scheduler.py
@@ -206,9 +206,10 @@ def _get_submit_script_footer(self, job_tmpl):
     def _get_run_line(self, codes_info, codes_run_mode):
         """Return a string with the line to execute a specific code with specific arguments.
 
-        :parameter codes_info: a list of `aiida.common.datastructures.CodeInfo` objects. Each contains the information
-            needed to run the code. I.e. `cmdline_params`, `stdin_name`, `stdout_name`, `stderr_name`, `join_files`. See
-            the documentation of `JobTemplate` and `CodeInfo`.
+        :parameter codes_info: a list of `aiida.scheduler.datastructures.JobTemplateCodeInfo` objects.
+            Each contains the information needed to run the code. I.e. `cmdline_params`, `stdin_name`,
+            `stdout_name`, `stderr_name`, `join_files`. See
+            the documentation of `JobTemplate` and `JobTemplateCodeInfo`.
         :parameter codes_run_mode: instance of `aiida.common.datastructures.CodeRunMode` contains the information on how
             to launch the multiple codes.
         :return: string with format: [executable] [args] {[ < stdin ]} {[ < stdout ]} {[2>&1 | 2> stderr]}
diff --git a/tests/schedulers/test_direct.py b/tests/schedulers/test_direct.py
index f982a3cd5a..36bcd8a01d 100644
--- a/tests/schedulers/test_direct.py
+++ b/tests/schedulers/test_direct.py
@@ -11,9 +11,9 @@
 """Tests for the ``DirectScheduler`` plugin."""
 import pytest
 
-from aiida.common.datastructures import CodeInfo, CodeRunMode
+from aiida.common.datastructures import CodeRunMode
 from aiida.schedulers import SchedulerError
-from aiida.schedulers.datastructures import JobTemplate
+from aiida.schedulers.datastructures import JobTemplate, JobTemplateCodeInfo
 from aiida.schedulers.plugins.direct import DirectScheduler
 
 
@@ -26,11 +26,11 @@ def scheduler():
 @pytest.fixture
 def template():
     """Return an instance of the ``JobTemplate`` with some required presets."""
-    code_info = CodeInfo()
-    code_info.cmdline_params = []
+    tmpl_code_info = JobTemplateCodeInfo()
+    tmpl_code_info.cmdline_params = []
 
     template = JobTemplate()
-    template.codes_info = [code_info]
+    template.codes_info = [tmpl_code_info]
     template.codes_run_mode = CodeRunMode.SERIAL
 
     return template
diff --git a/tests/schedulers/test_lsf.py b/tests/schedulers/test_lsf.py
index 35ffd9086b..a47cc3a0a0 100644
--- a/tests/schedulers/test_lsf.py
+++ b/tests/schedulers/test_lsf.py
@@ -112,8 +112,8 @@ def test_parse_common_joblist_output():
 
 def test_submit_script():
     """Test the creation of a simple submission script"""
-    from aiida.common.datastructures import CodeInfo, CodeRunMode
-    from aiida.schedulers.datastructures import JobTemplate
+    from aiida.common.datastructures import CodeRunMode
+    from aiida.schedulers.datastructures import JobTemplate, JobTemplateCodeInfo
 
     scheduler = LsfScheduler()
 
@@ -122,10 +122,10 @@ def test_submit_script():
     job_tmpl.uuid = str(uuid.uuid4())
     job_tmpl.job_resource = scheduler.create_job_resource(tot_num_mpiprocs=2, parallel_env='b681e480bd.cern.ch')
     job_tmpl.max_wallclock_seconds = 24 * 3600
-    code_info = CodeInfo()
-    code_info.cmdline_params = ['mpirun', '-np', '2', 'pw.x', '-npool', '1']
-    code_info.stdin_name = 'aiida.in'
-    job_tmpl.codes_info = [code_info]
+    tmpl_code_info = JobTemplateCodeInfo()
+    tmpl_code_info.cmdline_params = ['mpirun', '-np', '2', 'pw.x', '-npool', '1']
+    tmpl_code_info.stdin_name = 'aiida.in'
+    job_tmpl.codes_info = [tmpl_code_info]
     job_tmpl.codes_run_mode = CodeRunMode.SERIAL
     job_tmpl.account = 'account_id'
 
@@ -142,16 +142,16 @@ def test_submit_script():
 
 def test_submit_script_rerunnable():
     """Test the `rerunnable` option of the submit script."""
-    from aiida.common.datastructures import CodeInfo, CodeRunMode
-    from aiida.schedulers.datastructures import JobTemplate
+    from aiida.common.datastructures import CodeRunMode
+    from aiida.schedulers.datastructures import JobTemplate, JobTemplateCodeInfo
 
     scheduler = LsfScheduler()
 
     job_tmpl = JobTemplate()
     job_tmpl.job_resource = scheduler.create_job_resource(tot_num_mpiprocs=2, parallel_env='b681e480bd.cern.ch')
-    code_info = CodeInfo()
-    code_info.cmdline_params = []
-    job_tmpl.codes_info = [code_info]
+    tmpl_code_info = JobTemplateCodeInfo()
+    tmpl_code_info.cmdline_params = []
+    job_tmpl.codes_info = [tmpl_code_info]
     job_tmpl.codes_run_mode = CodeRunMode.SERIAL
 
     job_tmpl.rerunnable = True
diff --git a/tests/schedulers/test_pbspro.py b/tests/schedulers/test_pbspro.py
index 5d6d845c82..0cf566190c 100644
--- a/tests/schedulers/test_pbspro.py
+++ b/tests/schedulers/test_pbspro.py
@@ -896,8 +896,8 @@ def test_submit_script(self):
         """
         Test to verify if scripts works fine with default options
         """
-        from aiida.common.datastructures import CodeInfo, CodeRunMode
-        from aiida.schedulers.datastructures import JobTemplate
+        from aiida.common.datastructures import CodeRunMode
+        from aiida.schedulers.datastructures import JobTemplate, JobTemplateCodeInfo
 
         scheduler = PbsproScheduler()
 
@@ -906,10 +906,10 @@ def test_submit_script(self):
         job_tmpl.job_resource = scheduler.create_job_resource(num_machines=1, num_mpiprocs_per_machine=1)
         job_tmpl.uuid = str(uuid.uuid4())
         job_tmpl.max_wallclock_seconds = 24 * 3600
-        code_info = CodeInfo()
-        code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
-        code_info.stdin_name = 'aiida.in'
-        job_tmpl.codes_info = [code_info]
+        tmpl_code_info = JobTemplateCodeInfo()
+        tmpl_code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
+        tmpl_code_info.stdin_name = 'aiida.in'
+        job_tmpl.codes_info = [tmpl_code_info]
         job_tmpl.codes_run_mode = CodeRunMode.SERIAL
 
         submit_script_text = scheduler.get_submit_script(job_tmpl)
@@ -924,13 +924,13 @@ def test_submit_script_bad_shebang(self):
         """
         Test to verify if scripts works fine with default options
         """
-        from aiida.common.datastructures import CodeInfo, CodeRunMode
-        from aiida.schedulers.datastructures import JobTemplate
+        from aiida.common.datastructures import CodeRunMode
+        from aiida.schedulers.datastructures import JobTemplate, JobTemplateCodeInfo
 
         scheduler = PbsproScheduler()
-        code_info = CodeInfo()
-        code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
-        code_info.stdin_name = 'aiida.in'
+        tmpl_code_info = JobTemplateCodeInfo()
+        tmpl_code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
+        tmpl_code_info.stdin_name = 'aiida.in'
 
         for (shebang, expected_first_line) in ((None, '#!/bin/bash'), ('', ''), ('NOSET', '#!/bin/bash')):
             job_tmpl = JobTemplate()
@@ -939,7 +939,7 @@ def test_submit_script_bad_shebang(self):
             else:
                 job_tmpl.shebang = shebang
             job_tmpl.job_resource = scheduler.create_job_resource(num_machines=1, num_mpiprocs_per_machine=1)
-            job_tmpl.codes_info = [code_info]
+            job_tmpl.codes_info = [tmpl_code_info]
             job_tmpl.codes_run_mode = CodeRunMode.SERIAL
 
             submit_script_text = scheduler.get_submit_script(job_tmpl)
@@ -952,8 +952,8 @@ def test_submit_script_with_num_cores_per_machine(self):
         Test to verify if script works fine if we specify only
         num_cores_per_machine value.
         """
-        from aiida.common.datastructures import CodeInfo, CodeRunMode
-        from aiida.schedulers.datastructures import JobTemplate
+        from aiida.common.datastructures import CodeRunMode
+        from aiida.schedulers.datastructures import JobTemplate, JobTemplateCodeInfo
 
         scheduler = PbsproScheduler()
 
@@ -964,10 +964,10 @@ def test_submit_script_with_num_cores_per_machine(self):
         )
         job_tmpl.uuid = str(uuid.uuid4())
         job_tmpl.max_wallclock_seconds = 24 * 3600
-        code_info = CodeInfo()
-        code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
-        code_info.stdin_name = 'aiida.in'
-        job_tmpl.codes_info = [code_info]
+        tmpl_code_info = JobTemplateCodeInfo()
+        tmpl_code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
+        tmpl_code_info.stdin_name = 'aiida.in'
+        job_tmpl.codes_info = [tmpl_code_info]
         job_tmpl.codes_run_mode = CodeRunMode.SERIAL
 
         submit_script_text = scheduler.get_submit_script(job_tmpl)
@@ -985,8 +985,8 @@ def test_submit_script_with_num_cores_per_mpiproc(self):
         Test to verify if scripts works fine if we pass only
         num_cores_per_mpiproc value
         """
-        from aiida.common.datastructures import CodeInfo, CodeRunMode
-        from aiida.schedulers.datastructures import JobTemplate
+        from aiida.common.datastructures import CodeRunMode
+        from aiida.schedulers.datastructures import JobTemplate, JobTemplateCodeInfo
 
         scheduler = PbsproScheduler()
 
@@ -997,10 +997,10 @@ def test_submit_script_with_num_cores_per_mpiproc(self):
         )
         job_tmpl.uuid = str(uuid.uuid4())
         job_tmpl.max_wallclock_seconds = 24 * 3600
-        code_info = CodeInfo()
-        code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
-        code_info.stdin_name = 'aiida.in'
-        job_tmpl.codes_info = [code_info]
+        tmpl_code_info = JobTemplateCodeInfo()
+        tmpl_code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
+        tmpl_code_info.stdin_name = 'aiida.in'
+        job_tmpl.codes_info = [tmpl_code_info]
         job_tmpl.codes_run_mode = CodeRunMode.SERIAL
 
         submit_script_text = scheduler.get_submit_script(job_tmpl)
@@ -1020,8 +1020,8 @@ def test_submit_script_with_num_cores_per_machine_and_mpiproc1(self):
         It should pass in check:
         res.num_cores_per_mpiproc * res.num_mpiprocs_per_machine = res.num_cores_per_machine
         """
-        from aiida.common.datastructures import CodeInfo, CodeRunMode
-        from aiida.schedulers.datastructures import JobTemplate
+        from aiida.common.datastructures import CodeRunMode
+        from aiida.schedulers.datastructures import JobTemplate, JobTemplateCodeInfo
 
         scheduler = PbsproScheduler()
 
@@ -1032,10 +1032,10 @@ def test_submit_script_with_num_cores_per_machine_and_mpiproc1(self):
         )
         job_tmpl.uuid = str(uuid.uuid4())
         job_tmpl.max_wallclock_seconds = 24 * 3600
-        code_info = CodeInfo()
-        code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
-        code_info.stdin_name = 'aiida.in'
-        job_tmpl.codes_info = [code_info]
+        tmpl_code_info = JobTemplateCodeInfo()
+        tmpl_code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
+        tmpl_code_info.stdin_name = 'aiida.in'
+        job_tmpl.codes_info = [tmpl_code_info]
         job_tmpl.codes_run_mode = CodeRunMode.SERIAL
 
         submit_script_text = scheduler.get_submit_script(job_tmpl)
@@ -1066,16 +1066,16 @@ def test_submit_script_with_num_cores_per_machine_and_mpiproc2(self):
 
     def test_submit_script_rerunnable(self):  # pylint: disable=no-self-use
         """Test the `rerunnable` option of the submit script."""
-        from aiida.common.datastructures import CodeInfo, CodeRunMode
-        from aiida.schedulers.datastructures import JobTemplate
+        from aiida.common.datastructures import CodeRunMode
+        from aiida.schedulers.datastructures import JobTemplate, JobTemplateCodeInfo
 
         scheduler = PbsproScheduler()
 
         job_tmpl = JobTemplate()
         job_tmpl.job_resource = scheduler.create_job_resource(num_machines=1, num_mpiprocs_per_machine=1)
-        code_info = CodeInfo()
-        code_info.cmdline_params = []
-        job_tmpl.codes_info = [code_info]
+        tmpl_code_info = JobTemplateCodeInfo()
+        tmpl_code_info.cmdline_params = []
+        job_tmpl.codes_info = [tmpl_code_info]
         job_tmpl.codes_run_mode = CodeRunMode.SERIAL
 
         job_tmpl.rerunnable = True
diff --git a/tests/schedulers/test_slurm.py b/tests/schedulers/test_slurm.py
index f3cac9af1f..0fc8cf1099 100644
--- a/tests/schedulers/test_slurm.py
+++ b/tests/schedulers/test_slurm.py
@@ -195,8 +195,8 @@ def test_submit_script(self):
         """
         Test the creation of a simple submission script.
         """
-        from aiida.common.datastructures import CodeInfo, CodeRunMode
-        from aiida.schedulers.datastructures import JobTemplate
+        from aiida.common.datastructures import CodeRunMode
+        from aiida.schedulers.datastructures import JobTemplate, JobTemplateCodeInfo
 
         scheduler = SlurmScheduler()
 
@@ -205,10 +205,10 @@ def test_submit_script(self):
         job_tmpl.uuid = str(uuid.uuid4())
         job_tmpl.job_resource = scheduler.create_job_resource(num_machines=1, num_mpiprocs_per_machine=1)
         job_tmpl.max_wallclock_seconds = 24 * 3600
-        code_info = CodeInfo()
-        code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
-        code_info.stdin_name = 'aiida.in'
-        job_tmpl.codes_info = [code_info]
+        tmpl_code_info = JobTemplateCodeInfo()
+        tmpl_code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
+        tmpl_code_info.stdin_name = 'aiida.in'
+        job_tmpl.codes_info = [tmpl_code_info]
         job_tmpl.codes_run_mode = CodeRunMode.SERIAL
 
         submit_script_text = scheduler.get_submit_script(job_tmpl)
@@ -223,13 +223,13 @@ def test_submit_script(self):
 
     def test_submit_script_bad_shebang(self):
         """Test that first line of submit script is as expected."""
-        from aiida.common.datastructures import CodeInfo, CodeRunMode
-        from aiida.schedulers.datastructures import JobTemplate
+        from aiida.common.datastructures import CodeRunMode
+        from aiida.schedulers.datastructures import JobTemplate, JobTemplateCodeInfo
 
         scheduler = SlurmScheduler()
-        code_info = CodeInfo()
-        code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
-        code_info.stdin_name = 'aiida.in'
+        tmpl_code_info = JobTemplateCodeInfo()
+        tmpl_code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
+        tmpl_code_info.stdin_name = 'aiida.in'
 
         for (shebang, expected_first_line) in ((None, '#!/bin/bash'), ('', ''), ('NOSET', '#!/bin/bash')):
             job_tmpl = JobTemplate()
@@ -238,7 +238,7 @@ def test_submit_script_bad_shebang(self):
             else:
                 job_tmpl.shebang = shebang
             job_tmpl.job_resource = scheduler.create_job_resource(num_machines=1, num_mpiprocs_per_machine=1)
-            job_tmpl.codes_info = [code_info]
+            job_tmpl.codes_info = [tmpl_code_info]
             job_tmpl.codes_run_mode = CodeRunMode.SERIAL
 
             submit_script_text = scheduler.get_submit_script(job_tmpl)
@@ -251,8 +251,8 @@ def test_submit_script_with_num_cores_per_machine(self):  # pylint: disable=inva
         Test to verify if script works fine if we specify only
         num_cores_per_machine value.
         """
-        from aiida.common.datastructures import CodeInfo, CodeRunMode
-        from aiida.schedulers.datastructures import JobTemplate
+        from aiida.common.datastructures import CodeRunMode
+        from aiida.schedulers.datastructures import JobTemplate, JobTemplateCodeInfo
 
         scheduler = SlurmScheduler()
 
@@ -263,10 +263,10 @@ def test_submit_script_with_num_cores_per_machine(self):  # pylint: disable=inva
         )
         job_tmpl.uuid = str(uuid.uuid4())
         job_tmpl.max_wallclock_seconds = 24 * 3600
-        code_info = CodeInfo()
-        code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
-        code_info.stdin_name = 'aiida.in'
-        job_tmpl.codes_info = [code_info]
+        tmpl_code_info = JobTemplateCodeInfo()
+        tmpl_code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
+        tmpl_code_info.stdin_name = 'aiida.in'
+        job_tmpl.codes_info = [tmpl_code_info]
         job_tmpl.codes_run_mode = CodeRunMode.SERIAL
 
         submit_script_text = scheduler.get_submit_script(job_tmpl)
@@ -283,8 +283,8 @@ def test_submit_script_with_num_cores_per_mpiproc(self):  # pylint: disable=inva
         """
         Test to verify if scripts works fine if we pass only num_cores_per_mpiproc value
         """
-        from aiida.common.datastructures import CodeInfo, CodeRunMode
-        from aiida.schedulers.datastructures import JobTemplate
+        from aiida.common.datastructures import CodeRunMode
+        from aiida.schedulers.datastructures import JobTemplate, JobTemplateCodeInfo
 
         scheduler = SlurmScheduler()
 
@@ -295,10 +295,10 @@ def test_submit_script_with_num_cores_per_mpiproc(self):  # pylint: disable=inva
         )
         job_tmpl.uuid = str(uuid.uuid4())
         job_tmpl.max_wallclock_seconds = 24 * 3600
-        code_info = CodeInfo()
-        code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
-        code_info.stdin_name = 'aiida.in'
-        job_tmpl.codes_info = [code_info]
+        tmpl_code_info = JobTemplateCodeInfo()
+        tmpl_code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
+        tmpl_code_info.stdin_name = 'aiida.in'
+        job_tmpl.codes_info = [tmpl_code_info]
         job_tmpl.codes_run_mode = CodeRunMode.SERIAL
 
         submit_script_text = scheduler.get_submit_script(job_tmpl)
@@ -318,8 +318,8 @@ def test_submit_script_with_num_cores_per_machine_and_mpiproc1(self):  # pylint:
         It should pass in check:
         res.num_cores_per_mpiproc * res.num_mpiprocs_per_machine = res.num_cores_per_machine
         """
-        from aiida.common.datastructures import CodeInfo, CodeRunMode
-        from aiida.schedulers.datastructures import JobTemplate
+        from aiida.common.datastructures import CodeRunMode
+        from aiida.schedulers.datastructures import JobTemplate, JobTemplateCodeInfo
 
         scheduler = SlurmScheduler()
 
@@ -330,10 +330,10 @@ def test_submit_script_with_num_cores_per_machine_and_mpiproc1(self):  # pylint:
         )
         job_tmpl.uuid = str(uuid.uuid4())
         job_tmpl.max_wallclock_seconds = 24 * 3600
-        code_info = CodeInfo()
-        code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
-        code_info.stdin_name = 'aiida.in'
-        job_tmpl.codes_info = [code_info]
+        tmpl_code_info = JobTemplateCodeInfo()
+        tmpl_code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
+        tmpl_code_info.stdin_name = 'aiida.in'
+        job_tmpl.codes_info = [tmpl_code_info]
         job_tmpl.codes_run_mode = CodeRunMode.SERIAL
 
         submit_script_text = scheduler.get_submit_script(job_tmpl)
@@ -368,17 +368,17 @@ def test_submit_script_rerunnable(self):
         """
         Test the creation of a submission script with the `rerunnable` option.
         """
-        from aiida.common.datastructures import CodeInfo, CodeRunMode
-        from aiida.schedulers.datastructures import JobTemplate
+        from aiida.common.datastructures import CodeRunMode
+        from aiida.schedulers.datastructures import JobTemplate, JobTemplateCodeInfo
 
         scheduler = SlurmScheduler()
 
         # minimal job template setup
         job_tmpl = JobTemplate()
         job_tmpl.job_resource = scheduler.create_job_resource(num_machines=1, num_mpiprocs_per_machine=1)
-        code_info = CodeInfo()
-        code_info.cmdline_params = []
-        job_tmpl.codes_info = [code_info]
+        tmpl_code_info = JobTemplateCodeInfo()
+        tmpl_code_info.cmdline_params = []
+        job_tmpl.codes_info = [tmpl_code_info]
         job_tmpl.codes_run_mode = CodeRunMode.SERIAL
 
         # Test the `rerunnable` setting
diff --git a/tests/schedulers/test_torque.py b/tests/schedulers/test_torque.py
index 3318f53eea..f4e4815347 100644
--- a/tests/schedulers/test_torque.py
+++ b/tests/schedulers/test_torque.py
@@ -872,8 +872,8 @@ def test_submit_script(self):
         """
         Test to verify if scripts works fine with default options
         """
-        from aiida.common.datastructures import CodeInfo, CodeRunMode
-        from aiida.schedulers.datastructures import JobTemplate
+        from aiida.common.datastructures import CodeRunMode
+        from aiida.schedulers.datastructures import JobTemplate, JobTemplateCodeInfo
 
         s = TorqueScheduler()
 
@@ -882,10 +882,10 @@ def test_submit_script(self):
         job_tmpl.job_resource = s.create_job_resource(num_machines=1, num_mpiprocs_per_machine=1)
         job_tmpl.uuid = str(uuid.uuid4())
         job_tmpl.max_wallclock_seconds = 24 * 3600
-        code_info = CodeInfo()
-        code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
-        code_info.stdin_name = 'aiida.in'
-        job_tmpl.codes_info = [code_info]
+        tmpl_code_info = JobTemplateCodeInfo()
+        tmpl_code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
+        tmpl_code_info.stdin_name = 'aiida.in'
+        job_tmpl.codes_info = [tmpl_code_info]
         job_tmpl.codes_run_mode = CodeRunMode.SERIAL
 
         submit_script_text = s.get_submit_script(job_tmpl)
@@ -900,8 +900,8 @@ def test_submit_script_with_num_cores_per_machine(self):
         Test to verify if script works fine if we specify only
         num_cores_per_machine value.
         """
-        from aiida.common.datastructures import CodeInfo, CodeRunMode
-        from aiida.schedulers.datastructures import JobTemplate
+        from aiida.common.datastructures import CodeRunMode
+        from aiida.schedulers.datastructures import JobTemplate, JobTemplateCodeInfo
 
         scheduler = TorqueScheduler()
 
@@ -912,10 +912,10 @@ def test_submit_script_with_num_cores_per_machine(self):
         )
         job_tmpl.uuid = str(uuid.uuid4())
         job_tmpl.max_wallclock_seconds = 24 * 3600
-        code_info = CodeInfo()
-        code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
-        code_info.stdin_name = 'aiida.in'
-        job_tmpl.codes_info = [code_info]
+        tmpl_code_info = JobTemplateCodeInfo()
+        tmpl_code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
+        tmpl_code_info.stdin_name = 'aiida.in'
+        job_tmpl.codes_info = [tmpl_code_info]
         job_tmpl.codes_run_mode = CodeRunMode.SERIAL
 
         submit_script_text = scheduler.get_submit_script(job_tmpl)
@@ -930,8 +930,8 @@ def test_submit_script_with_num_cores_per_mpiproc(self):
         Test to verify if scripts works fine if we pass only
         num_cores_per_mpiproc value
         """
-        from aiida.common.datastructures import CodeInfo, CodeRunMode
-        from aiida.schedulers.datastructures import JobTemplate
+        from aiida.common.datastructures import CodeRunMode
+        from aiida.schedulers.datastructures import JobTemplate, JobTemplateCodeInfo
 
         scheduler = TorqueScheduler()
 
@@ -942,10 +942,10 @@ def test_submit_script_with_num_cores_per_mpiproc(self):
         )
         job_tmpl.uuid = str(uuid.uuid4())
         job_tmpl.max_wallclock_seconds = 24 * 3600
-        code_info = CodeInfo()
-        code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
-        code_info.stdin_name = 'aiida.in'
-        job_tmpl.codes_info = [code_info]
+        tmpl_code_info = JobTemplateCodeInfo()
+        tmpl_code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
+        tmpl_code_info.stdin_name = 'aiida.in'
+        job_tmpl.codes_info = [tmpl_code_info]
         job_tmpl.codes_run_mode = CodeRunMode.SERIAL
 
         submit_script_text = scheduler.get_submit_script(job_tmpl)
@@ -962,8 +962,8 @@ def test_submit_script_with_num_cores_per_machine_and_mpiproc1(self):
         It should pass in check:
         res.num_cores_per_mpiproc * res.num_mpiprocs_per_machine = res.num_cores_per_machine
         """
-        from aiida.common.datastructures import CodeInfo, CodeRunMode
-        from aiida.schedulers.datastructures import JobTemplate
+        from aiida.common.datastructures import CodeRunMode
+        from aiida.schedulers.datastructures import JobTemplate, JobTemplateCodeInfo
 
         scheduler = TorqueScheduler()
 
@@ -974,10 +974,10 @@ def test_submit_script_with_num_cores_per_machine_and_mpiproc1(self):
         )
         job_tmpl.uuid = str(uuid.uuid4())
         job_tmpl.max_wallclock_seconds = 24 * 3600
-        code_info = CodeInfo()
-        code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
-        code_info.stdin_name = 'aiida.in'
-        job_tmpl.codes_info = [code_info]
+        tmpl_code_info = JobTemplateCodeInfo()
+        tmpl_code_info.cmdline_params = ['mpirun', '-np', '23', 'pw.x', '-npool', '1']
+        tmpl_code_info.stdin_name = 'aiida.in'
+        job_tmpl.codes_info = [tmpl_code_info]
         job_tmpl.codes_run_mode = CodeRunMode.SERIAL
 
         submit_script_text = scheduler.get_submit_script(job_tmpl)
@@ -1006,16 +1006,16 @@ def test_submit_script_with_num_cores_per_machine_and_mpiproc2(self):
 
     def test_submit_script_rerunnable(self):  # pylint: disable=no-self-use
         """Test the `rerunnable` option of the submit script."""
-        from aiida.common.datastructures import CodeInfo, CodeRunMode
-        from aiida.schedulers.datastructures import JobTemplate
+        from aiida.common.datastructures import CodeRunMode
+        from aiida.schedulers.datastructures import JobTemplate, JobTemplateCodeInfo
 
         scheduler = TorqueScheduler()
 
         job_tmpl = JobTemplate()
         job_tmpl.job_resource = scheduler.create_job_resource(num_machines=1, num_mpiprocs_per_machine=1)
-        code_info = CodeInfo()
-        code_info.cmdline_params = []
-        job_tmpl.codes_info = [code_info]
+        tmpl_code_info = JobTemplateCodeInfo()
+        tmpl_code_info.cmdline_params = []
+        job_tmpl.codes_info = [tmpl_code_info]
         job_tmpl.codes_run_mode = CodeRunMode.SERIAL
 
         job_tmpl.rerunnable = True