diff --git a/proto/cheby/gen_gena_memmap.py b/proto/cheby/gen_gena_memmap.py
index d29a4c84cecfa5a12693f69e356fac563beedbdf..aeab7038ec3c6a65367af05ee3e4998913380839 100644
--- a/proto/cheby/gen_gena_memmap.py
+++ b/proto/cheby/gen_gena_memmap.py
@@ -8,29 +8,16 @@ def get_gena(n, name, default=None):
     return n.get_extension('x_gena', name, default)
 
 
-def get_cern_info(root, name, default=None):
-    return root.get_extension('x_cern_info', name, default)
-
-
-def get_version(root, name):
-    # Versions info have moved from x-cern-info to x-gena.
-    gena = get_gena(root, name)
-    if gena is not None:
-        return gena
-    cern_info = get_cern_info(root, name)
-    return cern_info
-
-
 def gen_header(root, decls):
     cpfx = 'C_{}'.format(root.name)
-    ident_code = get_version(root, 'ident-code')
+    ident_code = root.ident
     if ident_code is not None:
         width = root.c_word_size * tree.BYTE_SIZE
         decls.append(HDLComment('Ident Code'))
         decls.append(HDLConstant(cpfx + '_IdentCode', width,
                      value=HDLHexConst(ident_code, width)))
 
-    version = get_version(root, 'map-version')
+    version = get_gena(root, 'map-version')
     if version is not None:
         decls.append(HDLComment('Memory Map Version'))
         cst = HDLConstant(cpfx + '_MemMapVersion', 32,
@@ -38,7 +25,7 @@ def gen_header(root, decls):
         cst.eol_comment = '{}'.format(version)
         decls.append(cst)
 
-    sem_version = get_version(root, 'semantic-mem-map-version')
+    sem_version = root.memmap_version
     if sem_version is not None:
         # TODO: check format ?
         vers = [int(x) for x in sem_version.split('.')]
diff --git a/proto/cheby/gena2cheby.py b/proto/cheby/gena2cheby.py
index f5f056f2a3259afb3eb414e45ea87e5f738c5029..807993ac0568d3627491f147a622cd033a2d649a 100755
--- a/proto/cheby/gena2cheby.py
+++ b/proto/cheby/gena2cheby.py
@@ -788,6 +788,7 @@ def conv_root(root, filename):
     res.x_fesa = {}
     res.x_driver_edge = {}
     res.x_enums = []
+    res.x_map_info = {}
     acc_mode = None
     size_val = None
     size_str = None
@@ -805,8 +806,12 @@ def conv_root(root, filename):
         elif k == 'area-depth':
             size_str = v
             size_val = conv_depth(v)
-        elif k in ('map-version', 'ident-code', 'semantic-mem-map-version'):
+        elif k == 'map-version':
             res.x_gena[k] = v
+        elif k == 'ident-code':
+            res.x_map_info['ident'] = v
+        elif k == 'semantic-mem-map-version':
+            res.x_map_info['memmap-version'] = v
         elif k == 'gen':
             xg = {}
             for e in [g.strip() for g in v.split(',')]:
diff --git a/proto/cheby/layout.py b/proto/cheby/layout.py
index 99b085187e4008556b58fdc8000c7ad5387d4395..e7e7908394d894124bf5d07d21f5d5739da5aa1e 100644
--- a/proto/cheby/layout.py
+++ b/proto/cheby/layout.py
@@ -268,11 +268,12 @@ def layout_reg(lo, n):
                         n.get_path()))
             v = lo.root.c_version
             f.c_preset = (v[0] << 16) | (v[1] << 8) | v[2]
-        elif n.constant == 'ident':
+        elif n.constant == 'ident' or n.constant == 'ident-code':
             v = lo.root.ident
             if v is None:
                 raise LayoutException(
-                    n, "cannot use 'constant: ident' for register {} without x-map-info:ident".format(
+                    n, "cannot use 'constant: {}' for register {} without x-map-info:ident".format(
+                        n.constant,
                         n.get_path()))
             f.c_preset = v
         elif n.constant == 'memmap-version':
@@ -283,17 +284,10 @@ def layout_reg(lo, n):
                         n.get_path()))
             f.c_preset = (v[0] << 16) | (v[1] << 8) | v[2]
         elif n.constant == 'map-version':
-            v = lo.root.get_extension('x_cern_info', 'map-version', None)
+            v = lo.root.get_extension('x_gena', 'map-version', None)
             if v is None:
                 raise LayoutException(
-                    n, "cannot use 'constant: map-version' for register {} without x-cern-info:map-version".format(
-                        n.get_path()))
-            f.c_preset = v
-        elif n.constant == 'ident-code':
-            v = lo.root.get_extension('x_cern_info', 'ident-code', None)
-            if v is None:
-                raise LayoutException(
-                    n, "cannot use 'constant: ident-code' for register {} without x-cern-info:ident-code".format(
+                    n, "cannot use 'constant: map-version' for register {} without x-gena:map-version".format(
                         n.get_path()))
             f.c_preset = v
         else:
diff --git a/proto/cheby/parser.py b/proto/cheby/parser.py
index 3b5306acc2352a8d2b76073c387281e37c1f0488..fd58b64e6e5dd488c498969f081a64ad40d9b4fd 100644
--- a/proto/cheby/parser.py
+++ b/proto/cheby/parser.py
@@ -93,8 +93,8 @@ def parse_named(node, key, val):
             node.x_fesa = val
         elif key == 'x-driver-edge':
             node.x_driver_edge = val
-        elif key == 'x-cern-info':
-            node.x_cern_info = val
+        elif key == 'x-map-info':
+            node.x_map_info = val
         elif key == 'x-devicetree':
             node.x_devicetree = val
         elif key == 'x-interrupts':
diff --git a/proto/cheby/pprint.py b/proto/cheby/pprint.py
index 244074f9dfc4e612a966bf6b8169cdb21d50ceac..cce97e844cf358d8abeb5dadccbec61e3bd327dd 100644
--- a/proto/cheby/pprint.py
+++ b/proto/cheby/pprint.py
@@ -93,7 +93,7 @@ def pprint_extensions(pp, n):
                  'x-fesa',
                  'x-driver-edge',
                  'x-conversions',
-                 'x-cern-info']:
+                 'x-map-info']:
         attr = name.replace('-', '_')
         if hasattr(n, attr):
             pprint_extension(pp, name, getattr(n, attr))
