Index: flexoentity/flexo_entity.py
===================================================================
--- flexoentity/flexo_entity.py	(revision 269fdc23e841020927c3cf9d45d5b59d1c54a8ff)
+++ flexoentity/flexo_entity.py	(revision 182ba7dfd414277cbb293dd85fbd302f2266f776)
@@ -554,6 +554,5 @@
     def apply_state_change(self, new_state):
         """
-        High-level dispatcher used by GUI actions.
-        Safely applies the requested state transition by invoking
+        I safely apply the requested state transition by invoking
         the corresponding FlexoEntity method if available.
         """
Index: flexoentity/id_factory.py
===================================================================
--- flexoentity/id_factory.py	(revision 269fdc23e841020927c3cf9d45d5b59d1c54a8ff)
+++ flexoentity/id_factory.py	(revision 182ba7dfd414277cbb293dd85fbd302f2266f776)
@@ -114,5 +114,5 @@
 
     OID_PATTERN = re.compile(
-        r"^(?P<domain>[A-Z0-9]+)-"
+        r"^(?P<domain>[A-Z0-9_]+)-"
         r"(?P<etype>[A-Z0-9]+)"
         r"(?P<date>\d{6})-"