diff --git a/src/rougail/objspace.py b/src/rougail/objspace.py
index bdbc8df5..34223754 100644
--- a/src/rougail/objspace.py
+++ b/src/rougail/objspace.py
@@ -29,7 +29,7 @@ from lxml.etree import Element, SubElement  # pylint: disable=E0611
 from .i18n import _
 from .xmlreflector import XMLReflector
 from .annotator import ERASED_ATTRIBUTES, SpaceAnnotator
-from .loader import PopulateTiramisuObjects
+from .tiramisureflector import TiramisuReflector
 from .utils import normalize_family
 from .error import OperationError, SpaceObjShallNotBeUpdated, DictConsistencyError
 from .path import Path
@@ -525,7 +525,7 @@ class CreoleObjSpace:
     def save(self,
              filename,
              ):
-        tiramisu_objects = PopulateTiramisuObjects(self.space,
-                                                   self.funcs_path,
-                                                   )
+        tiramisu_objects = TiramisuReflector(self.space,
+                                             self.funcs_path,
+                                             )
         return tiramisu_objects.get_text() + '\n'
diff --git a/src/rougail/loader.py b/src/rougail/tiramisureflector.py
similarity index 97%
rename from src/rougail/loader.py
rename to src/rougail/tiramisureflector.py
index 2b61bde9..d3fcc954 100644
--- a/src/rougail/loader.py
+++ b/src/rougail/tiramisureflector.py
@@ -31,10 +31,8 @@ CONVERT_OPTION = {'number': dict(opttype="IntOption", func=int),
                   'network': dict(opttype="NetworkOption"),
                   'broadcast': dict(opttype="BroadcastOption"),
                   'netbios': dict(opttype="DomainnameOption", initkwargs={'type': 'netbios', 'warnings_only': True}),
-                  'domain': dict(opttype="DomainnameOption", initkwargs={'type': 'domainname', 'allow_ip': True, 'allow_without_dot': True}),
-                  'domain_strict': dict(opttype="DomainnameOption", initkwargs={'type': 'domainname', 'allow_ip': False}),
-                  'hostname': dict(opttype="DomainnameOption", initkwargs={'type': 'hostname', 'allow_ip': True}),
-                  'hostname_strict': dict(opttype="DomainnameOption", initkwargs={'type': 'hostname', 'allow_ip': False}),
+                  'domain': dict(opttype="DomainnameOption", initkwargs={'type': 'domainname', 'allow_ip': False}),
+                  'hostname': dict(opttype="DomainnameOption", initkwargs={'type': 'hostname', 'allow_ip': False}),
                   'web_address': dict(opttype="URLOption", initkwargs={'allow_ip': True, 'allow_without_dot': True}),
                   'port': dict(opttype="PortOption", initkwargs={'allow_private': True}),
                   'mac': dict(opttype="MACOption"),
@@ -43,7 +41,7 @@ CONVERT_OPTION = {'number': dict(opttype="IntOption", func=int),
                   }
 
 
-class PopulateTiramisuObjects:
+class TiramisuReflector:
     def __init__(self,
                  xmlroot,
                  funcs_path,
diff --git a/tests/flattener_dicos/01fill_mandatory/tiramisu/base.py b/tests/flattener_dicos/01fill_mandatory/tiramisu/base.py
index a0eb5304..ca545b2f 100644
--- a/tests/flattener_dicos/01fill_mandatory/tiramisu/base.py
+++ b/tests/flattener_dicos/01fill_mandatory/tiramisu/base.py
@@ -3,7 +3,7 @@ from rougail.tiramisu import ConvertDynOptionDescription
 import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
-option_3 = DomainnameOption(type='domainname', allow_ip=True, allow_without_dot=True, properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})))
+option_3 = DomainnameOption(type='domainname', allow_ip=False, properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])