diff --git a/templates/xml/calibration_item.xml b/templates/xml/calibration_item.xml
index 50eb6d2e64573cd650917c45d4f04834f70abd99..fa3050635f3c79742cbece670bc49c942cb8b524 100644
--- a/templates/xml/calibration_item.xml
+++ b/templates/xml/calibration_item.xml
@@ -37,13 +37,13 @@
       <dcc:identification>
         <dcc:issuer>{{j.issuer}}</dcc:issuer>
         <dcc:value>{{j.value}}</dcc:value>
-        <dcc:description>
-          {%- for k in j['description'] %}
+        <dcc:name>
+          {%- for k in j['name'] %}
           <dcc:content lang="{{k.lang}}">
             <![CDATA[{%- for l in k.content %}{{l|safe}}{% endfor -%}]]>
           </dcc:content>
           {% endfor -%}            
-        </dcc:description>          
+        </dcc:name>          
       </dcc:identification>
       {% endfor -%}
     </dcc:identifications>
diff --git a/templates/xml/core_data.xml b/templates/xml/core_data.xml
index db36439c403fa10ed752dc2c5a62909ddec0f5e2..dbd155d486e49ec9ac3c3948d1256826086c53e4 100644
--- a/templates/xml/core_data.xml
+++ b/templates/xml/core_data.xml
@@ -17,13 +17,13 @@
         <dcc:identification>
           <dcc:issuer>{{i.issuer}}</dcc:issuer>
           <dcc:value>{{i.value}}</dcc:value>
-          <dcc:description>
-            {%- for j in i['description'] %}
+          <dcc:name>
+            {%- for j in i['name'] %}
             <dcc:content lang="{{j.lang}}">
               <![CDATA[{%- for k in j.content %}{{k|safe}}{% endfor -%}]]>
             </dcc:content>
             {% endfor -%}            
-          </dcc:description>          
+          </dcc:name>          
         </dcc:identification>
         {% endfor -%}
       </dcc:identifications>
@@ -38,4 +38,7 @@
       <dcc:endPerformanceDate>
         {{x.endPerformanceDate}}
       </dcc:endPerformanceDate>
+      <dcc:performanceLocation>
+        {{x.performanceLocation}}
+      </dcc:performanceLocation>
     </dcc:coreData>
diff --git a/templates/xml/dcc.xml b/templates/xml/dcc.xml
index a89e54e200f524e03059ce88cea8071a34697e8c..a533f482d18c55be4275169b6d0ed89b4dc5877b 100644
--- a/templates/xml/dcc.xml
+++ b/templates/xml/dcc.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dcc:digitalCalibrationCertificate
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="https://ptb.de/dcc https://ptb.de/dcc/v2.4.0/dcc.xsd"
+    xsi:schemaLocation="https://ptb.de/dcc https://ptb.de/dcc/v3.0.0/dcc.xsd"
     xmlns:dcc="https://ptb.de/dcc"
     xmlns:si="https://ptb.de/si"
-    schemaVersion="2.4.0">  
+    schemaVersion="3.0.0">      
     <!--
     Copyright (c) 2019 - Physikalisch-Technische Bundesanstalt, alle Rechte 
     vorbehalten - all rights reserved
@@ -46,6 +46,7 @@
   </dcc:administrativeData>
   <dcc:measurementResults>
     <dcc:measurementResult>
+      {% include 'xml/result_header.xml' %}
       {% include 'xml/used_methods.xml' %}
       {% include 'xml/influence_conditions.xml' %}
       {% include 'xml/results.xml' %}