diff --git a/foundation/codecomponents/nsds.ts b/foundation/codecomponents/nsds.ts
index 601ed86..13ce8f2 100644
--- a/foundation/codecomponents/nsds.ts
+++ b/foundation/codecomponents/nsds.ts
@@ -5,10 +5,15 @@ export const nsd72 = `<?xml version="1.0" encoding="UTF-8"?>
     id="IEC 61850-7-2"
     version="2007"
     revision="B"
-    release="3"
-    umlVersion="WG10built4"
-    umlDate="2019-10-02T00:00:00Z"
-    publicationStage="IS">
+    release="5"
+    umlVersion="WG10built12"
+    umlDate="2024-01-15"
+    publicationStage="IS"
+    appVersion="j61850DocBuilder 02.03 based on jCleanCim noNS beta9.3 (derived from jCleanCim 02-02)"
+    namespaceType="basic"
+    nsdVersion="2017"
+    nsdRevision="B"
+    nsdRelease="5">
    <Copyright>
          <Notice>
 			COPYRIGHT (c) IEC, www.iec.ch/tc57/supportdocuments. This version of this NSD is part of IEC_61850-7-2:2010 Edition 2.1; see the IEC_61850-7-2:2010 Edition 2.1 for full legal notices. In case of any differences between the here-below code and the IEC published content, the here-below definition supersedes the IEC publication; it may contain updates. See history files. The whole document has to be taken into account to have a full description of this code component.
@@ -17,8 +22,8 @@ export const nsd72 = `<?xml version="1.0" encoding="UTF-8"?>
          <License uri="www.iec.ch/CCv1" kind="Standard"/>
       </Copyright>
    <Changes version="2007"
-            revision="A"
-            tissues="728, 730, 778, 780, 783, 786, 813, 820, 850, 852, 858, 860, 861, 869, 875, 876, 943, 970, 1038, 1050, 1061, 1062, 1071, 1091, 1092, 1116, 1122, 1127, 1145, 1154, 1194, 1202, 1232, 1242, 1252, 1276, 1283, 1307, 1308, 1319, 1338, 1341, 1356, 1377, 1386, 1428, 1432, 1433, 1435, 1439, 1455, 1569,  1589, 1622, 1630, 1650, 1652"/>
+            revision="B"
+            tissues="1781, 1782, 1801, 1841, 1847, 1822"/>
    <BasicTypes>
          <BasicType name="BOOLEAN" descID="IEC61850_7_2.BasicTypes::P_BOOLEAN.cl.desc"/>
          <BasicType name="INT8" descID="IEC61850_7_2.BasicTypes::P_INT8.cl.desc"/>
@@ -531,7 +536,8 @@ export const nsd72 = `<?xml version="1.0" encoding="UTF-8"?>
                            presCond="M"/>
          </ConstructedAttribute>
       </ConstructedAttributes>
-</NS>`;
+</NS>
+`;
 
 export const nsd73 = `<?xml version="1.0" encoding="UTF-8"?>
 <NS xmlns="http://www.iec.ch/61850/2016/NSD"
@@ -540,10 +546,15 @@ export const nsd73 = `<?xml version="1.0" encoding="UTF-8"?>
     id="IEC 61850-7-3"
     version="2007"
     revision="B"
-    release="3"
-    umlVersion="WG10built3"
-    umlDate="2019-10-02T00:00:00Z"
-    publicationStage="IS">
+    release="5"
+    umlVersion="WG10built12"
+    umlDate="2024-02-12"
+    publicationStage="IS"
+    appVersion="j61850DocBuilder 02.03 based on jCleanCim noNS beta9.3 (derived from jCleanCim 02-02)"
+    namespaceType="basic"
+    nsdVersion="2017"
+    nsdRevision="B"
+    nsdRelease="5">
    <Copyright>
          <Notice>
 			COPYRIGHT (c) IEC, www.iec.ch/tc57/supportdocuments. This version of this NSD is part of IEC_61850-7-3:2010 Edition 2.1; see the IEC_61850-7-3:2010 Edition 2.1 for full legal notices. In case of any differences between the here-below code and the IEC published content, the here-below definition supersedes the IEC publication; it may contain updates. See history files. The whole document has to be taken into account to have a full description of this code component.
@@ -552,9 +563,12 @@ export const nsd73 = `<?xml version="1.0" encoding="UTF-8"?>
          <License uri="www.iec.ch/CCv1" kind="Standard"/>
       </Copyright>
    <Changes version="2007"
-            revision="A"
-            tissues="690, 691, 692, 697, 698, 707, 709, 711, 722, 814, 816, 819, 832, 839, 846, 868, 887, 919, 924, 925, 926, 929, 953, 954, 962, 968, 996, 1078, 1079, 1122, 1127, 1184, 1187, 1189, 1220, 1233, 1240, 1242, 1247, 1253, 1265, 1270, 1311, 1372, 1387, 1388, 1403, 1430, 1438, 1578, 1581, 1598, 1602, 1623"/>
-   <DependsOn id="IEC 61850-7-2" version="2007" revision="B"/>
+            revision="B"
+            tissues="1716, 1730, 1783, 1785, 1807, 1829, 1840, 1851, 1852, 1889, 1900"/>
+   <DependsOn id="IEC 61850-7-2"
+              version="2007"
+              revision="B"
+              dependencyType="dependsOn"/>
    <Enumerations>
          <Enumeration name="AngleReferenceKind"
                    titleID="IEC61850_7_3.DAEnums::AngleReferenceKind.cl.title">
@@ -767,7 +781,7 @@ export const nsd73 = `<?xml version="1.0" encoding="UTF-8"?>
                   descID="IEC61850_7_3.DAEnums::MultiplierKind.n.desc"/>
             <Literal name="µ"
                   literalVal="-6"
-                  descID="IEC61850_7_3.DAEnums::MultiplierKind._micro.desc"/>
+                  descID="IEC61850_7_3.DAEnums::MultiplierKind.µ.desc"/>
             <Literal name="m"
                   literalVal="-3"
                   descID="IEC61850_7_3.DAEnums::MultiplierKind.m.desc"/>
@@ -920,7 +934,7 @@ export const nsd73 = `<?xml version="1.0" encoding="UTF-8"?>
                   descID="IEC61850_7_3.DAEnums::SIUnitKind.Bq.desc"/>
             <Literal name="°C"
                   literalVal="23"
-                  descID="IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc"/>
+                  descID="IEC61850_7_3.DAEnums::SIUnitKind.°C.desc"/>
             <Literal name="Sv"
                   literalVal="24"
                   descID="IEC61850_7_3.DAEnums::SIUnitKind.Sv.desc"/>
@@ -971,31 +985,31 @@ export const nsd73 = `<?xml version="1.0" encoding="UTF-8"?>
                   descID="IEC61850_7_3.DAEnums::SIUnitKind.Pa.desc"/>
             <Literal name="m²"
                   literalVal="41"
-                  descID="IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc"/>
+                  descID="IEC61850_7_3.DAEnums::SIUnitKind.m².desc"/>
             <Literal name="m³"
                   literalVal="42"
-                  descID="IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc"/>
+                  descID="IEC61850_7_3.DAEnums::SIUnitKind.m³.desc"/>
             <Literal name="m/s"
                   literalVal="43"
                   descID="IEC61850_7_3.DAEnums::SIUnitKind.m_per_s.desc"/>
             <Literal name="m/s²"
                   literalVal="44"
-                  descID="IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc"/>
+                  descID="IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc"/>
             <Literal name="m³/s"
                   literalVal="45"
-                  descID="IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc"/>
+                  descID="IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc"/>
             <Literal name="m/m³"
                   literalVal="46"
-                  descID="IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc"/>
+                  descID="IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc"/>
             <Literal name="M"
                   literalVal="47"
                   descID="IEC61850_7_3.DAEnums::SIUnitKind.M.desc"/>
             <Literal name="kg/m³"
                   literalVal="48"
-                  descID="IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc"/>
+                  descID="IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc"/>
             <Literal name="m²/s"
                   literalVal="49"
-                  descID="IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc"/>
+                  descID="IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc"/>
             <Literal name="W/m K"
                   literalVal="50"
                   descID="IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_K.desc"/>
@@ -1013,10 +1027,10 @@ export const nsd73 = `<?xml version="1.0" encoding="UTF-8"?>
                   descID="IEC61850_7_3.DAEnums::SIUnitKind.rad_per_s.desc"/>
             <Literal name="W/m²"
                   literalVal="55"
-                  descID="IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc"/>
+                  descID="IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc"/>
             <Literal name="J/m²"
                   literalVal="56"
-                  descID="IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc"/>
+                  descID="IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc"/>
             <Literal name="S/m"
                   literalVal="57"
                   descID="IEC61850_7_3.DAEnums::SIUnitKind.S_per_m.desc"/>
@@ -1051,16 +1065,16 @@ export const nsd73 = `<?xml version="1.0" encoding="UTF-8"?>
                   descID="IEC61850_7_3.DAEnums::SIUnitKind.Vs.desc"/>
             <Literal name="V²"
                   literalVal="67"
-                  descID="IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc"/>
+                  descID="IEC61850_7_3.DAEnums::SIUnitKind.V².desc"/>
             <Literal name="As"
                   literalVal="68"
                   descID="IEC61850_7_3.DAEnums::SIUnitKind.As.desc"/>
             <Literal name="A²"
                   literalVal="69"
-                  descID="IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc"/>
+                  descID="IEC61850_7_3.DAEnums::SIUnitKind.A².desc"/>
             <Literal name="A²t"
                   literalVal="70"
-                  descID="IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc"/>
+                  descID="IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc"/>
             <Literal name="VAh"
                   literalVal="71"
                   descID="IEC61850_7_3.DAEnums::SIUnitKind.VAh.desc"/>
@@ -1084,7 +1098,7 @@ export const nsd73 = `<?xml version="1.0" encoding="UTF-8"?>
                   descID="IEC61850_7_3.DAEnums::SIUnitKind.char_per_s.desc"/>
             <Literal name="kgm²"
                   literalVal="78"
-                  descID="IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc"/>
+                  descID="IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc"/>
             <Literal name="dB"
                   literalVal="79"
                   descID="IEC61850_7_3.DAEnums::SIUnitKind.dB.desc"/>
@@ -1964,7 +1978,8 @@ export const nsd73 = `<?xml version="1.0" encoding="UTF-8"?>
                         type="Timestamp"
                         dchg="true"
                         descID="IEC61850_7_3.CDCStatusInfo::BCR.strTm.desc"
-                        presCond="O"/>
+                        presCond="OF"
+                        presCondArgs="frVal"/>
             <DataAttribute name="frPd"
                         fc="CF"
                         type="INT32"
@@ -4076,7 +4091,8 @@ export const nsd73 = `<?xml version="1.0" encoding="UTF-8"?>
                         type="FLOAT32"
                         dchg="true"
                         descID="IEC61850_7_3.CDCControl::APC.dbRef.desc"
-                        presCond="M"/>
+                        presCond="MO"
+                        presCondArgs="db"/>
             <DataAttribute name="d"
                         fc="DC"
                         type="VisString255"
@@ -4265,7 +4281,8 @@ export const nsd73 = `<?xml version="1.0" encoding="UTF-8"?>
                         type="FLOAT32"
                         dchg="true"
                         descID="IEC61850_7_3.CDCControl::BAC.dbRef.desc"
-                        presCond="M"/>
+                        presCond="MO"
+                        presCondArgs="db"/>
             <DataAttribute name="d"
                         fc="DC"
                         type="VisString255"
@@ -6300,7 +6317,9 @@ export const nsd73 = `<?xml version="1.0" encoding="UTF-8"?>
                         descID="IEC61850_7_3.CoreAbstractCDCs::BasePrimitiveCDC.dataNs.desc"
                         presCond="MOdataNs"/>
          </CDC>
-         <CDC name="GTS" titleID="IEC61850_7_3.CDCServiceTracking::GTS.cl.title">
+         <CDC name="GTS"
+           titleID="IEC61850_7_3.CDCServiceTracking::GTS.cl.title"
+           typeKindParameterized="true">
             <DataAttribute name="objRef"
                         fc="SR"
                         type="ObjRef"