diff --git a/proto/cheby/schemas_version.py b/proto/cheby/schemas_version.py
index e5635d7be7fd5bae8ecb17b31ac5d30f3dd7cb31..8a1b6cd78815bba2421437cc1203523930393480 100644
--- a/proto/cheby/schemas_version.py
+++ b/proto/cheby/schemas_version.py
@@ -5,5 +5,6 @@ VERSIONS = {
     'x-fesa': "1.0.0",
     'x-driver-edge': "1.0.0",
     'x-conversions': "1.0.0",
-    "x-wbgen": "1.0.0"
-}
\ No newline at end of file
+    "x-wbgen": "1.0.0",
+    "x-map-info": "1.0.0"
+}
diff --git a/testfiles/bug-unit/rfLimiter.cheby b/testfiles/bug-unit/rfLimiter.cheby
index 3c4bff1904f61e29b0f7fe5a298c88fbab84c197..50c9f5ccc3bd731abd8c82989f0d8de48e82f329 100644
--- a/testfiles/bug-unit/rfLimiter.cheby
+++ b/testfiles/bug-unit/rfLimiter.cheby
@@ -3,11 +3,12 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1k
   x-gena:
-    ident-code: 0xff
     map-version: 20191111
-    semantic-mem-map-version: 0.0.3
   x-driver-edge:
     equipment-code: SP-ALCCA
+  x-map-info:
+    ident: 0xff
+    memmap-version: 0.0.3
   children:
     - submap:
         name: ipInfo
diff --git a/testfiles/bug-xml/acqCore.cheby b/testfiles/bug-xml/acqCore.cheby
index abf9c1e017f804b666a10e68b07eabf236f6773b..c5718b47338c5f3c5e12e1cf968f7b7546183273 100644
--- a/testfiles/bug-xml/acqCore.cheby
+++ b/testfiles/bug-xml/acqCore.cheby
@@ -4,11 +4,12 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1k
   x-gena:
-    ident-code: 0xff
     map-version: 20191120
-    semantic-mem-map-version: 0.0.1
   x-driver-edge:
     equipment-code: SP-ALCCA
+  x-map-info:
+    ident: 0xff
+    memmap-version: 0.0.1
   children:
     - submap:
         name: ipInfo
diff --git a/testfiles/err_gena/Muxed_code.cheby b/testfiles/err_gena/Muxed_code.cheby
index f9051b44ba16e74f44a94db62abc2ea56fa0604b..2acfcce0493310edcf6974cd29d0d5599f2a54c5 100644
--- a/testfiles/err_gena/Muxed_code.cheby
+++ b/testfiles/err_gena/Muxed_code.cheby
@@ -4,8 +4,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1M
   x-gena:
-    ident-code: 0x00
     map-version: 20180513
+  x-map-info:
+    ident: 0x00
   children:
     - reg:
         name: muxedRegRO
diff --git a/testfiles/err_gena/Muxed_name.cheby b/testfiles/err_gena/Muxed_name.cheby
index 0051066c2ebfc3b6e44ff1289f36862c9219e058..bf6c5ed6542609a819b85b77438d7bb7c533ce1e 100644
--- a/testfiles/err_gena/Muxed_name.cheby
+++ b/testfiles/err_gena/Muxed_name.cheby
@@ -4,8 +4,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1M
   x-gena:
-    ident-code: 0x00
     map-version: 20180513
+  x-map-info:
+    ident: 0x00
   children:
     - reg:
         name: muxedRegRO
diff --git a/testfiles/features/cern_info.cheby b/testfiles/features/cern_info.cheby
index 8d8109e5a7f3d1d5f4bb370774536c29e4a70939..fe047c0d1b78499af5bff0c624d112b55612cf4a 100644
--- a/testfiles/features/cern_info.cheby
+++ b/testfiles/features/cern_info.cheby
@@ -2,8 +2,9 @@ memory-map:
   name: cregs
   bus: cern-be-vme-err-32
   size: 1024k
-  x-cern-info:
-    ident-code: 0x11
+  x-map-info:
+    ident: 0x11
+  x-gena:
     map-version: 20161031
   children:
     - reg:
diff --git a/testfiles/gena/Area_CRegs.cheby b/testfiles/gena/Area_CRegs.cheby
index 8391f920cad97c2ac0d7a14b7b0694e2424f3064..8af29d4e7e80c129a4a9edccaba4baeffacca9ca 100644
--- a/testfiles/gena/Area_CRegs.cheby
+++ b/testfiles/gena/Area_CRegs.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test3
diff --git a/testfiles/gena/Area_CRegs_Regs_Mems.cheby b/testfiles/gena/Area_CRegs_Regs_Mems.cheby
index f1d4a5abce0ec3418299f10ffa172665084d47b1..8e8777e2a308b36115f35ad0969b19ef60049342 100644
--- a/testfiles/gena/Area_CRegs_Regs_Mems.cheby
+++ b/testfiles/gena/Area_CRegs_Regs_Mems.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/Area_CRegs_Regs_Mems_EmptyRoot.cheby b/testfiles/gena/Area_CRegs_Regs_Mems_EmptyRoot.cheby
index 79cc9eb068def89869a7c8a78ddc04478767b24e..71af50262665751cd3931119cce3ccef622857a2 100644
--- a/testfiles/gena/Area_CRegs_Regs_Mems_EmptyRoot.cheby
+++ b/testfiles/gena/Area_CRegs_Regs_Mems_EmptyRoot.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - block:
         name: area
