diff --git a/doc/dev/config.md b/doc/dev/config.md
index 9f2592c7..5b7f92b5 100644
--- a/doc/dev/config.md
+++ b/doc/dev/config.md
@@ -65,3 +65,7 @@ Le répertoire de temporaire est géré dans la clef "tmp_dir" et a comme valeur
 ## Le répertoire de destination des fichiers générés
 
 Le répertoire de destination des fichiers générés est géré dans la clef "destinations_dir" et a comme valeur par défaut : "/srv/rougail/destinations".
+
+## La variable auto_freeze
+
+La propriété auto_freeze n'est appliqué que une variable spécifique passe à True. Par défaut le nom de la variable est "instancied_module", mais il est possible de changer le nom de cette variable via la clef "auto_freeze_variable".
diff --git a/doc/family/auto.md b/doc/family/auto.md
index a5dc7819..1209dd30 100644
--- a/doc/family/auto.md
+++ b/doc/family/auto.md
@@ -6,20 +6,17 @@ Le nom et la description de la famille et des variables qu'elle contient sera en
 Par exemple :
 
 ```
-<family name='my_family'>
-    <variable name='varname' multi="True">
-        <value>val1</value>
-        <value>val2</value>
-    </variable>
-</family>
-<family name='my_dyn_family_' dynamic="varname description="Describe "">
-    <variable name='my_dyn_var_'/>
+<variable name='varname' multi="True">
+    <value>val1</value>
+    <value>val2</value>
+</variable>
+<family name="my_dyn_family_" dynamic="varname" description="Describe ">
+    <variable name="my_dyn_var_"/>
 </family>
 ```
 
-Créera trois familles :
+Créera deux familles :
 
-- la famille : "my_family"
 - la famille dynamique : "my_dyn_family_val1" avec la description "Describe val1"
 - la famille dynamique : "my_dyn_family_val2" avec la description "Describe val2"
 
diff --git a/doc/family/simple.md b/doc/family/simple.md
index eb3da32e..c0ce2d33 100644
--- a/doc/family/simple.md
+++ b/doc/family/simple.md
@@ -56,7 +56,7 @@ Pour définir le [mode](../mode.md) :
 
 ## Famille invisible
 
-Il est possible de cacher une famille, ainsi toutes les variables et des familles inclusent dans cette famille.
+Il est possible de cacher une famille, ainsi que toutes les variables et des familles inclusent dans cette famille.
 
 Cacher une famille signifie qu'elle ne sera pas visible lorsqu'on modifie la configuration du service.
 Par contre ces variables sont accessibles lorsqu'on va utiliser ces variables.
diff --git a/doc/variable/README.md b/doc/variable/README.md
index db84b9ed..af87388f 100644
--- a/doc/variable/README.md
+++ b/doc/variable/README.md
@@ -2,5 +2,3 @@
 
   - [Une variable](simple.md)
   - [Variable meneuse ou suiveuse](leadership.md)
-
-FIXME <!ATTLIST variable test CDATA #IMPLIED>
diff --git a/doc/variable/simple.md b/doc/variable/simple.md
index 4ac5a286..98df5cf2 100644
--- a/doc/variable/simple.md
+++ b/doc/variable/simple.md
@@ -36,10 +36,10 @@ Une variable a un type. Ce type permet de définir les valeurs acceptées par ce
 - string : chaine de caractère (type par défaut)
 - number : un nombre
 - float : un chiffre flottant
-- boolean : True ou False si aucune valeur n'est défini la valeur par défaut cette variable sera True
+- boolean : "True" ou "False", si aucune valeur n'est défini la valeur par défaut de cette variable sera "True"
 - password : un mot de passe
 - mail : une adresse mail
-- filename : nom de fichier au sens Unix (exemple : '/etc/passwd')
+- filename : nom de fichier au sens Unix (exemple : "/etc/passwd")
 - date : une date au format "%Y-%m-%d" (exemple : "2021-01-30")
 - unix_user : nom d'utilisateur au sens Unix
 - ip : n'importe quelle adresse IPv4
