diff --git a/doc/service/file.md b/doc/service/file.md
index f14435ca6..b1b092718 100644
--- a/doc/service/file.md
+++ b/doc/service/file.md
@@ -11,7 +11,7 @@ Il est nécessaire, au minimum, de spécifier le chemin complet du fichier :
 ```
 <services>
     <service name="squid">
-        <file name="/etc/squid/squid.conf"/>
+        <file>/etc/squid/squid.conf</file>
     </service>
 </services>
 ```
@@ -21,7 +21,7 @@ Dans ce cas, le nom du template est déduit du nom du fichier, ici cela sera "sq
 Si le template a un nom différent (par exemple si plusieurs template se retrouve avec le même nom), il est possible de changer le nom du template avec l'attribut source :
 
 ```
-<file name="/etc/squid/squid.conf" source="template-squid.conf"/>
+<file source="template-squid.conf">/etc/squid/squid.conf</file>
 ```
 
 ## Les noms de fichiers dynamique
@@ -31,7 +31,7 @@ Il est possible également de définir le nom du fichier dans une variable :
 ```
 <services>
     <service name="squid">
-        <file name="my_variable" file_type="variable" source="squid.conf"/>
+        <file file_type="variable" source="squid.conf">my_variable</file>
     </service>
 </services>
 <variables>
@@ -50,7 +50,7 @@ Il est même possible de définir une variable de type multiple, ce qui génère
 ```
 <services>
     <service name="squid">
-        <file name="my_variable" file_type="variable" source="squid.conf"/>
+        <file file_type="variable" source="squid.conf">my_variable</file>
     </service>
 </services>
 <variables>
@@ -74,7 +74,7 @@ En effet, il est possible de passer le contenu d'une variable au template :
 ```
 <services>
     <service name="squid">
-        <file name="my_variable1" file_type="variable" source="squid.conf" variable="my_variable2"/>
+        <file file_type="variable" source="squid.conf" variable="my_variable2">my_variable1</file>
     </service>
 </services>
 <variables>
@@ -100,7 +100,7 @@ Par défaut les droits du fichier généré sont "0644" avec comme utilisateur "
 Il est possible de définir une autre valeur à un ou plusieurs de ces attributs :
 
 ```
-<file name="/etc/squid/squid.conf" mode="0640" owner="nobody" group="squid"/>
+<file mode="0640" owner="nobody" group="squid">/etc/squid/squid.conf</file>
 ```
 
 ## Désactiver la génération d'un fichier
@@ -110,7 +110,7 @@ Il est possible de définir une [condition](../condition/README.md) de type "dis
 ```
 <services>
     <service name="test">
-        <file name="/etc/squid/squid.conf" filelist="squid"/>
+        <file filelist="squid">/etc/squid/squid.conf</file>
     </service>
 </services>
 <variables>
@@ -131,7 +131,7 @@ Dans ce cas, tous les fichiers avec un attribut filelist à "squid" seront désa
 Il est possible de redéfinir les éléments d'un fichier dans un dictionnaire différent en utilisant l'attribut redefine :
 
 ```
-<file name="/etc/squid/squid.conf" source="template-squid.conf" redefine="True"/>
+<file source="template-squid.conf" redefine="True">/etc/squid/squid.conf</file>
 ```
 
 ## Choix du moteur de templating
@@ -141,5 +141,5 @@ Par défaut, le moteur de templating est le moteur de templating compatible avec
 Aujourd'hui il est possible de désactiver la templatisation du fichier (il sera alors uniquement copié) :
 
 ```
-<file name="/etc/squid/squid.conf" templating="none"/>
+<file templating="none">/etc/squid/squid.conf</file>
 ```
diff --git a/src/rougail/data/rougail.dtd b/src/rougail/data/rougail.dtd
index c7e3f0a5e..448020247 100644
--- a/src/rougail/data/rougail.dtd
+++ b/src/rougail/data/rougail.dtd
@@ -61,8 +61,7 @@
 <!ATTLIST ip netmask_type (variable) "variable">
 <!ATTLIST ip netmask CDATA #IMPLIED>
 
