Correct prompt template

config.yml

@@ -4,22 +4,28 @@ min_length: 2
 repetition_penalty: 1
 template_string: >
   _setting_name {{ location_name }}
+
   _setting_desc {{ location }}</s>
-  _setting_name {{ name }}
-  _setting_desc {{ persona }}</s>
-  _setting_name {{ other_name }}
-  _setting_desc {{ other_persona }}</s>
+
+  _self_name {{ name }}
+
+  _self_persona {{ persona }}</s>
+
+  _partner_name {{ other_name }}
+
+  _other_persona {{ other_persona }}</s>
+
   {% for line in history -%}
   {% if line.speaker == name -%}
-  <speaker_self> 
+  <speaker_self>
   {%- elif line.speaker == other_name -%}
-  <speaker_other> 
+  <speaker_other>
   {%- endif -%}
-  {{ line.line }}  
-  {%- if loop.index != (history|length) -%}
+  {{- line.line -}}
   </s>
-  {% endif %}
-  {%- endfor %}
+
+  {% endfor -%}
+
 default_context: >
   {
     "location_name": "",