@@ -91,7 +91,7 @@ Pour définir le [mode](../mode.md) :
 Il est possible de cacher une variable.
 
 Cacher une variable signifie qu'elle ne sera pas visible lorsqu'on modifie la configuration du service.
-Par contre cette variable sont accessibles lorsqu'on va l'utiliser.
+Par contre cette variable sera accessibles lorsqu'on va l'utiliser.
 
 Pour cacher une variable :
 
@@ -215,3 +215,5 @@ Par exemple, si la valeur de cette variable est issue d'un calcul, la valeur ne
 Ces variables sont généralement des variables obligatoires. En effet ces variable ne sont en lecteur seul que si elles sont une valeurs.
 
 Une [variable meneuse ou suiveuse](leadership.md) ne peut pas avoir la propriété auto_freeze.
+
+FIXME <!ATTLIST variable test CDATA #IMPLIED>
diff --git a/src/rougail/annotator/condition.py b/src/rougail/annotator/condition.py
index 613026fb..4286872c 100644
--- a/src/rougail/annotator/condition.py
+++ b/src/rougail/annotator/condition.py
@@ -35,8 +35,6 @@ from .target import TargetAnnotator
 from .param import ParamAnnotator
 from .variable import Walk
 
-FREEZE_AUTOFREEZE_VARIABLE = 'module_instancie'
-
 
 class ConditionAnnotator(TargetAnnotator, ParamAnnotator, Walk):
     """Annotate condition
@@ -72,35 +70,30 @@ class ConditionAnnotator(TargetAnnotator, ParamAnnotator, Walk):
 
     def convert_auto_freeze(self):
         """convert auto_freeze
-        only if FREEZE_AUTOFREEZE_VARIABLE == 'oui' this variable is frozen
+        only if auto_freeze_variable is True this variable is frozen
         """
         for variable in self.get_variables():
-            self._convert_auto_freeze(variable)
-
-    def _convert_auto_freeze(self,
-                             variable: 'self.objectspace.variable',
-                             ) -> None:
-        if not variable.auto_freeze:
-            return
-        if variable.namespace != RougailConfig['variable_namespace']:
-            msg = _(f'auto_freeze is not allowed in extra "{variable.namespace}"')
-            raise DictConsistencyError(msg, 49, variable.xmlfiles)
-        new_condition = self.objectspace.condition(variable.xmlfiles)
-        new_condition.name = 'auto_frozen_if_not_in'
-        new_condition.namespace = variable.namespace
-        new_condition.source = FREEZE_AUTOFREEZE_VARIABLE
-        new_param = self.objectspace.param(variable.xmlfiles)
-        new_param.text = 'oui'
-        new_condition.param = [new_param]
-        new_target = self.objectspace.target(variable.xmlfiles)
-        new_target.type = 'variable'
-        new_target.name = variable.name
-        new_condition.target = [new_target]
-        if not hasattr(self.objectspace.space, 'constraints'):
-            self.objectspace.space.constraints = self.objectspace.constraints(variable.xmlfiles)
-        if not hasattr(self.objectspace.space.constraints, 'condition'):
-            self.objectspace.space.constraints.condition = []
-        self.objectspace.space.constraints.condition.append(new_condition)
+            if not variable.auto_freeze:
+                continue
+            if variable.namespace != RougailConfig['variable_namespace']:
+                msg = _(f'auto_freeze is not allowed in extra "{variable.namespace}"')
+                raise DictConsistencyError(msg, 49, variable.xmlfiles)
+            new_condition = self.objectspace.condition(variable.xmlfiles)
+            new_condition.name = 'auto_frozen_if_not_in'
+            new_condition.namespace = variable.namespace
+            new_condition.source = RougailConfig['auto_freeze_variable']
+            new_param = self.objectspace.param(variable.xmlfiles)
+            new_param.text = True
+            new_condition.param = [new_param]
+            new_target = self.objectspace.target(variable.xmlfiles)
+            new_target.type = 'variable'
+            new_target.name = variable.name
+            new_condition.target = [new_target]
+            if not hasattr(self.objectspace.space, 'constraints'):
+                self.objectspace.space.constraints = self.objectspace.constraints(variable.xmlfiles)
+            if not hasattr(self.objectspace.space.constraints, 'condition'):
+                self.objectspace.space.constraints.condition = []
+            self.objectspace.space.constraints.condition.append(new_condition)
 
     def check_source_target(self):
         """verify that source != target in condition