-<!ELEMENT file EMPTY>
-<!ATTLIST file name CDATA #REQUIRED>
+<!ELEMENT file (#PCDATA)>
 <!ATTLIST file file_type (filename|variable) "filename">
 <!ATTLIST file variable CDATA #IMPLIED>
 <!ATTLIST file variable_type (variable) "variable">
diff --git a/tests/dictionaries/01base_file/00-base.xml b/tests/dictionaries/01base_file/00-base.xml
index 5b56c9204..c5d313376 100644
--- a/tests/dictionaries/01base_file/00-base.xml
+++ b/tests/dictionaries/01base_file/00-base.xml
@@ -3,7 +3,7 @@
 
     <services>
         <service name="test">
-            <file name="/etc/file"/>
+            <file>/etc/file</file>
         </service>
     </services>
 
diff --git a/tests/dictionaries/01base_file_include/00-base.xml b/tests/dictionaries/01base_file_include/00-base.xml
index 5b56c9204..c5d313376 100644
--- a/tests/dictionaries/01base_file_include/00-base.xml
+++ b/tests/dictionaries/01base_file_include/00-base.xml
@@ -3,7 +3,7 @@
 
     <services>
         <service name="test">
-            <file name="/etc/file"/>
+            <file>/etc/file</file>
         </service>
     </services>
 
diff --git a/tests/dictionaries/01base_file_patch/00-base.xml b/tests/dictionaries/01base_file_patch/00-base.xml
index 5b56c9204..c5d313376 100644
--- a/tests/dictionaries/01base_file_patch/00-base.xml
+++ b/tests/dictionaries/01base_file_patch/00-base.xml
@@ -3,7 +3,7 @@
 
     <services>
         <service name="test">
-            <file name="/etc/file"/>
+            <file>/etc/file</file>
         </service>
     </services>
 
diff --git a/tests/dictionaries/01base_file_utfchar/00-base.xml b/tests/dictionaries/01base_file_utfchar/00-base.xml
index 960bfe310..8cfac211f 100644
--- a/tests/dictionaries/01base_file_utfchar/00-base.xml
+++ b/tests/dictionaries/01base_file_utfchar/00-base.xml
@@ -3,7 +3,7 @@
 
     <services>
         <service name="test">
-            <file name="/etc/systemd-makefs@dev-disk-by\x2dpartlabel"/>
+            <file>/etc/systemd-makefs@dev-disk-by\x2dpartlabel</file>
         </service>
     </services>
 
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param/00-base.xml
index 5675ac2ba..6ed6397ab 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param/00-base.xml
@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <services>
         <service name="test">
-            <file name="/tmp/file1" filelist="afilllist"/>
+            <file filelist="afilllist">/tmp/file1</file>
         </service>
     </services>
     <variables>
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param2/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param2/00-base.xml
index 59a259295..a395156f6 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param2/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param2/00-base.xml
@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <services>
         <service name="test">
-            <file name="/tmp/file1" filelist="afilllist"/>
+            <file filelist="afilllist">/tmp/file1</file>
         </service>
     </services>
     <variables>
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param3/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param3/00-base.xml
index 896b1b1ef..ae7b98887 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param3/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param3/00-base.xml
@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <services>
         <service name="test">
-            <file name="/tmp/file1" filelist="afilllist"/>
+            <file filelist="afilllist">/tmp/file1</file>
         </service>
     </services>
     <variables>
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param4/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param4/00-base.xml
index 403de824b..13d996be5 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param4/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param4/00-base.xml
@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <services>
         <service name="test">
-            <file name="/tmp/file1" filelist="afilllist"/>
+            <file filelist="afilllist">/tmp/file1</file>
         </service>
     </services>
     <variables>
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param5/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param5/00-base.xml
index 02d98d430..e84d34d99 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param5/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param5/00-base.xml
@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <services>
         <service name="test">
-            <file name="/tmp/file1" filelist="afilllist"/>
+            <file filelist="afilllist">/tmp/file1</file>
         </service>
     </services>
     <variables>
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param6/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param6/00-base.xml
index ab0488cfe..ccd8dc9d5 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param6/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param6/00-base.xml
@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <services>
         <service name="test">
-            <file name="/tmp/file1" filelist="afilllist"/>
+            <file filelist="afilllist">/tmp/file1</file>
         </service>
     </services>
     <variables>
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/00-base.xml
index 335362d78..66ba77d28 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/00-base.xml
@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <services>
         <service name="test">
-            <file name="/tmp/file1" filelist="afilllist"/>
+            <file filelist="afilllist">/tmp/file1</file>
         </service>
     </services>
     <variables>
diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml b/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml
index ac129ca7e..481a47381 100644
--- a/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml
@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <services>
         <service name="test">
-            <file name="/tmp/file1" filelist="afilllist"/>
+            <file filelist="afilllist">/tmp/file1</file>
         </service>
     </services>
     <variables>
diff --git a/tests/dictionaries/11disabled_if_in_filelist/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist/00-base.xml
index 7240398fd..8a0fb898a 100644
--- a/tests/dictionaries/11disabled_if_in_filelist/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist/00-base.xml
@@ -3,7 +3,7 @@
 
     <services>
         <service name="test">
-            <file name="/etc/file" filelist="afilllist"/>
+            <file filelist="afilllist">/etc/file</file>
         </service>
     </services>
 
diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist_boolean/00-base.xml
index 7a2d7f342..1898469e4 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_boolean/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist_boolean/00-base.xml
@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <services>
         <service name="test">
-            <file name="/tmp/file1" filelist="afilllist"/>
+            <file filelist="afilllist">/tmp/file1</file>
         </service>
     </services>
     <variables>
diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean2/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist_boolean2/00-base.xml
index 5bfed6d81..b78688090 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_boolean2/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist_boolean2/00-base.xml
@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <services>
         <service name="test">
-            <file name="/tmp/file1" filelist="afilllist"/>
+            <file filelist="afilllist">/tmp/file1</file>
         </service>
     </services>
     <variables>
diff --git a/tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml
index 96f472099..950d9a779 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml
@@ -3,7 +3,7 @@
 
     <services>
         <service name="test">
-            <file name="/etc/file" filelist="afilllist"/>
+            <file filelist="afilllist">/etc/file</file>
         </service>
     </services>
 
diff --git a/tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml
index 17d3b5091..fdca7b2af 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml
@@ -3,8 +3,8 @@
 
     <services>
         <service name="test">
-            <file name="/tmp/file1" filelist="afilllist"/>
-            <file name="/tmp/file2" filelist="afilllist"/>
+            <file filelist="afilllist">/tmp/file1</file>
+            <file filelist="afilllist">/tmp/file2</file>
         </service>
     </services>
 
diff --git a/tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml b/tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml
index 437eca2b5..ccc7fa128 100644
--- a/tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml
+++ b/tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml
@@ -3,7 +3,7 @@
 
     <services>
         <service name="test">
-            <file name="/tmp/file" filelist="afilllist"/>
+            <file filelist="afilllist">/tmp/file</file>
         </service>
     </services>
 
diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml b/tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml
index ba3bd1590..ce128737d 100644
--- a/tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml
+++ b/tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml
@@ -3,7 +3,7 @@
 
     <services>
         <service name="test">
-            <file name="/tmp/file" filelist="afilllist"/>
+            <file filelist="afilllist">/tmp/file</file>
         </service>
     </services>
     <variables>
diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml
index be1306231..fe5b9ef6b 100644
--- a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml
+++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml
@@ -3,7 +3,7 @@
 
     <services>
         <service name="test">
-            <file name="/tmp/file" filelist="afilllist"/>
+            <file filelist="afilllist">/tmp/file</file>
         </service>
     </services>
 
diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/00-base.xml b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/00-base.xml
index 2b699bf0b..0f614bfa7 100644
--- a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/00-base.xml
+++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/00-base.xml
@@ -3,7 +3,7 @@
 
     <services>
         <service name="test">
-            <file name="/tmp/file" filelist="afilllist"/>
+            <file filelist="afilllist">/tmp/file</file>
         </service>
     </services>
 
diff --git a/tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml b/tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml
index 7da5a99e0..71af616d7 100644
--- a/tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml
+++ b/tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml
@@ -3,7 +3,7 @@
 
     <services>
         <service name="test">
-            <file name="/tmp/file1" filelist="afilllist"/>
+            <file filelist="afilllist">/tmp/file1</file>
         </service>
     </services>
 
diff --git a/tests/dictionaries/20notemplating/00-base.xml b/tests/dictionaries/20notemplating/00-base.xml
index 83bcf9541..17d1799ce 100644
--- a/tests/dictionaries/20notemplating/00-base.xml
+++ b/tests/dictionaries/20notemplating/00-base.xml
@@ -3,7 +3,7 @@
 
     <services>
         <service name="test">
-            <file name="/etc/file" templating="none"/>
+            <file templating="none">/etc/file</file>
         </service>
     </services>
 
diff --git a/tests/dictionaries/40ifin_leadershipauto/00-base.xml b/tests/dictionaries/40ifin_leadershipauto/00-base.xml
index 767c76d13..326da9309 100644
--- a/tests/dictionaries/40ifin_leadershipauto/00-base.xml
+++ b/tests/dictionaries/40ifin_leadershipauto/00-base.xml
@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <services>
         <service name='test'>
-            <file name='/etc/mailname'/>
+            <file>/etc/mailname</file>
         </service>
     </services>
     <variables>
diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/00-base.xml b/tests/dictionaries/40ifin_leadershipauto_follower/00-base.xml
index ce42edefd..89472aa2b 100644
--- a/tests/dictionaries/40ifin_leadershipauto_follower/00-base.xml
+++ b/tests/dictionaries/40ifin_leadershipauto_follower/00-base.xml
@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <services>
         <service name='test'>
-            <file name='/etc/mailname'/>
+            <file>/etc/mailname</file>
         </service>
     </services>
     <variables>
diff --git a/tests/dictionaries/45extra_without_family/00-base.xml b/tests/dictionaries/45extra_without_family/00-base.xml
index 60c8d48e6..5a64ea264 100644
--- a/tests/dictionaries/45extra_without_family/00-base.xml
+++ b/tests/dictionaries/45extra_without_family/00-base.xml
@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <services>
         <service name="test">
-            <file name="/etc/file"/>
+            <file>/etc/file</file>
         </service>
     </services>
     <variables>
diff --git a/tests/dictionaries/60extra_group/00-base.xml b/tests/dictionaries/60extra_group/00-base.xml
index 1e7dd1e1b..1fd2ac821 100644
--- a/tests/dictionaries/60extra_group/00-base.xml
+++ b/tests/dictionaries/60extra_group/00-base.xml
@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <services>
         <service name='test'>
-            <file name='/etc/mailname'/>
+            <file>/etc/mailname</file>
         </service>
     </services>
     <variables>
diff --git a/tests/dictionaries/60extra_help/00-base.xml b/tests/dictionaries/60extra_help/00-base.xml
index 357469b03..c9079ecb7 100644
--- a/tests/dictionaries/60extra_help/00-base.xml
+++ b/tests/dictionaries/60extra_help/00-base.xml
@@ -3,7 +3,7 @@
 
     <services>
         <service name='test'>
-            <file name='/etc/mailname'/>
+            <file>/etc/mailname</file>
         </service>
     </services>
 
diff --git a/tests/dictionaries/70container_files/00-base.xml b/tests/dictionaries/70container_files/00-base.xml
index 4ee601f34..bfeaeb216 100644
--- a/tests/dictionaries/70container_files/00-base.xml
+++ b/tests/dictionaries/70container_files/00-base.xml
@@ -4,8 +4,8 @@
 
     <services> 
         <service name='test'>
-            <file name='/etc/mailname'/>
-            <file name='/rougail.conf'/>
+            <file>/etc/mailname</file>
+            <file>/rougail.conf</file>
         </service>
     </services>
 
diff --git a/tests/dictionaries/70container_files_symlink_multi/00-base.xml b/tests/dictionaries/70container_files_symlink_multi/00-base.xml
index 432b8e0e4..07bc97421 100644
--- a/tests/dictionaries/70container_files_symlink_multi/00-base.xml
+++ b/tests/dictionaries/70container_files_symlink_multi/00-base.xml
@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <services> 
         <service name='test'>
-            <file name='file_name' file_type="variable" source="mailname"/>
+            <file file_type="variable" source="mailname">file_name</file>
         </service>
     </services>
     <variables>
diff --git a/tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml b/tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml
index a06b979cc..9a78b764b 100644
--- a/tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml
+++ b/tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml
@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <services> 
         <service name='test'>
-            <file name='file_name' file_type="variable" source="mailname" variable="var"/>
+            <file file_type="variable" source="mailname" variable="var">file_name</file>
         </service>
     </services>
     <variables>
diff --git a/tests/dictionaries/70container_files_symlink_variable/00-base.xml b/tests/dictionaries/70container_files_symlink_variable/00-base.xml
index b19d7015d..e765c5cc1 100644
--- a/tests/dictionaries/70container_files_symlink_variable/00-base.xml
+++ b/tests/dictionaries/70container_files_symlink_variable/00-base.xml
@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <services> 
         <service name='test'>
-            <file name='file_name' file_type="variable" source="mailname" variable="var"/>
+            <file file_type="variable" source="mailname" variable="var">file_name</file>
         </service>
     </services>
     <variables>
diff --git a/tests/dictionaries/70container_files_twice/00-base.xml b/tests/dictionaries/70container_files_twice/00-base.xml
index 22084ac54..7f96b3bd9 100644
--- a/tests/dictionaries/70container_files_twice/00-base.xml
+++ b/tests/dictionaries/70container_files_twice/00-base.xml
@@ -4,9 +4,9 @@
 
     <services> 
         <service name='test'>
-            <file name='/etc/mailname'/>
-            <file name='/etc/eole/mailname'/>
-            <file name='/rougail.conf'/>
+            <file>/etc/mailname</file>
+            <file>/etc/eole/mailname</file>
+            <file>/rougail.conf</file>
         </service>
     </services>
 
diff --git a/tests/dictionaries/70container_filesmulti/00-base.xml b/tests/dictionaries/70container_filesmulti/00-base.xml
index b5e0a00ee..a4f9de1af 100644
--- a/tests/dictionaries/70container_filesmulti/00-base.xml
+++ b/tests/dictionaries/70container_filesmulti/00-base.xml
@@ -4,8 +4,8 @@
 
     <services> 
         <service name='test'>
-            <file name='/etc/mailname'/>
-            <file name='/etc/mailname2'/>
+            <file>/etc/mailname</file>
+            <file>/etc/mailname2</file>
         </service>
     </services>
 
diff --git a/tests/dictionaries/70container_filesredefine/00-base.xml b/tests/dictionaries/70container_filesredefine/00-base.xml
index 2944b9d9d..cc609997a 100644
--- a/tests/dictionaries/70container_filesredefine/00-base.xml
+++ b/tests/dictionaries/70container_filesredefine/00-base.xml
@@ -4,7 +4,7 @@
 
     <services> 
         <service name='test'>
-            <file name='/etc/mailname'/>
+            <file>/etc/mailname</file>
         </service>
     </services>
 
diff --git a/tests/dictionaries/70container_filesredefine/01-base.xml b/tests/dictionaries/70container_filesredefine/01-base.xml
index ef2db8530..dd33c3575 100644
--- a/tests/dictionaries/70container_filesredefine/01-base.xml
+++ b/tests/dictionaries/70container_filesredefine/01-base.xml
@@ -3,7 +3,7 @@
 <rougail version="0.9">
     <services> 
         <service name='test'>
-            <file name='/etc/mailname' source="mailname.new" redefine="True"/>
+            <file source="mailname.new" redefine="True">/etc/mailname</file>
         </service>
     </services>
 </rougail>
diff --git a/tests/dictionaries/70service_not_managed/00-base.xml b/tests/dictionaries/70service_not_managed/00-base.xml
index 82fb00192..8b00831f8 100644
--- a/tests/dictionaries/70service_not_managed/00-base.xml
+++ b/tests/dictionaries/70service_not_managed/00-base.xml
@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <services> 
         <service name='test' manage="False">
-            <file name="/tmp/test"/>
+            <file>/tmp/test</file>
         </service>
     </services>
     <variables>
diff --git a/tests/dictionaries/80container_files_symlink_without_source/00-base.xml b/tests/dictionaries/80container_files_symlink_without_source/00-base.xml
index 9d06a3410..770da0737 100644
--- a/tests/dictionaries/80container_files_symlink_without_source/00-base.xml
+++ b/tests/dictionaries/80container_files_symlink_without_source/00-base.xml
@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <services> 
         <service name='test'>
-            <file name='file_name' file_type="variable"/>
+            <file file_type="variable">file_name</file>
         </service>
     </services>
     <variables>
diff --git a/tests/dictionaries/80container_filesredefine_error/00-base.xml b/tests/dictionaries/80container_filesredefine_error/00-base.xml
index 2dfd5c712..cab095498 100644
--- a/tests/dictionaries/80container_filesredefine_error/00-base.xml
+++ b/tests/dictionaries/80container_filesredefine_error/00-base.xml
@@ -3,7 +3,7 @@
 
     <services> 
         <service name="test">
-            <file name="/etc/mailname"/>
+            <file>/etc/mailname</file>
         </service>
     </services>
 
diff --git a/tests/dictionaries/80container_filesredefine_error/01-base.xml b/tests/dictionaries/80container_filesredefine_error/01-base.xml
index a08d2827e..da88e9500 100644
--- a/tests/dictionaries/80container_filesredefine_error/01-base.xml
+++ b/tests/dictionaries/80container_filesredefine_error/01-base.xml
@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <services> 
         <service name="test">
-            <file name="/etc/mailname" source="mailname.new"/>
+            <file source="mailname.new">/etc/mailname</file>
         </service>
     </services>
 </rougail>
diff --git a/tests/dictionaries/80hidden_if_in_filelist/00-base.xml b/tests/dictionaries/80hidden_if_in_filelist/00-base.xml
index a05e9d6da..7aaf14d79 100644
--- a/tests/dictionaries/80hidden_if_in_filelist/00-base.xml
+++ b/tests/dictionaries/80hidden_if_in_filelist/00-base.xml
@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <services>
         <service name="test">
-            <file name="/tmp/file1" filelist="afilllist"/>
+            <file filelist="afilllist">/tmp/file1</file>
         </service>
     </services>
     <variables>
diff --git a/tests/dictionaries/80service_not_managed_port/00-base.xml b/tests/dictionaries/80service_not_managed_port/00-base.xml
new file mode 100644
index 000000000..fd79ecc39
--- /dev/null
+++ b/tests/dictionaries/80service_not_managed_port/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rougail version="0.9">
+    <services> 
+        <service name='test' manage="False">
+	    <port>10</port>
+        </service>
+    </services>
+    <variables>
+        <variable name='var' type='string'>
+            <value>mailname</value>
+        </variable>
+    </variables>
+</rougail>
diff --git a/tests/dictionaries/80service_not_managed_port/__init__.py b/tests/dictionaries/80service_not_managed_port/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/dictionaries/80service_not_managed_port/errno_66 b/tests/dictionaries/80service_not_managed_port/errno_66
new file mode 100644
index 000000000..e69de29bb