@@ -6361,7 +6380,7 @@ export const nsd73 = `<?xml version="1.0" encoding="UTF-8"?>
                         presCond="M"/>
             <DataAttribute name="dstAddress"
                         fc="SR"
-                        type="PhyComAddr"
+                        typeKind="SCSM"
                         descID="IEC61850_7_3.CDCServiceTracking::GTS.dstAddress.desc"
                         presCond="M"/>
             <DataAttribute name="d"
@@ -6385,7 +6404,9 @@ export const nsd73 = `<?xml version="1.0" encoding="UTF-8"?>
                         descID="IEC61850_7_3.CoreAbstractCDCs::BasePrimitiveCDC.dataNs.desc"
                         presCond="MOdataNs"/>
          </CDC>
-         <CDC name="MTS" titleID="IEC61850_7_3.CDCServiceTracking::MTS.cl.title">
+         <CDC name="MTS"
+           titleID="IEC61850_7_3.CDCServiceTracking::MTS.cl.title"
+           typeKindParameterized="true">
             <DataAttribute name="objRef"
                         fc="SR"
                         type="ObjRef"
@@ -6457,7 +6478,7 @@ export const nsd73 = `<?xml version="1.0" encoding="UTF-8"?>
                         presCond="M"/>
             <DataAttribute name="dstAddress"
                         fc="SR"
-                        type="PhyComAddr"
+                        typeKind="SCSM"
                         descID="IEC61850_7_3.CDCServiceTracking::MTS.dstAddress.desc"
                         presCond="M"/>
             <DataAttribute name="d"
@@ -6770,20 +6791,29 @@ export const nsd74 = `<?xml version="1.0" encoding="UTF-8"?>
     id="IEC 61850-7-4"
     version="2007"
     revision="B"
-    release="3"
-    umlVersion="WG10UML02v20draft25"
-    umlDate="2019-10-31T00:00:00Z"
-    publicationStage="IS">
+    release="5"
+    umlVersion="WG10built12"
+    umlDate="2024-02-14"
+    publicationStage="IS"
+    appVersion="j61850DocBuilder 02.03 based on jCleanCim noNS beta9.3 (derived from jCleanCim 02-02)"
+    namespaceType="basic"
+    nsdVersion="2017"
+    nsdRevision="B"
+    nsdRelease="5">
    <Copyright>
          <Notice>
-			COPYRIGHT (c) IEC, www.iec.ch/tc57/supportdocuments. This version of this NSD is part of IEC_61850-7-4:2007; see the IEC_61850-7-4:2007 for full legal notices. In case of any differences between the here-below code and the IEC published content, the here-below definition supersedes the IEC publication; it may contain updates. See history files. The whole document has to be taken into account to have a full description of this code component.
+			COPYRIGHT (c) IEC, www.iec.ch/tc57/supportdocuments. This version of this NSD is part of IEC_61850-7-4:2020 Edition 2.1; see the IEC_61850-7-4:2020 Edition 2.1 for full legal notices. In case of any differences between the here-below code and the IEC published content, the here-below definition supersedes the IEC publication; it may contain updates. See history files. The whole document has to be taken into account to have a full description of this code component.
 			See www.iec.ch/CCv1 for copyright details.
 			</Notice>
          <License uri="www.iec.ch/CCv1" kind="Standard"/>
       </Copyright>
-   <Changes version=""
-            revision=""
-            tissues="671, 672, 674, 675, 676, 677, 679, 680, 682, 683, 685, 686, 689, 693, 694, 695, 696, 712, 713, 714, 715, 716, 724, 725, 732, 734, 735, 736, 742, 743, 744, 748, 749, 772, 773, 774, 775, 776, 800, 802, 808, 819, 830, 831, 835, 838, 842, 843, 844, 849, 871, 877, 878, 879, 881, 882, 902, 908, 909, 910, 911, 912, 913, 920, 928, 932, 933, 937, 939, 940, 952, 967, 991, 1007, 1029, 1044, 1046, 1071, 1075, 1076, 1077, 1081, 1086, 1117, 1119, 1128, 1137, 1139, 1176, 1177, 1190, 1191, 1203, 1205, 1229, 1235, 1236, 1244, 1250, 1256, 1258, 1259, 1261, 1269, 1273, 1278, 1282, 1292, 1294, 1310, 1316, 1330, 1331, 1333, 1339, 1347, 1348, 1364, 1368, 1375, 1380, 1390, 1404, 1411, 1420, 1423, 1425, 1426, 1436, 1456, 1568"/>
+   <Changes version="2007"
+            revision="B"
+            tissues="1701, 1766, 1775, 1819, 1821, 1836, 1846, 1856, 1859, 1866, 1883"/>
+   <DependsOn id="IEC 61850-7-3"
+              version="2007"
+              revision="B"
+              dependencyType="dependsOn"/>
    <Abbreviations>
          <Abbreviation name="A" descID="IEC61850_7_4.Abbreviations::AbbrTermA.A.desc"/>
          <Abbreviation name="AC" descID="IEC61850_7_4.Abbreviations::AbbrTermA.AC.desc"/>
@@ -7718,6 +7748,7 @@ export const nsd74 = `<?xml version="1.0" encoding="UTF-8"?>
          <Abbreviation name="Typ" descID="IEC61850_7_4.Abbreviations::AbbrTermT.Typ.desc"/>
          <Abbreviation name="UPS" descID="IEC61850_7_4.Abbreviations::AbbrTermU.UPS.desc"/>
          <Abbreviation name="UTC" descID="IEC61850_7_4.Abbreviations::AbbrTermU.UTC.desc"/>
+         <Abbreviation name="Udp" descID="IEC61850_7_4.Abbreviations::AbbrTermU.Udp.desc"/>
          <Abbreviation name="Uhf" descID="IEC61850_7_4.Abbreviations::AbbrTermU.Uhf.desc"/>
          <Abbreviation name="Un" descID="IEC61850_7_4.Abbreviations::AbbrTermU.Un.desc"/>
          <Abbreviation name="Unav" descID="IEC61850_7_4.Abbreviations::AbbrTermU.Unav.desc"/>
@@ -7929,11 +7960,9 @@ export const nsd74 = `<?xml version="1.0" encoding="UTF-8"?>
          </Enumeration>
          <Enumeration name="ClockSyncKind"
                    titleID="IEC61850_7_4.DOEnums::ClockSyncKind.cl.title">
-            <Literal name="InternalClock" literalVal="1"/>
-            <Literal name="LocalAreaClock" literalVal="2"/>
-            <Literal name="GlobalAreaClock"
-                  literalVal="3"
-                  descID="IEC61850_7_4.DOEnums::ClockSyncKind.GlobalAreaClock.desc"/>
+            <Literal name="InternalClock" literalVal="0"/>
+            <Literal name="LocalAreaClock" literalVal="1"/>
+            <Literal name="GlobalAreaClock" literalVal="2"/>
          </Enumeration>
          <Enumeration name="ClockSyncLockingKind"
                    titleID="IEC61850_7_4.DOEnums::ClockSyncLockingKind.cl.title">
@@ -8376,7 +8405,8 @@ export const nsd74 = `<?xml version="1.0" encoding="UTF-8"?>
             <Literal name="TPY" literalVal="7"/>
             <Literal name="TPZ" literalVal="8"/>
             <Literal name="TPE" literalVal="9"/>
-            <Literal name="TPS" literalVal="10"/>
+            <Literal name="TPS" literalVal="10" deprecated="true"/>
+            <Literal name="TPM" literalVal="11"/>
          </Enumeration>
          <Enumeration name="TpcAppModeKind"
                    titleID="IEC61850_7_4.DOEnums::TpcAppModeKind.cl.title">
@@ -8722,12 +8752,6 @@ export const nsd74 = `<?xml version="1.0" encoding="UTF-8"?>
          <AbstractLNClass name="SynchronisationLN"
                        titleID="IEC61850_7_4.AbstractLNsCommon::SynchronisationLN.cl.title"
                        base="ControlledLN">
-            <DataObject name="Rel"
-                     type="SPS"
-                     descID="IEC61850_7_4.AbstractLNsCommon::SynchronisationLN.Rel.desc"
-                     presCond="AtLeastOne"
-                     presCondArgs="1"
-                     dsPresCond="F"/>
             <DataObject name="VInd"
                      type="SPS"
                      descID="IEC61850_7_4.AbstractLNsCommon::SynchronisationLN.VInd.desc"
@@ -10294,11 +10318,15 @@ export const nsd74 = `<?xml version="1.0" encoding="UTF-8"?>
                      dsPresCond="na"/>
             <DataObject name="GocbTrk"
                      type="GTS"
+                     underlyingTypeKind="SCSM"
+                     underlyingType="PhyComAddrL2"
                      descID="IEC61850_7_4.LNGroupL::LTRK.GocbTrk.desc"
                      presCond="O"
                      dsPresCond="na"/>
             <DataObject name="MsvcbTrk"
                      type="MTS"
+                     underlyingTypeKind="SCSM"
+                     underlyingType="PhyComAddrL2"
                      descID="IEC61850_7_4.LNGroupL::LTRK.MsvcbTrk.desc"
                      presCond="O"
                      dsPresCond="na"/>
@@ -10312,6 +10340,20 @@ export const nsd74 = `<?xml version="1.0" encoding="UTF-8"?>
                      descID="IEC61850_7_4.LNGroupL::LTRK.SgcbTrk.desc"
                      presCond="O"
                      dsPresCond="na"/>
+            <DataObject name="GocbUdpTrk"
+                     type="GTS"
+                     underlyingTypeKind="SCSM"
+                     underlyingType="PhyComAddrUDP"
+                     descID="IEC61850_7_4.LNGroupL::LTRK.GocbUdpTrk.desc"
+                     presCond="O"
+                     dsPresCond="na"/>
+            <DataObject name="MsvcbUdpTrk"
+                     type="MTS"
+                     underlyingTypeKind="SCSM"
+                     underlyingType="PhyComAddrUDP"
+                     descID="IEC61850_7_4.LNGroupL::LTRK.MsvcbUdpTrk.desc"
+                     presCond="O"
+                     dsPresCond="na"/>
          </LNClass>
          <LNClass name="ANCR"
                titleID="IEC61850_7_4.LNGroupA::ANCR.cl.title"
@@ -11102,9 +11144,9 @@ export const nsd74 = `<?xml version="1.0" encoding="UTF-8"?>
                      presCond="AtLeastOne"
                      presCondArgs="1"
                      dsPresCond="F"/>
-            <DataObject name="RV"
+            <DataObject name="LHz"
                      type="SPS"
-                     descID="IEC61850_7_4.LNGroupC::CSYN.RV.desc"
+                     descID="IEC61850_7_4.LNGroupC::CSYN.LHz.desc"
                      presCond="O"
                      dsPresCond="F"/>
             <DataObject name="LV"
@@ -11112,14 +11154,15 @@ export const nsd74 = `<?xml version="1.0" encoding="UTF-8"?>
                      descID="IEC61850_7_4.LNGroupC::CSYN.LV.desc"
                      presCond="O"
                      dsPresCond="F"/>
-            <DataObject name="RHz"
+            <DataObject name="Rel"
                      type="SPS"
-                     descID="IEC61850_7_4.LNGroupC::CSYN.RHz.desc"
-                     presCond="O"
+                     descID="IEC61850_7_4.LNGroupC::CSYN.Rel.desc"
+                     presCond="AtLeastOne"
+                     presCondArgs="1"
                      dsPresCond="F"/>
-            <DataObject name="LHz"
+            <DataObject name="RHz"
                      type="SPS"
-                     descID="IEC61850_7_4.LNGroupC::CSYN.LHz.desc"
+                     descID="IEC61850_7_4.LNGroupC::CSYN.RHz.desc"
                      presCond="O"
                      dsPresCond="F"/>
             <DataObject name="RotDir"
