--- ./app/code/core/Mage/Customer/etc/config.xml.org	2011-01-25 12:35:25.000000000 +0100
+++ ./app/code/core/Mage/Customer/etc/config.xml	2011-01-25 12:53:54.000000000 +0100
@@ -101,7 +101,7 @@
                     <text translate="title" module="customer">
                         <title>Text</title>
                         <defaultFormat><![CDATA[
-{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}
+{{depend prefix}}{{var prefix}} {{/depend}}{{depend suffix}}{{var suffix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}
 {{depend company}}{{var company}}{{/depend}}
 {{if street1}}{{var street1}}
 {{/if}}
@@ -118,14 +118,14 @@
                         <title>Text One Line</title>
                         <htmlEscape>true</htmlEscape>
                         <defaultFormat>
-<![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}, {{var street}}, {{var city}}, {{var region}} {{var postcode}}, {{var country}}]]>
+<![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{depend suffix}}{{var suffix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}, {{var street}}, {{var city}}, {{var region}} {{var postcode}}, {{var country}}]]>
                         </defaultFormat>
                     </oneline>
                     <html translate="title" module="customer">
                         <title>HTML</title>
                         <htmlEscape>true</htmlEscape>
                         <defaultFormat><![CDATA[
-{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}<br/>
+{{depend prefix}}{{var prefix}} {{/depend}}{{depend suffix}}{{var suffix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}<br/>
 {{depend company}}{{var company}}<br />{{/depend}}
 {{if street1}}{{var street1}}<br />{{/if}}
 {{depend street2}}{{var street2}}<br />{{/depend}}
@@ -140,7 +140,7 @@
                     <pdf translate="title" module="customer">
                         <title>PDF</title>
                         <defaultFormat><![CDATA[
-{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}|
+{{depend prefix}}{{var prefix}} {{/depend}}{{depend suffix}}{{var suffix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}|
 {{depend company}}{{var company}}|{{/depend}}
 {{if street1}}{{var street1}}
 {{/if}}
@@ -155,7 +155,7 @@
                     </pdf>
                     <js_template template="title" module="customer">
                         <title>Javascript Template</title>
-                        <defaultFormat><![CDATA[#{prefix} #{firstname} #{middlename} #{lastname} #{suffix}<br/>#{company}<br/>#{street0}<br/>#{street1}<br/>#{street2}<br/>#{street3}<br/>#{city}, #{region}, #{postcode}<br/>#{country_id}<br/>T: #{telephone}<br/>F: #{fax}]]></defaultFormat>
+                        <defaultFormat><![CDATA[#{prefix} #{suffix} #{firstname} #{middlename} #{lastname}<br/>#{company}<br/>#{street0}<br/>#{street1}<br/>#{street2}<br/>#{street3}<br/>#{city}, #{region}, #{postcode}<br/>#{country_id}<br/>T: #{telephone}<br/>F: #{fax}]]></defaultFormat>
                     </js_template>
                 </formats>
             </address>
