From 308e980bfd8ede51a09d8ff124bb8b4e780c3f35 Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Sat, 18 Apr 2020 09:00:03 +0200
Subject: [PATCH] master/slave => leader/follower

---
 src/rougail/annotator.py                      | 12 ++---
 src/rougail/data/rougail.dtd                  |  8 +--
 src/rougail/objspace.py                       |  4 +-
 src/rougail/template.py                       | 54 +++++++++----------
 .../10load_masterslaves/00-base.xml           | 18 +++----
 .../10load_masterslaves/makedict/base.json    |  2 +-
 .../10load_masterslaves/result/00-base.xml    | 10 ++--
 .../00-base.xml                               | 14 ++---
 .../makedict/base.json                        |  2 +-
 .../result/00-base.xml                        | 10 ++--
 .../00-base.xml                               | 14 ++---
 .../makedict/base.json                        |  2 +-
 .../result/00-base.xml                        | 10 ++--
 .../00-base.xml                               | 18 +++----
 .../makedict/base.json                        |  2 +-
 .../result/00-base.xml                        | 10 ++--
 .../00-base.xml                               | 12 ++---
 .../01-base.xml                               |  2 +-
 .../makedict/base.json                        |  2 +-
 .../result/00-base.xml                        |  8 +--
 .../10masterslave_autosaveexpert/00-base.xml  | 18 +++----
 .../makedict/base.json                        |  2 +-
 .../result/00-base.xml                        | 10 ++--
 .../10masterslave_mandatory/00-base.xml       | 18 +++----
 .../makedict/base.json                        |  2 +-
 .../result/00-base.xml                        | 10 ++--
 .../10masterslave_mandatoryslave/00-base.xml  |  4 +-
 .../10masterslave_mastermandatory/00-base.xml | 18 +++----
 .../makedict/base.json                        |  2 +-
 .../result/00-base.xml                        | 10 ++--
 .../10masterslave_multi/00-base.xml           | 30 +++++------
 .../10masterslave_multi/makedict/base.json    |  2 +-
 .../10masterslave_multi/result/00-base.xml    | 18 +++----
 .../10masterslaves_append/00-base.xml         | 18 +++----
 .../10masterslaves_append/01-base.xml         |  6 +--
 .../10masterslaves_append/makedict/base.json  |  2 +-
 .../10masterslaves_append/result/00-base.xml  | 12 ++---
 .../10masterslaves_auto/00-base.xml           | 26 ++++-----
 .../10masterslaves_auto/makedict/base.json    |  2 +-
 .../10masterslaves_auto/result/00-base.xml    | 14 ++---
 .../10masterslaves_automaster/00-base.xml     | 18 +++----
 .../makedict/base.json                        |  2 +-
 .../result/00-base.xml                        | 10 ++--
 .../00-base.xml                               | 16 +++---
 .../result/00-base.xml                        | 10 ++--
 .../10masterslaves_familyaccent/00-base.xml   | 18 +++----
 .../makedict/base.json                        |  2 +-
 .../result/00-base.xml                        | 10 ++--
 .../10valid_enum_master/00-base.xml           | 14 ++---
 .../10valid_enum_master/makedict/base.json    |  2 +-
 .../10valid_enum_master/result/00-base.xml    |  8 +--
 .../20family_modemasterslaves/00-base.xml     | 12 ++---
 .../makedict/base.json                        |  2 +-
 .../result/00-base.xml                        |  8 +--
 .../40ifin_masterslaves/00-base.xml           | 14 ++---
 .../40ifin_masterslaves/makedict/base.json    |  2 +-
 .../40ifin_masterslaves/result/00-base.xml    |  8 +--
 .../40ifin_masterslavesauto/00-base.xml       | 16 +++---
 .../makedict/base.json                        |  2 +-
 .../result/00-base.xml                        |  8 +--
 .../extra_dirs/extra/00-base.xml              |  4 +-
 .../00-base.xml                               |  4 +-
 .../80condition_itself/00-base.xml            |  2 +-
 .../80family_several/00-base.xml              | 18 +++----
 .../00-base.xml                               | 18 +++----
 .../80leadership_not_ordered/00-base.xml      | 18 +++----
 .../80leadership_not_same_family/00-base.xml  | 18 +++----
 .../80leadership_notmulti2/00-base.xml        | 18 +++----
 .../80masterslave_auto_save/00-base.xml       | 18 +++----
 .../80masterslave_notexists/00-base.xml       | 24 ++++-----
 .../80masterslaves_autofreeze/00-base.xml     | 18 +++----
 .../80masterslaves_notmulti/00-base.xml       | 18 +++----
 72 files changed, 399 insertions(+), 399 deletions(-)

diff --git a/src/rougail/annotator.py b/src/rougail/annotator.py
index a38a94f2..0c0e6185 100644
--- a/src/rougail/annotator.py
+++ b/src/rougail/annotator.py
@@ -488,7 +488,7 @@ class SpaceAnnotator(object):
         leader_space.path = leader_fullname
 
 