diff --git a/testfiles/gena/Area_Mems.cheby b/testfiles/gena/Area_Mems.cheby
index 07e03d3fd4c3e7828076a1f38cfbe25a3c37b260..a7af0093b767ba19b3fc9d3ed1b67e8231d37e56 100644
--- a/testfiles/gena/Area_Mems.cheby
+++ b/testfiles/gena/Area_Mems.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - block:
         name: area
diff --git a/testfiles/gena/Area_extarea.cheby b/testfiles/gena/Area_extarea.cheby
index fac6d74a39bcc3eecefcf8aaba6857bcfa890856..29a4df99f0c28261c42cce5a6e982fe1b7f3475e 100644
--- a/testfiles/gena/Area_extarea.cheby
+++ b/testfiles/gena/Area_extarea.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/Area_extarea_error.cheby b/testfiles/gena/Area_extarea_error.cheby
index 77ff7a604c92727497624ea7d8a8bb9e57a3ec9d..ef90934eb04045bd5979c8704aa9fd0044462d43 100644
--- a/testfiles/gena/Area_extarea_error.cheby
+++ b/testfiles/gena/Area_extarea_error.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/Area_reserved.cheby b/testfiles/gena/Area_reserved.cheby
index feffe3c1f933424757c6b84362aa3092ef04c597..3aee2fe0f3f7cda7dde17cfcdae660f4e52caa01 100644
--- a/testfiles/gena/Area_reserved.cheby
+++ b/testfiles/gena/Area_reserved.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs.cheby b/testfiles/gena/CRegs.cheby
index 7f38058d0cc0b0a6c54f54a6b137c4f410292396..dff63a4fa4edad72a9e77b448dd470d189b26afd 100644
--- a/testfiles/gena/CRegs.cheby
+++ b/testfiles/gena/CRegs.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs_Address.cheby b/testfiles/gena/CRegs_Address.cheby
index 2f58d7c61a51ab636481904de5afb767a93cf5c9..a8a4888cf98d925bb3289ac852abdb9d10971b96 100644
--- a/testfiles/gena/CRegs_Address.cheby
+++ b/testfiles/gena/CRegs_Address.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs_Mems.cheby b/testfiles/gena/CRegs_Mems.cheby
index f17cba6e04baaa9835ceb5209a21beb59806ae19..e0a44c1e3fd853a4d8c59008b3bd33b9f8befbf4 100644
--- a/testfiles/gena/CRegs_Mems.cheby
+++ b/testfiles/gena/CRegs_Mems.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs_NoRMW.cheby b/testfiles/gena/CRegs_NoRMW.cheby
index 3fb73364b20781d0cf55a60afb52ec164889ba43..cb526e79fa081e8ff9eb254cd5c475e9fb9a0c39 100644
--- a/testfiles/gena/CRegs_NoRMW.cheby
+++ b/testfiles/gena/CRegs_NoRMW.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs_Preset.cheby b/testfiles/gena/CRegs_Preset.cheby
index 3d88a91fa9d212a739d96d8b152f01e3f7a7d389..53df7a58bcf2ac3280f34070e9c182e1eee61b80 100644
--- a/testfiles/gena/CRegs_Preset.cheby
+++ b/testfiles/gena/CRegs_Preset.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs_Regs.cheby b/testfiles/gena/CRegs_Regs.cheby
index 456107313a1e76da4f73ebaaa23c7f494529f7f5..c5568012f0802425f7253d8d362eb4c574fb84bb 100644
--- a/testfiles/gena/CRegs_Regs.cheby
+++ b/testfiles/gena/CRegs_Regs.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs_Regs_Mems.cheby b/testfiles/gena/CRegs_Regs_Mems.cheby
index af826528e30926c25154e760ede2548b611180b7..edcd1e4ad18007914f98ef1bbd86d53752ac6067 100644
--- a/testfiles/gena/CRegs_Regs_Mems.cheby
+++ b/testfiles/gena/CRegs_Regs_Mems.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161101
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs_Regs_NoRMW.cheby b/testfiles/gena/CRegs_Regs_NoRMW.cheby
index 70b6c5f6aab5a0453f8c5274dcd10deab71b0e66..0c3a5da3f59419bf621b274bc952ae9aa32f11d4 100644
--- a/testfiles/gena/CRegs_Regs_NoRMW.cheby
+++ b/testfiles/gena/CRegs_Regs_NoRMW.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161101
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs_busout.cheby b/testfiles/gena/CRegs_busout.cheby
index 19359844a5357242534cf08a6e0019c5f81cdc42..320e775a203d384120b5a68910fe815df75e898a 100644
--- a/testfiles/gena/CRegs_busout.cheby
+++ b/testfiles/gena/CRegs_busout.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs_d8.cheby b/testfiles/gena/CRegs_d8.cheby
index 9924da6cc35bf4cb327abee7ccd590e613abc5db..298c432d7dec8f2dbe93cb4e9765b5bb14a5839d 100644
--- a/testfiles/gena/CRegs_d8.cheby
+++ b/testfiles/gena/CRegs_d8.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-8
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs_extacm.cheby b/testfiles/gena/CRegs_extacm.cheby
index 529902c0ca99dc629857f05ea328afac0cb40cfd..6475c43e118cc13d99df9230bd773501869bb2cd 100644
--- a/testfiles/gena/CRegs_extacm.cheby
+++ b/testfiles/gena/CRegs_extacm.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs_extcreg.cheby b/testfiles/gena/CRegs_extcreg.cheby
index f209130e650f9c4a5c25d175bb1994b779cb90cd..b38d315d236f61ba8f5ded3fc6a98e80f41d09ee 100644
--- a/testfiles/gena/CRegs_extcreg.cheby
+++ b/testfiles/gena/CRegs_extcreg.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs_ignore.cheby b/testfiles/gena/CRegs_ignore.cheby
index ad7e661e549b4944008850ecfa43c2574ef5184f..02435d38efa331a72971d5190762aa65b3ebf882 100644
--- a/testfiles/gena/CRegs_ignore.cheby
+++ b/testfiles/gena/CRegs_ignore.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs_internal.cheby b/testfiles/gena/CRegs_internal.cheby
index 493c6b108a9eb38ed247fd1dd18d9e3407931573..24dfb0978378fd2ea8a91743706b691947e54745 100644
--- a/testfiles/gena/CRegs_internal.cheby
+++ b/testfiles/gena/CRegs_internal.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs_library.cheby b/testfiles/gena/CRegs_library.cheby
index d54b8869ddb1f0bf84553188253c56deaa76182d..ba4ee791034274439712fb520d6774a987b2600a 100644
--- a/testfiles/gena/CRegs_library.cheby
+++ b/testfiles/gena/CRegs_library.cheby
@@ -5,8 +5,9 @@ memory-map:
   x-gena:
     gen:
       vhdl-library: mylib
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs_nodff.cheby b/testfiles/gena/CRegs_nodff.cheby
index 0672b96d2524be7b02a1da52c12275c1587ffdf8..255e78427c76d4bb5e591c1c8baa1c7f166305a0 100644
--- a/testfiles/gena/CRegs_nodff.cheby
+++ b/testfiles/gena/CRegs_nodff.cheby
@@ -5,8 +5,9 @@ memory-map:
   x-gena:
     gen:
       no-creg-mux-dff: True
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs_nosplit.cheby b/testfiles/gena/CRegs_nosplit.cheby
index 76e58ee21cfbfaf753f0c456265fe86a1693a68a..dcd69888897f2075812393e0cf7c03e6e234b7bd 100644
--- a/testfiles/gena/CRegs_nosplit.cheby
+++ b/testfiles/gena/CRegs_nosplit.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs_resize.cheby b/testfiles/gena/CRegs_resize.cheby
index 7c2853a3b528794afecc0f50a22516c5b8359df7..fa0d0602052efe160416f43b6040f8c019eed036 100644
--- a/testfiles/gena/CRegs_resize.cheby
+++ b/testfiles/gena/CRegs_resize.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs_resize_nosplit.cheby b/testfiles/gena/CRegs_resize_nosplit.cheby
index 18487415a8c335090a85074e2e0590c49e72d73e..2a9617acf0421df5f581a7f2bf56f317cacfc3bd 100644
--- a/testfiles/gena/CRegs_resize_nosplit.cheby
+++ b/testfiles/gena/CRegs_resize_nosplit.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs_resize_signed.cheby b/testfiles/gena/CRegs_resize_signed.cheby
index 2dadf19349180e24d6fb9e36a1a875f974f25e70..221fc45d073193aa1e3d67b1dc14164ede5113a2 100644
--- a/testfiles/gena/CRegs_resize_signed.cheby
+++ b/testfiles/gena/CRegs_resize_signed.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs_splitaddr.cheby b/testfiles/gena/CRegs_splitaddr.cheby
index b6ef3cd4713502850fcda9426322bb7cf2f46b36..29c2b5e8eea30bc9f71a2c6d372696495dd9f988 100644
--- a/testfiles/gena/CRegs_splitaddr.cheby
+++ b/testfiles/gena/CRegs_splitaddr.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-split-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/CRegs_srff.cheby b/testfiles/gena/CRegs_srff.cheby
index 5fc9add26f323744f0b4f2689c8bdc6e36656077..6db1ddd225a6597d18ade73b9a6fcbadc0bf274c 100644
--- a/testfiles/gena/CRegs_srff.cheby
+++ b/testfiles/gena/CRegs_srff.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test3
diff --git a/testfiles/gena/CRegs_wrstrobe.cheby b/testfiles/gena/CRegs_wrstrobe.cheby
index 141eb74b2e54d3e0993cd233bcddae42bb448ffa..4df3adaaba11afffb44225245904325738c349fc 100644
--- a/testfiles/gena/CRegs_wrstrobe.cheby
+++ b/testfiles/gena/CRegs_wrstrobe.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/Consts.cheby b/testfiles/gena/Consts.cheby
index 17ddb820b6d18d4286b837399cbc87058fc900ea..6fc0113a307a795bf499a0f5545a3c8b686a0091 100644
--- a/testfiles/gena/Consts.cheby
+++ b/testfiles/gena/Consts.cheby
@@ -8,14 +8,15 @@ memory-map:
     gen:
       packages:
         - package: my_lib.my_pkg
