diff --git a/generate_parameter_library_py/generate_parameter_library_py/jinja_templates/python/declare_runtime_parameter b/generate_parameter_library_py/generate_parameter_library_py/jinja_templates/python/declare_runtime_parameter
index 117fa1b..0ba04a0 100644
--- a/generate_parameter_library_py/generate_parameter_library_py/jinja_templates/python/declare_runtime_parameter
+++ b/generate_parameter_library_py/generate_parameter_library_py/jinja_templates/python/declare_runtime_parameter
@@ -1,6 +1,6 @@
 {% for mapped_param in mapped_params -%}
 {%- filter indent(width=4*loop.index0) %}
-for value_{{loop.index}} in updated_params.{{mapped_param}}:
+for value_{{loop.index}} in updated_params.{{struct_name}}{% for map in parameter_map%}{% endfor %}.{{mapped_param}}:
 {%- endfilter -%}
 {% endfor -%}
 {%- filter indent(width=4*(mapped_params|length)) %}
diff --git a/generate_parameter_library_py/generate_parameter_library_py/jinja_templates/python/update_runtime_parameter b/generate_parameter_library_py/generate_parameter_library_py/jinja_templates/python/update_runtime_parameter
index 231a3c4..5f5f168 100644
--- a/generate_parameter_library_py/generate_parameter_library_py/jinja_templates/python/update_runtime_parameter
+++ b/generate_parameter_library_py/generate_parameter_library_py/jinja_templates/python/update_runtime_parameter
@@ -1,6 +1,6 @@
 {% for mapped_param in mapped_params -%}
 {%- filter indent(width=4*loop.index) %}
-for value_{{loop.index}} in updated_params.{{mapped_param}}:
+for value_{{loop.index}} in updated_params.{{struct_name}}{% for map in parameter_map%}{% endfor %}.{{mapped_param}}:
 {%- endfilter -%}
 {% endfor -%}
 {%- filter indent(width=4*(1+mapped_params|length)) %}