diff --git a/resources/templates/provision/snom/D712/{$mac}.xml b/resources/templates/provision/snom/D712/{$mac}.xml
index fd2266b604..24959e0b6b 100644
--- a/resources/templates/provision/snom/D712/{$mac}.xml
+++ b/resources/templates/provision/snom/D712/{$mac}.xml
@@ -99,7 +99,8 @@
   <tbook e="2" complete="true">
     {foreach $contacts as $row}
     <item context="active" type="{if $row.category == "extensions"}colleagues{else}none{/if}" index="{$row@index}">
-      <name>{$row.contact_name_given} {$row.contact_name_family}</name>
+      <first_name>{$row.contact_name_given}</first_name>
+      <last_name>{$row.contact_name_family}</last_name>
       <number>{if $row.category == "extensions"}{$row.phone_extension}{else}{$row.phone_number}{/if}</number>
     </item>
     {/foreach}
diff --git a/resources/templates/provision/snom/D715/{$mac}.xml b/resources/templates/provision/snom/D715/{$mac}.xml
index 84759a0f2f..42602aa15b 100644
--- a/resources/templates/provision/snom/D715/{$mac}.xml
+++ b/resources/templates/provision/snom/D715/{$mac}.xml
@@ -99,7 +99,8 @@
   <tbook e="2" complete="true">
     {foreach $contacts as $row}
     <item context="active" type="{if $row.category == "extensions"}colleagues{else}none{/if}" index="{$row@index}">
-      <name>{$row.contact_name_given} {$row.contact_name_family}</name>
+      <first_name>{$row.contact_name_given}</first_name>
+      <last_name>{$row.contact_name_family}</last_name>
       <number>{if $row.category == "extensions"}{$row.phone_extension}{else}{$row.phone_number}{/if}</number>
     </item>
     {/foreach}
diff --git a/resources/templates/provision/snom/D717/{$mac}.xml b/resources/templates/provision/snom/D717/{$mac}.xml
index 70b23613e3..41b0742f61 100644
--- a/resources/templates/provision/snom/D717/{$mac}.xml
+++ b/resources/templates/provision/snom/D717/{$mac}.xml
@@ -106,7 +106,8 @@
   <tbook e="2" complete="true">
     {foreach $contacts as $row}
     <item context="active" type="{if $row.category == "extensions"}colleagues{else}none{/if}" index="{$row@index}">
-      <name>{$row.contact_name_given} {$row.contact_name_family}</name>
+      <first_name>{$row.contact_name_given}</first_name>
+      <last_name>{$row.contact_name_family}</last_name>
       <number>{if $row.category == "extensions"}{$row.phone_extension}{else}{$row.phone_number}{/if}</number>
     </item>
     {/foreach}
diff --git a/resources/templates/provision/snom/D725/{$mac}.xml b/resources/templates/provision/snom/D725/{$mac}.xml
index dccc8b775f..06cfdcba85 100644
--- a/resources/templates/provision/snom/D725/{$mac}.xml
+++ b/resources/templates/provision/snom/D725/{$mac}.xml
@@ -99,7 +99,8 @@
   <tbook e="2" complete="true">
     {foreach $contacts as $row}
     <item context="active" type="{if $row.category == "extensions"}colleagues{else}none{/if}" index="{$row@index}">
-      <name>{$row.contact_name_given} {$row.contact_name_family}</name>
+      <first_name>{$row.contact_name_given}</first_name>
+      <last_name>{$row.contact_name_family}</last_name>
       <number>{if $row.category == "extensions"}{$row.phone_extension}{else}{$row.phone_number}{/if}</number>
     </item>
     {/foreach}
diff --git a/resources/templates/provision/snom/D735/{$mac}.xml b/resources/templates/provision/snom/D735/{$mac}.xml
index baf9fbc638..1d31d171f1 100644
--- a/resources/templates/provision/snom/D735/{$mac}.xml
+++ b/resources/templates/provision/snom/D735/{$mac}.xml
@@ -114,7 +114,8 @@
   <tbook e="2" complete="true">
     {foreach $contacts as $row}
     <item context="active" type="{if $row.category == "extensions"}colleagues{else}none{/if}" index="{$row@index}">
-      <name>{$row.contact_name_given} {$row.contact_name_family}</name>
+      <first_name>{$row.contact_name_given}</first_name>
+      <last_name>{$row.contact_name_family}</last_name>
       <number>{if $row.category == "extensions"}{$row.phone_extension}{else}{$row.phone_number}{/if}</number>
     </item>
     {/foreach}
diff --git a/resources/templates/provision/snom/D745/{$mac}.xml b/resources/templates/provision/snom/D745/{$mac}.xml
index b81227f891..97fc64fb0b 100644
--- a/resources/templates/provision/snom/D745/{$mac}.xml
+++ b/resources/templates/provision/snom/D745/{$mac}.xml
@@ -104,7 +104,8 @@
   <tbook e="2" complete="true">
     {foreach $contacts as $row}
     <item context="active" type="{if $row.category == "extensions"}colleagues{else}none{/if}" index="{$row@index}">
-      <name>{$row.contact_name_given} {$row.contact_name_family}</name>
+      <first_name>{$row.contact_name_given}</first_name>
+      <last_name>{$row.contact_name_family}</last_name>
       <number>{if $row.category == "extensions"}{$row.phone_extension}{else}{$row.phone_number}{/if}</number>
     </item>
     {/foreach}