@@ -11128,6 +11171,11 @@ export const nsd74 = `<?xml version="1.0" encoding="UTF-8"?>
                      descID="IEC61850_7_4.LNGroupC::CSYN.RotDir.desc"
                      presCond="O"
                      dsPresCond="F"/>
+            <DataObject name="RV"
+                     type="SPS"
+                     descID="IEC61850_7_4.LNGroupC::CSYN.RV.desc"
+                     presCond="O"
+                     dsPresCond="F"/>
             <DataObject name="AccClc"
                      type="MV"
                      descID="IEC61850_7_4.LNGroupC::CSYN.AccClc.desc"
@@ -11138,25 +11186,20 @@ export const nsd74 = `<?xml version="1.0" encoding="UTF-8"?>
                      descID="IEC61850_7_4.LNGroupC::CSYN.AccClcDev.desc"
                      presCond="O"
                      dsPresCond="O"/>
-            <DataObject name="RelDeaBus"
-                     type="SPC"
-                     descID="IEC61850_7_4.LNGroupC::CSYN.RelDeaBus.desc"
-                     presCond="O"
-                     dsPresCond="F"/>
             <DataObject name="OpModSyn"
                      type="ENC"
                      underlyingType="SynchOperationModeKind"
                      descID="IEC61850_7_4.LNGroupC::CSYN.OpModSyn.desc"
                      presCond="O"
                      dsPresCond="F"/>
-            <DataObject name="VNom"
-                     type="ASG"
-                     descID="IEC61850_7_4.LNGroupC::CSYN.VNom.desc"
+            <DataObject name="RelDeaBus"
+                     type="SPC"
+                     descID="IEC61850_7_4.LNGroupC::CSYN.RelDeaBus.desc"
                      presCond="O"
                      dsPresCond="F"/>
-            <DataObject name="HzNom"
-                     type="ASG"
-                     descID="IEC61850_7_4.LNGroupC::CSYN.HzNom.desc"
+            <DataObject name="DlSynTmms"
+                     type="ING"
+                     descID="IEC61850_7_4.LNGroupC::CSYN.DlSynTmms.desc"
                      presCond="O"
                      dsPresCond="F"/>
             <DataObject name="DlTmms"
@@ -11164,6 +11207,11 @@ export const nsd74 = `<?xml version="1.0" encoding="UTF-8"?>
                      descID="IEC61850_7_4.LNGroupC::CSYN.DlTmms.desc"
                      presCond="O"
                      dsPresCond="F"/>
+            <DataObject name="HzNom"
+                     type="ASG"
+                     descID="IEC61850_7_4.LNGroupC::CSYN.HzNom.desc"
+                     presCond="O"
+                     dsPresCond="F"/>
             <DataObject name="MltCmd"
                      type="SPG"
                      descID="IEC61850_7_4.LNGroupC::CSYN.MltCmd.desc"
@@ -11184,6 +11232,11 @@ export const nsd74 = `<?xml version="1.0" encoding="UTF-8"?>
                      descID="IEC61850_7_4.LNGroupC::CSYN.VIntvTmms.desc"
                      presCond="O"
                      dsPresCond="F"/>
+            <DataObject name="VNom"
+                     type="ASG"
+                     descID="IEC61850_7_4.LNGroupC::CSYN.VNom.desc"
+                     presCond="O"
+                     dsPresCond="F"/>
             <DataObject name="MinVTmms"
                      type="ING"
                      descID="IEC61850_7_4.LNGroupC::CSYN.MinVTmms.desc"
@@ -11229,11 +11282,6 @@ export const nsd74 = `<?xml version="1.0" encoding="UTF-8"?>
                      descID="IEC61850_7_4.LNGroupC::CSYN.KckPls.desc"
                      presCond="O"
                      dsPresCond="F"/>
-            <DataObject name="DlSynTmms"
-                     type="ING"
-                     descID="IEC61850_7_4.LNGroupC::CSYN.DlSynTmms.desc"
-                     presCond="O"
-                     dsPresCond="F"/>
          </LNClass>
          <LNClass name="FCNT"
                titleID="IEC61850_7_4.LNGroupF::FCNT.cl.title"
@@ -14771,13 +14819,29 @@ export const nsd74 = `<?xml version="1.0" encoding="UTF-8"?>
             <DataObject name="FltZ"
                      type="CMV"
                      descID="IEC61850_7_4.LNGroupR::RFLO.FltZ.desc"
-                     presCond="O"
+                     presCond="MOcond"
+                     presCondArgs="2"
+                     presCondArgsID="IEC61850_7_4.LNGroupR::RFLO__(_MOcond(2)_=__((_FltZ,_FltX,_FltR_))__)_.cond.LNGroupR::RFLO.FltZ"
                      dsPresCond="O"/>
             <DataObject name="FltDiskm"
                      type="MV"
                      descID="IEC61850_7_4.LNGroupR::RFLO.FltDiskm.desc"
                      presCond="O"
                      dsPresCond="O"/>
+            <DataObject name="FltR"
+                     type="MV"
+                     descID="IEC61850_7_4.LNGroupR::RFLO.FltR.desc"
+                     presCond="MOcond"
+                     presCondArgs="2"
+                     presCondArgsID="IEC61850_7_4.LNGroupR::RFLO__(_MOcond(2)_=__((_FltZ,_FltX,_FltR_))__)_.cond.LNGroupR::RFLO.FltR"
+                     dsPresCond="O"/>
+            <DataObject name="FltX"
+                     type="MV"
+                     descID="IEC61850_7_4.LNGroupR::RFLO.FltX.desc"
+                     presCond="MOcond"
+                     presCondArgs="2"
+                     presCondArgsID="IEC61850_7_4.LNGroupR::RFLO__(_MOcond(2)_=__((_FltZ,_FltX,_FltR_))__)_.cond.LNGroupR::RFLO.FltX"
+                     dsPresCond="O"/>
             <DataObject name="OpCntRs"
                      type="INC"
                      descID="IEC61850_7_4.LNGroupR::RFLO.OpCntRs.desc"
