diff --git a/CHANGELOG b/CHANGELOG
index 7cb9ee373d..60c8b5b15e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Enforce suffix and prefix to have id or name
 * Sanitize path in file_open (CVE-2016-1242)
 * Prevent read of user password hash (CVE-2016-1241)
 * Add database dump cache for tests
diff --git a/doc/topics/views/index.rst b/doc/topics/views/index.rst
index 7670a61c41..82bf8dd438 100644
--- a/doc/topics/views/index.rst
+++ b/doc/topics/views/index.rst
@@ -559,7 +559,7 @@ Example
   <tree string="Taxes" sequence="sequence">
       <field name="name"/>
       <field name="percentage">
-          <suffix string="%"/>
+          <suffix name="percentage" string="%"/>
       </field>
       <field name="group"/>
       <field name="type"/>
diff --git a/trytond/ir/ui/tree.rnc b/trytond/ir/ui/tree.rnc
index 83f66eaf5c..83cb2a1399 100644
--- a/trytond/ir/ui/tree.rnc
+++ b/trytond/ir/ui/tree.rnc
@@ -64,7 +64,7 @@ attlist.field &= attribute view_ids { text }?
 prefix = element prefix { attlist.affix, empty }
 suffix = element suffix { attlist.affix, empty }
 attlist.affix &= attribute string { text }?
-attlist.affix &= attribute name { text }?
+attlist.affix &= ( attribute name { text } | attribute id { text } )
 attlist.affix &= attribute icon { text }?
 button = element button { attlist.button, empty }
 attlist.button &= attribute help { text }?
diff --git a/trytond/ir/ui/tree.rng b/trytond/ir/ui/tree.rng
index 8949f53320..1e800d19dd 100644
--- a/trytond/ir/ui/tree.rng
+++ b/trytond/ir/ui/tree.rng
@@ -211,9 +211,10 @@
     </optional>
   </define>
   <define name="attlist.affix" combine="interleave">
-    <optional>
+    <choice>
       <attribute name="name"/>
-    </optional>
+      <attribute name="id"/>
+    </choice>
   </define>
   <define name="attlist.affix" combine="interleave">
     <optional>