-    def manage_slave(self,
+    def manage_follower(self,
                      namespace: str,
                      leader_family_name: str,
                      variable: 'Variable',
@@ -512,8 +512,8 @@ class SpaceAnnotator(object):
     def convert_groups(self):  # pylint: disable=C0111
         if hasattr(self.space, 'constraints') and hasattr(self.space.constraints, 'group'):
             for group in self.space.constraints.group:
-                leader_fullname = group.master
-                follower_names = list(group.slave.keys())
+                leader_fullname = group.leader
+                follower_names = list(group.follower.keys())
                 leader_family_name = self.paths.get_variable_family_name(leader_fullname)
                 namespace = self.paths.get_variable_namespace(leader_fullname)
                 leader_name = self.paths.get_variable_name(leader_fullname)
@@ -527,8 +527,8 @@ class SpaceAnnotator(object):
                             has_a_leader = True
                     else:
                         if has_a_leader:
-                            # it's a slave
-                            self.manage_slave(namespace,
+                            # it's a follower
+                            self.manage_follower(namespace,
                                               leader_family_name,
                                               variable,
                                               leader_name,
@@ -537,7 +537,7 @@ class SpaceAnnotator(object):
                                               )
                             ori_leader_family.variable.pop(variable.name)
                             if follower_names == []:
-                                # no more slave
+                                # no more follower
                                 break
                         elif variable.name == leader_name:
                             # it's a leader
diff --git a/src/rougail/data/rougail.dtd b/src/rougail/data/rougail.dtd
index 22495198..df054016 100644
--- a/src/rougail/data/rougail.dtd
+++ b/src/rougail/data/rougail.dtd
@@ -13,7 +13,7 @@
 
 #    Forked by:
 #    Cadoles (http://www.cadoles.com)
-#    Copyright (C) 2019
+#    Copyright (C) 2019-2020
 
 #    distribued with GPL-2 or later license
 
@@ -172,8 +172,8 @@
 <!ATTLIST condition source CDATA #REQUIRED>
 <!ATTLIST condition fallback (True|False) "False">
 
-<!ELEMENT group (slave+)>
-<!ATTLIST group master CDATA #REQUIRED>
+<!ELEMENT group (follower+)>
+<!ATTLIST group leader CDATA #REQUIRED>
 <!ATTLIST group description CDATA #IMPLIED>
 
 <!ELEMENT param (#PCDATA)>
@@ -186,6 +186,6 @@
 <!ATTLIST target type (family|variable|filelist|iplist|portlist|tcpwrapperlist|packagelist|actionlist) "variable">
 <!ATTLIST target optional (True|False) "False">
 
-<!ELEMENT slave (#PCDATA)>
+<!ELEMENT follower (#PCDATA)>
 
 <!ELEMENT help ((variable* | family*)*)>
diff --git a/src/rougail/objspace.py b/src/rougail/objspace.py
index 284ec2a7..4654e3b7 100644
--- a/src/rougail/objspace.py
+++ b/src/rougail/objspace.py
@@ -34,8 +34,8 @@ from .annotator import ERASED_ATTRIBUTES, ActionAnnotator, ServiceAnnotator, Spa
 from .utils import normalize_family
 from .error import CreoleOperationError, SpaceObjShallNotBeUpdated, CreoleDictConsistencyError
 
-# CreoleObjSpace's elements like 'family' or 'slave', that shall be forced to the Redefinable type
-FORCE_REDEFINABLES = ('family', 'slave', 'service', 'disknod', 'variables', 'family_action')
+# CreoleObjSpace's elements like 'family' or 'follower', that shall be forced to the Redefinable type
+FORCE_REDEFINABLES = ('family', 'follower', 'service', 'disknod', 'variables', 'family_action')
 # CreoleObjSpace's elements that shall be forced to the UnRedefinable type
 FORCE_UNREDEFINABLES = ('value', 'input', 'profile', 'ewtapp', 'tag', 'saltaction')
 # CreoleObjSpace's elements that shall be set to the UnRedefinable type
diff --git a/src/rougail/template.py b/src/rougail/template.py
index 1a933da8..928e7f70 100644
--- a/src/rougail/template.py
+++ b/src/rougail/template.py
@@ -59,11 +59,11 @@ class IsDefined:
         if '.' in varname:
             splitted_var = varname.split('.')
             if len(splitted_var) != 2:
-                msg = _("Group variables must be of type master.slave")
+                msg = _("Group variables must be of type leader.follower")
                 raise KeyError(msg)
-            master, slave = splitted_var
-            if master in self.context:
-                return slave in self.context[master].slave.keys()
+            leader, follower = splitted_var
+            if leader in self.context:
+                return follower in self.context[leader].follower.keys()
             return False
         else:
             return varname in self.context
@@ -133,7 +133,7 @@ class CheetahTemplate(ChtTemplate):
 
 
 class CreoleLeader:
-    def __init__(self, value, slave=None, index=None):
+    def __init__(self, value, follower=None, index=None):
         """
         On rend la variable itérable pour pouvoir faire:
         for ip in iplist:
@@ -143,20 +143,20 @@ class CreoleLeader:
         index is used for CreoleLint
         """
         self._value = value
-        if slave is not None:
-            self.slave = slave
+        if follower is not None:
+            self.follower = follower
         else:
-            self.slave = {}
+            self.follower = {}
         self._index = index
 
     def __getattr__(self, name):
-        """Get slave variable or attribute of master value.
+        """Get follower variable or attribute of leader value.
 
-        If the attribute is a name of a slave variable, return its value.
-        Otherwise, returns the requested attribute of master value.
+        If the attribute is a name of a follower variable, return its value.
+        Otherwise, returns the requested attribute of leader value.
         """
-        if name in self.slave:
-            value = self.slave[name]
+        if name in self.follower:
+            value = self.follower[name]
             if isinstance(value, PropertiesOptionError):
                 raise AttributeError()
             return value
@@ -164,36 +164,36 @@ class CreoleLeader:
             return getattr(self._value, name)
 
     def __getitem__(self, index):
-        """Get a master.slave at requested index.
+        """Get a leader.follower at requested index.
         """
         ret = {}
-        for key, values in self.slave.items():
+        for key, values in self.follower.items():
             ret[key] = values[index]
         return CreoleLeader(self._value[index], ret, index)
 
     def __iter__(self):
-        """Iterate over master.slave.
+        """Iterate over leader.follower.
 
-        Return synchronised value of master.slave.
+        Return synchronised value of leader.follower.
         """
         for i in range(len(self._value)):
             ret = {}
-            for key, values in self.slave.items():
+            for key, values in self.follower.items():
                 ret[key] = values[i]
             yield CreoleLeader(self._value[i], ret, i)
 
     def __len__(self):
-        """Delegate to master value
+        """Delegate to leader value
         """
         return len(self._value)
 
     def __repr__(self):
         """Show CreoleLeader as dictionary.
 
-        The master value is stored under 'value' key.
-        The slaves are stored under 'slave' key.
+        The leader value is stored under 'value' key.
+        The followers are stored under 'follower' key.
         """
-        return repr({'value': self._value, 'slave': self.slave})
+        return repr({'value': self._value, 'follower': self.follower})
 
     def __eq__(self, value):
         return value == self._value
@@ -214,7 +214,7 @@ class CreoleLeader:
         return self._value >= value
 
     def __str__(self):
-        """Delegate to master value
+        """Delegate to leader value
         """
         return str(self._value)
 
@@ -227,7 +227,7 @@ class CreoleLeader:
     def __contains__(self, item):
         return item in self._value
 
-    async def add_slave(self, config, name, path):
+    async def add_follower(self, config, name, path):
         if isinstance(self._value, list):
             values = []
             for idx in range(len(self._value)):
@@ -237,7 +237,7 @@ class CreoleLeader:
                     values.append(err)
         else:
             raise Exception('hu?')
-        self.slave[name] = values
+        self.follower[name] = values
 
 
 class CreoleExtra:
@@ -285,7 +285,7 @@ class CreoleTemplateEngine:
                             leader = CreoleLeader(await suboption.value.get())
                             self.creole_variables_dict[await suboption.option.name()] = leader
                         else:
-                            await leader.add_slave(self.config,
+                            await leader.add_follower(self.config,
                                                    await suboption.option.name(),
                                                    await suboption.option.path())
                 else:
@@ -306,7 +306,7 @@ class CreoleTemplateEngine:
                             leader = CreoleLeader(await suboption.value.get())
                             leader_name = await suboption.option.name()
                         else:
-                            await leader.add_slave(self.config,
+                            await leader.add_follower(self.config,
                                                    await suboption.option.name(),
                                                    await suboption.option.path())
                     variables[leader_name] = leader
diff --git a/tests/flattener_dicos/10load_masterslaves/00-base.xml b/tests/flattener_dicos/10load_masterslaves/00-base.xml
index 20128fd6..f9a78f67 100644
--- a/tests/flattener_dicos/10load_masterslaves/00-base.xml
+++ b/tests/flattener_dicos/10load_masterslaves/00-base.xml
@@ -10,22 +10,22 @@
             </variable>
         </family>
         <family name="general1">
-            <variable name="master" type="string" description="master" multi="True"/>
-            <variable name="slave1" type="string" description="slave1" multi="True"/>
-            <variable name="slave2" type="string" description="slave2" multi="True"/>
+            <variable name="leader" type="string" description="leader" multi="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True"/>
+            <variable name="follower2" type="string" description="follower2" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-        <fill name="calc_val" target="slave1">
+        <fill name="calc_val" target="follower1">
             <param name="valeur">valfill</param>
         </fill>
-        <fill name="calc_val" target="slave2">
-            <param type="variable">slave1</param>
+        <fill name="calc_val" target="follower2">
+            <param type="variable">follower1</param>
         </fill>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/10load_masterslaves/makedict/base.json b/tests/flattener_dicos/10load_masterslaves/makedict/base.json
index d80c04f0..7637dca2 100644
--- a/tests/flattener_dicos/10load_masterslaves/makedict/base.json
+++ b/tests/flattener_dicos/10load_masterslaves/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general1.master.master": [], "creole.general1.master.slave1": [], "creole.general1.master.slave2": []}
+{"creole.general.mode_conteneur_actif": "non", "creole.general1.leader.leader": [], "creole.general1.leader.follower1": [], "creole.general1.leader.follower2": []}
diff --git a/tests/flattener_dicos/10load_masterslaves/result/00-base.xml b/tests/flattener_dicos/10load_masterslaves/result/00-base.xml
index ae3075fe..2c2cf4dc 100644
--- a/tests/flattener_dicos/10load_masterslaves/result/00-base.xml
+++ b/tests/flattener_dicos/10load_masterslaves/result/00-base.xml
@@ -13,19 +13,19 @@
     </family>
     <family doc="general1" name="general1">
       <property>normal</property>
-      <leader doc="master" name="master">
+      <leader doc="leader" name="leader">
         <property>normal</property>
-        <variable doc="master" multi="True" name="master" type="string"/>
-        <variable doc="slave1" multi="True" name="slave1" type="string">
+        <variable doc="leader" multi="True" name="leader" type="string"/>
+        <variable doc="follower1" multi="True" name="follower1" type="string">
           <property>normal</property>
           <value name="calc_val" type="calculation">
             <param name="valeur" transitive="False" type="string">valfill</param>
           </value>
         </variable>
-        <variable doc="slave2" multi="True" name="slave2" type="string">
+        <variable doc="follower2" multi="True" name="follower2" type="string">
           <property>normal</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="variable">creole.general1.master.slave1</param>
+            <param transitive="False" type="variable">creole.general1.leader.follower1</param>
           </value>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10load_masterslaves_default_multi/00-base.xml b/tests/flattener_dicos/10load_masterslaves_default_multi/00-base.xml
index 7026f0e2..e57a95af 100644
--- a/tests/flattener_dicos/10load_masterslaves_default_multi/00-base.xml
+++ b/tests/flattener_dicos/10load_masterslaves_default_multi/00-base.xml
@@ -5,21 +5,21 @@
 
     <variables>
         <family name="general">
-          <variable name="mode_conteneur_actif" type="oui/non" description="master" multi="True">
+          <variable name="mode_conteneur_actif" type="oui/non" description="leader" multi="True">
             <value>non</value>
           </variable>
-          <variable name="master" type="string" description="master" multi="True"/>
-          <variable name="slave1" type="string" description="slave1" multi="True">
+          <variable name="leader" type="string" description="leader" multi="True"/>
+          <variable name="follower1" type="string" description="follower1" multi="True">
            <value>value</value>
           </variable>
-          <variable name="slave2" type="string" description="slave2" multi="True"/>
+          <variable name="follower2" type="string" description="follower2" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/10load_masterslaves_default_multi/makedict/base.json b/tests/flattener_dicos/10load_masterslaves_default_multi/makedict/base.json
index d3f6f01a..ccd15703 100644
--- a/tests/flattener_dicos/10load_masterslaves_default_multi/makedict/base.json
+++ b/tests/flattener_dicos/10load_masterslaves_default_multi/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": ["non"], "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []}
+{"creole.general.mode_conteneur_actif": ["non"], "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []}
diff --git a/tests/flattener_dicos/10load_masterslaves_default_multi/result/00-base.xml b/tests/flattener_dicos/10load_masterslaves_default_multi/result/00-base.xml
index 88111892..a5da75c8 100644
--- a/tests/flattener_dicos/10load_masterslaves_default_multi/result/00-base.xml
+++ b/tests/flattener_dicos/10load_masterslaves_default_multi/result/00-base.xml
@@ -3,22 +3,22 @@
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
-      <variable doc="master" multi="True" name="mode_conteneur_actif" type="choice">
+      <variable doc="leader" multi="True" name="mode_conteneur_actif" type="choice">
         <choice type="string">oui</choice>
         <choice type="string">non</choice>
         <property>mandatory</property>
         <property>normal</property>
         <value type="string">non</value>
       </variable>
-      <leader doc="master" name="master">
+      <leader doc="leader" name="leader">
         <property>normal</property>
-        <variable doc="master" multi="True" name="master" type="string"/>
-        <variable doc="slave1" multi="True" name="slave1" type="string">
+        <variable doc="leader" multi="True" name="leader" type="string"/>
+        <variable doc="follower1" multi="True" name="follower1" type="string">
           <property>mandatory</property>
           <property>normal</property>
           <value>value</value>
         </variable>
-        <variable doc="slave2" multi="True" name="slave2" type="string">
+        <variable doc="follower2" multi="True" name="follower2" type="string">
           <property>normal</property>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/00-base.xml b/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/00-base.xml
index 561a6500..8f25b8c7 100644
--- a/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/00-base.xml
+++ b/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/00-base.xml
@@ -5,21 +5,21 @@
 
     <variables>
         <family name="general">
-          <variable name="mode_conteneur_actif" type="oui/non" description="master" multi="True">
+          <variable name="mode_conteneur_actif" type="oui/non" description="leader" multi="True">
             <value>non</value>
           </variable>
-          <variable name="master" type="string" description="master" multi="True">
+          <variable name="leader" type="string" description="leader" multi="True">
            <value>value</value>
           </variable>
-	  <variable name="slave1" type="string" description="slave1" multi="True"/>
-          <variable name="slave2" type="string" description="slave2" multi="True"/>
+	  <variable name="follower1" type="string" description="follower1" multi="True"/>
+          <variable name="follower2" type="string" description="follower2" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/makedict/base.json b/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/makedict/base.json
index 044ad1ee..4efe2c93 100644
--- a/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/makedict/base.json
+++ b/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": ["non"], "creole.general.master.master": ["value"], "creole.general.master.slave1": [null], "creole.general.master.slave2": [null]}
+{"creole.general.mode_conteneur_actif": ["non"], "creole.general.leader.leader": ["value"], "creole.general.leader.follower1": [null], "creole.general.leader.follower2": [null]}
diff --git a/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/result/00-base.xml b/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/result/00-base.xml
index 2108d613..cd29e940 100644
--- a/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/result/00-base.xml
+++ b/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/result/00-base.xml
@@ -3,23 +3,23 @@
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
-      <variable doc="master" multi="True" name="mode_conteneur_actif" type="choice">
+      <variable doc="leader" multi="True" name="mode_conteneur_actif" type="choice">
         <choice type="string">oui</choice>
         <choice type="string">non</choice>
         <property>mandatory</property>
         <property>normal</property>
         <value type="string">non</value>
       </variable>
-      <leader doc="master" name="master">
+      <leader doc="leader" name="leader">
         <property>normal</property>
-        <variable doc="master" multi="True" name="master" type="string">
+        <variable doc="leader" multi="True" name="leader" type="string">
           <property>mandatory</property>
           <value>value</value>
         </variable>
-        <variable doc="slave1" multi="True" name="slave1" type="string">
+        <variable doc="follower1" multi="True" name="follower1" type="string">
           <property>normal</property>
         </variable>
-        <variable doc="slave2" multi="True" name="slave2" type="string">
+        <variable doc="follower2" multi="True" name="follower2" type="string">
           <property>normal</property>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10load_masterslaves_description/00-base.xml b/tests/flattener_dicos/10load_masterslaves_description/00-base.xml
index 04b81b7f..f75f067c 100644
--- a/tests/flattener_dicos/10load_masterslaves_description/00-base.xml
+++ b/tests/flattener_dicos/10load_masterslaves_description/00-base.xml
@@ -7,21 +7,21 @@
             </variable>
         </family>
         <family name='general1'>
-            <variable name='master' type='string' description="master" multi="True"/>
-            <variable name='slave1' type='string' description="slave1" multi="True"/>
-            <variable name='slave2' type='string' description="slave2" multi="True"/>
+            <variable name='leader' type='string' description="leader" multi="True"/>
+            <variable name='follower1' type='string' description="follower1" multi="True"/>
+            <variable name='follower2' type='string' description="follower2" multi="True"/>
         </family>
     </variables>
     <constraints>
-        <fill name='calc_val' target='slave1'>
+        <fill name='calc_val' target='follower1'>
             <param name='valeur'>valfill</param>
         </fill>
-        <fill name='calc_val' target='slave2'>
-            <param type='variable'>slave1</param>
+        <fill name='calc_val' target='follower2'>
+            <param type='variable'>follower1</param>
         </fill>
-        <group master='master' description="other description">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader='leader' description="other description">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
     </constraints>
 </rougail>
diff --git a/tests/flattener_dicos/10load_masterslaves_description/makedict/base.json b/tests/flattener_dicos/10load_masterslaves_description/makedict/base.json
index d80c04f0..7637dca2 100644
--- a/tests/flattener_dicos/10load_masterslaves_description/makedict/base.json
+++ b/tests/flattener_dicos/10load_masterslaves_description/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general1.master.master": [], "creole.general1.master.slave1": [], "creole.general1.master.slave2": []}
+{"creole.general.mode_conteneur_actif": "non", "creole.general1.leader.leader": [], "creole.general1.leader.follower1": [], "creole.general1.leader.follower2": []}
diff --git a/tests/flattener_dicos/10load_masterslaves_description/result/00-base.xml b/tests/flattener_dicos/10load_masterslaves_description/result/00-base.xml
index b17a5b5a..a78ab551 100644
--- a/tests/flattener_dicos/10load_masterslaves_description/result/00-base.xml
+++ b/tests/flattener_dicos/10load_masterslaves_description/result/00-base.xml
@@ -13,19 +13,19 @@
     </family>
     <family doc="general1" name="general1">
       <property>normal</property>
-      <leader doc="other description" name="master">
+      <leader doc="other description" name="leader">
         <property>normal</property>
-        <variable doc="master" multi="True" name="master" type="string"/>
-        <variable doc="slave1" multi="True" name="slave1" type="string">
+        <variable doc="leader" multi="True" name="leader" type="string"/>
+        <variable doc="follower1" multi="True" name="follower1" type="string">
           <property>normal</property>
           <value name="calc_val" type="calculation">
             <param name="valeur" transitive="False" type="string">valfill</param>
           </value>
         </variable>
-        <variable doc="slave2" multi="True" name="slave2" type="string">
+        <variable doc="follower2" multi="True" name="follower2" type="string">
           <property>normal</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="variable">creole.general1.master.slave1</param>
+            <param transitive="False" type="variable">creole.general1.leader.follower1</param>
           </value>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10load_masterslaves_normalize_family/00-base.xml b/tests/flattener_dicos/10load_masterslaves_normalize_family/00-base.xml
index e80c2fd7..98041c11 100644
--- a/tests/flattener_dicos/10load_masterslaves_normalize_family/00-base.xml
+++ b/tests/flattener_dicos/10load_masterslaves_normalize_family/00-base.xml
@@ -10,16 +10,16 @@
             </variable>
         </family>
         <family name="general-1">
-            <variable name="master" type="string" description="master" multi="True"/>
-            <variable name="slave1" type="string" description="slave1" multi="True"/>
-            <variable name="slave2" type="string" description="slave2" multi="True"/>
+            <variable name="leader" type="string" description="leader" multi="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True"/>
+            <variable name="follower2" type="string" description="follower2" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/10load_masterslaves_normalize_family/01-base.xml b/tests/flattener_dicos/10load_masterslaves_normalize_family/01-base.xml
index 4db65a41..d0926cce 100644
--- a/tests/flattener_dicos/10load_masterslaves_normalize_family/01-base.xml
+++ b/tests/flattener_dicos/10load_masterslaves_normalize_family/01-base.xml
@@ -5,7 +5,7 @@
 
     <variables>
         <family name="general-1">
-            <variable name="master" redefine="True" mandatory="True"/>
+            <variable name="leader" redefine="True" mandatory="True"/>
         </family>
     </variables>
 
diff --git a/tests/flattener_dicos/10load_masterslaves_normalize_family/makedict/base.json b/tests/flattener_dicos/10load_masterslaves_normalize_family/makedict/base.json
index a82c00c4..dd3f25df 100644
--- a/tests/flattener_dicos/10load_masterslaves_normalize_family/makedict/base.json
+++ b/tests/flattener_dicos/10load_masterslaves_normalize_family/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general_1.master.master": [], "creole.general_1.master.slave1": [], "creole.general_1.master.slave2": []}
+{"creole.general.mode_conteneur_actif": "non", "creole.general_1.leader.leader": [], "creole.general_1.leader.follower1": [], "creole.general_1.leader.follower2": []}
diff --git a/tests/flattener_dicos/10load_masterslaves_normalize_family/result/00-base.xml b/tests/flattener_dicos/10load_masterslaves_normalize_family/result/00-base.xml
index eca99d8a..b581a144 100644
--- a/tests/flattener_dicos/10load_masterslaves_normalize_family/result/00-base.xml
+++ b/tests/flattener_dicos/10load_masterslaves_normalize_family/result/00-base.xml
@@ -13,15 +13,15 @@
     </family>
     <family doc="general-1" name="general_1">
       <property>basic</property>
-      <leader doc="master" name="master">
+      <leader doc="leader" name="leader">
         <property>basic</property>
-        <variable doc="master" multi="True" name="master" type="string">
+        <variable doc="leader" multi="True" name="leader" type="string">
           <property>mandatory</property>
         </variable>
-        <variable doc="slave1" multi="True" name="slave1" type="string">
+        <variable doc="follower1" multi="True" name="follower1" type="string">
           <property>normal</property>
         </variable>
-        <variable doc="slave2" multi="True" name="slave2" type="string">
+        <variable doc="follower2" multi="True" name="follower2" type="string">
           <property>normal</property>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10masterslave_autosaveexpert/00-base.xml b/tests/flattener_dicos/10masterslave_autosaveexpert/00-base.xml
index 0d157c7e..fbbd2e80 100644
--- a/tests/flattener_dicos/10masterslave_autosaveexpert/00-base.xml
+++ b/tests/flattener_dicos/10masterslave_autosaveexpert/00-base.xml
@@ -8,22 +8,22 @@
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
                 <value>non</value>
             </variable>
-            <variable name="master" type="string" description="master" multi="True"/>
-            <variable name="slave1" type="string" description="slave1" multi="True"/>
-            <variable name="slave2" type="string" description="slave2" multi="True" mode="expert"/>
+            <variable name="leader" type="string" description="leader" multi="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True"/>
+            <variable name="follower2" type="string" description="follower2" multi="True" mode="expert"/>
         </family>
     </variables>
 
     <constraints>
-        <fill name="calc_val" target="slave1">
+        <fill name="calc_val" target="follower1">
             <param name="valeur">valfill</param>
         </fill>
-        <fill name="calc_val" target="slave2">
-            <param type="variable">slave1</param>
+        <fill name="calc_val" target="follower2">
+            <param type="variable">follower1</param>
         </fill>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/10masterslave_autosaveexpert/makedict/base.json b/tests/flattener_dicos/10masterslave_autosaveexpert/makedict/base.json
index 61f7517c..a5b9c7f6 100644
--- a/tests/flattener_dicos/10masterslave_autosaveexpert/makedict/base.json
+++ b/tests/flattener_dicos/10masterslave_autosaveexpert/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []}
+{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []}
diff --git a/tests/flattener_dicos/10masterslave_autosaveexpert/result/00-base.xml b/tests/flattener_dicos/10masterslave_autosaveexpert/result/00-base.xml
index ffbe7a70..00318561 100644
--- a/tests/flattener_dicos/10masterslave_autosaveexpert/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslave_autosaveexpert/result/00-base.xml
@@ -10,19 +10,19 @@
         <property>normal</property>
         <value type="string">non</value>
       </variable>
-      <leader doc="master" name="master">
+      <leader doc="leader" name="leader">
         <property>normal</property>
-        <variable doc="master" multi="True" name="master" type="string"/>
-        <variable doc="slave1" multi="True" name="slave1" type="string">
+        <variable doc="leader" multi="True" name="leader" type="string"/>
+        <variable doc="follower1" multi="True" name="follower1" type="string">
           <property>normal</property>
           <value name="calc_val" type="calculation">
             <param name="valeur" transitive="False" type="string">valfill</param>
           </value>
         </variable>
-        <variable doc="slave2" multi="True" name="slave2" type="string">
+        <variable doc="follower2" multi="True" name="follower2" type="string">
           <property>expert</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="variable">creole.general.master.slave1</param>
+            <param transitive="False" type="variable">creole.general.leader.follower1</param>
           </value>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10masterslave_mandatory/00-base.xml b/tests/flattener_dicos/10masterslave_mandatory/00-base.xml
index 18157e61..3305c720 100644
--- a/tests/flattener_dicos/10masterslave_mandatory/00-base.xml
+++ b/tests/flattener_dicos/10masterslave_mandatory/00-base.xml
@@ -8,22 +8,22 @@
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
                 <value>non</value>
             </variable>
-            <variable name="master" type="string" description="master" multi="True"/>
-            <variable name="slave1" type="string" description="slave1" multi="True" mandatory="True"/>
-            <variable name="slave2" type="string" description="slave2" multi="True"/>
+            <variable name="leader" type="string" description="leader" multi="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True" mandatory="True"/>
+            <variable name="follower2" type="string" description="follower2" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-        <fill name="calc_val" target="slave1">
+        <fill name="calc_val" target="follower1">
             <param name="valeur">valfill</param>
         </fill>
-        <fill name="calc_val" target="slave2">
-            <param type="variable">slave1</param>
+        <fill name="calc_val" target="follower2">
+            <param type="variable">follower1</param>
         </fill>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/10masterslave_mandatory/makedict/base.json b/tests/flattener_dicos/10masterslave_mandatory/makedict/base.json
index 61f7517c..a5b9c7f6 100644
--- a/tests/flattener_dicos/10masterslave_mandatory/makedict/base.json
+++ b/tests/flattener_dicos/10masterslave_mandatory/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []}
+{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []}
diff --git a/tests/flattener_dicos/10masterslave_mandatory/result/00-base.xml b/tests/flattener_dicos/10masterslave_mandatory/result/00-base.xml
index 629553e6..66455866 100644
--- a/tests/flattener_dicos/10masterslave_mandatory/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslave_mandatory/result/00-base.xml
@@ -10,20 +10,20 @@
         <property>normal</property>
         <value type="string">non</value>
       </variable>
-      <leader doc="master" name="master">
+      <leader doc="leader" name="leader">
         <property>normal</property>
-        <variable doc="master" multi="True" name="master" type="string"/>
-        <variable doc="slave1" multi="True" name="slave1" type="string">
+        <variable doc="leader" multi="True" name="leader" type="string"/>
+        <variable doc="follower1" multi="True" name="follower1" type="string">
           <property>mandatory</property>
           <property>normal</property>
           <value name="calc_val" type="calculation">
             <param name="valeur" transitive="False" type="string">valfill</param>
           </value>
         </variable>
-        <variable doc="slave2" multi="True" name="slave2" type="string">
+        <variable doc="follower2" multi="True" name="follower2" type="string">
           <property>normal</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="variable">creole.general.master.slave1</param>
+            <param transitive="False" type="variable">creole.general.leader.follower1</param>
           </value>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10masterslave_mandatoryslave/00-base.xml b/tests/flattener_dicos/10masterslave_mandatoryslave/00-base.xml
index b72cc76e..dd4e26ff 100644
--- a/tests/flattener_dicos/10masterslave_mandatoryslave/00-base.xml
+++ b/tests/flattener_dicos/10masterslave_mandatoryslave/00-base.xml
@@ -13,8 +13,8 @@
     </variables>
 
     <constraints>
-        <group master="nut_monitor_netmask">
-            <slave>nut_monitor_host</slave>
+        <group leader="nut_monitor_netmask">
+            <follower>nut_monitor_host</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/10masterslave_mastermandatory/00-base.xml b/tests/flattener_dicos/10masterslave_mastermandatory/00-base.xml
index dcb7d03d..3ecc195c 100644
--- a/tests/flattener_dicos/10masterslave_mastermandatory/00-base.xml
+++ b/tests/flattener_dicos/10masterslave_mastermandatory/00-base.xml
@@ -8,22 +8,22 @@
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
                 <value>non</value>
             </variable>
-            <variable name="master" type="string" description="master" multi="True" mandatory="True"/>
-            <variable name="slave1" type="string" description="slave1" multi="True"/>
-            <variable name="slave2" type="string" description="slave2" multi="True"/>
+            <variable name="leader" type="string" description="leader" multi="True" mandatory="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True"/>
+            <variable name="follower2" type="string" description="follower2" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-        <fill name="calc_val" target="slave1">
+        <fill name="calc_val" target="follower1">
             <param name="valeur">valfill</param>
         </fill>
-        <fill name="calc_val" target="slave2">
-            <param type="variable">slave1</param>
+        <fill name="calc_val" target="follower2">
+            <param type="variable">follower1</param>
         </fill>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/10masterslave_mastermandatory/makedict/base.json b/tests/flattener_dicos/10masterslave_mastermandatory/makedict/base.json
index 61f7517c..a5b9c7f6 100644
--- a/tests/flattener_dicos/10masterslave_mastermandatory/makedict/base.json
+++ b/tests/flattener_dicos/10masterslave_mastermandatory/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []}
+{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []}
diff --git a/tests/flattener_dicos/10masterslave_mastermandatory/result/00-base.xml b/tests/flattener_dicos/10masterslave_mastermandatory/result/00-base.xml
index 7f4c6051..ba4245dc 100644
--- a/tests/flattener_dicos/10masterslave_mastermandatory/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslave_mastermandatory/result/00-base.xml
@@ -10,21 +10,21 @@
         <property>normal</property>
         <value type="string">non</value>
       </variable>
-      <leader doc="master" name="master">
+      <leader doc="leader" name="leader">
         <property>basic</property>
-        <variable doc="master" multi="True" name="master" type="string">
+        <variable doc="leader" multi="True" name="leader" type="string">
           <property>mandatory</property>
         </variable>
-        <variable doc="slave1" multi="True" name="slave1" type="string">
+        <variable doc="follower1" multi="True" name="follower1" type="string">
           <property>normal</property>
           <value name="calc_val" type="calculation">
             <param name="valeur" transitive="False" type="string">valfill</param>
           </value>
         </variable>
-        <variable doc="slave2" multi="True" name="slave2" type="string">
+        <variable doc="follower2" multi="True" name="follower2" type="string">
           <property>normal</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="variable">creole.general.master.slave1</param>
+            <param transitive="False" type="variable">creole.general.leader.follower1</param>
           </value>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10masterslave_multi/00-base.xml b/tests/flattener_dicos/10masterslave_multi/00-base.xml
index 38b4c14f..ff926ac6 100644
--- a/tests/flattener_dicos/10masterslave_multi/00-base.xml
+++ b/tests/flattener_dicos/10masterslave_multi/00-base.xml
@@ -10,29 +10,29 @@
             </variable>
         </family>
         <family name="general1">
-            <variable name="master" type="string" description="master" multi="True"/>
-            <variable name="slave1" type="string" description="slave1" multi="True"/>
-            <variable name="slave2" type="string" description="slave2" multi="True"/>
-            <variable name="master1" type="string" description="master" multi="True"/>
-            <variable name="slave11" type="string" description="slave1" multi="True"/>
-            <variable name="slave21" type="string" description="slave2" multi="True"/>
+            <variable name="leader" type="string" description="leader" multi="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True"/>
+            <variable name="follower2" type="string" description="follower2" multi="True"/>
+            <variable name="leader1" type="string" description="leader" multi="True"/>
+            <variable name="follower11" type="string" description="follower1" multi="True"/>
+            <variable name="follower21" type="string" description="follower2" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-        <fill name="calc_val" target="slave1">
+        <fill name="calc_val" target="follower1">
             <param name="valeur">valfill</param>
         </fill>
-        <fill name="calc_val" target="slave2">
-            <param type="variable">slave1</param>
+        <fill name="calc_val" target="follower2">
+            <param type="variable">follower1</param>
         </fill>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
-        <group master="master1">
-            <slave>slave11</slave>
-            <slave>slave21</slave>
+        <group leader="leader1">
+            <follower>follower11</follower>
+            <follower>follower21</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/10masterslave_multi/makedict/base.json b/tests/flattener_dicos/10masterslave_multi/makedict/base.json
index 1651d055..b51314de 100644
--- a/tests/flattener_dicos/10masterslave_multi/makedict/base.json
+++ b/tests/flattener_dicos/10masterslave_multi/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general1.master.master": [], "creole.general1.master.slave1": [], "creole.general1.master.slave2": [], "creole.general1.master1.master1": [], "creole.general1.master1.slave11": [], "creole.general1.master1.slave21": []}
+{"creole.general.mode_conteneur_actif": "non", "creole.general1.leader.leader": [], "creole.general1.leader.follower1": [], "creole.general1.leader.follower2": [], "creole.general1.leader1.leader1": [], "creole.general1.leader1.follower11": [], "creole.general1.leader1.follower21": []}
diff --git a/tests/flattener_dicos/10masterslave_multi/result/00-base.xml b/tests/flattener_dicos/10masterslave_multi/result/00-base.xml
index 3ecf24f1..a2525bef 100644
--- a/tests/flattener_dicos/10masterslave_multi/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslave_multi/result/00-base.xml
@@ -13,29 +13,29 @@
     </family>
     <family doc="general1" name="general1">
       <property>normal</property>
-      <leader doc="master" name="master">
+      <leader doc="leader" name="leader">
         <property>normal</property>
-        <variable doc="master" multi="True" name="master" type="string"/>
-        <variable doc="slave1" multi="True" name="slave1" type="string">
+        <variable doc="leader" multi="True" name="leader" type="string"/>
+        <variable doc="follower1" multi="True" name="follower1" type="string">
           <property>normal</property>
           <value name="calc_val" type="calculation">
             <param name="valeur" transitive="False" type="string">valfill</param>
           </value>
         </variable>
-        <variable doc="slave2" multi="True" name="slave2" type="string">
+        <variable doc="follower2" multi="True" name="follower2" type="string">
           <property>normal</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="variable">creole.general1.master.slave1</param>
+            <param transitive="False" type="variable">creole.general1.leader.follower1</param>
           </value>
         </variable>
       </leader>
-      <leader doc="master" name="master1">
+      <leader doc="leader" name="leader1">
         <property>normal</property>
-        <variable doc="master" multi="True" name="master1" type="string"/>
-        <variable doc="slave1" multi="True" name="slave11" type="string">
+        <variable doc="leader" multi="True" name="leader1" type="string"/>
+        <variable doc="follower1" multi="True" name="follower11" type="string">
           <property>normal</property>
         </variable>
-        <variable doc="slave2" multi="True" name="slave21" type="string">
+        <variable doc="follower2" multi="True" name="follower21" type="string">
           <property>normal</property>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10masterslaves_append/00-base.xml b/tests/flattener_dicos/10masterslaves_append/00-base.xml
index 20128fd6..f9a78f67 100644
--- a/tests/flattener_dicos/10masterslaves_append/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_append/00-base.xml
@@ -10,22 +10,22 @@
             </variable>
         </family>
         <family name="general1">
-            <variable name="master" type="string" description="master" multi="True"/>
-            <variable name="slave1" type="string" description="slave1" multi="True"/>
-            <variable name="slave2" type="string" description="slave2" multi="True"/>
+            <variable name="leader" type="string" description="leader" multi="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True"/>
+            <variable name="follower2" type="string" description="follower2" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-        <fill name="calc_val" target="slave1">
+        <fill name="calc_val" target="follower1">
             <param name="valeur">valfill</param>
         </fill>
-        <fill name="calc_val" target="slave2">
-            <param type="variable">slave1</param>
+        <fill name="calc_val" target="follower2">
+            <param type="variable">follower1</param>
         </fill>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/10masterslaves_append/01-base.xml b/tests/flattener_dicos/10masterslaves_append/01-base.xml
index cb85bf0e..d0fab650 100644
--- a/tests/flattener_dicos/10masterslaves_append/01-base.xml
+++ b/tests/flattener_dicos/10masterslaves_append/01-base.xml
@@ -5,13 +5,13 @@
 
     <variables>
         <family name="general1">
-            <variable name="slave3" type="string" description="slave3" multi="True"/>
+            <variable name="follower3" type="string" description="follower3" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-	<group master="master">
-            <slave>slave3</slave>
+	<group leader="leader">
+            <follower>follower3</follower>
 	</group>
     </constraints>
 
diff --git a/tests/flattener_dicos/10masterslaves_append/makedict/base.json b/tests/flattener_dicos/10masterslaves_append/makedict/base.json
index 459e3dfc..efadab16 100644
--- a/tests/flattener_dicos/10masterslaves_append/makedict/base.json
+++ b/tests/flattener_dicos/10masterslaves_append/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general1.master.master": [], "creole.general1.master.slave1": [], "creole.general1.master.slave2": [], "creole.general1.master.slave3": []}
+{"creole.general.mode_conteneur_actif": "non", "creole.general1.leader.leader": [], "creole.general1.leader.follower1": [], "creole.general1.leader.follower2": [], "creole.general1.leader.follower3": []}
diff --git a/tests/flattener_dicos/10masterslaves_append/result/00-base.xml b/tests/flattener_dicos/10masterslaves_append/result/00-base.xml
index d30e3b74..4b8d1024 100644
--- a/tests/flattener_dicos/10masterslaves_append/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_append/result/00-base.xml
@@ -13,22 +13,22 @@
     </family>
     <family doc="general1" name="general1">
       <property>normal</property>
-      <leader doc="master" name="master">
+      <leader doc="leader" name="leader">
         <property>normal</property>
-        <variable doc="master" multi="True" name="master" type="string"/>
-        <variable doc="slave1" multi="True" name="slave1" type="string">
+        <variable doc="leader" multi="True" name="leader" type="string"/>
+        <variable doc="follower1" multi="True" name="follower1" type="string">
           <property>normal</property>
           <value name="calc_val" type="calculation">
             <param name="valeur" transitive="False" type="string">valfill</param>
           </value>
         </variable>
-        <variable doc="slave2" multi="True" name="slave2" type="string">
+        <variable doc="follower2" multi="True" name="follower2" type="string">
           <property>normal</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="variable">creole.general1.master.slave1</param>
+            <param transitive="False" type="variable">creole.general1.leader.follower1</param>
           </value>
         </variable>
-        <variable doc="slave3" multi="True" name="slave3" type="string">
+        <variable doc="follower3" multi="True" name="follower3" type="string">
           <property>normal</property>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10masterslaves_auto/00-base.xml b/tests/flattener_dicos/10masterslaves_auto/00-base.xml
index a6e6872f..7d9f1ca2 100644
--- a/tests/flattener_dicos/10masterslaves_auto/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_auto/00-base.xml
@@ -8,27 +8,27 @@
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
                 <value>non</value>
             </variable>
-            <variable name="master" type="string" description="master" multi="True"/>
-            <variable name="slave1" type="string" description="slave1" multi="True"/>
-            <variable name="slave2" type="string" description="slave2" multi="True"/>
-            <variable name="slave3" type="string" description="slave3" multi="True"/>
+            <variable name="leader" type="string" description="leader" multi="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True"/>
+            <variable name="follower2" type="string" description="follower2" multi="True"/>
+            <variable name="follower3" type="string" description="follower3" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-        <auto name="calc_val" target="slave1">
+        <auto name="calc_val" target="follower1">
             <param name="valeur">valfill</param>
         </auto>
-        <auto name="calc_val" target="slave2">
-            <param type="variable">slave1</param>
+        <auto name="calc_val" target="follower2">
+            <param type="variable">follower1</param>
         </auto>
-        <auto name="calc_val" target="slave3">
-            <param type="variable">master</param>
+        <auto name="calc_val" target="follower3">
+            <param type="variable">leader</param>
         </auto>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
-            <slave>slave3</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
+            <follower>follower3</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/10masterslaves_auto/makedict/base.json b/tests/flattener_dicos/10masterslaves_auto/makedict/base.json
index 9202d7fe..f8bc165e 100644
--- a/tests/flattener_dicos/10masterslaves_auto/makedict/base.json
+++ b/tests/flattener_dicos/10masterslaves_auto/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": []}
+{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": []}
diff --git a/tests/flattener_dicos/10masterslaves_auto/result/00-base.xml b/tests/flattener_dicos/10masterslaves_auto/result/00-base.xml
index 93c36e41..ef7e3cc0 100644
--- a/tests/flattener_dicos/10masterslaves_auto/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_auto/result/00-base.xml
@@ -10,10 +10,10 @@
         <property>normal</property>
         <value type="string">non</value>
       </variable>
-      <leader doc="master" name="master">
+      <leader doc="leader" name="leader">
         <property>normal</property>
-        <variable doc="master" multi="True" name="master" type="string"/>
-        <variable doc="slave1" multi="True" name="slave1" type="string">
+        <variable doc="leader" multi="True" name="leader" type="string"/>
+        <variable doc="follower1" multi="True" name="follower1" type="string">
           <property>force_default_on_freeze</property>
           <property>frozen</property>
           <property>hidden</property>
@@ -22,22 +22,22 @@
             <param name="valeur" transitive="False" type="string">valfill</param>
           </value>
         </variable>
-        <variable doc="slave2" multi="True" name="slave2" type="string">
+        <variable doc="follower2" multi="True" name="follower2" type="string">
           <property>force_default_on_freeze</property>
           <property>frozen</property>
           <property>hidden</property>
           <property>normal</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="variable">creole.general.master.slave1</param>
+            <param transitive="False" type="variable">creole.general.leader.follower1</param>
           </value>
         </variable>
-        <variable doc="slave3" multi="True" name="slave3" type="string">
+        <variable doc="follower3" multi="True" name="follower3" type="string">
           <property>force_default_on_freeze</property>
           <property>frozen</property>
           <property>hidden</property>
           <property>normal</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="variable">creole.general.master.master</param>
+            <param transitive="False" type="variable">creole.general.leader.leader</param>
           </value>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10masterslaves_automaster/00-base.xml b/tests/flattener_dicos/10masterslaves_automaster/00-base.xml
index 439c96a7..d24509d3 100644
--- a/tests/flattener_dicos/10masterslaves_automaster/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_automaster/00-base.xml
@@ -8,22 +8,22 @@
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
                 <value>non</value>
             </variable>
-            <variable name="master" type="string" description="master" multi="True"/>
-            <variable name="slave1" type="string" description="slave1" multi="True"/>
-            <variable name="slave2" type="string" description="slave2" multi="True"/>
+            <variable name="leader" type="string" description="leader" multi="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True"/>
+            <variable name="follower2" type="string" description="follower2" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-        <auto name="calc_val" target="slave1">
+        <auto name="calc_val" target="follower1">
             <param name="valeur">valfill</param>
         </auto>
-        <auto name="calc_val" target="slave2">
-            <param type="variable">master</param>
+        <auto name="calc_val" target="follower2">
+            <param type="variable">leader</param>
         </auto>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/10masterslaves_automaster/makedict/base.json b/tests/flattener_dicos/10masterslaves_automaster/makedict/base.json
index 9202d7fe..f8bc165e 100644
--- a/tests/flattener_dicos/10masterslaves_automaster/makedict/base.json
+++ b/tests/flattener_dicos/10masterslaves_automaster/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": []}
+{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": []}
diff --git a/tests/flattener_dicos/10masterslaves_automaster/result/00-base.xml b/tests/flattener_dicos/10masterslaves_automaster/result/00-base.xml
index a7fa7d42..32fc5126 100644
--- a/tests/flattener_dicos/10masterslaves_automaster/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_automaster/result/00-base.xml
@@ -10,10 +10,10 @@
         <property>normal</property>
         <value type="string">non</value>
       </variable>
-      <leader doc="master" name="master">
+      <leader doc="leader" name="leader">
         <property>normal</property>
-        <variable doc="master" multi="True" name="master" type="string"/>
-        <variable doc="slave1" multi="True" name="slave1" type="string">
+        <variable doc="leader" multi="True" name="leader" type="string"/>
+        <variable doc="follower1" multi="True" name="follower1" type="string">
           <property>force_default_on_freeze</property>
           <property>frozen</property>
           <property>hidden</property>
@@ -22,13 +22,13 @@
             <param name="valeur" transitive="False" type="string">valfill</param>
           </value>
         </variable>
-        <variable doc="slave2" multi="True" name="slave2" type="string">
+        <variable doc="follower2" multi="True" name="follower2" type="string">
           <property>force_default_on_freeze</property>
           <property>frozen</property>
           <property>hidden</property>
           <property>normal</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="variable">creole.general.master.master</param>
+            <param transitive="False" type="variable">creole.general.leader.leader</param>
           </value>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10masterslaves_automaster_expert/00-base.xml b/tests/flattener_dicos/10masterslaves_automaster_expert/00-base.xml
index 49369ad6..76e712e8 100644
--- a/tests/flattener_dicos/10masterslaves_automaster_expert/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_automaster_expert/00-base.xml
@@ -9,20 +9,20 @@
                 <value>non</value>
             </variable>
         </family>
-        <family name="mastermode" mode="expert">
-            <variable name="master" type="string" description="master" multi="True"/>
-            <variable name="slave1" type="string" description="slave1" multi="True"/>
-            <variable name="slave2" type="string" description="slave2" multi="True"/>
+        <family name="leadermode" mode="expert">
+            <variable name="leader" type="string" description="leader" multi="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True"/>
+            <variable name="follower2" type="string" description="follower2" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-        <auto name="calc_val" target="master">
+        <auto name="calc_val" target="leader">
             <param name="valeur">valfill</param>
         </auto>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/10masterslaves_automaster_expert/result/00-base.xml b/tests/flattener_dicos/10masterslaves_automaster_expert/result/00-base.xml
index 8fba03dc..37131b3e 100644
--- a/tests/flattener_dicos/10masterslaves_automaster_expert/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_automaster_expert/result/00-base.xml
@@ -11,22 +11,22 @@
         <value type="string">non</value>
       </variable>
     </family>
-    <family doc="mastermode" name="mastermode">
+    <family doc="leadermode" name="leadermode">
       <property>expert</property>
-      <leader doc="master" name="master">
+      <leader doc="leader" name="leader">
         <property>hidden</property>
         <property>expert</property>
-        <variable doc="master" multi="True" name="master" type="string">
+        <variable doc="leader" multi="True" name="leader" type="string">
           <property>force_default_on_freeze</property>
           <property>frozen</property>
           <value name="calc_val" type="calculation">
             <param name="valeur" transitive="False" type="string">valfill</param>
           </value>
         </variable>
-        <variable doc="slave1" multi="True" name="slave1" type="string">
+        <variable doc="follower1" multi="True" name="follower1" type="string">
           <property>expert</property>
         </variable>
-        <variable doc="slave2" multi="True" name="slave2" type="string">
+        <variable doc="follower2" multi="True" name="follower2" type="string">
           <property>expert</property>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10masterslaves_familyaccent/00-base.xml b/tests/flattener_dicos/10masterslaves_familyaccent/00-base.xml
index 7500aecc..b746e57e 100644
--- a/tests/flattener_dicos/10masterslaves_familyaccent/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_familyaccent/00-base.xml
@@ -8,22 +8,22 @@
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
                 <value>non</value>
             </variable>
-            <variable name="master" type="string" description="master" multi="True"/>
-            <variable name="slave1" type="string" description="slave1" multi="True"/>
-            <variable name="slave2" type="string" description="slave2" multi="True"/>
+            <variable name="leader" type="string" description="leader" multi="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True"/>
+            <variable name="follower2" type="string" description="follower2" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-        <fill name="calc_val" target="slave1">
+        <fill name="calc_val" target="follower1">
             <param name="valeur">valfill</param>
         </fill>
-        <fill name="calc_val" target="slave2">
-            <param type="variable">slave1</param>
+        <fill name="calc_val" target="follower2">
+            <param type="variable">follower1</param>
         </fill>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/10masterslaves_familyaccent/makedict/base.json b/tests/flattener_dicos/10masterslaves_familyaccent/makedict/base.json
index 61f7517c..a5b9c7f6 100644
--- a/tests/flattener_dicos/10masterslaves_familyaccent/makedict/base.json
+++ b/tests/flattener_dicos/10masterslaves_familyaccent/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []}
+{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []}
diff --git a/tests/flattener_dicos/10masterslaves_familyaccent/result/00-base.xml b/tests/flattener_dicos/10masterslaves_familyaccent/result/00-base.xml
index 190353f9..47482572 100644
--- a/tests/flattener_dicos/10masterslaves_familyaccent/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_familyaccent/result/00-base.xml
@@ -10,19 +10,19 @@
         <property>normal</property>
         <value type="string">non</value>
       </variable>
-      <leader doc="master" name="master">
+      <leader doc="leader" name="leader">
         <property>normal</property>
-        <variable doc="master" multi="True" name="master" type="string"/>
-        <variable doc="slave1" multi="True" name="slave1" type="string">
+        <variable doc="leader" multi="True" name="leader" type="string"/>
+        <variable doc="follower1" multi="True" name="follower1" type="string">
           <property>normal</property>
           <value name="calc_val" type="calculation">
             <param name="valeur" transitive="False" type="string">valfill</param>
           </value>
         </variable>
-        <variable doc="slave2" multi="True" name="slave2" type="string">
+        <variable doc="follower2" multi="True" name="follower2" type="string">
           <property>normal</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="variable">creole.general.master.slave1</param>
+            <param transitive="False" type="variable">creole.general.leader.follower1</param>
           </value>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10valid_enum_master/00-base.xml b/tests/flattener_dicos/10valid_enum_master/00-base.xml
index cfff2572..b605f770 100644
--- a/tests/flattener_dicos/10valid_enum_master/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_master/00-base.xml
@@ -8,20 +8,20 @@
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
                 <value>non</value>
             </variable>
-            <variable name="master" type="string" description="master" multi="True"/>
-            <variable name="slave1" type="string" description="slave1" multi="True"/>
-            <variable name="slave2" type="string" description="slave2" multi="True"/>
+            <variable name="leader" type="string" description="leader" multi="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True"/>
+            <variable name="follower2" type="string" description="follower2" multi="True"/>
         </family>
         <separators/>
     </variables>
 
     <constraints>
-        <check name="valid_enum" target="slave1">
+        <check name="valid_enum" target="follower1">
             <param>['a','b','c']</param>
         </check>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/10valid_enum_master/makedict/base.json b/tests/flattener_dicos/10valid_enum_master/makedict/base.json
index 61f7517c..a5b9c7f6 100644
--- a/tests/flattener_dicos/10valid_enum_master/makedict/base.json
+++ b/tests/flattener_dicos/10valid_enum_master/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []}
+{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []}
diff --git a/tests/flattener_dicos/10valid_enum_master/result/00-base.xml b/tests/flattener_dicos/10valid_enum_master/result/00-base.xml
index a4de8b15..117e6dac 100644
--- a/tests/flattener_dicos/10valid_enum_master/result/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_master/result/00-base.xml
@@ -10,10 +10,10 @@
         <property>normal</property>
         <value type="string">non</value>
       </variable>
-      <leader doc="master" name="master">
+      <leader doc="leader" name="leader">
         <property>normal</property>
-        <variable doc="master" multi="True" name="master" type="string"/>
-        <variable doc="slave1" multi="True" name="slave1" type="choice">
+        <variable doc="leader" multi="True" name="leader" type="string"/>
+        <variable doc="follower1" multi="True" name="follower1" type="choice">
           <choice type="string">a</choice>
           <choice type="string">b</choice>
           <choice type="string">c</choice>
@@ -21,7 +21,7 @@
           <property>normal</property>
           <value type="string">a</value>
         </variable>
-        <variable doc="slave2" multi="True" name="slave2" type="string">
+        <variable doc="follower2" multi="True" name="follower2" type="string">
           <property>normal</property>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/20family_modemasterslaves/00-base.xml b/tests/flattener_dicos/20family_modemasterslaves/00-base.xml
index 62aeae3e..4a6ac513 100644
--- a/tests/flattener_dicos/20family_modemasterslaves/00-base.xml
+++ b/tests/flattener_dicos/20family_modemasterslaves/00-base.xml
@@ -8,17 +8,17 @@
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
                 <value>non</value>
             </variable>
-            <variable name="master" type="string" description="master" multi="True"/>
-            <variable name="slave1" type="string" description="slave1" multi="True"/>
-            <variable name="slave2" type="string" description="slave2" multi="True" mode="basic"/>
+            <variable name="leader" type="string" description="leader" multi="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True"/>
+            <variable name="follower2" type="string" description="follower2" multi="True" mode="basic"/>
         </family>
         <separators/>
     </variables>
 
     <constraints>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/20family_modemasterslaves/makedict/base.json b/tests/flattener_dicos/20family_modemasterslaves/makedict/base.json
index 61f7517c..a5b9c7f6 100644
--- a/tests/flattener_dicos/20family_modemasterslaves/makedict/base.json
+++ b/tests/flattener_dicos/20family_modemasterslaves/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []}
+{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []}
diff --git a/tests/flattener_dicos/20family_modemasterslaves/result/00-base.xml b/tests/flattener_dicos/20family_modemasterslaves/result/00-base.xml
index f584c5ae..b4ccf3fe 100644
--- a/tests/flattener_dicos/20family_modemasterslaves/result/00-base.xml
+++ b/tests/flattener_dicos/20family_modemasterslaves/result/00-base.xml
@@ -10,13 +10,13 @@
         <property>normal</property>
         <value type="string">non</value>
       </variable>
-      <leader doc="master" name="master">
+      <leader doc="leader" name="leader">
         <property>normal</property>
-        <variable doc="master" multi="True" name="master" type="string"/>
-        <variable doc="slave1" multi="True" name="slave1" type="string">
+        <variable doc="leader" multi="True" name="leader" type="string"/>
+        <variable doc="follower1" multi="True" name="follower1" type="string">
           <property>normal</property>
         </variable>
-        <variable doc="slave2" multi="True" name="slave2" type="string">
+        <variable doc="follower2" multi="True" name="follower2" type="string">
           <property>normal</property>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/40ifin_masterslaves/00-base.xml b/tests/flattener_dicos/40ifin_masterslaves/00-base.xml
index 4615d044..58919ad4 100644
--- a/tests/flattener_dicos/40ifin_masterslaves/00-base.xml
+++ b/tests/flattener_dicos/40ifin_masterslaves/00-base.xml
@@ -9,20 +9,20 @@
                 <value>non</value>
             </variable>
 	    <variable name="condition" type="oui/non" description="condition"/>
-            <variable name="master" type="string" description="master" multi="True"/>
-            <variable name="slave1" type="string" description="slave1" multi="True"/>
-            <variable name="slave2" type="string" description="slave2" multi="True"/>
+            <variable name="leader" type="string" description="leader" multi="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True"/>
+            <variable name="follower2" type="string" description="follower2" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
         <condition name="disabled_if_in" source="condition">
             <param>oui</param>
-            <target type="variable">slave1</target>
+            <target type="variable">follower1</target>
         </condition>
     </constraints>
 
diff --git a/tests/flattener_dicos/40ifin_masterslaves/makedict/base.json b/tests/flattener_dicos/40ifin_masterslaves/makedict/base.json
index 24f59146..4d5d7674 100644
--- a/tests/flattener_dicos/40ifin_masterslaves/makedict/base.json
+++ b/tests/flattener_dicos/40ifin_masterslaves/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general.condition": "oui", "creole.general.master.master": [], "creole.general.master.slave2": []}
+{"creole.general.mode_conteneur_actif": "non", "creole.general.condition": "oui", "creole.general.leader.leader": [], "creole.general.leader.follower2": []}
diff --git a/tests/flattener_dicos/40ifin_masterslaves/result/00-base.xml b/tests/flattener_dicos/40ifin_masterslaves/result/00-base.xml
index ccee203c..94359a0a 100644
--- a/tests/flattener_dicos/40ifin_masterslaves/result/00-base.xml
+++ b/tests/flattener_dicos/40ifin_masterslaves/result/00-base.xml
@@ -17,14 +17,14 @@
         <property>normal</property>
         <value type="string">oui</value>
       </variable>
-      <leader doc="master" name="master">
+      <leader doc="leader" name="leader">
         <property>normal</property>
-        <variable doc="master" multi="True" name="master" type="string"/>
-        <variable doc="slave1" multi="True" name="slave1" type="string">
+        <variable doc="leader" multi="True" name="leader" type="string"/>
+        <variable doc="follower1" multi="True" name="follower1" type="string">
           <property>normal</property>
           <property expected="oui" inverse="False" source="creole.general.condition" type="calculation">disabled</property>
         </variable>
-        <variable doc="slave2" multi="True" name="slave2" type="string">
+        <variable doc="follower2" multi="True" name="follower2" type="string">
           <property>normal</property>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/40ifin_masterslavesauto/00-base.xml b/tests/flattener_dicos/40ifin_masterslavesauto/00-base.xml
index c031638b..45846822 100644
--- a/tests/flattener_dicos/40ifin_masterslavesauto/00-base.xml
+++ b/tests/flattener_dicos/40ifin_masterslavesauto/00-base.xml
@@ -9,23 +9,23 @@
                 <value>non</value>
             </variable>
 	    <variable name="condition" type="oui/non" description="condition"/>
-            <variable name="master" type="string" description="master" multi="True"/>
-            <variable name="slave1" type="string" description="slave1" multi="True"/>
-            <variable name="slave2" type="string" description="slave2" multi="True"/>
+            <variable name="leader" type="string" description="leader" multi="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True"/>
+            <variable name="follower2" type="string" description="follower2" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
-        <auto name="calc_val" target="slave1">
+        <auto name="calc_val" target="follower1">
             <param name="valeur">valfill</param>
         </auto>
         <condition name="disabled_if_in" source="condition">
             <param>oui</param>
-            <target type="variable">slave1</target>
+            <target type="variable">follower1</target>
         </condition>
     </constraints>
 
diff --git a/tests/flattener_dicos/40ifin_masterslavesauto/makedict/base.json b/tests/flattener_dicos/40ifin_masterslavesauto/makedict/base.json
index 24f59146..4d5d7674 100644
--- a/tests/flattener_dicos/40ifin_masterslavesauto/makedict/base.json
+++ b/tests/flattener_dicos/40ifin_masterslavesauto/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general.condition": "oui", "creole.general.master.master": [], "creole.general.master.slave2": []}
+{"creole.general.mode_conteneur_actif": "non", "creole.general.condition": "oui", "creole.general.leader.leader": [], "creole.general.leader.follower2": []}
diff --git a/tests/flattener_dicos/40ifin_masterslavesauto/result/00-base.xml b/tests/flattener_dicos/40ifin_masterslavesauto/result/00-base.xml
index 180b37dc..624e3346 100644
--- a/tests/flattener_dicos/40ifin_masterslavesauto/result/00-base.xml
+++ b/tests/flattener_dicos/40ifin_masterslavesauto/result/00-base.xml
@@ -17,10 +17,10 @@
         <property>normal</property>
         <value type="string">oui</value>
       </variable>
-      <leader doc="master" name="master">
+      <leader doc="leader" name="leader">
         <property>normal</property>
-        <variable doc="master" multi="True" name="master" type="string"/>
-        <variable doc="slave1" multi="True" name="slave1" type="string">
+        <variable doc="leader" multi="True" name="leader" type="string"/>
+        <variable doc="follower1" multi="True" name="follower1" type="string">
           <property>force_default_on_freeze</property>
           <property>frozen</property>
           <property>hidden</property>
@@ -30,7 +30,7 @@
             <param name="valeur" transitive="False" type="string">valfill</param>
           </value>
         </variable>
-        <variable doc="slave2" multi="True" name="slave2" type="string">
+        <variable doc="follower2" multi="True" name="follower2" type="string">
           <property>normal</property>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/60extra_group/extra_dirs/extra/00-base.xml b/tests/flattener_dicos/60extra_group/extra_dirs/extra/00-base.xml
index 158e7b05..ebbabd26 100644
--- a/tests/flattener_dicos/60extra_group/extra_dirs/extra/00-base.xml
+++ b/tests/flattener_dicos/60extra_group/extra_dirs/extra/00-base.xml
@@ -12,8 +12,8 @@
         </family>
     </variables>
     <constraints>
-        <group master="extra.ejabberd.description">
-            <slave>mode</slave>
+        <group leader="extra.ejabberd.description">
+            <follower>mode</follower>
         </group>
     </constraints>
 </rougail>
diff --git a/tests/flattener_dicos/70container_pathaccess_masterslaves/00-base.xml b/tests/flattener_dicos/70container_pathaccess_masterslaves/00-base.xml
index 44322da3..1ab25a5d 100644
--- a/tests/flattener_dicos/70container_pathaccess_masterslaves/00-base.xml
+++ b/tests/flattener_dicos/70container_pathaccess_masterslaves/00-base.xml
@@ -20,8 +20,8 @@
     </variables>
 
     <constraints>
-        <group master="nut_monitor_netmask">
-            <slave>nut_monitor_host</slave>
+        <group leader="nut_monitor_netmask">
+            <follower>nut_monitor_host</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/80condition_itself/00-base.xml b/tests/flattener_dicos/80condition_itself/00-base.xml
index dbe0f58a..99fb6ba1 100644
--- a/tests/flattener_dicos/80condition_itself/00-base.xml
+++ b/tests/flattener_dicos/80condition_itself/00-base.xml
@@ -7,7 +7,7 @@
     </variables>
     <constraints>
         <condition name="disabled_if_in" source="replicationType">
-            <param>master-master</param>
+            <param>leader-leader</param>
             <target type="variable">replicationType</target>
         </condition>
     </constraints>
diff --git a/tests/flattener_dicos/80family_several/00-base.xml b/tests/flattener_dicos/80family_several/00-base.xml
index 194230c4..2422864a 100644
--- a/tests/flattener_dicos/80family_several/00-base.xml
+++ b/tests/flattener_dicos/80family_several/00-base.xml
@@ -10,22 +10,22 @@
             </variable>
         </family>
         <family name="general">
-            <variable name="master" type="string" description="master" multi="True"/>
-            <variable name="slave1" type="string" description="slave1" multi="True"/>
-            <variable name="slave2" type="string" description="slave2" multi="True"/>
+            <variable name="leader" type="string" description="leader" multi="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True"/>
+            <variable name="follower2" type="string" description="follower2" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-        <fill name="calc_val" target="slave1">
+        <fill name="calc_val" target="follower1">
             <param name="valeur">valfill</param>
         </fill>
-        <fill name="calc_val" target="slave2">
-            <param type="variable">slave1</param>
+        <fill name="calc_val" target="follower2">
+            <param type="variable">follower1</param>
         </fill>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/80leadership_none_slave_between_slave/00-base.xml b/tests/flattener_dicos/80leadership_none_slave_between_slave/00-base.xml
index cb88b2f0..3157fc88 100644
--- a/tests/flattener_dicos/80leadership_none_slave_between_slave/00-base.xml
+++ b/tests/flattener_dicos/80leadership_none_slave_between_slave/00-base.xml
@@ -5,25 +5,25 @@
 
     <variables>
         <family name="general">
-            <variable name="master" type="string" description="master" multi="True"/>
+            <variable name="leader" type="string" description="leader" multi="True"/>
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
                 <value>non</value>
             </variable>
-            <variable name="slave1" type="string" description="slave1" multi="True"/>
-            <variable name="slave2" type="string" description="slave2" multi="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True"/>
+            <variable name="follower2" type="string" description="follower2" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-        <fill name="calc_val" target="slave1">
+        <fill name="calc_val" target="follower1">
             <param name="valeur">valfill</param>
         </fill>
-        <fill name="calc_val" target="slave2">
-            <param type="variable">slave1</param>
+        <fill name="calc_val" target="follower2">
+            <param type="variable">follower1</param>
         </fill>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/80leadership_not_ordered/00-base.xml b/tests/flattener_dicos/80leadership_not_ordered/00-base.xml
index 71254809..742dfe13 100644
--- a/tests/flattener_dicos/80leadership_not_ordered/00-base.xml
+++ b/tests/flattener_dicos/80leadership_not_ordered/00-base.xml
@@ -10,22 +10,22 @@
             </variable>
         </family>
         <family name="general1">
-            <variable name="master" type="string" description="master" multi="True"/>
-            <variable name="slave1" type="string" description="slave1" multi="True"/>
-            <variable name="slave2" type="string" description="slave2" multi="True"/>
+            <variable name="leader" type="string" description="leader" multi="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True"/>
+            <variable name="follower2" type="string" description="follower2" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-        <fill name="calc_val" target="slave1">
+        <fill name="calc_val" target="follower1">
             <param name="valeur">valfill</param>
         </fill>
-        <fill name="calc_val" target="slave2">
-            <param type="variable">slave1</param>
+        <fill name="calc_val" target="follower2">
+            <param type="variable">follower1</param>
         </fill>
-        <group master="master">
-            <slave>slave2</slave>
-            <slave>slave1</slave>
+        <group leader="leader">
+            <follower>follower2</follower>
+            <follower>follower1</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/80leadership_not_same_family/00-base.xml b/tests/flattener_dicos/80leadership_not_same_family/00-base.xml
index 52ae2ce7..c2753816 100644
--- a/tests/flattener_dicos/80leadership_not_same_family/00-base.xml
+++ b/tests/flattener_dicos/80leadership_not_same_family/00-base.xml
@@ -10,24 +10,24 @@
             </variable>
         </family>
         <family name="general1">
-            <variable name="master" type="string" description="master" multi="True"/>
-            <variable name="slave1" type="string" description="slave1" multi="True"/>
+            <variable name="leader" type="string" description="leader" multi="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True"/>
         </family>
         <family name="general2">
-            <variable name="slave2" type="string" description="slave2" multi="True"/>
+            <variable name="follower2" type="string" description="follower2" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-        <fill name="calc_val" target="slave1">
+        <fill name="calc_val" target="follower1">
             <param name="valeur">valfill</param>
         </fill>
-        <fill name="calc_val" target="slave2">
-            <param type="variable">slave1</param>
+        <fill name="calc_val" target="follower2">
+            <param type="variable">follower1</param>
         </fill>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/80leadership_notmulti2/00-base.xml b/tests/flattener_dicos/80leadership_notmulti2/00-base.xml
index 8568956e..48377ba3 100644
--- a/tests/flattener_dicos/80leadership_notmulti2/00-base.xml
+++ b/tests/flattener_dicos/80leadership_notmulti2/00-base.xml
@@ -10,22 +10,22 @@
             </variable>
         </family>
         <family name="general1">
-            <variable name="master" type="string" description="master" multi="True"/>
-            <variable name="slave1" type="string" description="slave1"/>
-            <variable name="slave2" type="string" description="slave2" multi="True"/>
+            <variable name="leader" type="string" description="leader" multi="True"/>
+            <variable name="follower1" type="string" description="follower1"/>
+            <variable name="follower2" type="string" description="follower2" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-        <fill name="calc_val" target="slave1">
+        <fill name="calc_val" target="follower1">
             <param name="valeur">valfill</param>
         </fill>
-        <fill name="calc_val" target="slave2">
-            <param type="variable">slave1</param>
+        <fill name="calc_val" target="follower2">
+            <param type="variable">follower1</param>
         </fill>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/80masterslave_auto_save/00-base.xml b/tests/flattener_dicos/80masterslave_auto_save/00-base.xml
index df5350aa..2a817fe9 100644
--- a/tests/flattener_dicos/80masterslave_auto_save/00-base.xml
+++ b/tests/flattener_dicos/80masterslave_auto_save/00-base.xml
@@ -8,22 +8,22 @@
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
               <value>non</value>
             </variable>
-            <variable name="master" type="string" description="master" multi="True"/>
-            <variable name="slave1" type="string" description="slave1" multi="True"/>
-            <variable name="slave2" type="string" description="slave2" auto_save="True" multi="True"/>
+            <variable name="leader" type="string" description="leader" multi="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True"/>
+            <variable name="follower2" type="string" description="follower2" auto_save="True" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-        <fill name="calc_val" target="slave1">
+        <fill name="calc_val" target="follower1">
             <param name="valeur">valfill</param>
         </fill>
-        <fill name="calc_val" target="slave2">
-            <param type="variable">slave1</param>
+        <fill name="calc_val" target="follower2">
+            <param type="variable">follower1</param>
         </fill>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/80masterslave_notexists/00-base.xml b/tests/flattener_dicos/80masterslave_notexists/00-base.xml
index 35e7f43a..ce53a30a 100644
--- a/tests/flattener_dicos/80masterslave_notexists/00-base.xml
+++ b/tests/flattener_dicos/80masterslave_notexists/00-base.xml
@@ -8,26 +8,26 @@
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
               <value>non</value>
             </variable>
-            <variable name="master" type="string" description="master" multi="True"/>
-            <variable name="slave1" type="string" description="slave1" multi="True"/>
-            <variable name="slave2" type="string" description="slave2" auto_save="True" multi="True"/>
+            <variable name="leader" type="string" description="leader" multi="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True"/>
+            <variable name="follower2" type="string" description="follower2" auto_save="True" multi="True"/>
         </family>
     </variables>
 
     <constraints>
-        <fill name="calc_val" target="slave1">
+        <fill name="calc_val" target="follower1">
             <param name="valeur">valfill</param>
         </fill>
-        <fill name="calc_val" target="slave2">
-            <param type="variable">slave1</param>
+        <fill name="calc_val" target="follower2">
+            <param type="variable">follower1</param>
         </fill>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
-        <group master="master1">
-            <slave>slave3</slave>
-            <slave>slave4</slave>
+        <group leader="leader1">
+            <follower>follower3</follower>
+            <follower>follower4</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/80masterslaves_autofreeze/00-base.xml b/tests/flattener_dicos/80masterslaves_autofreeze/00-base.xml
index 404c029a..70dec0a9 100644
--- a/tests/flattener_dicos/80masterslaves_autofreeze/00-base.xml
+++ b/tests/flattener_dicos/80masterslaves_autofreeze/00-base.xml
@@ -5,22 +5,22 @@
 
     <variables>
         <family name="general">
-            <variable name="master" type="string" description="master" auto_freeze="True"/>
-            <variable name="slave1" type="string" description="slave1"/>
-            <variable name="slave2" type="string" description="slave2"/>
+            <variable name="leader" type="string" description="leader" auto_freeze="True"/>
+            <variable name="follower1" type="string" description="follower1"/>
+            <variable name="follower2" type="string" description="follower2"/>
         </family>
     </variables>
 
     <constraints>
-        <fill name="calc_val" target="slave1">
+        <fill name="calc_val" target="follower1">
             <param name="valeur">valfill</param>
         </fill>
-        <fill name="calc_val" target="slave2">
-            <param type="variable">slave1</param>
+        <fill name="calc_val" target="follower2">
+            <param type="variable">follower1</param>
         </fill>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
     </constraints>
 
diff --git a/tests/flattener_dicos/80masterslaves_notmulti/00-base.xml b/tests/flattener_dicos/80masterslaves_notmulti/00-base.xml
index 722ef04d..7226ba04 100644
--- a/tests/flattener_dicos/80masterslaves_notmulti/00-base.xml
+++ b/tests/flattener_dicos/80masterslaves_notmulti/00-base.xml
@@ -5,22 +5,22 @@
 
     <variables>
         <family name="general">
-            <variable name="master" type="string" description="master"/>
-            <variable name="slave1" type="string" description="slave1"/>
-            <variable name="slave2" type="string" description="slave2"/>
+            <variable name="leader" type="string" description="leader"/>
+            <variable name="follower1" type="string" description="follower1"/>
+            <variable name="follower2" type="string" description="follower2"/>
         </family>
     </variables>
 
     <constraints>
-        <fill name="calc_val" target="slave1">
+        <fill name="calc_val" target="follower1">
             <param name="valeur">valfill</param>
         </fill>
-        <fill name="calc_val" target="slave2">
-            <param type="variable">slave1</param>
+        <fill name="calc_val" target="follower2">
+            <param type="variable">follower1</param>
         </fill>
-        <group master="master">
-            <slave>slave1</slave>
-            <slave>slave2</slave>
+        <group leader="leader">
+            <follower>follower1</follower>
+            <follower>follower2</follower>
         </group>
     </constraints>