-    ident-code: 0x00300010
     map-version: 20190607
-    semantic-mem-map-version: 1.1.0
   x-driver-edge:
     equipment-code: PX-ALGCA
     module-type: RF_VXS_MAIN
     name: RFVXSMAIN
     vme-base-addr: 0xb0000000
+  x-map-info:
+    ident: 0x00300010
+    memmap-version: 1.1.0
   children:
     - reg:
         name: firmwareVersion
diff --git a/testfiles/gena/Inc_CRegs.cheby b/testfiles/gena/Inc_CRegs.cheby
index 82b605b0ca64440dfaab5113a1614723af7eecff..ea23c5c27107e2302914e7e2da90a6f8efd91682 100644
--- a/testfiles/gena/Inc_CRegs.cheby
+++ b/testfiles/gena/Inc_CRegs.cheby
@@ -2,8 +2,9 @@ memory-map:
   name: incCRegs
   bus: cern-be-vme-err-32
   size: 1024
-  x-cern-info:
-    ident-code: 0xff
+  x-map-info:
+    ident: 0xff
+  x-gena:
     map-version: 20161031
   children:
     - reg:
diff --git a/testfiles/gena/Mems.cheby b/testfiles/gena/Mems.cheby
index 73b149d3e3953ed9dd24873e7e5cf3f0adb1db4f..88bd520c83ea947d9820ab372bd7362c80032c10 100644
--- a/testfiles/gena/Mems.cheby
+++ b/testfiles/gena/Mems.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161101
+  x-map-info:
+    ident: 0xff
   children:
     - memory:
         name: mem1