diff --git a/resources/templates/provision/snom/D765/{$mac}.xml b/resources/templates/provision/snom/D765/{$mac}.xml
index b690e5b8b8..4cd99225c0 100644
--- a/resources/templates/provision/snom/D765/{$mac}.xml
+++ b/resources/templates/provision/snom/D765/{$mac}.xml
@@ -103,7 +103,8 @@
   <tbook e="2" complete="true">
     {foreach $contacts as $row}
     <item context="active" type="{if $row.category == "extensions"}colleagues{else}none{/if}" index="{$row@index}">
-      <name>{$row.contact_name_given} {$row.contact_name_family}</name>
+      <first_name>{$row.contact_name_given}</first_name>
+      <last_name>{$row.contact_name_family}</last_name>
       <number>{if $row.category == "extensions"}{$row.phone_extension}{else}{$row.phone_number}{/if}</number>
     </item>
     {/foreach}
diff --git a/resources/templates/provision/snom/D785/{$mac}.xml b/resources/templates/provision/snom/D785/{$mac}.xml
index 29f1ed8f62..15181b1842 100644
--- a/resources/templates/provision/snom/D785/{$mac}.xml
+++ b/resources/templates/provision/snom/D785/{$mac}.xml
@@ -102,7 +102,8 @@
   <tbook e="2" complete="true">
     {foreach $contacts as $row}
     <item context="active" type="{if $row.category == "extensions"}colleagues{else}none{/if}" index="{$row@index}">
-      <name>{$row.contact_name_given} {$row.contact_name_family}</name>
+      <first_name>{$row.contact_name_given}</first_name>
+      <last_name>{$row.contact_name_family}</last_name>
       <number>{if $row.category == "extensions"}{$row.phone_extension}{else}{$row.phone_number}{/if}</number>
     </item>
     {/foreach}
diff --git a/resources/templates/provision/snom/D812/{$mac}.xml b/resources/templates/provision/snom/D812/{$mac}.xml
index 70eea06ec5..c12a52cb72 100644
--- a/resources/templates/provision/snom/D812/{$mac}.xml
+++ b/resources/templates/provision/snom/D812/{$mac}.xml
@@ -102,7 +102,8 @@
   <tbook e="2" complete="true">
     {foreach $contacts as $row}
     <item context="active" type="{if $row.category == "extensions"}colleagues{else}none{/if}" index="{$row@index}">
-      <name>{$row.contact_name_given} {$row.contact_name_family}</name>
+      <first_name>{$row.contact_name_given}</first_name>
+      <last_name>{$row.contact_name_family}</last_name>
       <number>{if $row.category == "extensions"}{$row.phone_extension}{else}{$row.phone_number}{/if}</number>
     </item>
     {/foreach}
diff --git a/resources/templates/provision/snom/D815/{$mac}.xml b/resources/templates/provision/snom/D815/{$mac}.xml
index a3d3a64513..6835084383 100644
--- a/resources/templates/provision/snom/D815/{$mac}.xml
+++ b/resources/templates/provision/snom/D815/{$mac}.xml
@@ -102,7 +102,8 @@
   <tbook e="2" complete="true">
     {foreach $contacts as $row}
     <item context="active" type="{if $row.category == "extensions"}colleagues{else}none{/if}" index="{$row@index}">
-      <name>{$row.contact_name_given} {$row.contact_name_family}</name>
+      <first_name>{$row.contact_name_given}</first_name>
+      <last_name>{$row.contact_name_family}</last_name>
       <number>{if $row.category == "extensions"}{$row.phone_extension}{else}{$row.phone_number}{/if}</number>
     </item>
     {/foreach}
diff --git a/resources/templates/provision/snom/D862/{$mac}.xml b/resources/templates/provision/snom/D862/{$mac}.xml
index 6e5fc75a9c..0025f93db3 100644
--- a/resources/templates/provision/snom/D862/{$mac}.xml
+++ b/resources/templates/provision/snom/D862/{$mac}.xml
@@ -102,7 +102,8 @@
   <tbook e="2" complete="true">
     {foreach $contacts as $row}
     <item context="active" type="{if $row.category == "extensions"}colleagues{else}none{/if}" index="{$row@index}">
-      <name>{$row.contact_name_given} {$row.contact_name_family}</name>
+      <first_name>{$row.contact_name_given}</first_name>
+      <last_name>{$row.contact_name_family}</last_name>
       <number>{if $row.category == "extensions"}{$row.phone_extension}{else}{$row.phone_number}{/if}</number>
     </item>
     {/foreach}
diff --git a/resources/templates/provision/snom/D865/{$mac}.xml b/resources/templates/provision/snom/D865/{$mac}.xml
index 6e5fc75a9c..0025f93db3 100644
--- a/resources/templates/provision/snom/D865/{$mac}.xml
+++ b/resources/templates/provision/snom/D865/{$mac}.xml
@@ -102,7 +102,8 @@
   <tbook e="2" complete="true">
     {foreach $contacts as $row}
     <item context="active" type="{if $row.category == "extensions"}colleagues{else}none{/if}" index="{$row@index}">
-      <name>{$row.contact_name_given} {$row.contact_name_family}</name>
+      <first_name>{$row.contact_name_given}</first_name>
+      <last_name>{$row.contact_name_family}</last_name>
       <number>{if $row.category == "extensions"}{$row.phone_extension}{else}{$row.phone_number}{/if}</number>
     </item>
     {/foreach}