@@ -14984,6 +15048,11 @@ export const nsd74 = `<?xml version="1.0" encoding="UTF-8"?>
          <LNClass name="RSYN"
                titleID="IEC61850_7_4.LNGroupR::RSYN.cl.title"
                base="SynchronisationLN">
+            <DataObject name="Rel"
+                     type="SPS"
+                     descID="IEC61850_7_4.LNGroupR::RSYN.Rel.desc"
+                     presCond="M"
+                     dsPresCond="F"/>
             <DataObject name="DifV"
                      type="ASG"
                      descID="IEC61850_7_4.LNGroupR::RSYN.DifV.desc"
diff --git a/tDataTypeTemplates/nsdToJson/testJson/APC.ts b/tDataTypeTemplates/nsdToJson/testJson/APC.ts
index d6c948d..e5be999 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/APC.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/APC.ts
@@ -424,7 +424,7 @@ export const apcChildren = {
             tagName: "Literal",
             name: "°C",
             literalVal: "23",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
           },
           Sv: {
             tagName: "Literal",
@@ -526,13 +526,13 @@ export const apcChildren = {
             tagName: "Literal",
             name: "m²",
             literalVal: "41",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
           },
           "m³": {
             tagName: "Literal",
             name: "m³",
             literalVal: "42",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
           },
           "m/s": {
             tagName: "Literal",
@@ -544,19 +544,19 @@ export const apcChildren = {
             tagName: "Literal",
             name: "m/s²",
             literalVal: "44",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
           },
           "m³/s": {
             tagName: "Literal",
             name: "m³/s",
             literalVal: "45",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
           },
           "m/m³": {
             tagName: "Literal",
             name: "m/m³",
             literalVal: "46",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
           },
           M: {
             tagName: "Literal",
@@ -568,13 +568,13 @@ export const apcChildren = {
             tagName: "Literal",
             name: "kg/m³",
             literalVal: "48",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
           },
           "m²/s": {
             tagName: "Literal",
             name: "m²/s",
             literalVal: "49",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
           },
           "W/m K": {
             tagName: "Literal",
@@ -610,13 +610,13 @@ export const apcChildren = {
             tagName: "Literal",
             name: "W/m²",
             literalVal: "55",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
           },
           "J/m²": {
             tagName: "Literal",
             name: "J/m²",
             literalVal: "56",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
           },
           "S/m": {
             tagName: "Literal",
@@ -684,7 +684,7 @@ export const apcChildren = {
             tagName: "Literal",
             name: "V²",
             literalVal: "67",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
           },
           As: {
             tagName: "Literal",
@@ -696,13 +696,13 @@ export const apcChildren = {
             tagName: "Literal",
             name: "A²",
             literalVal: "69",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
           },
           "A²t": {
             tagName: "Literal",
             name: "A²t",
             literalVal: "70",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
           },
           VAh: {
             tagName: "Literal",
@@ -750,7 +750,7 @@ export const apcChildren = {
             tagName: "Literal",
             name: "kgm²",
             literalVal: "78",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
           },
           dB: {
             tagName: "Literal",
@@ -869,7 +869,7 @@ export const apcChildren = {
             tagName: "Literal",
             name: "µ",
             literalVal: "-6",
-            descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+            descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
           },
           m: {
             tagName: "Literal",
@@ -1097,8 +1097,8 @@ export const apcChildren = {
     type: "FLOAT32",
     dchg: "true",
     descID: "IEC61850_7_3.CDCControl::APC.dbRef.desc",
-    mandatory: true,
-    presCond: "M",
+    presCond: "MO",
+    presCondArgs: "db"
   },
   d: {
     tagName: "DataAttribute",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/ASG.ts b/tDataTypeTemplates/nsdToJson/testJson/ASG.ts
index 16eff6c..8bc649f 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/ASG.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/ASG.ts
@@ -128,7 +128,7 @@ export const asgChildren = {
             tagName: "Literal",
             name: "°C",
             literalVal: "23",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
           },
           Sv: {
             tagName: "Literal",
@@ -230,13 +230,13 @@ export const asgChildren = {
             tagName: "Literal",
             name: "m²",
             literalVal: "41",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
           },
           "m³": {
             tagName: "Literal",
             name: "m³",
             literalVal: "42",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
           },
           "m/s": {
             tagName: "Literal",
@@ -248,19 +248,19 @@ export const asgChildren = {
             tagName: "Literal",
             name: "m/s²",
             literalVal: "44",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
           },
           "m³/s": {
             tagName: "Literal",
             name: "m³/s",
             literalVal: "45",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
           },
           "m/m³": {
             tagName: "Literal",
             name: "m/m³",
             literalVal: "46",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
           },
           M: {
             tagName: "Literal",
@@ -272,13 +272,13 @@ export const asgChildren = {
             tagName: "Literal",
             name: "kg/m³",
             literalVal: "48",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
           },
           "m²/s": {
             tagName: "Literal",
             name: "m²/s",
             literalVal: "49",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
           },
           "W/m K": {
             tagName: "Literal",
@@ -314,13 +314,13 @@ export const asgChildren = {
             tagName: "Literal",
             name: "W/m²",
             literalVal: "55",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
           },
           "J/m²": {
             tagName: "Literal",
             name: "J/m²",
             literalVal: "56",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
           },
           "S/m": {
             tagName: "Literal",
@@ -388,7 +388,7 @@ export const asgChildren = {
             tagName: "Literal",
             name: "V²",
             literalVal: "67",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
           },
           As: {
             tagName: "Literal",
@@ -400,13 +400,13 @@ export const asgChildren = {
             tagName: "Literal",
             name: "A²",
             literalVal: "69",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
           },
           "A²t": {
             tagName: "Literal",
             name: "A²t",
             literalVal: "70",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
           },
           VAh: {
             tagName: "Literal",
@@ -454,7 +454,7 @@ export const asgChildren = {
             tagName: "Literal",
             name: "kgm²",
             literalVal: "78",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
           },
           dB: {
             tagName: "Literal",
@@ -573,7 +573,7 @@ export const asgChildren = {
             tagName: "Literal",
             name: "µ",
             literalVal: "-6",
-            descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+            descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
           },
           m: {
             tagName: "Literal",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/BAC.ts b/tDataTypeTemplates/nsdToJson/testJson/BAC.ts
index 0257815..5b89105 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/BAC.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/BAC.ts
@@ -434,7 +434,7 @@ export const bacChildren = {
             tagName: "Literal",
             name: "°C",
             literalVal: "23",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
           },
           Sv: {
             tagName: "Literal",
@@ -536,13 +536,13 @@ export const bacChildren = {
             tagName: "Literal",
             name: "m²",
             literalVal: "41",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
           },
           "m³": {
             tagName: "Literal",
             name: "m³",
             literalVal: "42",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
           },
           "m/s": {
             tagName: "Literal",
@@ -554,19 +554,19 @@ export const bacChildren = {
             tagName: "Literal",
             name: "m/s²",
             literalVal: "44",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
           },
           "m³/s": {
             tagName: "Literal",
             name: "m³/s",
             literalVal: "45",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
           },
           "m/m³": {
             tagName: "Literal",
             name: "m/m³",
             literalVal: "46",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
           },
           M: {
             tagName: "Literal",
@@ -578,13 +578,13 @@ export const bacChildren = {
             tagName: "Literal",
             name: "kg/m³",
             literalVal: "48",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
           },
           "m²/s": {
             tagName: "Literal",
             name: "m²/s",
             literalVal: "49",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
           },
           "W/m K": {
             tagName: "Literal",
@@ -620,13 +620,13 @@ export const bacChildren = {
             tagName: "Literal",
             name: "W/m²",
             literalVal: "55",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
           },
           "J/m²": {
             tagName: "Literal",
             name: "J/m²",
             literalVal: "56",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
           },
           "S/m": {
             tagName: "Literal",
@@ -694,7 +694,7 @@ export const bacChildren = {
             tagName: "Literal",
             name: "V²",
             literalVal: "67",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
           },
           As: {
             tagName: "Literal",
@@ -706,13 +706,13 @@ export const bacChildren = {
             tagName: "Literal",
             name: "A²",
             literalVal: "69",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
           },
           "A²t": {
             tagName: "Literal",
             name: "A²t",
             literalVal: "70",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
           },
           VAh: {
             tagName: "Literal",
@@ -760,7 +760,7 @@ export const bacChildren = {
             tagName: "Literal",
             name: "kgm²",
             literalVal: "78",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
           },
           dB: {
             tagName: "Literal",
@@ -879,7 +879,7 @@ export const bacChildren = {
             tagName: "Literal",
             name: "µ",
             literalVal: "-6",
-            descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+            descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
           },
           m: {
             tagName: "Literal",
@@ -1107,8 +1107,8 @@ export const bacChildren = {
     type: "FLOAT32",
     dchg: "true",
     descID: "IEC61850_7_3.CDCControl::BAC.dbRef.desc",
-    mandatory: true,
-    presCond: "M",
+    presCond: "MO",
+    presCondArgs: "db"
   },
   d: {
     tagName: "DataAttribute",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/BCR.ts b/tDataTypeTemplates/nsdToJson/testJson/BCR.ts
index 5e04554..ab00a39 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/BCR.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/BCR.ts
@@ -148,7 +148,7 @@ export const bcrChildren = {
             tagName: "Literal",
             name: "°C",
             literalVal: "23",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
           },
           Sv: {
             tagName: "Literal",
@@ -250,13 +250,13 @@ export const bcrChildren = {
             tagName: "Literal",
             name: "m²",
             literalVal: "41",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
           },
           "m³": {
             tagName: "Literal",
             name: "m³",
             literalVal: "42",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
           },
           "m/s": {
             tagName: "Literal",
@@ -268,19 +268,19 @@ export const bcrChildren = {
             tagName: "Literal",
             name: "m/s²",
             literalVal: "44",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
           },
           "m³/s": {
             tagName: "Literal",
             name: "m³/s",
             literalVal: "45",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
           },
           "m/m³": {
             tagName: "Literal",
             name: "m/m³",
             literalVal: "46",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
           },
           M: {
             tagName: "Literal",
@@ -292,13 +292,13 @@ export const bcrChildren = {
             tagName: "Literal",
             name: "kg/m³",
             literalVal: "48",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
           },
           "m²/s": {
             tagName: "Literal",
             name: "m²/s",
             literalVal: "49",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
           },
           "W/m K": {
             tagName: "Literal",
@@ -334,13 +334,13 @@ export const bcrChildren = {
             tagName: "Literal",
             name: "W/m²",
             literalVal: "55",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
           },
           "J/m²": {
             tagName: "Literal",
             name: "J/m²",
             literalVal: "56",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
           },
           "S/m": {
             tagName: "Literal",
@@ -408,7 +408,7 @@ export const bcrChildren = {
             tagName: "Literal",
             name: "V²",
             literalVal: "67",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
           },
           As: {
             tagName: "Literal",
@@ -420,13 +420,13 @@ export const bcrChildren = {
             tagName: "Literal",
             name: "A²",
             literalVal: "69",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
           },
           "A²t": {
             tagName: "Literal",
             name: "A²t",
             literalVal: "70",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
           },
           VAh: {
             tagName: "Literal",
@@ -474,7 +474,7 @@ export const bcrChildren = {
             tagName: "Literal",
             name: "kgm²",
             literalVal: "78",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
           },
           dB: {
             tagName: "Literal",
@@ -593,7 +593,7 @@ export const bcrChildren = {
             tagName: "Literal",
             name: "µ",
             literalVal: "-6",
-            descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+            descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
           },
           m: {
             tagName: "Literal",
@@ -710,7 +710,8 @@ export const bcrChildren = {
     type: "Timestamp",
     dchg: "true",
     descID: "IEC61850_7_3.CDCStatusInfo::BCR.strTm.desc",
-    presCond: "O",
+    presCond: "OF",
+    presCondArgs: "frVal"
   },
   frPd: {
     tagName: "DataAttribute",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/CMV.ts b/tDataTypeTemplates/nsdToJson/testJson/CMV.ts
index a6b94e1..0fead2f 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/CMV.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/CMV.ts
@@ -426,7 +426,7 @@ export const cmvChildren = {
             tagName: "Literal",
             name: "°C",
             literalVal: "23",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
           },
           Sv: {
             tagName: "Literal",
@@ -528,13 +528,13 @@ export const cmvChildren = {
             tagName: "Literal",
             name: "m²",
             literalVal: "41",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
           },
           "m³": {
             tagName: "Literal",
             name: "m³",
             literalVal: "42",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
           },
           "m/s": {
             tagName: "Literal",
@@ -546,19 +546,19 @@ export const cmvChildren = {
             tagName: "Literal",
             name: "m/s²",
             literalVal: "44",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
           },
           "m³/s": {
             tagName: "Literal",
             name: "m³/s",
             literalVal: "45",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
           },
           "m/m³": {
             tagName: "Literal",
             name: "m/m³",
             literalVal: "46",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
           },
           M: {
             tagName: "Literal",
@@ -570,13 +570,13 @@ export const cmvChildren = {
             tagName: "Literal",
             name: "kg/m³",
             literalVal: "48",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
           },
           "m²/s": {
             tagName: "Literal",
             name: "m²/s",
             literalVal: "49",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
           },
           "W/m K": {
             tagName: "Literal",
@@ -612,13 +612,13 @@ export const cmvChildren = {
             tagName: "Literal",
             name: "W/m²",
             literalVal: "55",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
           },
           "J/m²": {
             tagName: "Literal",
             name: "J/m²",
             literalVal: "56",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
           },
           "S/m": {
             tagName: "Literal",
@@ -686,7 +686,7 @@ export const cmvChildren = {
             tagName: "Literal",
             name: "V²",
             literalVal: "67",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
           },
           As: {
             tagName: "Literal",
@@ -698,13 +698,13 @@ export const cmvChildren = {
             tagName: "Literal",
             name: "A²",
             literalVal: "69",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
           },
           "A²t": {
             tagName: "Literal",
             name: "A²t",
             literalVal: "70",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
           },
           VAh: {
             tagName: "Literal",
@@ -752,7 +752,7 @@ export const cmvChildren = {
             tagName: "Literal",
             name: "kgm²",
             literalVal: "78",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
           },
           dB: {
             tagName: "Literal",
@@ -871,7 +871,7 @@ export const cmvChildren = {
             tagName: "Literal",
             name: "µ",
             literalVal: "-6",
-            descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+            descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
           },
           m: {
             tagName: "Literal",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/CSYN.ts b/tDataTypeTemplates/nsdToJson/testJson/CSYN.ts
index bad7886..7940be0 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/CSYN.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/CSYN.ts
@@ -14,7 +14,7 @@ export const csyn = {
     tagName: "DataObject",
     name: "Rel",
     type: "SPS",
-    descID: "IEC61850_7_4.AbstractLNsCommon::SynchronisationLN.Rel.desc",
+    descID: "IEC61850_7_4.LNGroupC::CSYN.Rel.desc",
     presCond: "AtLeastOne",
     presCondArgs: "1",
     dsPresCond: "F",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/FCSD.ts b/tDataTypeTemplates/nsdToJson/testJson/FCSD.ts
index 5235a64..8478bf0 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/FCSD.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/FCSD.ts
@@ -1902,7 +1902,7 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -2004,13 +2004,13 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -2022,19 +2022,19 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -2046,13 +2046,13 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -2088,13 +2088,13 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -2162,7 +2162,7 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -2174,13 +2174,13 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -2228,7 +2228,7 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -2347,7 +2347,7 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -2539,7 +2539,7 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -2641,13 +2641,13 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -2659,19 +2659,19 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -2683,13 +2683,13 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -2725,13 +2725,13 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -2799,7 +2799,7 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -2811,13 +2811,13 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -2865,7 +2865,7 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -2984,7 +2984,7 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -3175,7 +3175,7 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -3277,13 +3277,13 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -3295,19 +3295,19 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -3319,13 +3319,13 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -3361,13 +3361,13 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -3435,7 +3435,7 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -3447,13 +3447,13 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -3501,7 +3501,7 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -3620,7 +3620,7 @@ export const fcsd = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/FXOT.ts b/tDataTypeTemplates/nsdToJson/testJson/FXOT.ts
index 244dcf5..1f3f777 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/FXOT.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/FXOT.ts
@@ -203,7 +203,7 @@ export const fxot = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -305,13 +305,13 @@ export const fxot = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -323,19 +323,19 @@ export const fxot = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -347,13 +347,13 @@ export const fxot = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -389,13 +389,13 @@ export const fxot = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -463,7 +463,7 @@ export const fxot = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -475,13 +475,13 @@ export const fxot = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -529,7 +529,7 @@ export const fxot = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -648,7 +648,7 @@ export const fxot = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -840,7 +840,7 @@ export const fxot = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -942,13 +942,13 @@ export const fxot = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -960,19 +960,19 @@ export const fxot = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -984,13 +984,13 @@ export const fxot = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -1026,13 +1026,13 @@ export const fxot = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -1100,7 +1100,7 @@ export const fxot = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -1112,13 +1112,13 @@ export const fxot = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -1166,7 +1166,7 @@ export const fxot = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -1285,7 +1285,7 @@ export const fxot = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -1476,7 +1476,7 @@ export const fxot = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -1578,13 +1578,13 @@ export const fxot = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -1596,19 +1596,19 @@ export const fxot = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -1620,13 +1620,13 @@ export const fxot = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -1662,13 +1662,13 @@ export const fxot = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -1736,7 +1736,7 @@ export const fxot = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -1748,13 +1748,13 @@ export const fxot = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -1802,7 +1802,7 @@ export const fxot = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -1921,7 +1921,7 @@ export const fxot = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/FXUT.ts b/tDataTypeTemplates/nsdToJson/testJson/FXUT.ts
index b127937..319ea52 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/FXUT.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/FXUT.ts
@@ -203,7 +203,7 @@ export const fxut = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -305,13 +305,13 @@ export const fxut = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -323,19 +323,19 @@ export const fxut = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -347,13 +347,13 @@ export const fxut = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -389,13 +389,13 @@ export const fxut = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -463,7 +463,7 @@ export const fxut = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -475,13 +475,13 @@ export const fxut = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -529,7 +529,7 @@ export const fxut = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -648,7 +648,7 @@ export const fxut = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -840,7 +840,7 @@ export const fxut = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -942,13 +942,13 @@ export const fxut = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -960,19 +960,19 @@ export const fxut = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -984,13 +984,13 @@ export const fxut = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -1026,13 +1026,13 @@ export const fxut = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -1100,7 +1100,7 @@ export const fxut = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -1112,13 +1112,13 @@ export const fxut = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -1166,7 +1166,7 @@ export const fxut = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -1285,7 +1285,7 @@ export const fxut = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -1476,7 +1476,7 @@ export const fxut = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -1578,13 +1578,13 @@ export const fxut = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -1596,19 +1596,19 @@ export const fxut = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -1620,13 +1620,13 @@ export const fxut = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -1662,13 +1662,13 @@ export const fxut = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -1736,7 +1736,7 @@ export const fxut = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -1748,13 +1748,13 @@ export const fxut = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -1802,7 +1802,7 @@ export const fxut = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -1921,7 +1921,7 @@ export const fxut = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/HST.ts b/tDataTypeTemplates/nsdToJson/testJson/HST.ts
index 4d1ebc9..ed8e4a1 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/HST.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/HST.ts
@@ -187,7 +187,7 @@ export const hstChildren = {
             tagName: "Literal",
             name: "°C",
             literalVal: "23",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
           },
           Sv: {
             tagName: "Literal",
@@ -289,13 +289,13 @@ export const hstChildren = {
             tagName: "Literal",
             name: "m²",
             literalVal: "41",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
           },
           "m³": {
             tagName: "Literal",
             name: "m³",
             literalVal: "42",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
           },
           "m/s": {
             tagName: "Literal",
@@ -307,19 +307,19 @@ export const hstChildren = {
             tagName: "Literal",
             name: "m/s²",
             literalVal: "44",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
           },
           "m³/s": {
             tagName: "Literal",
             name: "m³/s",
             literalVal: "45",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
           },
           "m/m³": {
             tagName: "Literal",
             name: "m/m³",
             literalVal: "46",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
           },
           M: {
             tagName: "Literal",
@@ -331,13 +331,13 @@ export const hstChildren = {
             tagName: "Literal",
             name: "kg/m³",
             literalVal: "48",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
           },
           "m²/s": {
             tagName: "Literal",
             name: "m²/s",
             literalVal: "49",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
           },
           "W/m K": {
             tagName: "Literal",
@@ -373,13 +373,13 @@ export const hstChildren = {
             tagName: "Literal",
             name: "W/m²",
             literalVal: "55",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
           },
           "J/m²": {
             tagName: "Literal",
             name: "J/m²",
             literalVal: "56",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
           },
           "S/m": {
             tagName: "Literal",
@@ -447,7 +447,7 @@ export const hstChildren = {
             tagName: "Literal",
             name: "V²",
             literalVal: "67",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
           },
           As: {
             tagName: "Literal",
@@ -459,13 +459,13 @@ export const hstChildren = {
             tagName: "Literal",
             name: "A²",
             literalVal: "69",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
           },
           "A²t": {
             tagName: "Literal",
             name: "A²t",
             literalVal: "70",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
           },
           VAh: {
             tagName: "Literal",
@@ -513,7 +513,7 @@ export const hstChildren = {
             tagName: "Literal",
             name: "kgm²",
             literalVal: "78",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
           },
           dB: {
             tagName: "Literal",
@@ -632,7 +632,7 @@ export const hstChildren = {
             tagName: "Literal",
             name: "µ",
             literalVal: "-6",
-            descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+            descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
           },
           m: {
             tagName: "Literal",
@@ -823,7 +823,7 @@ export const hstChildren = {
             tagName: "Literal",
             name: "°C",
             literalVal: "23",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
           },
           Sv: {
             tagName: "Literal",
@@ -925,13 +925,13 @@ export const hstChildren = {
             tagName: "Literal",
             name: "m²",
             literalVal: "41",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
           },
           "m³": {
             tagName: "Literal",
             name: "m³",
             literalVal: "42",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
           },
           "m/s": {
             tagName: "Literal",
@@ -943,19 +943,19 @@ export const hstChildren = {
             tagName: "Literal",
             name: "m/s²",
             literalVal: "44",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
           },
           "m³/s": {
             tagName: "Literal",
             name: "m³/s",
             literalVal: "45",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
           },
           "m/m³": {
             tagName: "Literal",
             name: "m/m³",
             literalVal: "46",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
           },
           M: {
             tagName: "Literal",
@@ -967,13 +967,13 @@ export const hstChildren = {
             tagName: "Literal",
             name: "kg/m³",
             literalVal: "48",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
           },
           "m²/s": {
             tagName: "Literal",
             name: "m²/s",
             literalVal: "49",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
           },
           "W/m K": {
             tagName: "Literal",
@@ -1009,13 +1009,13 @@ export const hstChildren = {
             tagName: "Literal",
             name: "W/m²",
             literalVal: "55",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
           },
           "J/m²": {
             tagName: "Literal",
             name: "J/m²",
             literalVal: "56",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
           },
           "S/m": {
             tagName: "Literal",
@@ -1083,7 +1083,7 @@ export const hstChildren = {
             tagName: "Literal",
             name: "V²",
             literalVal: "67",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
           },
           As: {
             tagName: "Literal",
@@ -1095,13 +1095,13 @@ export const hstChildren = {
             tagName: "Literal",
             name: "A²",
             literalVal: "69",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
           },
           "A²t": {
             tagName: "Literal",
             name: "A²t",
             literalVal: "70",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
           },
           VAh: {
             tagName: "Literal",
@@ -1149,7 +1149,7 @@ export const hstChildren = {
             tagName: "Literal",
             name: "kgm²",
             literalVal: "78",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
           },
           dB: {
             tagName: "Literal",
@@ -1268,7 +1268,7 @@ export const hstChildren = {
             tagName: "Literal",
             name: "µ",
             literalVal: "-6",
-            descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+            descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
           },
           m: {
             tagName: "Literal",
@@ -1459,7 +1459,7 @@ export const hstChildren = {
             tagName: "Literal",
             name: "°C",
             literalVal: "23",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
           },
           Sv: {
             tagName: "Literal",
@@ -1561,13 +1561,13 @@ export const hstChildren = {
             tagName: "Literal",
             name: "m²",
             literalVal: "41",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
           },
           "m³": {
             tagName: "Literal",
             name: "m³",
             literalVal: "42",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
           },
           "m/s": {
             tagName: "Literal",
@@ -1579,19 +1579,19 @@ export const hstChildren = {
             tagName: "Literal",
             name: "m/s²",
             literalVal: "44",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
           },
           "m³/s": {
             tagName: "Literal",
             name: "m³/s",
             literalVal: "45",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
           },
           "m/m³": {
             tagName: "Literal",
             name: "m/m³",
             literalVal: "46",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
           },
           M: {
             tagName: "Literal",
@@ -1603,13 +1603,13 @@ export const hstChildren = {
             tagName: "Literal",
             name: "kg/m³",
             literalVal: "48",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
           },
           "m²/s": {
             tagName: "Literal",
             name: "m²/s",
             literalVal: "49",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
           },
           "W/m K": {
             tagName: "Literal",
@@ -1645,13 +1645,13 @@ export const hstChildren = {
             tagName: "Literal",
             name: "W/m²",
             literalVal: "55",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
           },
           "J/m²": {
             tagName: "Literal",
             name: "J/m²",
             literalVal: "56",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
           },
           "S/m": {
             tagName: "Literal",
@@ -1719,7 +1719,7 @@ export const hstChildren = {
             tagName: "Literal",
             name: "V²",
             literalVal: "67",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
           },
           As: {
             tagName: "Literal",
@@ -1731,13 +1731,13 @@ export const hstChildren = {
             tagName: "Literal",
             name: "A²",
             literalVal: "69",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
           },
           "A²t": {
             tagName: "Literal",
             name: "A²t",
             literalVal: "70",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
           },
           VAh: {
             tagName: "Literal",
@@ -1785,7 +1785,7 @@ export const hstChildren = {
             tagName: "Literal",
             name: "kgm²",
             literalVal: "78",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
           },
           dB: {
             tagName: "Literal",
@@ -1904,7 +1904,7 @@ export const hstChildren = {
             tagName: "Literal",
             name: "µ",
             literalVal: "-6",
-            descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+            descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
           },
           m: {
             tagName: "Literal",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/INC.ts b/tDataTypeTemplates/nsdToJson/testJson/INC.ts
index a28425b..45eb722 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/INC.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/INC.ts
@@ -423,7 +423,7 @@ export const incChildren = {
             tagName: "Literal",
             name: "°C",
             literalVal: "23",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
           },
           Sv: {
             tagName: "Literal",
@@ -525,13 +525,13 @@ export const incChildren = {
             tagName: "Literal",
             name: "m²",
             literalVal: "41",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
           },
           "m³": {
             tagName: "Literal",
             name: "m³",
             literalVal: "42",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
           },
           "m/s": {
             tagName: "Literal",
@@ -543,19 +543,19 @@ export const incChildren = {
             tagName: "Literal",
             name: "m/s²",
             literalVal: "44",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
           },
           "m³/s": {
             tagName: "Literal",
             name: "m³/s",
             literalVal: "45",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
           },
           "m/m³": {
             tagName: "Literal",
             name: "m/m³",
             literalVal: "46",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
           },
           M: {
             tagName: "Literal",
@@ -567,13 +567,13 @@ export const incChildren = {
             tagName: "Literal",
             name: "kg/m³",
             literalVal: "48",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
           },
           "m²/s": {
             tagName: "Literal",
             name: "m²/s",
             literalVal: "49",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
           },
           "W/m K": {
             tagName: "Literal",
@@ -609,13 +609,13 @@ export const incChildren = {
             tagName: "Literal",
             name: "W/m²",
             literalVal: "55",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
           },
           "J/m²": {
             tagName: "Literal",
             name: "J/m²",
             literalVal: "56",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
           },
           "S/m": {
             tagName: "Literal",
@@ -683,7 +683,7 @@ export const incChildren = {
             tagName: "Literal",
             name: "V²",
             literalVal: "67",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
           },
           As: {
             tagName: "Literal",
@@ -695,13 +695,13 @@ export const incChildren = {
             tagName: "Literal",
             name: "A²",
             literalVal: "69",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
           },
           "A²t": {
             tagName: "Literal",
             name: "A²t",
             literalVal: "70",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
           },
           VAh: {
             tagName: "Literal",
@@ -749,7 +749,7 @@ export const incChildren = {
             tagName: "Literal",
             name: "kgm²",
             literalVal: "78",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
           },
           dB: {
             tagName: "Literal",
@@ -868,7 +868,7 @@ export const incChildren = {
             tagName: "Literal",
             name: "µ",
             literalVal: "-6",
-            descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+            descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
           },
           m: {
             tagName: "Literal",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/ING.ts b/tDataTypeTemplates/nsdToJson/testJson/ING.ts
index a1180c4..2046b10 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/ING.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/ING.ts
@@ -136,7 +136,7 @@ export const ingChildren = {
             tagName: "Literal",
             name: "°C",
             literalVal: "23",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
           },
           Sv: {
             tagName: "Literal",
@@ -238,13 +238,13 @@ export const ingChildren = {
             tagName: "Literal",
             name: "m²",
             literalVal: "41",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
           },
           "m³": {
             tagName: "Literal",
             name: "m³",
             literalVal: "42",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
           },
           "m/s": {
             tagName: "Literal",
@@ -256,19 +256,19 @@ export const ingChildren = {
             tagName: "Literal",
             name: "m/s²",
             literalVal: "44",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
           },
           "m³/s": {
             tagName: "Literal",
             name: "m³/s",
             literalVal: "45",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
           },
           "m/m³": {
             tagName: "Literal",
             name: "m/m³",
             literalVal: "46",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
           },
           M: {
             tagName: "Literal",
@@ -280,13 +280,13 @@ export const ingChildren = {
             tagName: "Literal",
             name: "kg/m³",
             literalVal: "48",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
           },
           "m²/s": {
             tagName: "Literal",
             name: "m²/s",
             literalVal: "49",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
           },
           "W/m K": {
             tagName: "Literal",
@@ -322,13 +322,13 @@ export const ingChildren = {
             tagName: "Literal",
             name: "W/m²",
             literalVal: "55",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
           },
           "J/m²": {
             tagName: "Literal",
             name: "J/m²",
             literalVal: "56",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
           },
           "S/m": {
             tagName: "Literal",
@@ -396,7 +396,7 @@ export const ingChildren = {
             tagName: "Literal",
             name: "V²",
             literalVal: "67",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
           },
           As: {
             tagName: "Literal",
@@ -408,13 +408,13 @@ export const ingChildren = {
             tagName: "Literal",
             name: "A²",
             literalVal: "69",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
           },
           "A²t": {
             tagName: "Literal",
             name: "A²t",
             literalVal: "70",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
           },
           VAh: {
             tagName: "Literal",
@@ -462,7 +462,7 @@ export const ingChildren = {
             tagName: "Literal",
             name: "kgm²",
             literalVal: "78",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
           },
           dB: {
             tagName: "Literal",
@@ -581,7 +581,7 @@ export const ingChildren = {
             tagName: "Literal",
             name: "µ",
             literalVal: "-6",
-            descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+            descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
           },
           m: {
             tagName: "Literal",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/INS.ts b/tDataTypeTemplates/nsdToJson/testJson/INS.ts
index e2a7e6d..1d3ed4f 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/INS.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/INS.ts
@@ -170,7 +170,7 @@ export const insChildren = {
             tagName: "Literal",
             name: "°C",
             literalVal: "23",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
           },
           Sv: {
             tagName: "Literal",
@@ -272,13 +272,13 @@ export const insChildren = {
             tagName: "Literal",
             name: "m²",
             literalVal: "41",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
           },
           "m³": {
             tagName: "Literal",
             name: "m³",
             literalVal: "42",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
           },
           "m/s": {
             tagName: "Literal",
@@ -290,19 +290,19 @@ export const insChildren = {
             tagName: "Literal",
             name: "m/s²",
             literalVal: "44",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
           },
           "m³/s": {
             tagName: "Literal",
             name: "m³/s",
             literalVal: "45",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
           },
           "m/m³": {
             tagName: "Literal",
             name: "m/m³",
             literalVal: "46",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
           },
           M: {
             tagName: "Literal",
@@ -314,13 +314,13 @@ export const insChildren = {
             tagName: "Literal",
             name: "kg/m³",
             literalVal: "48",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
           },
           "m²/s": {
             tagName: "Literal",
             name: "m²/s",
             literalVal: "49",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
           },
           "W/m K": {
             tagName: "Literal",
@@ -356,13 +356,13 @@ export const insChildren = {
             tagName: "Literal",
             name: "W/m²",
             literalVal: "55",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
           },
           "J/m²": {
             tagName: "Literal",
             name: "J/m²",
             literalVal: "56",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
           },
           "S/m": {
             tagName: "Literal",
@@ -430,7 +430,7 @@ export const insChildren = {
             tagName: "Literal",
             name: "V²",
             literalVal: "67",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
           },
           As: {
             tagName: "Literal",
@@ -442,13 +442,13 @@ export const insChildren = {
             tagName: "Literal",
             name: "A²",
             literalVal: "69",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
           },
           "A²t": {
             tagName: "Literal",
             name: "A²t",
             literalVal: "70",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
           },
           VAh: {
             tagName: "Literal",
@@ -496,7 +496,7 @@ export const insChildren = {
             tagName: "Literal",
             name: "kgm²",
             literalVal: "78",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
           },
           dB: {
             tagName: "Literal",
@@ -615,7 +615,7 @@ export const insChildren = {
             tagName: "Literal",
             name: "µ",
             literalVal: "-6",
-            descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+            descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
           },
           m: {
             tagName: "Literal",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/LTMS.ts b/tDataTypeTemplates/nsdToJson/testJson/LTMS.ts
index dc39fe5..1504953 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/LTMS.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/LTMS.ts
@@ -1451,18 +1451,17 @@ export const ltms = {
           InternalClock: {
             tagName: "Literal",
             name: "InternalClock",
-            literalVal: "1",
+            literalVal: "0",
           },
           LocalAreaClock: {
             tagName: "Literal",
             name: "LocalAreaClock",
-            literalVal: "2",
+            literalVal: "1",
           },
           GlobalAreaClock: {
             tagName: "Literal",
             name: "GlobalAreaClock",
-            literalVal: "3",
-            descID: "IEC61850_7_4.DOEnums::ClockSyncKind.GlobalAreaClock.desc",
+            literalVal: "2",
           },
         },
       },
@@ -1505,18 +1504,17 @@ export const ltms = {
           InternalClock: {
             tagName: "Literal",
             name: "InternalClock",
-            literalVal: "1",
+            literalVal: "0",
           },
           LocalAreaClock: {
             tagName: "Literal",
             name: "LocalAreaClock",
-            literalVal: "2",
+            literalVal: "1",
           },
           GlobalAreaClock: {
             tagName: "Literal",
             name: "GlobalAreaClock",
-            literalVal: "3",
-            descID: "IEC61850_7_4.DOEnums::ClockSyncKind.GlobalAreaClock.desc",
+            literalVal: "2",
           },
         },
       },
diff --git a/tDataTypeTemplates/nsdToJson/testJson/LTRK.ts b/tDataTypeTemplates/nsdToJson/testJson/LTRK.ts
index df9cb61..f77fb75 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/LTRK.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/LTRK.ts
@@ -10782,6 +10782,8 @@ export const ltrk = {
     descID: "IEC61850_7_4.LNGroupL::LTRK.GocbTrk.desc",
     presCond: "O",
     dsPresCond: "na",
+    underlyingType: "PhyComAddrL2",
+    underlyingTypeKind: "SCSM",
     children: {
       objRef: {
         tagName: "DataAttribute",
@@ -11250,7 +11252,8 @@ export const ltrk = {
         tagName: "DataAttribute",
         name: "dstAddress",
         fc: "SR",
-        type: "PhyComAddr",
+        type: "PhyComAddrL2",
+        typeKind: "SCSM",
         descID: "IEC61850_7_3.CDCServiceTracking::GTS.dstAddress.desc",
         mandatory: true,
         presCond: "M",
@@ -11296,6 +11299,8 @@ export const ltrk = {
     descID: "IEC61850_7_4.LNGroupL::LTRK.MsvcbTrk.desc",
     presCond: "O",
     dsPresCond: "na",
+    underlyingType: "PhyComAddrL2",
+    underlyingTypeKind: "SCSM",
     children: {
       objRef: {
         tagName: "DataAttribute",
@@ -11800,7 +11805,8 @@ export const ltrk = {
         tagName: "DataAttribute",
         name: "dstAddress",
         fc: "SR",
-        type: "PhyComAddr",
+        type: "PhyComAddrL2",
+        typeKind: "SCSM",
         descID: "IEC61850_7_3.CDCServiceTracking::MTS.dstAddress.desc",
         mandatory: true,
         presCond: "M",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/MV.ts b/tDataTypeTemplates/nsdToJson/testJson/MV.ts
index e7cf45c..c2f7c88 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/MV.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/MV.ts
@@ -272,7 +272,7 @@ export const mvChildren = {
             tagName: "Literal",
             name: "°C",
             literalVal: "23",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
           },
           Sv: {
             tagName: "Literal",
@@ -374,13 +374,13 @@ export const mvChildren = {
             tagName: "Literal",
             name: "m²",
             literalVal: "41",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
           },
           "m³": {
             tagName: "Literal",
             name: "m³",
             literalVal: "42",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
           },
           "m/s": {
             tagName: "Literal",
@@ -392,19 +392,19 @@ export const mvChildren = {
             tagName: "Literal",
             name: "m/s²",
             literalVal: "44",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
           },
           "m³/s": {
             tagName: "Literal",
             name: "m³/s",
             literalVal: "45",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
           },
           "m/m³": {
             tagName: "Literal",
             name: "m/m³",
             literalVal: "46",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
           },
           M: {
             tagName: "Literal",
@@ -416,13 +416,13 @@ export const mvChildren = {
             tagName: "Literal",
             name: "kg/m³",
             literalVal: "48",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
           },
           "m²/s": {
             tagName: "Literal",
             name: "m²/s",
             literalVal: "49",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
           },
           "W/m K": {
             tagName: "Literal",
@@ -458,13 +458,13 @@ export const mvChildren = {
             tagName: "Literal",
             name: "W/m²",
             literalVal: "55",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
           },
           "J/m²": {
             tagName: "Literal",
             name: "J/m²",
             literalVal: "56",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
           },
           "S/m": {
             tagName: "Literal",
@@ -532,7 +532,7 @@ export const mvChildren = {
             tagName: "Literal",
             name: "V²",
             literalVal: "67",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
           },
           As: {
             tagName: "Literal",
@@ -544,13 +544,13 @@ export const mvChildren = {
             tagName: "Literal",
             name: "A²",
             literalVal: "69",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
           },
           "A²t": {
             tagName: "Literal",
             name: "A²t",
             literalVal: "70",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
           },
           VAh: {
             tagName: "Literal",
@@ -598,7 +598,7 @@ export const mvChildren = {
             tagName: "Literal",
             name: "kgm²",
             literalVal: "78",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
           },
           dB: {
             tagName: "Literal",
@@ -717,7 +717,7 @@ export const mvChildren = {
             tagName: "Literal",
             name: "µ",
             literalVal: "-6",
-            descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+            descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
           },
           m: {
             tagName: "Literal",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/PDIF.ts b/tDataTypeTemplates/nsdToJson/testJson/PDIF.ts
index c69f374..0b64652 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/PDIF.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/PDIF.ts
@@ -2277,7 +2277,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -2379,13 +2379,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -2397,19 +2397,19 @@ export const pdif = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -2421,13 +2421,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -2463,13 +2463,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -2537,7 +2537,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -2549,13 +2549,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -2603,7 +2603,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -2722,7 +2722,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -2930,7 +2930,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -3032,13 +3032,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -3050,19 +3050,19 @@ export const pdif = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -3074,13 +3074,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -3116,13 +3116,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -3190,7 +3190,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -3202,13 +3202,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -3256,7 +3256,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -3375,7 +3375,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -3582,7 +3582,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -3684,13 +3684,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -3702,19 +3702,19 @@ export const pdif = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -3726,13 +3726,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -3768,13 +3768,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -3842,7 +3842,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -3854,13 +3854,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -3908,7 +3908,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -4027,7 +4027,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -5167,7 +5167,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -5269,13 +5269,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -5287,19 +5287,19 @@ export const pdif = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -5311,13 +5311,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -5353,13 +5353,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -5427,7 +5427,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -5439,13 +5439,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -5493,7 +5493,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -5612,7 +5612,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -5804,7 +5804,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -5906,13 +5906,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -5924,19 +5924,19 @@ export const pdif = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -5948,13 +5948,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -5990,13 +5990,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -6064,7 +6064,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -6076,13 +6076,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -6130,7 +6130,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -6249,7 +6249,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -6440,7 +6440,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -6542,13 +6542,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -6560,19 +6560,19 @@ export const pdif = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -6584,13 +6584,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -6626,13 +6626,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -6700,7 +6700,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -6712,13 +6712,13 @@ export const pdif = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -6766,7 +6766,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -6885,7 +6885,7 @@ export const pdif = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/PTOC.ts b/tDataTypeTemplates/nsdToJson/testJson/PTOC.ts
index 0eb3094..a3f9418 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/PTOC.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/PTOC.ts
@@ -119,7 +119,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -221,13 +221,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -239,19 +239,19 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -263,13 +263,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -305,13 +305,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -379,7 +379,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -391,13 +391,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -445,7 +445,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -564,7 +564,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -772,7 +772,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -874,13 +874,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -892,19 +892,19 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -916,13 +916,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -958,13 +958,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -1032,7 +1032,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -1044,13 +1044,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -1098,7 +1098,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -1217,7 +1217,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -1424,7 +1424,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -1526,13 +1526,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -1544,19 +1544,19 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -1568,13 +1568,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -1610,13 +1610,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -1684,7 +1684,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -1696,13 +1696,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -1750,7 +1750,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -1869,7 +1869,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -2652,7 +2652,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -2754,13 +2754,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -2772,19 +2772,19 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -2796,13 +2796,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -2838,13 +2838,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -2912,7 +2912,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -2924,13 +2924,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -2978,7 +2978,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -3097,7 +3097,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -3289,7 +3289,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -3391,13 +3391,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -3409,19 +3409,19 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -3433,13 +3433,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -3475,13 +3475,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -3549,7 +3549,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -3561,13 +3561,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -3615,7 +3615,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -3734,7 +3734,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -3925,7 +3925,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -4027,13 +4027,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -4045,19 +4045,19 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -4069,13 +4069,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -4111,13 +4111,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -4185,7 +4185,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -4197,13 +4197,13 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -4251,7 +4251,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -4370,7 +4370,7 @@ export const ptoc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/PTOV.ts b/tDataTypeTemplates/nsdToJson/testJson/PTOV.ts
index 14834b5..c448335 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/PTOV.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/PTOV.ts
@@ -2343,7 +2343,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -2445,13 +2445,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -2463,19 +2463,19 @@ export const ptov = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -2487,13 +2487,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -2529,13 +2529,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -2603,7 +2603,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -2615,13 +2615,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -2669,7 +2669,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -2788,7 +2788,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -2996,7 +2996,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -3098,13 +3098,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -3116,19 +3116,19 @@ export const ptov = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -3140,13 +3140,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -3182,13 +3182,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -3256,7 +3256,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -3268,13 +3268,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -3322,7 +3322,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -3441,7 +3441,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -3648,7 +3648,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -3750,13 +3750,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -3768,19 +3768,19 @@ export const ptov = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -3792,13 +3792,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -3834,13 +3834,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -3908,7 +3908,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -3920,13 +3920,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -3974,7 +3974,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -4093,7 +4093,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -4865,7 +4865,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -4967,13 +4967,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -4985,19 +4985,19 @@ export const ptov = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -5009,13 +5009,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -5051,13 +5051,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -5125,7 +5125,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -5137,13 +5137,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -5191,7 +5191,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -5310,7 +5310,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -5502,7 +5502,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -5604,13 +5604,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -5622,19 +5622,19 @@ export const ptov = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -5646,13 +5646,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -5688,13 +5688,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -5762,7 +5762,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -5774,13 +5774,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -5828,7 +5828,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -5947,7 +5947,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -6138,7 +6138,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -6240,13 +6240,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -6258,19 +6258,19 @@ export const ptov = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -6282,13 +6282,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -6324,13 +6324,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -6398,7 +6398,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -6410,13 +6410,13 @@ export const ptov = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -6464,7 +6464,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -6583,7 +6583,7 @@ export const ptov = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/PTTR.ts b/tDataTypeTemplates/nsdToJson/testJson/PTTR.ts
index 7beeb8e..1669409 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/PTTR.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/PTTR.ts
@@ -2278,7 +2278,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -2380,13 +2380,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -2398,19 +2398,19 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -2422,13 +2422,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -2464,13 +2464,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -2538,7 +2538,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -2550,13 +2550,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -2604,7 +2604,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -2723,7 +2723,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -2931,7 +2931,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -3033,13 +3033,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -3051,19 +3051,19 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -3075,13 +3075,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -3117,13 +3117,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -3191,7 +3191,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -3203,13 +3203,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -3257,7 +3257,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -3376,7 +3376,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -3583,7 +3583,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -3685,13 +3685,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -3703,19 +3703,19 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -3727,13 +3727,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -3769,13 +3769,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -3843,7 +3843,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -3855,13 +3855,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -3909,7 +3909,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -4028,7 +4028,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -4333,7 +4333,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -4435,13 +4435,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -4453,19 +4453,19 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -4477,13 +4477,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -4519,13 +4519,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -4593,7 +4593,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -4605,13 +4605,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -4659,7 +4659,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -4778,7 +4778,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -4986,7 +4986,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -5088,13 +5088,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -5106,19 +5106,19 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -5130,13 +5130,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -5172,13 +5172,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -5246,7 +5246,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -5258,13 +5258,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -5312,7 +5312,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -5431,7 +5431,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -5638,7 +5638,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -5740,13 +5740,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -5758,19 +5758,19 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -5782,13 +5782,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -5824,13 +5824,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -5898,7 +5898,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -5910,13 +5910,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -5964,7 +5964,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -6083,7 +6083,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -6928,7 +6928,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -7030,13 +7030,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -7048,19 +7048,19 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -7072,13 +7072,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -7114,13 +7114,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -7188,7 +7188,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -7200,13 +7200,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -7254,7 +7254,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -7373,7 +7373,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -7565,7 +7565,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -7667,13 +7667,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -7685,19 +7685,19 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -7709,13 +7709,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -7751,13 +7751,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -7825,7 +7825,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -7837,13 +7837,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -7891,7 +7891,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -8010,7 +8010,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -8201,7 +8201,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -8303,13 +8303,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -8321,19 +8321,19 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -8345,13 +8345,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -8387,13 +8387,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -8461,7 +8461,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -8473,13 +8473,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -8527,7 +8527,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -8646,7 +8646,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -9396,7 +9396,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -9498,13 +9498,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -9516,19 +9516,19 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -9540,13 +9540,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -9582,13 +9582,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -9656,7 +9656,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -9668,13 +9668,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -9722,7 +9722,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -9841,7 +9841,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -10033,7 +10033,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -10135,13 +10135,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -10153,19 +10153,19 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -10177,13 +10177,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -10219,13 +10219,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -10293,7 +10293,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -10305,13 +10305,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -10359,7 +10359,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -10478,7 +10478,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -10669,7 +10669,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -10771,13 +10771,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -10789,19 +10789,19 @@ export const pttr = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -10813,13 +10813,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -10855,13 +10855,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -10929,7 +10929,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -10941,13 +10941,13 @@ export const pttr = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -10995,7 +10995,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -11114,7 +11114,7 @@ export const pttr = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/PTUC.ts b/tDataTypeTemplates/nsdToJson/testJson/PTUC.ts
index db0d514..f7a995a 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/PTUC.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/PTUC.ts
@@ -119,7 +119,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -221,13 +221,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -239,19 +239,19 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -263,13 +263,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -305,13 +305,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -379,7 +379,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -391,13 +391,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -445,7 +445,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -564,7 +564,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -772,7 +772,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -874,13 +874,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -892,19 +892,19 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -916,13 +916,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -958,13 +958,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -1032,7 +1032,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -1044,13 +1044,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -1098,7 +1098,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -1217,7 +1217,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -1424,7 +1424,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -1526,13 +1526,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -1544,19 +1544,19 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -1568,13 +1568,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -1610,13 +1610,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -1684,7 +1684,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -1696,13 +1696,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -1750,7 +1750,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -1869,7 +1869,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -2652,7 +2652,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -2754,13 +2754,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -2772,19 +2772,19 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -2796,13 +2796,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -2838,13 +2838,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -2912,7 +2912,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -2924,13 +2924,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -2978,7 +2978,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -3097,7 +3097,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -3289,7 +3289,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -3391,13 +3391,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -3409,19 +3409,19 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -3433,13 +3433,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -3475,13 +3475,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -3549,7 +3549,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -3561,13 +3561,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -3615,7 +3615,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -3734,7 +3734,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -3925,7 +3925,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -4027,13 +4027,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -4045,19 +4045,19 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -4069,13 +4069,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -4111,13 +4111,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -4185,7 +4185,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -4197,13 +4197,13 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -4251,7 +4251,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -4370,7 +4370,7 @@ export const ptuc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/PTUV.ts b/tDataTypeTemplates/nsdToJson/testJson/PTUV.ts
index 4976d98..8b2cbe9 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/PTUV.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/PTUV.ts
@@ -2343,7 +2343,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -2445,13 +2445,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -2463,19 +2463,19 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -2487,13 +2487,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -2529,13 +2529,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -2603,7 +2603,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -2615,13 +2615,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -2669,7 +2669,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -2788,7 +2788,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -2996,7 +2996,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -3098,13 +3098,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -3116,19 +3116,19 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -3140,13 +3140,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -3182,13 +3182,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -3256,7 +3256,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -3268,13 +3268,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -3322,7 +3322,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -3441,7 +3441,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -3648,7 +3648,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -3750,13 +3750,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -3768,19 +3768,19 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -3792,13 +3792,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -3834,13 +3834,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -3908,7 +3908,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -3920,13 +3920,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -3974,7 +3974,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -4093,7 +4093,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -4866,7 +4866,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -4968,13 +4968,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -4986,19 +4986,19 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -5010,13 +5010,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -5052,13 +5052,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -5126,7 +5126,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -5138,13 +5138,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -5192,7 +5192,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -5311,7 +5311,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -5503,7 +5503,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -5605,13 +5605,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -5623,19 +5623,19 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -5647,13 +5647,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -5689,13 +5689,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -5763,7 +5763,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -5775,13 +5775,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -5829,7 +5829,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -5948,7 +5948,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -6139,7 +6139,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -6241,13 +6241,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -6259,19 +6259,19 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -6283,13 +6283,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -6325,13 +6325,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -6399,7 +6399,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -6411,13 +6411,13 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -6465,7 +6465,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -6584,7 +6584,7 @@ export const ptuv = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/PVOC.ts b/tDataTypeTemplates/nsdToJson/testJson/PVOC.ts
index e676737..ac14ea4 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/PVOC.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/PVOC.ts
@@ -119,7 +119,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -221,13 +221,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -239,19 +239,19 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -263,13 +263,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -305,13 +305,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -379,7 +379,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -391,13 +391,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -445,7 +445,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -564,7 +564,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -772,7 +772,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -874,13 +874,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -892,19 +892,19 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -916,13 +916,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -958,13 +958,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -1032,7 +1032,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -1044,13 +1044,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -1098,7 +1098,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -1217,7 +1217,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -1424,7 +1424,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -1526,13 +1526,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -1544,19 +1544,19 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -1568,13 +1568,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -1610,13 +1610,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -1684,7 +1684,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -1696,13 +1696,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -1750,7 +1750,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -1869,7 +1869,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -2652,7 +2652,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -2754,13 +2754,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -2772,19 +2772,19 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -2796,13 +2796,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -2838,13 +2838,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -2912,7 +2912,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -2924,13 +2924,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -2978,7 +2978,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -3097,7 +3097,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -3289,7 +3289,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -3391,13 +3391,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -3409,19 +3409,19 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -3433,13 +3433,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -3475,13 +3475,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -3549,7 +3549,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -3561,13 +3561,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -3615,7 +3615,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -3734,7 +3734,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -3925,7 +3925,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -4027,13 +4027,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -4045,19 +4045,19 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -4069,13 +4069,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -4111,13 +4111,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -4185,7 +4185,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -4197,13 +4197,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -4251,7 +4251,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -4370,7 +4370,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -6938,7 +6938,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -7040,13 +7040,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -7058,19 +7058,19 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -7082,13 +7082,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -7124,13 +7124,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -7198,7 +7198,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -7210,13 +7210,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -7264,7 +7264,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -7383,7 +7383,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -7591,7 +7591,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -7693,13 +7693,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -7711,19 +7711,19 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -7735,13 +7735,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -7777,13 +7777,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -7851,7 +7851,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -7863,13 +7863,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -7917,7 +7917,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -8036,7 +8036,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -8243,7 +8243,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -8345,13 +8345,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -8363,19 +8363,19 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -8387,13 +8387,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -8429,13 +8429,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -8503,7 +8503,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -8515,13 +8515,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -8569,7 +8569,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -8688,7 +8688,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -9450,7 +9450,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -9552,13 +9552,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -9570,19 +9570,19 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -9594,13 +9594,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -9636,13 +9636,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -9710,7 +9710,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -9722,13 +9722,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -9776,7 +9776,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -9895,7 +9895,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -10087,7 +10087,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -10189,13 +10189,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -10207,19 +10207,19 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -10231,13 +10231,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -10273,13 +10273,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -10347,7 +10347,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -10359,13 +10359,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -10413,7 +10413,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -10532,7 +10532,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -10723,7 +10723,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -10825,13 +10825,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -10843,19 +10843,19 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -10867,13 +10867,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -10909,13 +10909,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -10983,7 +10983,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -10995,13 +10995,13 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -11049,7 +11049,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -11168,7 +11168,7 @@ export const pvoc = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/PVPH.ts b/tDataTypeTemplates/nsdToJson/testJson/PVPH.ts
index 75dca96..ea8b21f 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/PVPH.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/PVPH.ts
@@ -2343,7 +2343,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -2445,13 +2445,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -2463,19 +2463,19 @@ export const pvph = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -2487,13 +2487,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -2529,13 +2529,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -2603,7 +2603,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -2615,13 +2615,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -2669,7 +2669,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -2788,7 +2788,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -2996,7 +2996,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -3098,13 +3098,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -3116,19 +3116,19 @@ export const pvph = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -3140,13 +3140,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -3182,13 +3182,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -3256,7 +3256,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -3268,13 +3268,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -3322,7 +3322,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -3441,7 +3441,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -3648,7 +3648,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -3750,13 +3750,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -3768,19 +3768,19 @@ export const pvph = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -3792,13 +3792,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -3834,13 +3834,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -3908,7 +3908,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -3920,13 +3920,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -3974,7 +3974,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -4093,7 +4093,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -4866,7 +4866,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -4968,13 +4968,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -4986,19 +4986,19 @@ export const pvph = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -5010,13 +5010,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -5052,13 +5052,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -5126,7 +5126,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -5138,13 +5138,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -5192,7 +5192,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -5311,7 +5311,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -5503,7 +5503,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -5605,13 +5605,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -5623,19 +5623,19 @@ export const pvph = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -5647,13 +5647,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -5689,13 +5689,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -5763,7 +5763,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -5775,13 +5775,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -5829,7 +5829,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -5948,7 +5948,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -6139,7 +6139,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -6241,13 +6241,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -6259,19 +6259,19 @@ export const pvph = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -6283,13 +6283,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -6325,13 +6325,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -6399,7 +6399,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -6411,13 +6411,13 @@ export const pvph = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -6465,7 +6465,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -6584,7 +6584,7 @@ export const pvph = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/RFLO.ts b/tDataTypeTemplates/nsdToJson/testJson/RFLO.ts
index 7ce23c7..c71b1c9 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/RFLO.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/RFLO.ts
@@ -1935,7 +1935,9 @@ export const rflo = {
     name: "FltZ",
     type: "CMV",
     descID: "IEC61850_7_4.LNGroupR::RFLO.FltZ.desc",
-    presCond: "O",
+    presCond: "MOcond",
+    presCondArgs: "2",
+    presCondArgsID: "IEC61850_7_4.LNGroupR::RFLO__(_MOcond(2)_=__((_FltZ,_FltX,_FltR_))__)_.cond.LNGroupR::RFLO.FltZ",
     dsPresCond: "O",
     children: cmvChildren,
   },
diff --git a/tDataTypeTemplates/nsdToJson/testJson/RSYN.ts b/tDataTypeTemplates/nsdToJson/testJson/RSYN.ts
index 0d04987..dc3b428 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/RSYN.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/RSYN.ts
@@ -12,10 +12,10 @@ export const rsyn = {
     tagName: "DataObject",
     name: "Rel",
     type: "SPS",
-    descID: "IEC61850_7_4.AbstractLNsCommon::SynchronisationLN.Rel.desc",
-    presCond: "AtLeastOne",
-    presCondArgs: "1",
+    descID: "IEC61850_7_4.LNGroupR::RSYN.Rel.desc",
+    presCond: "M",
     dsPresCond: "F",
+    mandatory: true,
     children: spsChildren,
   },
   VInd: {
diff --git a/tDataTypeTemplates/nsdToJson/testJson/SAV.ts b/tDataTypeTemplates/nsdToJson/testJson/SAV.ts
index 6b70fa0..2d45722 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/SAV.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/SAV.ts
@@ -146,7 +146,7 @@ export const savChildren = {
             tagName: "Literal",
             name: "°C",
             literalVal: "23",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
           },
           Sv: {
             tagName: "Literal",
@@ -248,13 +248,13 @@ export const savChildren = {
             tagName: "Literal",
             name: "m²",
             literalVal: "41",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
           },
           "m³": {
             tagName: "Literal",
             name: "m³",
             literalVal: "42",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
           },
           "m/s": {
             tagName: "Literal",
@@ -266,19 +266,19 @@ export const savChildren = {
             tagName: "Literal",
             name: "m/s²",
             literalVal: "44",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
           },
           "m³/s": {
             tagName: "Literal",
             name: "m³/s",
             literalVal: "45",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
           },
           "m/m³": {
             tagName: "Literal",
             name: "m/m³",
             literalVal: "46",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
           },
           M: {
             tagName: "Literal",
@@ -290,13 +290,13 @@ export const savChildren = {
             tagName: "Literal",
             name: "kg/m³",
             literalVal: "48",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
           },
           "m²/s": {
             tagName: "Literal",
             name: "m²/s",
             literalVal: "49",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
           },
           "W/m K": {
             tagName: "Literal",
@@ -332,13 +332,13 @@ export const savChildren = {
             tagName: "Literal",
             name: "W/m²",
             literalVal: "55",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
           },
           "J/m²": {
             tagName: "Literal",
             name: "J/m²",
             literalVal: "56",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
           },
           "S/m": {
             tagName: "Literal",
@@ -406,7 +406,7 @@ export const savChildren = {
             tagName: "Literal",
             name: "V²",
             literalVal: "67",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
           },
           As: {
             tagName: "Literal",
@@ -418,13 +418,13 @@ export const savChildren = {
             tagName: "Literal",
             name: "A²",
             literalVal: "69",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
           },
           "A²t": {
             tagName: "Literal",
             name: "A²t",
             literalVal: "70",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
           },
           VAh: {
             tagName: "Literal",
@@ -472,7 +472,7 @@ export const savChildren = {
             tagName: "Literal",
             name: "kgm²",
             literalVal: "78",
-            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+            descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
           },
           dB: {
             tagName: "Literal",
@@ -591,7 +591,7 @@ export const savChildren = {
             tagName: "Literal",
             name: "µ",
             literalVal: "-6",
-            descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+            descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
           },
           m: {
             tagName: "Literal",
diff --git a/tDataTypeTemplates/nsdToJson/testJson/TCTR.ts b/tDataTypeTemplates/nsdToJson/testJson/TCTR.ts
index 6fdb414..776ac02 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/TCTR.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/TCTR.ts
@@ -221,7 +221,7 @@ export const tctr = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -323,13 +323,13 @@ export const tctr = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -341,19 +341,19 @@ export const tctr = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -365,13 +365,13 @@ export const tctr = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -407,13 +407,13 @@ export const tctr = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -481,7 +481,7 @@ export const tctr = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -493,13 +493,13 @@ export const tctr = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -547,7 +547,7 @@ export const tctr = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -666,7 +666,7 @@ export const tctr = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -858,7 +858,7 @@ export const tctr = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -960,13 +960,13 @@ export const tctr = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -978,19 +978,19 @@ export const tctr = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -1002,13 +1002,13 @@ export const tctr = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -1044,13 +1044,13 @@ export const tctr = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -1118,7 +1118,7 @@ export const tctr = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -1130,13 +1130,13 @@ export const tctr = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -1184,7 +1184,7 @@ export const tctr = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -1303,7 +1303,7 @@ export const tctr = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -1494,7 +1494,7 @@ export const tctr = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -1596,13 +1596,13 @@ export const tctr = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -1614,19 +1614,19 @@ export const tctr = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -1638,13 +1638,13 @@ export const tctr = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -1680,13 +1680,13 @@ export const tctr = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -1754,7 +1754,7 @@ export const tctr = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -1766,13 +1766,13 @@ export const tctr = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -1820,7 +1820,7 @@ export const tctr = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -1939,7 +1939,7 @@ export const tctr = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -4322,10 +4322,16 @@ export const tctr = {
             literalVal: "9",
           },
           TPS: {
+            deprecated: "true",
             tagName: "Literal",
             name: "TPS",
             literalVal: "10",
           },
+          TPM: {
+            literalVal: "11",
+            name: "TPM",
+            tagName: "Literal"
+          }
         },
       },
       d: {
diff --git a/tDataTypeTemplates/nsdToJson/testJson/TVTR.ts b/tDataTypeTemplates/nsdToJson/testJson/TVTR.ts
index d9d3406..362eb23 100644
--- a/tDataTypeTemplates/nsdToJson/testJson/TVTR.ts
+++ b/tDataTypeTemplates/nsdToJson/testJson/TVTR.ts
@@ -221,7 +221,7 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -323,13 +323,13 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -341,19 +341,19 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -365,13 +365,13 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -407,13 +407,13 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -481,7 +481,7 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -493,13 +493,13 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -547,7 +547,7 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -666,7 +666,7 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -858,7 +858,7 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -960,13 +960,13 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -978,19 +978,19 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -1002,13 +1002,13 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -1044,13 +1044,13 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -1118,7 +1118,7 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -1130,13 +1130,13 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -1184,7 +1184,7 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -1303,7 +1303,7 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",
@@ -1494,7 +1494,7 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "°C",
                 literalVal: "23",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind._deg_C.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.°C.desc",
               },
               Sv: {
                 tagName: "Literal",
@@ -1596,13 +1596,13 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "m²",
                 literalVal: "41",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m².desc",
               },
               "m³": {
                 tagName: "Literal",
                 name: "m³",
                 literalVal: "42",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³.desc",
               },
               "m/s": {
                 tagName: "Literal",
@@ -1614,19 +1614,19 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "m/s²",
                 literalVal: "44",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_s².desc",
               },
               "m³/s": {
                 tagName: "Literal",
                 name: "m³/s",
                 literalVal: "45",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_cube__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m³_per_s.desc",
               },
               "m/m³": {
                 tagName: "Literal",
                 name: "m/m³",
                 literalVal: "46",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_per_m³.desc",
               },
               M: {
                 tagName: "Literal",
@@ -1638,13 +1638,13 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "kg/m³",
                 literalVal: "48",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m_cube_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kg_per_m³.desc",
               },
               "m²/s": {
                 tagName: "Literal",
                 name: "m²/s",
                 literalVal: "49",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m_sq__per_s.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.m²_per_s.desc",
               },
               "W/m K": {
                 tagName: "Literal",
@@ -1680,13 +1680,13 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "W/m²",
                 literalVal: "55",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.W_per_m².desc",
               },
               "J/m²": {
                 tagName: "Literal",
                 name: "J/m²",
                 literalVal: "56",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.J_per_m².desc",
               },
               "S/m": {
                 tagName: "Literal",
@@ -1754,7 +1754,7 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "V²",
                 literalVal: "67",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.V².desc",
               },
               As: {
                 tagName: "Literal",
@@ -1766,13 +1766,13 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "A²",
                 literalVal: "69",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A².desc",
               },
               "A²t": {
                 tagName: "Literal",
                 name: "A²t",
                 literalVal: "70",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A_sq_t.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.A²t.desc",
               },
               VAh: {
                 tagName: "Literal",
@@ -1820,7 +1820,7 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "kgm²",
                 literalVal: "78",
-                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm_sq_.desc",
+                descID: "IEC61850_7_3.DAEnums::SIUnitKind.kgm².desc",
               },
               dB: {
                 tagName: "Literal",
@@ -1939,7 +1939,7 @@ export const tvtr = {
                 tagName: "Literal",
                 name: "µ",
                 literalVal: "-6",
-                descID: "IEC61850_7_3.DAEnums::MultiplierKind._micro.desc",
+                descID: "IEC61850_7_3.DAEnums::MultiplierKind.µ.desc",
               },
               m: {
                 tagName: "Literal",