diff --git a/testfiles/gena/Mems2.cheby b/testfiles/gena/Mems2.cheby
index 6e3110ed448eb73f0f0a2320dd859364d926752f..ddd8af075a017723633af3e2a1311c61694fd633 100644
--- a/testfiles/gena/Mems2.cheby
+++ b/testfiles/gena/Mems2.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161101
+  x-map-info:
+    ident: 0xff
   children:
     - memory:
         name: mem1
diff --git a/testfiles/gena/Mems_RO.cheby b/testfiles/gena/Mems_RO.cheby
index c5d90028df6217be8d5311ef6241c3e8882c72a9..f1b95e315e6894276737582550b27feaa8d2535d 100644
--- a/testfiles/gena/Mems_RO.cheby
+++ b/testfiles/gena/Mems_RO.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161101
+  x-map-info:
+    ident: 0xff
   children:
     - memory:
         name: mem1
diff --git a/testfiles/gena/Mems_WO.cheby b/testfiles/gena/Mems_WO.cheby
index 686552d3b2de7fa3d7d88f9da0dae954ea09bacc..2956d29ce253e033175af27872cedd5ee2b9c823 100644
--- a/testfiles/gena/Mems_WO.cheby
+++ b/testfiles/gena/Mems_WO.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161101
+  x-map-info:
+    ident: 0xff
   children:
     - memory:
         name: mem1
diff --git a/testfiles/gena/Mems_nodff.cheby b/testfiles/gena/Mems_nodff.cheby
index fae1ade329aa02b14b4523e6058af6ddb9c9ea97..64a0640642e460229879e686498c3f14f1a818ce 100644
--- a/testfiles/gena/Mems_nodff.cheby
+++ b/testfiles/gena/Mems_nodff.cheby
@@ -5,8 +5,9 @@ memory-map:
   x-gena:
     gen:
       no-mem-mux-dff: True
-    ident-code: 0xff
     map-version: 20161101
+  x-map-info:
+    ident: 0xff
   children:
     - memory:
         name: mem1
diff --git a/testfiles/gena/Mems_splitaddr.cheby b/testfiles/gena/Mems_splitaddr.cheby
index 63f209696e132b84525098c80bb297ab37e5888e..5f8ff6facbcd2c127503a6d5609e92d308492b4d 100644
--- a/testfiles/gena/Mems_splitaddr.cheby
+++ b/testfiles/gena/Mems_splitaddr.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-split-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161101
+  x-map-info:
+    ident: 0xff
   children:
     - memory:
         name: mem1
diff --git a/testfiles/gena/Muxed.cheby b/testfiles/gena/Muxed.cheby
index 21358c2a1639a5516deda7e896632ef010c4aee9..219c930d1f23443dfa3283212451569505f6f333 100644
--- a/testfiles/gena/Muxed.cheby
+++ b/testfiles/gena/Muxed.cheby
@@ -4,8 +4,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1M
   x-gena:
-    ident-code: 0x00
     map-version: 20180513
+  x-map-info:
+    ident: 0x00
   children:
     - reg:
         name: muxedRegRO
diff --git a/testfiles/gena/Muxed2.cheby b/testfiles/gena/Muxed2.cheby
index 2e8a70a718873eb86ac4c1d4911f8dcf24bff3bb..4f9794c050d3561bbf36e0020673a6b935225e15 100644
--- a/testfiles/gena/Muxed2.cheby
+++ b/testfiles/gena/Muxed2.cheby
@@ -4,8 +4,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1M
   x-gena:
-    ident-code: 0x00
     map-version: 20180513
+  x-map-info:
+    ident: 0x00
   children:
     - reg:
         name: muxedRegRO
diff --git a/testfiles/gena/Regs.cheby b/testfiles/gena/Regs.cheby
index 4bd7a8ec300a04678439143a3e6a983a2448ab4b..8e6d200bde0d8b625bc50c06a300cbcfc65b5910 100644
--- a/testfiles/gena/Regs.cheby
+++ b/testfiles/gena/Regs.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161101
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/Regs_Mems.cheby b/testfiles/gena/Regs_Mems.cheby
index d58e4672947c2efb0665d86d8fa8749a90e99fbf..61a3ce804e091d18d535f1b40df35aeb3bc1e18f 100644
--- a/testfiles/gena/Regs_Mems.cheby
+++ b/testfiles/gena/Regs_Mems.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161101
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/Regs_cross_words.cheby b/testfiles/gena/Regs_cross_words.cheby
index dca6c52c49ffc0618a234be18f57152dd14cd7a2..aa8c4ce9d6720106d43f88baed1a1db69989cd2f 100644
--- a/testfiles/gena/Regs_cross_words.cheby
+++ b/testfiles/gena/Regs_cross_words.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161101
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test2
diff --git a/testfiles/gena/Regs_nodff.cheby b/testfiles/gena/Regs_nodff.cheby
index 3ad6f5b5659e63f7ba3c3bccf4a62ca707f8c5c4..a39e98d5840e9aa9536c938337873e0391ea656a 100644
--- a/testfiles/gena/Regs_nodff.cheby
+++ b/testfiles/gena/Regs_nodff.cheby
@@ -5,8 +5,9 @@ memory-map:
   x-gena:
     gen:
       no-reg-mux-dff: True