diff --git a/src/rougail/annotator/variable.py b/src/rougail/annotator/variable.py
index 379d5001..b56edb7c 100644
--- a/src/rougail/annotator/variable.py
+++ b/src/rougail/annotator/variable.py
@@ -90,9 +90,6 @@ class Walk:
                         yield follower
                     continue
                 yield variable
-#        if hasattr(family, 'family'):
-#            for fam in family.family.values():
-#                yield from self._get_variables(fam, with_leadership)
 
     def get_families(self):
         """Iter all families from the objectspace
diff --git a/src/rougail/config.py b/src/rougail/config.py
index b153f49e..20c79f87 100644
--- a/src/rougail/config.py
+++ b/src/rougail/config.py
@@ -39,6 +39,7 @@ RougailConfig = {'dictionaries_dir': [join(ROUGAILROOT, 'dictionaries')],
                  'destinations_dir': join(ROUGAILROOT, 'destinations'),
                  'tmp_dir': join(ROUGAILROOT, 'tmp'),
                  'dtdfilename': join(DTDDIR, 'rougail.dtd'),
-                 'variable_namespace': 'rougail',
                  'functions_file': join(ROUGAILROOT, 'functions.py'),
+                 'variable_namespace': 'rougail',
+                 'auto_freeze_variable': 'instanciated_module',
                  }
diff --git a/tests/dictionaries/00load_autofreeze/00-base.xml b/tests/dictionaries/00load_autofreeze/00-base.xml
index fd503179..592d52e8 100644
--- a/tests/dictionaries/00load_autofreeze/00-base.xml
+++ b/tests/dictionaries/00load_autofreeze/00-base.xml
@@ -1,14 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
     <variables>
-        <family name="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" auto_freeze="True">
-                <value>non</value>
-            </variable>
-            <variable name="module_instancie" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
+        <variable name="myvar" auto_freeze="True">
+            <value>no</value>
+        </variable>
+        <variable name="instanciated_module" type="boolean">
+            <value>False</value>
+        </variable>
     </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
diff --git a/tests/dictionaries/00load_autofreeze/makedict/base.json b/tests/dictionaries/00load_autofreeze/makedict/base.json
index 6e7af070..c9de7171 100644
--- a/tests/dictionaries/00load_autofreeze/makedict/base.json
+++ b/tests/dictionaries/00load_autofreeze/makedict/base.json
@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.module_instancie": "non"}
+{"rougail.myvar": "no", "rougail.instanciated_module": false}
diff --git a/tests/dictionaries/00load_autofreeze/tiramisu/base.py b/tests/dictionaries/00load_autofreeze/tiramisu/base.py
index 2c0d31ee..43889062 100644
--- a/tests/dictionaries/00load_autofreeze/tiramisu/base.py
+++ b/tests/dictionaries/00load_autofreeze/tiramisu/base.py
@@ -11,8 +11,7 @@ try:
     from tiramisu3 import *
 except:
     from tiramisu import *
-option_4 = StrOption(name="module_instancie", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"auto_freeze", "basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}))}))
-option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"basic"}))
-option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_3 = BoolOption(name="instanciated_module", doc="instanciated_module", default=False, properties=frozenset({"mandatory", "normal"}))
+option_2 = StrOption(name="myvar", doc="myvar", default="no", properties=frozenset({"auto_freeze", "force_store_value", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries/00load_autofreezeexpert/00-base.xml b/tests/dictionaries/00load_autofreezeexpert/00-base.xml
index f344cdef..362981aa 100644
--- a/tests/dictionaries/00load_autofreezeexpert/00-base.xml
+++ b/tests/dictionaries/00load_autofreezeexpert/00-base.xml
@@ -1,14 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
     <variables>
-        <family name="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" auto_freeze="True" mode="expert">
-                <value>non</value>
-            </variable>
-            <variable name="module_instancie" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
+        <variable name="my_var" auto_freeze="True" mode="expert">
+            <value>no</value>
+        </variable>
+        <variable name="instanciated_module" type="boolean">
+            <value>False</value>
+        </variable>
     </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
diff --git a/tests/dictionaries/00load_autofreezeexpert/makedict/base.json b/tests/dictionaries/00load_autofreezeexpert/makedict/base.json
index 6e7af070..c3ee18d2 100644
--- a/tests/dictionaries/00load_autofreezeexpert/makedict/base.json
+++ b/tests/dictionaries/00load_autofreezeexpert/makedict/base.json
@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.module_instancie": "non"}
+{"rougail.my_var": "no", "rougail.instanciated_module": false}
diff --git a/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py b/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py
index 380afdaf..85abcb29 100644
--- a/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py
+++ b/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py
@@ -11,8 +11,7 @@ try:
     from tiramisu3 import *
 except:
     from tiramisu import *
-option_4 = StrOption(name="module_instancie", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"auto_freeze", "expert", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}))}))
-option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"normal"}))
-option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_3 = BoolOption(name="instanciated_module", doc="instanciated_module", default=False, properties=frozenset({"mandatory", "normal"}))
+option_2 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"auto_freeze", "expert", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries/01auto_autofreeze/00-base.xml b/tests/dictionaries/01auto_autofreeze/00-base.xml
index 1cee6e10..e205cf12 100644
--- a/tests/dictionaries/01auto_autofreeze/00-base.xml
+++ b/tests/dictionaries/01auto_autofreeze/00-base.xml
@@ -1,19 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
     <variables>
-        <family name="general">
-            <variable name="module_instancie" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" auto_freeze="True" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
+        <variable name="instanciated_module" type="boolean">
+            <value>no</value>
+        </variable>
+        <variable name="my_variable" auto_freeze="True" hidden="True">
+            <value>no</value>
+        </variable>
     </variables>
     <constraints>
         <fill name="calc_val">
-            <param>oui</param>
-            <target>mode_conteneur_actif</target>
+            <param>yes</param>
+            <target>my_variable</target>
         </fill>
     </constraints>
 </rougail>
diff --git a/tests/dictionaries/01auto_autofreeze/makedict/base.json b/tests/dictionaries/01auto_autofreeze/makedict/base.json
index 8b4451f4..322df539 100644
--- a/tests/dictionaries/01auto_autofreeze/makedict/base.json
+++ b/tests/dictionaries/01auto_autofreeze/makedict/base.json
@@ -1 +1 @@
-{"rougail.general.module_instancie": "non", "rougail.general.mode_conteneur_actif": "oui"}
+{"rougail.instanciated_module": false, "rougail.my_variable": "yes"}
diff --git a/tests/dictionaries/01auto_autofreeze/tiramisu/base.py b/tests/dictionaries/01auto_autofreeze/tiramisu/base.py
index 1ba7e160..37cd5726 100644
--- a/tests/dictionaries/01auto_autofreeze/tiramisu/base.py
+++ b/tests/dictionaries/01auto_autofreeze/tiramisu/base.py
@@ -11,8 +11,7 @@ try:
     from tiramisu3 import *
 except:
     from tiramisu import *
-option_3 = StrOption(name="module_instancie", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({"auto_freeze", "basic", "force_store_value", "frozen", "hidden", Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}))}))
-option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"basic"}))
-option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_2 = BoolOption(name="instanciated_module", doc="instanciated_module", default=False, properties=frozenset({"mandatory", "normal"}))
+option_3 = StrOption(name="my_variable", doc="my_variable", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"auto_freeze", "force_store_value", "frozen", "hidden", "normal", Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_2, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries/01fill_autofreeze/00-base.xml b/tests/dictionaries/01fill_autofreeze/00-base.xml
index 4cb6b371..ec5f66fc 100644
--- a/tests/dictionaries/01fill_autofreeze/00-base.xml
+++ b/tests/dictionaries/01fill_autofreeze/00-base.xml
@@ -1,23 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
     <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" auto_freeze="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="module_instancie" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
+        <variable name="my_var1" auto_freeze="True">
+            <value>no</value>
+        </variable>
+        <variable name="my_var2">
+            <value>no</value>
+        </variable>
+        <variable name="instanciated_module" type="boolean">
+            <value>False</value>
+        </variable>
     </variables>
 
     <constraints>
         <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
+            <param type="variable">my_var2</param>
+            <target>my_var1</target>
         </fill>
     </constraints>
 </rougail>
diff --git a/tests/dictionaries/01fill_autofreeze/makedict/base.json b/tests/dictionaries/01fill_autofreeze/makedict/base.json
index 2dac1070..58c9b691 100644
--- a/tests/dictionaries/01fill_autofreeze/makedict/base.json
+++ b/tests/dictionaries/01fill_autofreeze/makedict/base.json
@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "non", "rougail.general.module_instancie": "non"}
+{"rougail.my_var1": "no", "rougail.my_var2": "no", "rougail.instanciated_module": false}
diff --git a/tests/dictionaries/01fill_autofreeze/tiramisu/base.py b/tests/dictionaries/01fill_autofreeze/tiramisu/base.py
index e90e85b4..6fbfb95a 100644
--- a/tests/dictionaries/01fill_autofreeze/tiramisu/base.py
+++ b/tests/dictionaries/01fill_autofreeze/tiramisu/base.py
@@ -11,9 +11,8 @@ try:
     from tiramisu3 import *
 except:
     from tiramisu import *
-option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_5 = StrOption(name="module_instancie", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_4)))), properties=frozenset({"auto_freeze", "basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}))}))
-option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"basic"}))
-option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_3 = StrOption(name="my_var2", doc="my_var2", default="no", properties=frozenset({"mandatory", "normal"}))
+option_4 = BoolOption(name="instanciated_module", doc="instanciated_module", default=False, properties=frozenset({"mandatory", "normal"}))
+option_2 = StrOption(name="my_var1", doc="my_var1", default=Calculation(func.calc_val, Params((ParamOption(option_3)))), properties=frozenset({"auto_freeze", "force_store_value", "normal", Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3, option_4])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries/01hidden_if_in_autofreeze/00-base.xml b/tests/dictionaries/01hidden_if_in_autofreeze/00-base.xml
index 270fdf2e..dc5b2c74 100644
--- a/tests/dictionaries/01hidden_if_in_autofreeze/00-base.xml
+++ b/tests/dictionaries/01hidden_if_in_autofreeze/00-base.xml
@@ -1,23 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
     <variables>
-        <family name="general">
-            <variable name="module_instancie" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" auto_freeze="True">
-                <value>non</value>
-            </variable>
-        </family>
+        <variable name="instanciated_module" type="boolean">
+            <value>False</value>
+        </variable>
+        <variable name="my_var" type="string" auto_freeze="True">
+            <value>no</value>
+        </variable>
     </variables>
     <constraints>
         <fill name="calc_val">
-            <param>oui</param>
-            <target>mode_conteneur_actif</target>
+            <param>yes</param>
+            <target>my_var</target>
         </fill>
-        <condition name="hidden_if_in" source="module_instancie">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
+        <condition name="hidden_if_in" source="instanciated_module">
+            <param>True</param>
+            <target type="variable">my_var</target>
         </condition>
     </constraints>
 </rougail>
diff --git a/tests/dictionaries/01hidden_if_in_autofreeze/makedict/base.json b/tests/dictionaries/01hidden_if_in_autofreeze/makedict/base.json
index 8b4451f4..7401e42f 100644
--- a/tests/dictionaries/01hidden_if_in_autofreeze/makedict/base.json
+++ b/tests/dictionaries/01hidden_if_in_autofreeze/makedict/base.json
@@ -1 +1 @@
-{"rougail.general.module_instancie": "non", "rougail.general.mode_conteneur_actif": "oui"}
+{"rougail.instanciated_module": false, "rougail.my_var": "yes"}
diff --git a/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py b/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py
index b351fd5b..5704e7b6 100644
--- a/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py
+++ b/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py
@@ -11,8 +11,7 @@ try:
     from tiramisu3 import *
 except:
     from tiramisu import *
-option_3 = StrOption(name="module_instancie", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({"auto_freeze", "basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}))}))
-option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"basic"}))
-option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_2 = BoolOption(name="instanciated_module", doc="instanciated_module", default=False, properties=frozenset({"mandatory", "normal"}))
+option_3 = StrOption(name="my_var", doc="my_var", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"auto_freeze", "force_store_value", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True), 'expected': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_2, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml b/tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml
index 785d47c8..2104d279 100644
--- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml
+++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml
@@ -1,30 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
     <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" auto_freeze="True">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="module_instancie" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
+        <variable name="my_var" auto_freeze="True">
+            <value>no</value>
+        </variable>
+        <variable name="condition">
+            <value>no</value>
+        </variable>
+        <variable name="my_var1" hidden="True">
+            <value>no</value>
+        </variable>
+        <variable name="my_var2">
+            <value>no</value>
+        </variable>
+        <variable name="instanciated_module" type="boolean" hidden="True">
+            <value>False</value>
+        </variable>
     </variables>
 
     <constraints>
         <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif1</target>
-            <target type="variable">mode_conteneur_actif2</target>
+            <param>yes</param>
+            <target type="variable">my_var1</target>
+            <target type="variable">my_var2</target>
         </condition>
     </constraints>
 </rougail>
diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/01-base.xml b/tests/dictionaries/51redefine_removecondition_nonautofreeze/01-base.xml
index e11fe0c6..2fc46c96 100644
--- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/01-base.xml
+++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/01-base.xml
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
     <variables>
-        <family name="general">
-            <variable name="condition" redefine="True" remove_condition="True"/>
-        </family>
+        <variable name="condition" redefine="True" remove_condition="True"/>
     </variables>
 </rougail>
diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/makedict/base.json b/tests/dictionaries/51redefine_removecondition_nonautofreeze/makedict/base.json
index a5d0b07e..ecfa44c8 100644
--- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/makedict/base.json
+++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/makedict/base.json
@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.condition": "non", "rougail.general.mode_conteneur_actif1": "non", "rougail.general.mode_conteneur_actif2": "non", "rougail.general.module_instancie": "non"}
+{"rougail.my_var": "no", "rougail.condition": "no", "rougail.my_var1": "no", "rougail.my_var2": "no", "rougail.instanciated_module": false}
diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py
index c8f3bdf7..e3fa456b 100644
--- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py
+++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py
@@ -11,11 +11,10 @@ try:
     from tiramisu3 import *
 except:
     from tiramisu import *
-option_7 = StrOption(name="module_instancie", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
-option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"auto_freeze", "basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}))}))
-option_4 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_5 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
-option_6 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5, option_6, option_7], properties=frozenset({"basic"}))
-option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_6 = BoolOption(name="instanciated_module", doc="instanciated_module", default=False, properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"auto_freeze", "force_store_value", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_6, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
+option_3 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="my_var1", doc="my_var1", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_5 = StrOption(name="my_var2", doc="my_var2", default="no", properties=frozenset({"mandatory", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3, option_4, option_5, option_6])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries/60extra_externalspacecondition/00-base.xml b/tests/dictionaries/60extra_externalspacecondition/00-base.xml
index 55a61c05..b42e6ab0 100644
--- a/tests/dictionaries/60extra_externalspacecondition/00-base.xml
+++ b/tests/dictionaries/60extra_externalspacecondition/00-base.xml
@@ -2,14 +2,14 @@
 <rougail>
     <variables>
         <family name="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" auto_freeze="True">
-                <value>non</value>
+            <variable name="my_var" auto_freeze="True">
+                <value>no</value>
             </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
+            <variable name="my_var1" hidden="True">
+                <value>no</value>
             </variable>
-            <variable name="module_instancie" type="string" description="No change" hidden="True">
-                <value>non</value>
+            <variable name="instanciated_module" type="boolean" hidden="True">
+                <value>False</value>
             </variable>
         </family>
     </variables>
diff --git a/tests/dictionaries/60extra_externalspacecondition/makedict/base.json b/tests/dictionaries/60extra_externalspacecondition/makedict/base.json
index e44851be..a14f48fe 100644
--- a/tests/dictionaries/60extra_externalspacecondition/makedict/base.json
+++ b/tests/dictionaries/60extra_externalspacecondition/makedict/base.json
@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.activer_ejabberd": "non", "rougail.general.module_instancie": "non", "extra.ejabberd.description": "Exportation de la base de ejabberd", "extra.ejabberd.day": "none", "extra.ejabberd.mode": "pre", "extra1.external.description": "test"}
+{"rougail.general.my_var": "no", "rougail.general.my_var1": "no", "rougail.general.instanciated_module": false, "extra.ejabberd.description": "Exportation de la base de ejabberd", "extra.ejabberd.day": "none", "extra.ejabberd.mode": "pre", "extra1.external.description": "test"}
diff --git a/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py b/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py
index e9805eb4..bac533f1 100644
--- a/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py
+++ b/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py
@@ -11,9 +11,9 @@ try:
     from tiramisu3 import *
 except:
     from tiramisu import *
-option_5 = StrOption(name="module_instancie", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
-option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"auto_freeze", "basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}))}))
-option_4 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_5 = BoolOption(name="instanciated_module", doc="instanciated_module", default=False, properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_3 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"auto_freeze", "basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
+option_4 = StrOption(name="my_var1", doc="my_var1", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
 option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4, option_5], properties=frozenset({"basic"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_8 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"}))
diff --git a/tests/dictionaries/60extra_no_condition/00-base.xml b/tests/dictionaries/60extra_no_condition/00-base.xml
index 55a61c05..2e5f5be2 100644
--- a/tests/dictionaries/60extra_no_condition/00-base.xml
+++ b/tests/dictionaries/60extra_no_condition/00-base.xml
@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" auto_freeze="True">
+            <variable name="mode_conteneur_actif" type="string" description="No change">
                 <value>non</value>
             </variable>
             <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
diff --git a/tests/dictionaries/60extra_no_condition/tiramisu/base.py b/tests/dictionaries/60extra_no_condition/tiramisu/base.py
index 912d77c1..581f42b8 100644
--- a/tests/dictionaries/60extra_no_condition/tiramisu/base.py
+++ b/tests/dictionaries/60extra_no_condition/tiramisu/base.py
@@ -11,10 +11,10 @@ try:
     from tiramisu3 import *
 except:
     from tiramisu import *
-option_5 = StrOption(name="module_instancie", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
-option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"auto_freeze", "basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}))}))
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
 option_4 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
-option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4, option_5], properties=frozenset({"basic"}))
+option_5 = StrOption(name="module_instancie", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_8 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"}))
 option_9 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default="none", properties=frozenset({"mandatory", "normal"}))
diff --git a/tests/dictionaries/80leadership_autofreeze/00-base.xml b/tests/dictionaries/80leadership_autofreeze/00-base.xml
index 28c7ec47..ab255db3 100644
--- a/tests/dictionaries/80leadership_autofreeze/00-base.xml
+++ b/tests/dictionaries/80leadership_autofreeze/00-base.xml
@@ -2,10 +2,10 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="module_instancie" type="string" description="No change"/>
-            <variable name="leader" type="string" description="leader" auto_freeze="True" multi="True"/>
-            <variable name="follower1" type="string" description="follower1" multi="True"/>
-            <variable name="follower2" type="string" description="follower2" multi="True"/>
+            <variable name="instanciated_module" type="boolean"/>
+            <variable name="leader" description="leader" auto_freeze="True" multi="True"/>
+            <variable name="follower1" multi="True"/>
+            <variable name="follower2" multi="True"/>
         </family>
     </variables>