-    ident-code: 0xff
     map-version: 20161101
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/Regs_rdstrobe.cheby b/testfiles/gena/Regs_rdstrobe.cheby
index af291e7a6f57f11d10efcdfb54812bb17915649d..68c73e62a9b57f13675ee55e7d2a7ded626a1079 100644
--- a/testfiles/gena/Regs_rdstrobe.cheby
+++ b/testfiles/gena/Regs_rdstrobe.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161101
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/Regs_small.cheby b/testfiles/gena/Regs_small.cheby
index 5b241052729431a1650fe784e46c51b202833712..b6ab95b12b4bfa2691d2a750d66a8b63fd03532b 100644
--- a/testfiles/gena/Regs_small.cheby
+++ b/testfiles/gena/Regs_small.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161101
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test2
diff --git a/testfiles/gena/Semver.cheby b/testfiles/gena/Semver.cheby
index c6b525b867f81d968c6e6f8a0fba752e007a0f2c..f7147d3a4ee26907c739868ee81c77faadbf68b9 100644
--- a/testfiles/gena/Semver.cheby
+++ b/testfiles/gena/Semver.cheby
@@ -3,9 +3,10 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
-    semantic-mem-map-version: 1.2.3
+  x-map-info:
+    ident: 0xff
+    memmap-version: 1.2.3
   children:
     - reg:
         name: test3
diff --git a/testfiles/gena/Submap.cheby b/testfiles/gena/Submap.cheby
index ce49d53c332c490b741ec7c187f95a37c4a487c1..0d29b44066acaf307d6ff17a7e41f5e8618d1add 100644
--- a/testfiles/gena/Submap.cheby
+++ b/testfiles/gena/Submap.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161101
+  x-map-info:
+    ident: 0xff
   children:
     - submap:
         name: submap1
diff --git a/testfiles/gena/Submap_internal.cheby b/testfiles/gena/Submap_internal.cheby
index 0d2f3ddc6ec714bf6eba9c0bacf835dc59e6cafa..a324c7e6811cb731b41eecba461c55e1a6561146 100644
--- a/testfiles/gena/Submap_internal.cheby
+++ b/testfiles/gena/Submap_internal.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161101
+  x-map-info:
+    ident: 0xff
   children:
     - submap:
         name: submap1
diff --git a/testfiles/gena/sub_reg_one.cheby b/testfiles/gena/sub_reg_one.cheby
index 0f95e2c4cbf9785990e7bd18e2efd310ef558b0f..dd44382d618ab7b4ad848d33c270c0cba7516cfe 100644
--- a/testfiles/gena/sub_reg_one.cheby
+++ b/testfiles/gena/sub_reg_one.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/sub_reg_preset.cheby b/testfiles/gena/sub_reg_preset.cheby
index c099b4c56d65d1ccaa09371be7efa82cc2d019bd..fd18afbbf7e62a49fa278a2e9506b7c1cdcf82ef 100644
--- a/testfiles/gena/sub_reg_preset.cheby
+++ b/testfiles/gena/sub_reg_preset.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/sub_reg_preset2.cheby b/testfiles/gena/sub_reg_preset2.cheby
index b915b9150ab111a3ec9a916b402b146e5729d351..1ce1789322dd4f530ae71500f9fa781d359b7136 100644
--- a/testfiles/gena/sub_reg_preset2.cheby
+++ b/testfiles/gena/sub_reg_preset2.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena/sub_reg_swap.cheby b/testfiles/gena/sub_reg_swap.cheby
index 584936b7972b58330fdc7184d1b966c97da2c6d2..eb0a76d9480e81d727881246e5ac7752bc9b8dfd 100644
--- a/testfiles/gena/sub_reg_swap.cheby
+++ b/testfiles/gena/sub_reg_swap.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/gena2cheby/Inc_CRegs.cheby b/testfiles/gena2cheby/Inc_CRegs.cheby
index 82b605b0ca64440dfaab5113a1614723af7eecff..ea23c5c27107e2302914e7e2da90a6f8efd91682 100644
--- a/testfiles/gena2cheby/Inc_CRegs.cheby
+++ b/testfiles/gena2cheby/Inc_CRegs.cheby
@@ -2,8 +2,9 @@ memory-map:
   name: incCRegs
   bus: cern-be-vme-err-32
   size: 1024
-  x-cern-info:
-    ident-code: 0xff
+  x-map-info:
+    ident: 0xff
+  x-gena:
     map-version: 20161031
   children:
     - reg:
diff --git a/testfiles/gena2cheby/submap_noinc.cheby b/testfiles/gena2cheby/submap_noinc.cheby
index 40469181b838e392f8f5cd55b9b899514e6a5385..06f832d133fa8374f497fec3276a956c5184c850 100644
--- a/testfiles/gena2cheby/submap_noinc.cheby
+++ b/testfiles/gena2cheby/submap_noinc.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-16
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161101
+  x-map-info:
+    ident: 0xff
   children:
     - submap:
         name: submap1
diff --git a/testfiles/issue24/map_arrays.cheby b/testfiles/issue24/map_arrays.cheby
index fcda3b5185a7d08c21a0fa135f0bc87004352220..9499dc3c5aa0a54511d630dac3f90cf5e87ba4e8 100644
--- a/testfiles/issue24/map_arrays.cheby
+++ b/testfiles/issue24/map_arrays.cheby
@@ -1,9 +1,10 @@
 memory-map:
   bus: axi4-lite-32
   name: arraysTests
-  x-cern-info:
+  x-gena:
     map-version: 00000000
-    ident-code: 0x0
+  x-map-info:
+    ident: 0x0
   children:
     - array:
         name: repeatBlock
diff --git a/testfiles/issue32/memmap.cheby b/testfiles/issue32/memmap.cheby
index 59ad2f14ba279948627dacb338a8ab7678bb1846..b437c5fb1a0c433f988f7f3069fab8f9556b4a69 100644
--- a/testfiles/issue32/memmap.cheby
+++ b/testfiles/issue32/memmap.cheby
@@ -1,9 +1,10 @@
 memory-map:
   bus: cern-be-vme-16
   name: memmap
-  x-cern-info:
+  x-gena:
     map-version: 00000000
-    ident-code: 0x0
+  x-map-info:
+    ident: 0x0
   children:
     - reg:
         name: reg1
diff --git a/testfiles/issue33/testmap.cheby b/testfiles/issue33/testmap.cheby
index 61180bc75f96b71d6c74c619ebb51c85ea0a035a..cffd6ea90c05d5a7cdec163bb36e8d79478e511d 100644
--- a/testfiles/issue33/testmap.cheby
+++ b/testfiles/issue33/testmap.cheby
@@ -3,11 +3,12 @@ memory-map:
   bus: cern-be-vme-16
   size: 1k
   x-gena:
-    ident-code: 0x1
     map-version: 20190923
-    semantic-mem-map-version: 0.0.1
   x-driver-edge:
     equipment-code: PX-ALCOB
+  x-map-info:
+    ident: 0x1
+    memmap-version: 0.0.1
   children:
     - reg:
         name: reg1
diff --git a/testfiles/issue33b/testmap.cheby b/testfiles/issue33b/testmap.cheby
index 881545f1b07993d943d063ebe9acf71a67a6d066..b54f2dfa5ff196a9a5337e71b6cbf7d164588d6b 100644
--- a/testfiles/issue33b/testmap.cheby
+++ b/testfiles/issue33b/testmap.cheby
@@ -3,11 +3,12 @@ memory-map:
   bus: cern-be-vme-16
   size: 1k
   x-gena:
-    ident-code: 0x1
     map-version: 20190923
-    semantic-mem-map-version: 0.0.1
   x-driver-edge:
     equipment-code: PX-ALCOB
+  x-map-info:
+    ident: 0x1
+    memmap-version: 0.0.1
   children:
     - reg:
         name: reg1
diff --git a/testfiles/issue33c/adf4002.cheby b/testfiles/issue33c/adf4002.cheby
index dd8e22feff038b1e404f3bbfae106a0eb9f6584f..3b27b9e6ddddfa405c9c2069b82d0ddc2154cae2 100644
--- a/testfiles/issue33c/adf4002.cheby
+++ b/testfiles/issue33c/adf4002.cheby
@@ -4,8 +4,9 @@ memory-map:
   size: 512
   x-driver-edge:
     equipment-code: PX-ALGSA
-  x-cern-info:
-    ident-code: 0x01
+  x-map-info:
+    ident: 0x01
+  x-gena:
     map-version: 20191108
     semantic-mem-map-version: 1.0.0
   children:
diff --git a/testfiles/issue33c/fractDivider.cheby b/testfiles/issue33c/fractDivider.cheby
index 5c57cc856430be44b2f0de8d05f6e0b2ccb45cee..8bfa423060a2e4d2f6465b7486ee6ff670c0e705 100644
--- a/testfiles/issue33c/fractDivider.cheby
+++ b/testfiles/issue33c/fractDivider.cheby
@@ -7,10 +7,11 @@ memory-map:
     equipment-code: SP-ALCPF
     module-type: RF_FRACTDIV
     name: RFFRACTDIV
-  x-cern-info:
-    ident-code: 0x50
+  x-map-info:
+    ident: 0x50
+    memmap-version: 1.0.0
+  x-gena:
     map-version: 20191107
-    semantic-mem-map-version: 1.0.0
   children:
     - reg:
         name: status1
diff --git a/testfiles/issue33d/preset1-preset-always.cheby b/testfiles/issue33d/preset1-preset-always.cheby
index 0e8972e0efbb1fb15f48720d9d0a9abead1e75e8..6b721212c002eb529457757cd0f4f734ea8974d3 100644
--- a/testfiles/issue33d/preset1-preset-always.cheby
+++ b/testfiles/issue33d/preset1-preset-always.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/issue33d/preset1-preset-no.cheby b/testfiles/issue33d/preset1-preset-no.cheby
index 4faf347e1db46d83372f1d13dc5ecee19df61eaf..59c54f3b8b9c31a36304b6a680406b1505917e77 100644
--- a/testfiles/issue33d/preset1-preset-no.cheby
+++ b/testfiles/issue33d/preset1-preset-no.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/issue33d/preset1-preset-nosplit.cheby b/testfiles/issue33d/preset1-preset-nosplit.cheby
index 4faf347e1db46d83372f1d13dc5ecee19df61eaf..59c54f3b8b9c31a36304b6a680406b1505917e77 100644
--- a/testfiles/issue33d/preset1-preset-nosplit.cheby
+++ b/testfiles/issue33d/preset1-preset-nosplit.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/issue33d/preset2-preset-nosplit.cheby b/testfiles/issue33d/preset2-preset-nosplit.cheby
index b7b7bee70fcb9b77655c331eb5355ce06daaf127..ce4baaa00038657325f639541c652e940df8c066 100644
--- a/testfiles/issue33d/preset2-preset-nosplit.cheby
+++ b/testfiles/issue33d/preset2-preset-nosplit.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/issue39/addressingMemory.cheby b/testfiles/issue39/addressingMemory.cheby
index bc65ee544545a0a38ede165fa04ea960f74e7d76..75d3c09fa2bb6a70c750d433aaa453ae533bd5e5 100644
--- a/testfiles/issue39/addressingMemory.cheby
+++ b/testfiles/issue39/addressingMemory.cheby
@@ -6,10 +6,11 @@ memory-map:
   size: 2M
   x-driver-edge:
     equipment-code: PX-ALCOB
-  x-cern-info:
-    ident-code: 0x1
+  x-map-info:
+    ident: 0x1
+    memmap-version: 0.0.1
+  x-gena:
     map-version: 20190917
-    semantic-mem-map-version: 0.0.1
   children:
     - memory:
         name: acqVP
diff --git a/testfiles/issue40/bugConstraints.cheby b/testfiles/issue40/bugConstraints.cheby
index 2b1bca7a3047663edab09aaee54008982a1e91ed..df7e8e5ab31c13356137dee99073840dd4ad2926 100644
--- a/testfiles/issue40/bugConstraints.cheby
+++ b/testfiles/issue40/bugConstraints.cheby
@@ -1,9 +1,10 @@
 memory-map:
   bus: cern-be-vme-32
   name: bugConstraintFields
-  x-cern-info:
+  x-gena:
     map-version: 00000000
-    ident-code: 0x0
+  x-map-info:
+    ident: 0x0
   children:
     - reg:
         name: r1
diff --git a/testfiles/issue41/bugBlockFields.cheby b/testfiles/issue41/bugBlockFields.cheby
index 3f251695863fbf10ee0e899d4043f9a607265ea3..9433731e5c6fa0a1df3b1d25273ef65a8d8ad425 100644
--- a/testfiles/issue41/bugBlockFields.cheby
+++ b/testfiles/issue41/bugBlockFields.cheby
@@ -1,9 +1,10 @@
 memory-map:
   bus: cern-be-vme-32
   name: bugBlockRegField
-  x-cern-info:
+  x-gena:
     map-version: 00000000
-    ident-code: 0x0
+  x-map-info:
+    ident: 0x0
   children:
     - block:
         name: b1
diff --git a/testfiles/issue49/mainMap.cheby b/testfiles/issue49/mainMap.cheby
index 40923f2173ab0c2d54b70bf1f1e16c0d5d7bf583..a7130b322220bc1cb79e7c0595bf5b52f5532552 100644
--- a/testfiles/issue49/mainMap.cheby
+++ b/testfiles/issue49/mainMap.cheby
@@ -2,9 +2,10 @@ memory-map:
   bus: cern-be-vme-32
   name: mainMap
   size: 1k
-  x-cern-info:
+  x-gena:
     map-version: 00000000
-    ident-code: 0x0
+  x-map-info:
+    ident: 0x0
   children:
     - submap:
         name: ssmap2
diff --git a/testfiles/issue49/ssmap.cheby b/testfiles/issue49/ssmap.cheby
index 987c4d5052025a9bacded0b550b0a607dc510198..abad339f0b5af02c6c34839f0e5d335ca3145c04 100644
--- a/testfiles/issue49/ssmap.cheby
+++ b/testfiles/issue49/ssmap.cheby
@@ -1,9 +1,10 @@
 memory-map:
   bus: cern-be-vme-32
   name: ssmap
-  x-cern-info:
+  x-gena:
     map-version: 00000000
-    ident-code: 0x0
+  x-map-info:
+    ident: 0x0
   children:
     - block:
         name: b1
diff --git a/testfiles/issue51/map.cheby b/testfiles/issue51/map.cheby
index 45552820e45b8a919c145628933a9700f63ae1fd..15751a95d593f99f0d0f85a65a3bb796848516a5 100644
--- a/testfiles/issue51/map.cheby
+++ b/testfiles/issue51/map.cheby
@@ -3,11 +3,12 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 10k
   x-gena:
-    ident-code: 0x1
     map-version: 20190607
-    semantic-mem-map-version: 0.0.1
   x-driver-edge:
     equipment-code: PX-ALCOB
+  x-map-info:
+    ident: 0x1
+    memmap-version: 0.0.1
   children:
     - submap:
         name: submap
diff --git a/testfiles/issue7/code_fields.cheby b/testfiles/issue7/code_fields.cheby
index 9de505a72cb3e68599c9ca162f454cdf4416399f..83d710a0f80e143bc95f3494321ddebe73610ab4 100644
--- a/testfiles/issue7/code_fields.cheby
+++ b/testfiles/issue7/code_fields.cheby
@@ -3,11 +3,12 @@ memory-map:
   bus: cern-be-vme-16
   size: 16k
   x-gena:
-    ident-code: 0x1
     map-version: 20190204
-    semantic-mem-map-version: 1.0.0
   x-driver-edge:
     equipment-code: PX-ALCOB
+  x-map-info:
+    ident: 0x1
+    memmap-version: 1.0.0
   children:
     - block:
         name: area1
diff --git a/testfiles/issue_gena_rst/CRegs.cheby b/testfiles/issue_gena_rst/CRegs.cheby
index 7f38058d0cc0b0a6c54f54a6b137c4f410292396..dff63a4fa4edad72a9e77b448dd470d189b26afd 100644
--- a/testfiles/issue_gena_rst/CRegs.cheby
+++ b/testfiles/issue_gena_rst/CRegs.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test1
diff --git a/testfiles/issue_gena_rst/CRegs_srff.cheby b/testfiles/issue_gena_rst/CRegs_srff.cheby
index 5fc9add26f323744f0b4f2689c8bdc6e36656077..6db1ddd225a6597d18ade73b9a6fcbadc0bf274c 100644
--- a/testfiles/issue_gena_rst/CRegs_srff.cheby
+++ b/testfiles/issue_gena_rst/CRegs_srff.cheby
@@ -3,8 +3,9 @@ memory-map:
   bus: cern-be-vme-err-32
   size: 1024k
   x-gena:
-    ident-code: 0xff
     map-version: 20161031
+  x-map-info:
+    ident: 0xff
   children:
     - reg:
         name: test3