npm - @enervance/insight-cim-model - Versions diffs - 0.0.32 → 0.0.34 - Mend

@enervance/insight-cim-model 0.0.32 → 0.0.34

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (47) hide show

package/dist/converter/integral7/converter-i7.js CHANGED Viewed

@@ -135,7 +135,6 @@ class ConverterI7 {
     convert(objectMappingConfig, defaultValuesConfig, energyTypesConfig, exportConfig, tempDirPath) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                var _a, _b;
                 try {
                     yield this.createColumnIndex();
                     yield this.configExportFrames(exportConfig, defaultValuesConfig, tempDirPath);
@@ -148,6 +147,7 @@ class ConverterI7 {
                     yield this.queryLDroselAnschlussIDs();
                     yield this.queryErsatzLaengsAnschlussIDs();
                     yield this.queryLkondensatorAnschlussIDs();
+                    console.log('Convert BD Profiles');
                     for (const entry of this.exportFramesBoundary.entries()) {
                         const geoRegionUUID = entry[0];
                         const frame = entry[1];
@@ -156,33 +156,38 @@ class ConverterI7 {
                             continue;
                         yield this.convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig);
                     }
+                    console.log('Convert MAS Profiles');
                     for (const entry of this.exportFrames.entries()) {
                         const geoRegionUUID = entry[0];
                         const frame = entry[1];
                         const geoRegion = frame.cimModel.getGeographicalRegion(geoRegionUUID);
                         if (!geoRegion)
                             continue;
-                        frame.addDependentModel(rdf_xml_1.RDF_XML.PROFILE_EQ_BD, (_a = this.exportFramesBoundary.entries().next()) === null || _a === void 0 ? void 0 : _a.value[1].getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD));
+                        console.log(`Convert MAS profile: ${frame.mas}`);
                         yield this.convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig);
                         frame.validateCIMModel();
                         const startTime = perf_hooks_1.performance.now();
                         frame.openXMLModel();
+                        console.log(`Serialize MAS profile: ${frame.mas}`);
                         frame.serializeModel(defaultValuesConfig);
                         yield frame.closeXMLModel();
                         let endTime = perf_hooks_1.performance.now();
                         frame.cimModel.purgeData();
                         console.log(`\nSerializeModel ${geoRegion.name} ${(endTime - startTime) / 1000} seconds\n`);
                     }
+                    console.log('Serialize BD Profiles');
                     for (const entry of this.exportFramesBoundary.entries()) {
                         const geoRegionUUID = entry[0];
                         const frame = entry[1];
                         const geoRegion = frame.cimModel.getGeographicalRegion(geoRegionUUID);
                         if (!geoRegion)
                             continue;
-                        yield this.transformBoundaryModel(frame, (_b = this.exportFrames.entries().next()) === null || _b === void 0 ? void 0 : _b.value[1]);
+                        console.log('Transform MAS Profiles');
+                        yield this.transformBoundaryModel(frame, [...this.exportFrames.values()]);
                         frame.validateCIMModel();
                         const startTime = perf_hooks_1.performance.now();
                         frame.openXMLModel();
+                        console.log(`Serialize BD profile: ${frame.mas}`);
                         frame.serializeModel(defaultValuesConfig);
                         yield frame.closeXMLModel();
                         let endTime = perf_hooks_1.performance.now();
@@ -386,7 +391,7 @@ class ConverterI7 {
                 yield this.convertLeitungen(frame, integral7Modell, defaultValuesConfig);
                 logExecutionTime(this.logger, startTime, `convertLeitungen`);
                 startTime = perf_hooks_1.performance.now();
-                yield this.convertErsatzLaengszweige(cimModel, integral7Modell, defaultValuesConfig);
+                yield this.convertErsatzLaengszweige(frame, integral7Modell, defaultValuesConfig);
                 logExecutionTime(this.logger, startTime, `convertErsatzlaengszweige`);
             }
             startTime = perf_hooks_1.performance.now();
@@ -409,7 +414,7 @@ class ConverterI7 {
                         .then((result) => {
                         for (const i7Data of result) {
                             const i7Schluesel = integral_prefix_1.GEOREGION_PRAEFIX + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                            const region = new GeographicalRegion_1.GeographicalRegion(utils_1.getUUID(i7Data.guid), utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluesel);
+                            const region = new GeographicalRegion_1.GeographicalRegion(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), "_GR", `_${regions.length}`.toString()]), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluesel);
                             this.addIdMapping(i7Data.id, region.mrid, integral_sql_1.Integral7TableNames.REGION);
                             regions.push(region);
                         }
@@ -433,8 +438,8 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.REGELZONE)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.REGELZONE, 0, 0, []));
                 for (const i7Data of result) {
-                    const i7Schluesel = integral_prefix_1.REGELZONE_PRAEFIX + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                    const ctrlarea = new ControlArea_1.ControlArea(utils_1.getUUID(i7Data.guid), 'RZ_' + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluesel);
+                    const i7Schluessel = integral_prefix_1.REGELZONE_PRAEFIX + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
+                    const ctrlarea = new ControlArea_1.ControlArea(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), "_RZ", `_${cimModel.controlArea.size}`.toString()]), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluessel);
                     cimModel.addControlArea(ctrlarea);
                     this.addIdMapping(i7Data.id, ctrlarea.mrid, integral_sql_1.Integral7TableNames.REGELZONE);
                 }
@@ -453,11 +458,11 @@ class ConverterI7 {
                         .then((result) => {
                         for (const i7Data of result) {
                             const i7Schluesel = integral_prefix_1.SUBGEOREGION_PRAEFIX + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                            const subregion = new SubGeographicalRegion_1.SubGeographicalRegion(utils_1.getUUID(i7Data.guid), utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluesel);
+                            const subregion = new SubGeographicalRegion_1.SubGeographicalRegion(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), "_SGR", `_${subRegions.length}`.toString()]), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluesel);
                             const regionUUID = this.integralID2UUID.get(i7Data.georegion);
                             let region = regions.find(elem => elem.mrid === regionUUID);
                             if (!region) {
-                                region = utils_1.createIfNotExitsGeoregionByName(this.cimModelDefault, defaultValuesConfig.GeographicalRegion.name);
+                                region = utils_1.createIfNotExitsGeoregionByName(this.cimModelDefault, util_create_1.createNotation([defaultValuesConfig.GeographicalRegion.name, "_GR", `_${regions.length}`.toString()]));
                                 this.logger.debug(`SubGeographicalRegion UUID ${subregion.mrid} I7-ID ${i7Data.id} Name ${i7Data.bezeichner} hat keine Region.`);
                             }
                             subregion.region = region;
@@ -489,7 +494,7 @@ class ConverterI7 {
                         utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
                         integral_prefix_1.MITTIGER_PUNKT +
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                    const i7name = util_create_1.createNotation([utils_2.getName(i7Data), utils_2.ueberpruefeZeichenkette(i7Data.ukz)], 32);
+                    const i7name = util_create_1.createNotation([utils_2.getName(i7Data), "_", utils_2.ueberpruefeZeichenkette(i7Data.ukz)], 32);
                     const substation = new AMPRIONSubstation_1.AMPRIONSubstation(utils_1.getUUID(i7Data.guid), i7name, i7Data.id + '', i7Schluessel, i7Data.stationsnummer, i7Data.ukz);
                     let subregion = cimModel.getSubGeographicalRegion(this.integralID2UUID.get(i7Data.subgeoregion));
                     if (!subregion) {
@@ -541,7 +546,7 @@ class ConverterI7 {
                         i7Data.un +
                         integral_prefix_1.MITTIGER_PUNKT +
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                    const vl = new VoltageLevel_1.VoltageLevel(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname, i7Schluessel);
+                    const vl = new VoltageLevel_1.VoltageLevel(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_VL", `_${cimModel.voltageLevels.size}`.toString()]), i7Data.kurzname, i7Schluessel);
                     const un = utils_2.getU(i7Data.un, defaultValuesConfig.DefaultVoltage);
                     const baseVoltage = util_create_1.createBaseVoltageIfNotExists(cimModel, un, this.exportFramesBoundary);
                     vl.baseVoltage = baseVoltage;
@@ -593,7 +598,7 @@ class ConverterI7 {
                     const i7Schluessel = voltageLevel.description +
                         integral_prefix_1.SCHALTFELD_PRAEFIX +
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname, i7Schluessel);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_B", `_${cimModel.bays.size}`.toString()]), i7Data.kurzname, i7Schluessel);
                     bay.number = i7Data.feldnummer + '';
                     bay.locationID = i7Data.ips_folder_id;
                     bay.voltageLevel = voltageLevel;
@@ -620,8 +625,8 @@ class ConverterI7 {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_SO, standortIDs));
                 for (const i7Data of result) {
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
-                    const vl = new VoltageLevel_1.VoltageLevel(utils_1.generateUUID(), substation.name + "/" + utils_2.getName(i7Data), i7Data.kurzname);
-                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(utils_1.getUUID(i7Data.guid), 'Abzweig', String(i7Data.id));
+                    const vl = new VoltageLevel_1.VoltageLevel(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_VL", `_${cimModel.voltageLevels.size}`.toString()]), i7Data.kurzname);
+                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CN", `_${cimModel.connectivityNodes.size}`.toString()]), String(i7Data.id));
                     connectivityNode.setConnectivityNodeContainer(vl);
                     vl.addConnectivityNode(connectivityNode);
                     connectivityNode.nodeNumber = i7Data.id_psse_cape;
@@ -668,10 +673,10 @@ class ConverterI7 {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SAMMELSCHIENE, schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
                     const i7Schaltanlagenabschnitt = integral7.integralSchaltanlagenAbschnitte.get(i7Data.saabschnitt);
-                    const busbarSection = new BusbarSection_1.BusbarSection(utils_1.generateUUID(), utils_2.getName(i7Schaltanlagenabschnitt), i7Schaltanlagenabschnitt.kurzname);
+                    const busbarSection = new BusbarSection_1.BusbarSection(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Schaltanlagenabschnitt), "_BBS", `_${cimModel.busbarSections.size}`.toString()]), i7Schaltanlagenabschnitt.kurzname);
                     busbarSection.ipMax = i7Data.limit_ip;
                     busbarSection.aggregate = false;
-                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CN", `_${cimModel.connectivityNodes.size}`.toString()]), i7Data.id.toString());
                     const terminal = this.createConnection(cimModel, busbarSection, connectivityNode, PhaseCode_1.PhaseCode.ABC, true, 1);
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Schaltanlagenabschnitt.id));
                     connectivityNode.nodeNumber = i7Data.id_psse_cape;
@@ -711,7 +716,7 @@ class ConverterI7 {
                 const result = yield this.queryDataInChuncks(integral_sql_1.I7Objects.KNOTEN_SF, schaltfeldIDs);
                 for (const i7Data of result) {
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.schaltfeld));
-                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.getUUID(i7Data.guid), 'knotensf cn', 'knotensf', `${bay.description}/${i7Data.bezeichner}`);
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CN", `_${cimModel.connectivityNodes.size}`.toString()]), 'knotensf', `${bay.description}/${i7Data.bezeichner}`);
                     if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
                         bay.addConnectivityNode(connectivityNode);
@@ -735,7 +740,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_KF)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_KF, querkupplungIDs));
                 for (const i7Data of result) {
-                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.getUUID(i7Data.guid), 'knotenkf cn', 'knotenkf');
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CN", `_${cimModel.connectivityNodes.size}`.toString()]), 'knotenkf');
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.kpfeld));
                     if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
@@ -758,7 +763,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_LK)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_LK, laengskupplungIDs));
                 for (const i7Data of result) {
-                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), utils_2.getName(i7Data), 'KnotenLk');
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_CN", `_${cimModel.connectivityNodes.size}`.toString()]), 'KnotenLk');
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.lkupplung));
                     if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
@@ -781,7 +786,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SCHLAUFE)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHLAUFE, knotenSoIDs));
                 for (const i7Data of result) {
-                    const terminal = new Terminal_1.Terminal(utils_1.generateUUID(), 'T_Schlaufe', String(i7Data.id));
+                    const terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "-Schlaufe_T", `_${cimModel.terminals.size}`.toString()]), String(i7Data.id));
                     terminal.connected = utils_2.convertToBooleanI7(i7Data.schaltzustand);
                     terminal.phases = PhaseCode_1.PhaseCode.ABC;
                     this.addIdMapping(i7Data.id, terminal.mrid, integral_sql_1.Integral7TableNames.SCHLAUFE);
@@ -809,7 +814,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.BELASTUNG)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.BELASTUNG, knotenSfIDs));
                 for (const i7Data of result) {
-                    const load = targetClass === cim_class_names_1.CIM_CLASS_NAMES.ConformLoad ? new ConformLoad_1.ConformLoad(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data)) : new EnergyConsumer_1.EnergyConsumer(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data));
+                    const load = targetClass === cim_class_names_1.CIM_CLASS_NAMES.ConformLoad ? new ConformLoad_1.ConformLoad(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CL", `_${cimModel.energyConsumers.size}`.toString()])) : new EnergyConsumer_1.EnergyConsumer(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_EC", `_${cimModel.energyConsumers.size}`.toString()]));
                     this.setTopologyEnergySourceConsumerObject(cimModel, load, i7Data);
                     const powerData = utils_2.getActiveReactivePower(i7Data);
                     load.p = powerData[0];
@@ -855,7 +860,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.GENERATOR)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.GENERATOR, knotenSfIDs));
                 for (const i7Data of result) {
-                    const synchronousMachine = new SynchronousMachine_1.SynchronousMachine(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname, i7Data.nameprimaertyp);
+                    const synchronousMachine = new SynchronousMachine_1.SynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SM", `_${cimModel.synchronousMachine.size}`.toString()]), i7Data.kurzname, i7Data.nameprimaertyp);
                     synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generator;
                     synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.generator;
                     if (utils_2.convertToNumberI7(i7Data.blocktrafo_1)) {
@@ -900,7 +905,7 @@ class ConverterI7 {
                     synchronousMachine.aggregate = true;
                     synchronousMachine.ratedPowerFactor = utils_2.isNumericI7(i7Data.cosphir) ? utils_2.convertToNumberI7(i7Data.cosphir) : undefined;
                     synchronousMachine.r = utils_2.isNumericI7(i7Data.rg) ? utils_2.convertToNumberI7(i7Data.rg) : undefined;
-                    const reactiveCapabilityCurve = new ReactiveCapabilityCurve_1.ReactiveCapabilityCurve(utils_1.generateUUID(), 'CurveData');
+                    const reactiveCapabilityCurve = new ReactiveCapabilityCurve_1.ReactiveCapabilityCurve(utils_1.generateUUID(), util_create_1.createNotation(['CurveData', "_RCC", `_${cimModel.reactiveCapabilityCurve.size}`.toString()]));
                     reactiveCapabilityCurve.curveStyle = CurveStyle_1.CurveStyle.straightLineYValues;
                     reactiveCapabilityCurve.xUnit = UnitSymbol_1.UnitSymbol.W;
                     reactiveCapabilityCurve.y1Unit = UnitSymbol_1.UnitSymbol.VAr;
@@ -920,43 +925,41 @@ class ConverterI7 {
                     cimModel.addReactiveCapabilityCurve(reactiveCapabilityCurve);
                     synchronousMachine.initialReactiveCapabilityCurveUUID = reactiveCapabilityCurve.mrid;
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
-                    const regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_Gen_${i7Data.id}`);
-                    regulatingControl.enabled = inBetrieb;
-                    regulatingControl.targetValue = usoll;
+                    let regulatingControl = undefined;
                     switch (i7Data.spannungsgeregelt) {
                         case 1: {
+                            regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_Gen_${i7Data.id}`);
+                            regulatingControl.targetValue = usoll;
                             regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                             regulatingControl.discrete = false;
                             regulatingControl.enabled = inBetrieb;
                             synchronousMachine.controlEnabled = inBetrieb;
+                            regulatingControl.addRegulatingCondEq(synchronousMachine);
+                            synchronousMachine.regulatingControlUUID = regulatingControl.mrid;
+                            cimModel.addRegulatingControl(regulatingControl);
                             break;
                         }
                         default: {
-                            regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
-                            regulatingControl.discrete = false;
-                            regulatingControl.enabled = inBetrieb;
-                            synchronousMachine.controlEnabled = inBetrieb;
+                            synchronousMachine.controlEnabled = false;
                         }
                     }
-                    regulatingControl.addRegulatingCondEq(synchronousMachine);
-                    synchronousMachine.regulatingControlUUID = regulatingControl.mrid;
                     const generatingUnitConfig = energyTypesConfig[i7Data.nameprimaertyp];
                     let generatingUnit;
                     if (generatingUnitConfig) {
                         switch (generatingUnitConfig.class) {
                             case 'ThermalGeneratingUnit': {
-                                generatingUnit = new ThermalGeneratingUnit_1.ThermalGeneratingUnit(utils_1.getUUID(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname, i7Data.nameprimaertyp);
+                                generatingUnit = new ThermalGeneratingUnit_1.ThermalGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_TGU", `_${cimModel.generatingUnit.size}`.toString()]), i7Data.kurzname, i7Data.nameprimaertyp);
                                 if (generatingUnitConfig.fuelType) {
                                     utils_2.generateFuelType(i7Data.nameprimaertyp, generatingUnitConfig.fuelType, generatingUnit, cimModel);
                                 }
                                 break;
                             }
                             case 'SolarGeneratingUnit': {
-                                generatingUnit = new SolarGeneratingUnit_1.SolarGeneratingUnit(utils_1.getUUID(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname, i7Data.nameprimaertyp);
+                                generatingUnit = new SolarGeneratingUnit_1.SolarGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_SGU", `_${cimModel.generatingUnit.size}`.toString()]), i7Data.kurzname, i7Data.nameprimaertyp);
                                 break;
                             }
                             case 'WindGeneratingUnit': {
-                                generatingUnit = new WindGeneratingUnit_1.WindGeneratingUnit(utils_1.getUUID(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname, i7Data.nameprimaertyp);
+                                generatingUnit = new WindGeneratingUnit_1.WindGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_WGU", `_${cimModel.generatingUnit.size}`.toString()]), i7Data.kurzname, i7Data.nameprimaertyp);
                                 switch (generatingUnitConfig.fuelType) {
                                     case 'onshore': {
                                         generatingUnit.windGenUnitType = WindGenUnitKind_1.WindGenUnitKind.onshore;
@@ -974,18 +977,18 @@ class ConverterI7 {
                                 break;
                             }
                             case 'NuclearGeneratingUnit': {
-                                generatingUnit = new NuclearGeneratingUnit_1.NuclearGeneratingUnit(utils_1.getUUID(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname);
+                                generatingUnit = new NuclearGeneratingUnit_1.NuclearGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_NGU", `_${cimModel.generatingUnit.size}`.toString()]), i7Data.kurzname);
                                 break;
                             }
                             case 'HydroGeneratingUnit': {
-                                generatingUnit = new HydroGeneratingUnit_1.HydroGeneratingUnit(utils_1.getUUID(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname);
+                                generatingUnit = new HydroGeneratingUnit_1.HydroGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_HGU", `_${cimModel.generatingUnit.size}`.toString()]), i7Data.kurzname);
                                 generatingUnit.energyConversionCapability = HydroEnergyConversionKind_1.HydroEnergyConversionKind.pumpAndGenerator;
                                 break;
                             }
                         }
                     }
                     if (!generatingUnit) {
-                        generatingUnit = new GeneratingUnit_1.GeneratingUnit(utils_1.getUUID(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname);
+                        generatingUnit = new GeneratingUnit_1.GeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_GU", `_${cimModel.generatingUnit.size}`.toString()]), i7Data.kurzname);
                     }
                     generatingUnit.initialP = utils_2.isNumericI7(i7Data.p0) ? utils_2.convertToNumberI7(i7Data.p0) : undefined;
                     generatingUnit.maxOperatingP = utils_2.isNumericI7(i7Data.p_max) ? utils_2.convertToNumberI7(i7Data.p_max) : undefined;
@@ -1012,7 +1015,6 @@ class ConverterI7 {
                     smtcr.xQuadSubtrans = utils_2.isNumericI7(i7Data.xqu2s) ? utils_2.convertToNumberI7(i7Data.xqu2s) : undefined;
                     smtcr.synchronousMachine = synchronousMachine;
                     synchronousMachine.synchronousMachineDynamics = smtcr;
-                    cimModel.addRegulatingControl(regulatingControl);
                     cimModel.addGeneratingUnit(generatingUnit);
                     cimModel.addSynchronousMachine(synchronousMachine);
                     cimModel.addSynchronousMachineTimeConstantReactance(smtcr);
@@ -1026,7 +1028,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ASYNCHRONMOTOR)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.ASYNCHRONMOTOR, 0, 0, knotenSfIDs));
                 for (const i7Data of result) {
-                    const asynchronousMachine = new AsynchronousMachine_1.AsynchronousMachine(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname, 'SO-' + i7Data.ukz + integral_prefix_1.MITTIGER_PUNKT + i7Data.bezeichner);
+                    const asynchronousMachine = new AsynchronousMachine_1.AsynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_AM", `_${cimModel.asynchronousMachine.size}`.toString()]), i7Data.kurzname, 'SO-' + i7Data.ukz + integral_prefix_1.MITTIGER_PUNKT + i7Data.bezeichner);
                     asynchronousMachine.efficiency = i7Data.wirkungsgrad * 100;
                     asynchronousMachine.iaIrRatio = i7Data.ilr_ir;
                     asynchronousMachine.polePairNumber = i7Data.polpaarz;
@@ -1067,7 +1069,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KWBLOCK)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KWBLOCK, knotenSfIDs));
                 for (const i7Data of result) {
-                    const synchronousMachine = new SynchronousMachine_1.SynchronousMachine(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+                    const synchronousMachine = new SynchronousMachine_1.SynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SM", `_${cimModel.synchronousMachine.size}`.toString()]), i7Data.kurzname);
                     synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generator;
                     synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.generator;
                     synchronousMachine.referencePriority = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : undefined;
@@ -1159,7 +1161,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.ERSATZQUERZWEIG, knotenSfIDs));
                 for (const i7Data of result) {
-                    const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+                    const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_ENI", `_${cimModel.externalNetworkInjections.size}`.toString()]), i7Data.kurzname);
                     const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : undefined;
                     const kr = 0;
                     externalNetworkInjection.governorSCD = kr;
@@ -1202,7 +1204,7 @@ class ConverterI7 {
     }
     convertBoundaryInjections2EquivalentInjection(cimModel, result) {
         for (const i7Data of result) {
-            const equivalentInjection = new EquivalentInjection_1.EquivalentInjection(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+            const equivalentInjection = new EquivalentInjection_1.EquivalentInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), 'BD_EI', `_${cimModel.equivalentInjections.size}`]), i7Data.kurzname);
             const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
             const einspeisePrio = utils_2.convertToNumberI7(i7Data.einspprio);
             equivalentInjection.p = utils_2.convertToNumberI7(i7Data.p_ersatznetz) + utils_2.convertToNumberI7(i7Data.p_restnetz);
@@ -1236,10 +1238,11 @@ class ConverterI7 {
             this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.Integral7TableNames.BOUNDARYINJECTION);
         }
     }
-    convertErsatzLaengszweige(cimModel, knotenSfIDs, defaultValuesConfig) {
+    convertErsatzLaengszweige(frame, knotenSfIDs, defaultValuesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const cimModel = frame.cimModel;
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.ERSATZLAENGSZWEIG, 0, 0, []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.ERSATZLAENGSZWEIG, knotenSfIDs));
                 for (const i7Data of result) {
                     const i7Schluessel = integral_prefix_1.ERSATZLAENGSZWEIG_PRAEFIX +
                         utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
@@ -1249,7 +1252,7 @@ class ConverterI7 {
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
                         integral_prefix_1.MITTIGER_PUNKT +
                         utils_2.ueberpruefeZeichenkette(i7Data.stkabname);
-                    const equivalentBranch = new EquivalentBranch_1.EquivalentBranch(utils_1.getUUID(i7Data.guid), i7Data.bezeichner, i7Data.kurzname, i7Schluessel);
+                    const equivalentBranch = new EquivalentBranch_1.EquivalentBranch(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([i7Data.bezeichner, '_EB', `_${cimModel.equivalentBranches.size}`]), i7Data.kurzname, i7Schluessel);
                     const ur1 = utils_2.getU(i7Data.ur1, defaultValuesConfig.DefaultVoltage);
                     const ur2 = utils_2.getU(i7Data.ur2, defaultValuesConfig.DefaultVoltage);
                     const baseVoltageUr1 = util_create_1.createBaseVoltageIfNotExists(cimModel, ur1, this.exportFramesBoundary);
@@ -1260,20 +1263,8 @@ class ConverterI7 {
                     else if (baseVoltageUr2) {
                         equivalentBranch.baseVoltage = baseVoltageUr2;
                     }
-                    const start = cimModel.objects.get(this.integralID2UUID.get(i7Data.aknoten));
-                    if (start) {
-                        util_create_1.createConnection(cimModel, equivalentBranch, start, PhaseCode_1.PhaseCode.ABC, 1);
-                    }
-                    else {
-                        this.logger.debug(`Leitung ${i7Data.id} ${equivalentBranch.mrid} besitzt keinen Anfangsknoten. ${i7Data.aknoten} ${this.integralID2UUID.get(i7Data.aknoten)}`);
-                    }
-                    const target = cimModel.objects.get(this.integralID2UUID.get(i7Data.eknoten));
-                    if (target) {
-                        util_create_1.createConnection(cimModel, equivalentBranch, target, PhaseCode_1.PhaseCode.ABC, 2);
-                    }
-                    else {
-                        this.logger.debug(`Leitung ${i7Data.id} ${equivalentBranch.mrid} besitzt keinen Zielknoten.`);
-                    }
+                    this.createBoundaryConnection(frame, equivalentBranch, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC, 1);
+                    this.createBoundaryConnection(frame, equivalentBranch, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC, 2);
                     cimModel.addEquivalentBranch(equivalentBranch);
                     this.addIdMapping(i7Data.id, equivalentBranch.mrid, integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG);
                 }
@@ -1288,7 +1279,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KOMPENSATIONSDROSSEL, knotenSfIDs));
                 for (const i7Data of result) {
-                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_LSC", `_${cimModel.linearShuntCompensators.size}`.toString()]), i7Data.kurzname);
                     shunt.normalSections = i7Data.aktstufe;
                     shunt.maximumSections = i7Data.maxstufe;
                     shunt.nomU = i7Data.ur;
@@ -1298,7 +1289,7 @@ class ConverterI7 {
                     const spannungsregelungRemote = utils_2.isBooleanI7(i7Data.rpv_geregelt) ? utils_2.convertToBooleanI7(i7Data.rpv_geregelt) : false;
                     let regulatingControl;
                     if (spannungsregelungLokal || spannungsregelungRemote) {
-                        regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_Kompdrossel ${i7Data.id}`);
+                        regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_Kompdrossel_${i7Data.id}`);
                         regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                         regulatingControl.discrete = true;
                         regulatingControl.targetDeadband = i7Data.uband;
@@ -1322,7 +1313,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KOMPENSATIONSKONDENSATOR)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KOMPENSATIONSKONDENSATOR, knotenSfIDs));
                 for (const i7Data of result) {
-                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_LSC", `_${cimModel.linearShuntCompensators.size}`.toString()]), i7Data.kurzname);
                     shunt.normalSections = i7Data.aktstufe;
                     shunt.maximumSections = i7Data.maxstufe;
                     shunt.nomU = i7Data.ur;
@@ -1332,7 +1323,7 @@ class ConverterI7 {
                     const spannungsregelungRemote = utils_2.isBooleanI7(i7Data.rpv_geregelt) ? utils_2.convertToBooleanI7(i7Data.rpv_geregelt) : false;
                     let regulatingControl;
                     if (spannungsregelungLokal || spannungsregelungRemote) {
-                        regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_${i7Data.bezeichner}`);
+                        regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_KompKondensator_${i7Data.id}`);
                         regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                         regulatingControl.discrete = true;
                         regulatingControl.enabled = inBetrieb;
@@ -1356,9 +1347,9 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STATCOM)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STATCOM, knotenSfIDs));
                 for (const i7Data of result) {
-                    const statVarCom = new StaticVarCompensator_1.StaticVarCompensator(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+                    const statVarCom = new StaticVarCompensator_1.StaticVarCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SVC", `_${cimModel.staticVarCompensator.size}`.toString()]), i7Data.kurzname);
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
-                    const regulatingControl = utils_2.createRegulatingControl(`RC_Statcom ${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
+                    const regulatingControl = utils_2.createRegulatingControl(`RC_Statcom_${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
                     this.setTopologyEnergySourceConsumerObject(cimModel, statVarCom, i7Data, regulatingControl);
                     const uref = utils_2.isNumericI7(i7Data.uref) ? utils_2.convertToNumberI7(i7Data.uref) : undefined;
                     regulatingControl.targetValue = uref;
@@ -1396,7 +1387,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SVC)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SVC, knotenSfIDs));
                 for (const i7Data of result) {
-                    const statVarCom = new StaticVarCompensator_1.StaticVarCompensator(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+                    const statVarCom = new StaticVarCompensator_1.StaticVarCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SVC", `_${cimModel.staticVarCompensator.size}`.toString()]), i7Data.kurzname);
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
                     const regulatingControl = utils_2.createRegulatingControl(`RC_SVC ${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
                     this.setTopologyEnergySourceConsumerObject(cimModel, statVarCom, i7Data, regulatingControl);
@@ -1436,12 +1427,11 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_KLASSISCH)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_KOPFSTATION_KLASSISCH, knotenSfIDs));
                 for (const i7Data of result) {
-                    const dcConverterUnit = new DCConverterUnit_1.DCConverterUnit(utils_1.generateUUID(), 'DCConverterUnit');
+                    const dcConverterUnit = new DCConverterUnit_1.DCConverterUnit(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCCU", `_${cimModel.dcConverterUnit.size}`.toString()]));
                     const acConnectivityNode = cimModel.connectivityNodes.get(this.integralID2UUID.get(i7Data.anschluss));
                     if (acConnectivityNode) {
                         const equipmentContainer = this.determineEquipmentContainer('Substation', cimModel, acConnectivityNode.connectivityNodeContainer);
                         if (equipmentContainer) {
-                            dcConverterUnit.name = `DCConverterUnit ${equipmentContainer.name}`;
                             dcConverterUnit.setSubstation(equipmentContainer);
                         }
                         else {
@@ -1451,7 +1441,7 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
-                    const csConverter = new CsConverter_1.CsConverter(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+                    const csConverter = new CsConverter_1.CsConverter(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CSC", `_${cimModel.csConverter.size}`.toString()]), i7Data.kurzname);
                     csConverter.equipmentContainer = dcConverterUnit;
                     csConverter.baseS = i7Data.pr;
                     csConverter.ratedUdc = i7Data.ur;
@@ -1480,10 +1470,10 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`CsConverter ${i7Data.id} ${csConverter.mrid} besitzt keinen AC Anschluss.`);
                     }
-                    const dcNode = new DCNode_1.DCNode(utils_1.generateUUID(), 'DCNode');
+                    const dcNode = new DCNode_1.DCNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCN", `_${cimModel.dcNodes.size}`.toString()]));
                     dcNode.dcEquipmentContainer = dcConverterUnit;
                     dcConverterUnit.dCNodes.set(dcNode.getUUID(), dcNode);
-                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal(utils_1.generateUUID(), 'ACDCConvTerminal');
+                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_ACDCC-DCT", `_${cimModel.acDCConverterDCTerminals.size}`.toString()]));
                     acDCConverterDCTerminal.sequenceNumber = 1;
                     acDCConverterDCTerminal.dCConductingEquipment = csConverter;
                     csConverter.dCTerminals.set(acDCConverterDCTerminal.getUUID(), acDCConverterDCTerminal);
@@ -1504,12 +1494,11 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_KOPFSTATION_VSC, knotenSfIDs));
                 for (const i7Data of result) {
-                    const dcConverterUnit = new DCConverterUnit_1.DCConverterUnit(utils_1.generateUUID(), 'DCConverterUnit');
+                    const dcConverterUnit = new DCConverterUnit_1.DCConverterUnit(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCCU", `_${cimModel.dcConverterUnit.size}`.toString()]));
                     const acConnectivityNode = cimModel.connectivityNodes.get(this.integralID2UUID.get(i7Data.anschluss));
                     if (acConnectivityNode) {
                         const equipmentContainer = this.determineEquipmentContainer('Substation', cimModel, acConnectivityNode.connectivityNodeContainer);
                         if (equipmentContainer) {
-                            dcConverterUnit.name = `DCConverterUnit ${equipmentContainer.name}`;
                             dcConverterUnit.setSubstation(equipmentContainer);
                         }
                         else {
@@ -1519,7 +1508,7 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
-                    const vsConverter = new VsConverter_1.VsConverter(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+                    const vsConverter = new VsConverter_1.VsConverter(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_VSC", `_${cimModel.vsConverter.size}`.toString()]), i7Data.kurzname);
                     vsConverter.equipmentContainer = dcConverterUnit;
                     vsConverter.baseS = i7Data.pr;
                     utils_2.isNumericI7(i7Data.udc) ? vsConverter.ratedUdc = i7Data.udc : vsConverter.ratedUdc = i7Data.ur;
@@ -1532,8 +1521,8 @@ class ConverterI7 {
                     const regelungP = utils_2.convertToBooleanI7(i7Data.p_geregelt);
                     const regelungW = utils_2.convertToBooleanI7(i7Data.grad_geregelt);
                     if (regelungU) {
-                        vsConverter.pPccControl = VsPpccControlKind_1.VsPpccControlKind.pPcc;
-                        vsConverter.qPccControl = VsQpccControlKind_1.VsQpccControlKind.powerFactorPcc;
+                        vsConverter.pPccControl = VsPpccControlKind_1.VsPpccControlKind.udc;
+                        vsConverter.qPccControl = VsQpccControlKind_1.VsQpccControlKind.voltagePcc;
                     }
                     else if (regelungP) {
                         vsConverter.pPccControl = VsPpccControlKind_1.VsPpccControlKind.pPcc;
@@ -1551,9 +1540,9 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`VsConverter ${i7Data.id} ${vsConverter.mrid} besitzt keinen AC Anschluss.`);
                     }
-                    const dcNode = new DCNode_1.DCNode(utils_1.generateUUID(), 'DCNode');
+                    const dcNode = new DCNode_1.DCNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCN", `_${cimModel.dcNodes.size}`.toString()]));
                     dcNode.dcEquipmentContainer = dcConverterUnit;
-                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal(utils_1.generateUUID(), 'ACDCConvTerminal');
+                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_ACDCC-DCT", `_${cimModel.acDCConverterDCTerminals.size}`.toString()]));
                     acDCConverterDCTerminal.sequenceNumber = 1;
                     acDCConverterDCTerminal.dCConductingEquipmentUUID = vsConverter.mrid;
                     acDCConverterDCTerminal.dcNode = dcNode;
@@ -1574,7 +1563,7 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
                 try {
-                    const energySource = new EnergySource_1.EnergySource(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+                    const energySource = new EnergySource_1.EnergySource(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_ES", `_${cimModel.energySources.size}`.toString()]), i7Data.kurzname);
                     this.setTopologyEnergySourceConsumerObject(cimModel, energySource, i7Data);
                     energySource.nominalVoltage = (_c = (_b = (_a = energySource.equipmentContainer) === null || _a === void 0 ? void 0 : _a.baseVoltage) === null || _b === void 0 ? void 0 : _b.nominalVoltage) === null || _c === void 0 ? void 0 : _c.value;
                     const prio = i7Data.einspprio;
@@ -1596,7 +1585,7 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
                 try {
-                    const equivalentInjection = new EquivalentInjection_1.EquivalentInjection(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+                    const equivalentInjection = new EquivalentInjection_1.EquivalentInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_EI', `_${cimModel.equivalentInjections.size}`]), i7Data.kurzname);
                     const prio = i7Data.einspprio;
                     const usoll = i7Data.usoll;
                     const powerData = utils_2.getActiveReactivePower(i7Data);
@@ -1616,15 +1605,33 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
                 try {
-                    const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+                    const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_ENI", `_${cimModel.externalNetworkInjections.size}`.toString()]), i7Data.kurzname);
                     const prio = i7Data.einspprio;
                     externalNetworkInjection.referencePriority = prio;
                     const usoll = i7Data.usoll;
                     const powerData = utils_2.getActiveReactivePower(i7Data);
                     externalNetworkInjection.p = powerData[0];
                     externalNetworkInjection.q = powerData[1];
-                    externalNetworkInjection.controlEnabled = false;
-                    this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data);
+                    const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
+                    let regulatingControl = undefined;
+                    switch (i7Data.spannungsgeregelt) {
+                        case 1: {
+                            regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_ENI_${i7Data.id}`);
+                            regulatingControl.targetValue = usoll;
+                            regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
+                            regulatingControl.discrete = false;
+                            regulatingControl.enabled = inBetrieb;
+                            externalNetworkInjection.controlEnabled = inBetrieb;
+                            regulatingControl.addRegulatingCondEq(externalNetworkInjection);
+                            externalNetworkInjection.regulatingControlUUID = regulatingControl.mrid;
+                            cimModel.addRegulatingControl(regulatingControl);
+                            break;
+                        }
+                        default: {
+                            externalNetworkInjection.controlEnabled = false;
+                        }
+                    }
+                    this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data, regulatingControl);
                     cimModel.addExternalNetworkInjection(externalNetworkInjection);
                     this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.I7Objects.EINSPEISUNG);
                 }
@@ -1668,7 +1675,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.QUERKUPPLUNG)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.QUERKUPPLUNG, schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
-                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), 'Querkupplung');
+                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_B", `_${cimModel.bays.size}`.toString()]), 'Querkupplung');
                     bay.number = i7Data.feldnummer + '';
                     bay.locationID = i7Data.ips_folder_id;
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.saabschnitt));
@@ -1698,7 +1705,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKUPPLUNG, schaltanlagenIDs));
                 for (const i7Data of result) {
-                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname, 'Laengskupplung');
+                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_B", `_${cimModel.bays.size}`.toString()]), i7Data.kurzname, 'Laengskupplung');
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
                     bay.number = i7Data.feldnummer + '';
                     bay.locationID = i7Data.ips_folder_id;
@@ -1728,42 +1735,10 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_STARR)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_STARR, containerIDs));
                 for (const i7Data of result) {
-                    const junction = new Junction_1.Junction(utils_1.getUUID(i7Data.guid), `${i7Data.bezeichner}`, 'JNCT', 'starre Verbindung');
-                    const schaltzustand = utils_2.convertToBooleanI7(i7Data.schaltzustand);
-                    const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject(this.integralID2UUID.get(i7Data.seliste)));
-                    if (equipmentContainer) {
-                        equipmentContainer.addEquipment(junction);
-                        junction.equipmentContainer = equipmentContainer;
-                    }
-                    else {
-                        this.logger.debug(`Starre verbindung ${i7Data.id} besitzt keinen EquipmentContainer.`);
-                    }
-                    const cnStart = cimModel.getConnectivityNode(this.integralID2UUID.get(i7Data.aknoten));
-                    const cnZiel = cimModel.getConnectivityNode(this.integralID2UUID.get(i7Data.eknoten));
-                    if (cnStart) {
-                        const terminal = this.createConnection(cimModel, junction, cnStart, PhaseCode_1.PhaseCode.ABC, true, 1);
-                        if (schaltzustand === false) {
-                            terminal.connected = schaltzustand;
-                        }
-                    }
-                    else {
-                        this.logger.debug(`Starre verbindung ${i7Data.id} besitzt keinen Anfangsknoten.`);
-                    }
-                    if (cnZiel) {
-                        const terminal = this.createConnection(cimModel, junction, cnZiel, PhaseCode_1.PhaseCode.ABC, true, 2);
-                        if (schaltzustand === false) {
-                            terminal.connected = schaltzustand;
-                        }
-                    }
-                    else {
-                        this.logger.debug(`Starre verbindung ${i7Data.id} besitzt keinen Zielknoten.`);
-                    }
-                    const baseVoltage = utils_2.getTerminalUn(cimModel, junction);
-                    if (baseVoltage) {
-                        junction.baseVoltage = baseVoltage;
-                    }
-                    this.addIdMapping(i7Data.id, junction.mrid, integral_sql_1.Integral7TableNames.KNOTEN_STARR);
-                    cimModel.addJunction(junction);
+                    const breaker = new Breaker_1.Breaker(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_BR", `_${cimModel.breakers.size}`.toString()]), 'Breaker', 'starre Verbindung');
+                    yield this.convertSwitch(breaker, cimModel, i7Data);
+                    cimModel.addBreaker(breaker);
+                    this.addIdMapping(i7Data.id, breaker.mrid, integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER);
                 }
             }
             else {
@@ -1776,7 +1751,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRENNERFI_3P)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRENNERFI_3P, containerIDs));
                 for (const i7Data of result) {
-                    const disconnector = new Disconnector_1.Disconnector(utils_1.getUUID(i7Data.guid), i7Data.bezeichner);
+                    const disconnector = new Disconnector_1.Disconnector(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_D", `_${cimModel.disconnectors.size}`.toString()]));
                     yield this.convertSwitch(disconnector, cimModel, i7Data);
                     cimModel.addDisconnector(disconnector);
                     this.addIdMapping(i7Data.id, disconnector.mrid, integral_sql_1.Integral7TableNames.TRENNERFI_3P);
@@ -1792,7 +1767,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRENNER_3P)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRENNER_3P, containerIDs));
                 for (const i7Data of result) {
-                    const disconnector = new Disconnector_1.Disconnector(utils_1.getUUID(i7Data.guid), i7Data.bezeichner);
+                    const disconnector = new Disconnector_1.Disconnector(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_D", `_${cimModel.disconnectors.size}`.toString()]));
                     yield this.convertSwitch(disconnector, cimModel, i7Data);
                     cimModel.addDisconnector(disconnector);
                     this.addIdMapping(i7Data.id, disconnector.mrid, integral_sql_1.Integral7TableNames.TRENNER_3P);
@@ -1808,7 +1783,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LEISTUNGSSCHALTER, containerIDs));
                 for (const i7Data of result) {
-                    const breaker = new Breaker_1.Breaker(utils_1.getUUID(i7Data.guid), i7Data.bezeichner);
+                    const breaker = new Breaker_1.Breaker(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_BR", `_${cimModel.breakers.size}`.toString()]));
                     yield this.convertSwitch(breaker, cimModel, i7Data);
                     cimModel.addBreaker(breaker);
                     this.addIdMapping(i7Data.id, breaker.mrid, integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER);
@@ -1861,7 +1836,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSDROSSEL)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.LAENGSDROSSEL, 0, 0, []));
                 for (const i7Data of result) {
-                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.id + '', 'LD-' + i7Data.bezeichner);
+                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SC", `_${cimModel.seriesCompensators.size}`.toString()]), i7Data.id + '', 'LD-' + i7Data.bezeichner);
                     const start = cimModel.objects.get(this.integralID2UUID.get(i7Data.aknoten));
                     let startTerminal;
                     if (start) {
@@ -1936,8 +1911,8 @@ class ConverterI7 {
                     for (const i7DataSchiene of stpSchiene) {
                         try {
                             stpSchieneIDs.push(i7DataSchiene.id);
-                            const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), utils_2.getName(i7DataSchiene), `StpSchiene_${i7DataSchiene.id}`);
-                            const junction = new Junction_1.Junction(utils_1.generateUUID(), `StpSchiene/${i7DataSchiene.id}`, `${i7DataSchiene.bezeichner}`);
+                            const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7DataSchiene), "_CN", `_${cimModel.connectivityNodes.size}`.toString()]), `StpSchiene_${i7DataSchiene.id}`);
+                            const junction = new Junction_1.Junction(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7DataSchiene), "_J", `_${cimModel.junctions.size}`.toString()]), `StpSchiene/${i7DataSchiene.id}`);
                             const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject(this.integralID2UUID.get(i7DataSchiene.id)));
                             if (equipmentContainer) {
                                 equipmentContainer.addEquipment(junction);
@@ -1980,14 +1955,14 @@ class ConverterI7 {
                                 const junctionUUID = integral7.sternPunktImpModel.stpSchieneJunctionUUIDs.get((i7Data.anschluss));
                                 let conductingEquip;
                                 if (imax && imin) {
-                                    const petersenCoil = new PetersenCoil_1.PetersenCoil(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.id + '');
+                                    const petersenCoil = new PetersenCoil_1.PetersenCoil(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_PC", `_${cimModel.petersenCoils.size}`.toString()]), i7Data.id + '');
                                     integral7.sternPunktImpModel.petersenCoils.set(petersenCoil.mrid, petersenCoil);
                                     integral7.sternPunktImpModel.junctionUUIDstpImp.set(junctionUUID, petersenCoil);
                                     this.addIdMapping(i7Data.id, petersenCoil.mrid, integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ);
                                     conductingEquip = petersenCoil;
                                 }
                                 else {
-                                    const groundingImpedance = new GroundingImpedance_1.GroundingImpedance(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.id + '');
+                                    const groundingImpedance = new GroundingImpedance_1.GroundingImpedance(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_GI", `_${cimModel.groundingImpedances.size}`.toString()]), i7Data.id + '');
                                     groundingImpedance.r = utils_2.isNumericI7(i7Data.rne) ? i7Data.rne : (utils_2.isNumericI7(kdType === null || kdType === void 0 ? void 0 : kdType.rne) ? kdType === null || kdType === void 0 ? void 0 : kdType.rne : undefined);
                                     groundingImpedance.x = utils_2.isNumericI7(i7Data.xne) ? i7Data.xne : (utils_2.isNumericI7(kdType === null || kdType === void 0 ? void 0 : kdType.xne) ? kdType === null || kdType === void 0 ? void 0 : kdType.xne : undefined);
                                     integral7.sternPunktImpModel.groundingImpedances.set(groundingImpedance.mrid, groundingImpedance);
@@ -2055,7 +2030,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKUPPLUNG, schaltanlagenIDs));
                 for (const i7Data of result) {
-                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname, 'Laengskupplung');
+                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_B", `_${cimModel.bays.size}`.toString()]), i7Data.kurzname, 'Laengskupplung');
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
                     bay.number = i7Data.feldnummer + '';
                     bay.locationID = i7Data.ips_folder_id;
@@ -2152,13 +2127,12 @@ class ConverterI7 {
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
                         integral_prefix_1.MITTIGER_PUNKT +
                         utils_2.ueberpruefeZeichenkette(i7Data.stkabname);
-                    let name = integral_prefix_1.LEITUNG_PRAEFIX +
-                        utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
+                    let name = utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
                         '-' +
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
                         '-' +
                         utils_2.ueberpruefeZeichenkette(i7Data.stkabname);
-                    const line = new AMPRIONLine_1.AMPRIONLine(utils_1.getUUID(i7Data.guid), name, i7Data.stkabname, i7Schluessel);
+                    const line = new AMPRIONLine_1.AMPRIONLine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([name, "_L", `_${cimModel.lines.size}`.toString()]), i7Data.stkabname, i7Schluessel);
                     line.ukz = i7Data.ukz;
                     let acLineSegments = [];
                     for (const stk of stromkreisabschnitte) {
@@ -2168,7 +2142,7 @@ class ConverterI7 {
                             utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
                             '-' +
                             utils_2.ueberpruefeZeichenkette(stk.bezeichner);
-                        const acLineSegment = new ACLineSegment_1.ACLineSegment(utils_1.generateUUID(), name, i7Data.stkabname, i7Schluessel);
+                        const acLineSegment = new ACLineSegment_1.ACLineSegment(utils_1.generateUUID(), util_create_1.createNotation([name, "_ACLS", `_${cimModel.acLineSegments.size}`.toString(), `_${acLineSegments.length}`.toString()]), i7Data.stkabname, i7Schluessel);
                         acLineSegment.equipmentContainer = line;
                         line.addEquipment(acLineSegment);
                         acLineSegments.push(acLineSegment);
@@ -2179,7 +2153,6 @@ class ConverterI7 {
                     const startTerminal = this.createBoundaryConnection(frame, acLineSegmentStart, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC, tmp_sequence_number);
                     let equivalentInjection = undefined;
                     if (startTerminal) {
-                        this.setACLineSegmentCurrentLimt(cimModel, acLineSegmentStart, acLineSegmentStart.description, startTerminal);
                         tmp_sequence_number++;
                         let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.aknoten));
                         let tmp_cn = bdf === null || bdf === void 0 ? void 0 : bdf.cimModel.getConnectivityNode(startTerminal.getConnectivityNodeUUID());
@@ -2198,13 +2171,13 @@ class ConverterI7 {
                         this.logger.debug(`Leitung ${i7Data.id} ${acLineSegmentStart.mrid} besitzt keinen Anfangsknoten. ${i7Data.aknoten} ${this.integralID2UUID.get(i7Data.aknoten)}`);
                     }
                     cimModel.addACLineSegment(acLineSegmentStart);
+                    this.setACLineSegmentProperties(cimModel, acLineSegments[0], stromkreisabschnitte[0], defaultValuesConfig);
                     const anzahl = acLineSegments.length;
                     let tmp_terminal = undefined;
                     for (let i = 0; i < anzahl - 1; i++) {
-                        const cn = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), 'CN_Lt');
+                        const cn = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([name, "_CN", `_${cimModel.connectivityNodes.size}`.toString()]));
                         const acLineSegment1 = acLineSegments[i];
                         tmp_terminal = this.createConnection(cimModel, acLineSegment1, cn, PhaseCode_1.PhaseCode.ABC, true, tmp_sequence_number);
-                        this.setACLineSegmentCurrentLimt(cimModel, acLineSegment1, acLineSegment1.description, tmp_terminal);
                         cimModel.addACLineSegment(acLineSegment1);
                         if (tmp_terminal) {
                             tmp_sequence_number++;
@@ -2213,7 +2186,6 @@ class ConverterI7 {
                         this.setACLineSegmentProperties(cimModel, acLineSegments[i], stromkreisabschnitte[i], defaultValuesConfig);
                         const acLineSegment2 = acLineSegments[i + 1];
                         tmp_terminal = this.createConnection(cimModel, acLineSegment2, cn, PhaseCode_1.PhaseCode.ABC, true, tmp_sequence_number);
-                        this.setACLineSegmentCurrentLimt(cimModel, acLineSegment2, acLineSegment2.description, tmp_terminal);
                         cimModel.addACLineSegment(acLineSegment1);
                         if (tmp_terminal) {
                             tmp_sequence_number++;
@@ -2225,7 +2197,6 @@ class ConverterI7 {
                     const acLineSegmentZiel = acLineSegments[anzahl - 1];
                     const targetTerminal = this.createBoundaryConnection(frame, acLineSegmentZiel, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC, tmp_sequence_number);
                     if (targetTerminal) {
-                        this.setACLineSegmentCurrentLimt(cimModel, acLineSegmentZiel, acLineSegmentZiel.description, targetTerminal);
                         let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.eknoten));
                         let tmp_cn = bdf === null || bdf === void 0 ? void 0 : bdf.cimModel.getConnectivityNode(targetTerminal.getConnectivityNodeUUID());
                         if (tmp_cn && 'boundaryPoint' in tmp_cn && tmp_cn.boundaryPoint) {
@@ -2294,7 +2265,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR) && integral7.lKondensatorAnschlussKnotenIDs) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKONDENSATOR, integral7.lKondensatorAnschlussKnotenIDs));
                 for (const i7Data of result) {
-                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.id + '', i7Data.bezeichner);
+                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SC", `_${cimModel.seriesCompensators.size}`.toString()]), i7Data.id + '', i7Data.bezeichner);
                     const start = cimModel.getObject(this.integralID2UUID.get(i7Data.aknoten));
                     let startTerminal;
                     if (start) {
@@ -2357,10 +2328,10 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_LEITUNG) && integral7.hgueAnschlussKnotenIDs.length) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_LEITUNG, integral7.hgueAnschlussKnotenIDs));
                 for (const i7Data of result) {
-                    const dcLine = new DCLine_1.DCLine(utils_1.getUUID(i7Data['guid_dcline']), i7Data.bezeichner);
+                    const dcLine = new DCLine_1.DCLine(utils_1.getUUID(i7Data['guid_dcline']), util_create_1.createNotation([utils_2.getName(i7Data), "_DCL", `_${cimModel.dcLines.size}`.toString()]));
                     const i7Schluessel = integral_prefix_1.HGUELEITUNG_PRAEFIX +
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                    const dcLineSegment = new DCLineSegment_1.DCLineSegment(utils_1.generateUUID(), i7Data.bezeichner, i7Data.id.toString(), i7Schluessel);
+                    const dcLineSegment = new DCLineSegment_1.DCLineSegment(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCLS", `_${cimModel.dcLineSegment.size}`.toString()]), i7Data.id.toString(), i7Schluessel);
                     dcLineSegment.resistance = i7Data.rdc;
                     dcLineSegment.equipmentContainer = dcLine;
                     const bipol = utils_2.convertToBooleanI7(i7Data.bipol);
@@ -2386,7 +2357,7 @@ class ConverterI7 {
                     }
                     const startDCNode = getDCNodeFromConverter(acDCConverterStart);
                     if (startDCNode) {
-                        const dcTerminal = new DCTerminal_1.DCTerminal(utils_1.generateUUID(), 'DCTerminal_HGÜ_Leitung');
+                        const dcTerminal = new DCTerminal_1.DCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCT", `_${cimModel.dcTerminals.size}`.toString()]));
                         dcTerminal.connected = true;
                         dcTerminal.sequenceNumber = 1;
                         dcTerminal.dCConductingEquipment = dcLineSegment;
@@ -2399,7 +2370,7 @@ class ConverterI7 {
                     }
                     const targetDCNode = getDCNodeFromConverter(acDCConverterTarget);
                     if (targetDCNode) {
-                        const dcTerminal = new DCTerminal_1.DCTerminal(utils_1.generateUUID(), 'DCTerminal_HGÜ_Leitung');
+                        const dcTerminal = new DCTerminal_1.DCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCT", `_${cimModel.dcTerminals.size}`.toString()]));
                         dcTerminal.connected = true;
                         dcTerminal.sequenceNumber = 2;
                         dcTerminal.dCConductingEquipment = dcLineSegment;
@@ -2504,7 +2475,7 @@ class ConverterI7 {
                     }
                 }
                 for (const i7Data of result) {
-                    const powerTransformer = new PowerTransformer_1.PowerTransformer(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.id + '', i7Data.bezeichner);
+                    const powerTransformer = new PowerTransformer_1.PowerTransformer(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_PT", `_${cimModel.powerTransformer.size}`.toString()]), i7Data.id + '', i7Data.bezeichner);
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     if (substation) {
                         powerTransformer.equipmentContainer = substation;
@@ -2575,7 +2546,7 @@ class ConverterI7 {
                     powerTransformerEnd1.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd1.endNumber);
                     powerTransformerEnd2.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd2.endNumber, powerTransformerEnd2.grounded);
                     powerTransformerEnd2.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd2.endNumber);
-                    powerTransformer.sortTransformerEnd('ratedU', 'desc');
+                    this.sortTransformerEnd(powerTransformer, 'ratedU', 'desc');
                     const powerTransformerEnds = [powerTransformerEnd1, powerTransformerEnd2];
                     const terminals = [startTerminal, zielTerminal];
                     const spRegKnoten = yield this.getSpannungsbandTrafo2W(i7Data);
@@ -2604,9 +2575,6 @@ class ConverterI7 {
                             }
                         }
                     }
-                    for (let i = 1; i <= powerTransformer.powerTransformerEnds.length; i++) {
-                        powerTransformer.powerTransformerEnds[i - 1].endNumber = i;
-                    }
                     cimModel.addPowerTransformerEnd(powerTransformerEnd1);
                     cimModel.addPowerTransformerEnd(powerTransformerEnd2);
                     cimModel.addPowerTransformer(powerTransformer);
@@ -2648,7 +2616,7 @@ class ConverterI7 {
                     }
                 }
                 for (const i7Data of result) {
-                    const powerTransformer = new PowerTransformer_1.PowerTransformer(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.id + '', i7Data.bezeichner);
+                    const powerTransformer = new PowerTransformer_1.PowerTransformer(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_PT", `_${cimModel.powerTransformer.size}`.toString()]), i7Data.id + '', i7Data.bezeichner);
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     if (substation) {
                         powerTransformer.equipmentContainer = substation;
@@ -2722,7 +2690,7 @@ class ConverterI7 {
                     powerTransformerEnd2.ratedS = sr2;
                     powerTransformerEnd2.ratedU = ur2;
                     powerTransformerEnd2.powerTransformer = powerTransformer;
-                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd2, powerTransformer, terminal2, sternpunktKnotenMap, integral7, ir1, i7Data, defaultValuesConfig);
+                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd2, powerTransformer, terminal2, sternpunktKnotenMap, integral7, ir2, i7Data, defaultValuesConfig);
                     equivalentInjection = undefined;
                     if (terminal2) {
                         let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(wicklung2.aknoten));
@@ -2748,7 +2716,7 @@ class ConverterI7 {
                     powerTransformerEnd3.ratedS = sr3;
                     powerTransformerEnd3.ratedU = ur3;
                     powerTransformerEnd3.powerTransformer = powerTransformer;
-                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd3, powerTransformer, terminal3, sternpunktKnotenMap, integral7, ir1, i7Data, defaultValuesConfig);
+                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd3, powerTransformer, terminal3, sternpunktKnotenMap, integral7, ir3, i7Data, defaultValuesConfig);
                     equivalentInjection = undefined;
                     if (terminal3) {
                         let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(wicklung3.aknoten));
@@ -2761,38 +2729,7 @@ class ConverterI7 {
                     }
                     powerTransformerEnd3.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd3.endNumber, powerTransformerEnd3.grounded);
                     powerTransformerEnd3.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd3.endNumber);
-                    powerTransformer.sortTransformerEnd('ratedU', 'desc');
-                    const terminals = [terminal1, terminal2, terminal3];
-                    const powerTransformerEnds = [powerTransformerEnd1, powerTransformerEnd2, powerTransformerEnd3];
-                    const spRegKnoten = yield this.getSpannungsbandTrafo2W(i7Data);
-                    const spannungsband = integral7.targetVoltages.get(spRegKnoten.id);
-                    const cnUUID = this.integralID2UUID.get(spRegKnoten.id);
-                    const connectivityNode = cimModel.getObject(cnUUID);
-                    for (const powerTransformerEnd of powerTransformerEnds) {
-                        const winkel = utils_2.convertToNumberI7(i7Data[`uzus_winkel_s${powerTransformerEnd.endNumber}`]);
-                        switch (i7Data.trafo_spezial) {
-                            case (1): {
-                                this.createPhaseTapChanger(i7Data, powerTransformerEnd, cimModel, powerTransformerEnd.ratedU, connectivityNode, spannungsband);
-                                break;
-                            }
-                            case (2): {
-                                this.createPhaseTapChanger(i7Data, powerTransformerEnd, cimModel, powerTransformerEnd.ratedU, connectivityNode, spannungsband);
-                                break;
-                            }
-                            default: {
-                                if (winkel !== 0) {
-                                    this.createPhaseTapChanger(i7Data, powerTransformerEnd, cimModel, powerTransformerEnd.ratedU, connectivityNode, spannungsband);
-                                }
-                                else {
-                                    this.createPhaseTapChanger(i7Data, powerTransformerEnd, cimModel, powerTransformerEnd.ratedU, connectivityNode, spannungsband);
-                                }
-                                break;
-                            }
-                        }
-                    }
-                    for (let i = 1; i <= powerTransformer.powerTransformerEnds.length; i++) {
-                        powerTransformer.powerTransformerEnds[i - 1].endNumber = i;
-                    }
+                    this.sortTransformerEnd(powerTransformer, 'ratedU', 'desc');
                     cimModel.addPowerTransformer(powerTransformer);
                     cimModel.addPowerTransformerEnd(powerTransformerEnd1);
                     cimModel.addPowerTransformerEnd(powerTransformerEnd2);
@@ -2823,12 +2760,18 @@ class ConverterI7 {
         wicklung.uMax = data[umax];
         wicklung.uMin = data[umin];
     }
-    transformBoundaryModel(frame, masFrame) {
+    transformBoundaryModel(frame, masFrames) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const bdModelUUID = frame.getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD);
+            const relevantMasFrames = masFrames.filter(elem => {
+                const modelUUIDs = elem.dependentModels.get(rdf_xml_1.RDF_XML.PROFILE_EQ_BD);
+                if ((modelUUIDs === null || modelUUIDs === void 0 ? void 0 : modelUUIDs.indexOf(bdModelUUID)) > -1)
+                    return elem;
+            });
             const cimModel = frame.cimModel;
             const substations = Array.from(cimModel.substations.values());
             for (const substation of substations) {
-                const line = new Line_1.Line(substation.mrid, substation.name, substation.shortName, substation.description);
+                const line = new Line_1.Line(substation.mrid, substation.name + "_BD-L", substation.shortName, substation.description);
                 const subregion = substation.subGeographicalRegion;
                 line.subGeographicalRegion = subregion;
                 subregion.addLine(line);
@@ -2867,65 +2810,80 @@ class ConverterI7 {
                     equipment.equipmentContainer = undefined;
                     cimModel.removeObject(equipment);
                 }
+                const location = substation.location;
                 let cnt = 1;
                 for (const connectivityNode of connectivityNodes) {
                     connectivityNode.connectivityNodeContainer = line;
                     line.addConnectivityNode(connectivityNode);
-                    const junction = new Junction_1.Junction(utils_1.generateUUID(), `${line.name} BD_Junc`, `Junction`, 'Junction for Geo');
+                    const junction = new Junction_1.Junction(utils_1.generateUUID(), `${line.name}_BD-J`, `Junction`, 'Junction for Geo');
                     junction.equipmentContainer = line;
-                    const terminal = new Terminal_1.Terminal(utils_1.generateUUID(), 'boundary_junction_label', 'bd_jct_lab', 'terminal to connect junction to associated boundary ConnectivityNode', 1);
-                    terminal.conductingEquipment = junction;
-                    terminal.connectivityNode = connectivityNode;
+                    const terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([`${line.name}_BD-T`, `_${cimModel.terminals.size}`.toString()]), 'bd_jct_lab', 'terminal to connect junction to associated boundary ConnectivityNode', 1);
                     junction.terminals.set(terminal.getUUID(), terminal);
+                    terminal.conductingEquipment = junction;
                     line.addEquipment(junction);
-                    const location = substation.location;
-                    if (location) {
-                        const clonedLocation = new Location_1.Location(utils_1.generateUUID(), `Location ${cnt}`);
-                        clonedLocation.addPowerSystemResource(junction);
-                        clonedLocation.coordinateSystem = location.coordinateSystem;
-                        const clonedPositionPoint = new PositionPoint_1.PositionPoint(utils_1.generateUUID(), `PositionPoint ${cnt}`);
-                        clonedPositionPoint.xPosition = location.positionPoints[0].xPosition;
-                        clonedPositionPoint.yPosition = location.positionPoints[0].yPosition;
-                        clonedPositionPoint.location = clonedLocation;
-                        clonedLocation.addPositionPoint(clonedPositionPoint);
-                        masFrame.cimModel.addLocation(clonedLocation);
-                    }
-                    if (location && location.powerSystemResources.size && location.powerSystemResources.get(substation.mrid) !== undefined) {
-                        location.addPowerSystemResource(junction);
-                        junction.location = location;
-                        masFrame.addDependentModel(rdf_xml_1.RDF_XML.PROFILE_EQ_BD, frame.getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD));
-                        location.powerSystemResources.delete(substation.mrid);
-                        substation.location = undefined;
-                        cimModel.locations.delete(location.mrid);
-                        cimModel.removeObject(location);
-                        for (const positionPoint of location.positionPoints) {
-                            const idx = frame.cimModel.positionPoints.indexOf(positionPoint);
-                            if (idx > -1) {
-                                frame.cimModel.positionPoints.splice(idx, 1);
-                            }
+                    if (location && location.positionPoints.length > 0) {
+                        for (const masFrame of relevantMasFrames) {
+                            const clonedLocation = new Location_1.Location(utils_1.generateUUID(), `Location ${cnt}`);
+                            clonedLocation.addPowerSystemResource(junction);
+                            clonedLocation.coordinateSystem = location.coordinateSystem;
+                            const clonedPositionPoint = new PositionPoint_1.PositionPoint(utils_1.generateUUID(), `PositionPoint ${cnt}`);
+                            clonedPositionPoint.xPosition = location.positionPoints[0].xPosition;
+                            clonedPositionPoint.yPosition = location.positionPoints[0].yPosition;
+                            clonedPositionPoint.location = clonedLocation;
+                            clonedLocation.addPositionPoint(clonedPositionPoint);
+                            masFrame.cimModel.addLocation(clonedLocation);
+                            masFrame.addDependentModel(rdf_xml_1.RDF_XML.PROFILE_GL, frame.getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD));
                         }
-                        masFrame.cimModel.addLocation(location);
-                    }
-                    else if (location) {
-                        const additionalLocation = new Location_1.Location(utils_1.generateUUID(), `Location ${cnt}`);
-                        additionalLocation.addPowerSystemResource(junction);
-                        additionalLocation.coordinateSystem = location.coordinateSystem;
-                        const additionalPositionPoint = new PositionPoint_1.PositionPoint(utils_1.generateUUID(), `PositionPoint ${cnt}`);
-                        additionalPositionPoint.xPosition = location.positionPoints[0].xPosition;
-                        additionalPositionPoint.yPosition = location.positionPoints[0].yPosition;
-                        additionalPositionPoint.location = additionalLocation;
-                        additionalLocation.addPositionPoint(additionalPositionPoint);
-                        masFrame.cimModel.addLocation(additionalLocation);
                     }
+                    cimModel.addTerminal(terminal);
                     cimModel.addJunction(junction);
                     cnt++;
                 }
+                if (location && location.powerSystemResources.size && location.powerSystemResources.get(substation.mrid) !== undefined) {
+                    location.powerSystemResources.delete(substation.mrid);
+                    substation.location = undefined;
+                    cimModel.locations.delete(location.mrid);
+                    cimModel.removeObject(location);
+                    for (const positionPoint of location.positionPoints) {
+                        const idx = frame.cimModel.positionPoints.indexOf(positionPoint);
+                        if (idx > -1) {
+                            frame.cimModel.positionPoints.splice(idx, 1);
+                        }
+                    }
+                }
                 cimModel.substations.delete(substation.mrid);
                 cimModel.removeObject(substation);
                 cimModel.addLine(line);
             }
         });
     }
+    sortTransformerEnd(powerTransformer, sortProperty, order) {
+        let winding_guids = new Array(powerTransformer.powerTransformerEnds.length);
+        let winding_guids_fixed = new Array(powerTransformer.powerTransformerEnds.length);
+        for (let i = 0; i < powerTransformer.powerTransformerEnds.length; i++) {
+            winding_guids[i] = powerTransformer.powerTransformerEnds[i].getUUID();
+            winding_guids_fixed[i] = powerTransformer.powerTransformerEnds[i].getUUID();
+        }
+        powerTransformer.powerTransformerEnds.sort(function (w1, w2) {
+            if (order === 'asc')
+                return w1[sortProperty] - w2[sortProperty];
+            if (order === 'desc')
+                return w2[sortProperty] - w1[sortProperty];
+        });
+        const winding1_guid = winding_guids[0];
+        const winding2 = powerTransformer.powerTransformerEnds[0];
+        if (!(winding1_guid === winding2.getUUID())) {
+            const winding1 = powerTransformer.powerTransformerEnds.find(e => e.mrid === winding1_guid[0]);
+            if (winding1) {
+                let val = winding2.phaseAngleClock;
+                winding2.phaseAngleClock = 0;
+                winding1.phaseAngleClock = 12 - val;
+            }
+            else {
+                const isNull = true;
+            }
+        }
+    }
     setACLineSegmentProperties(cimModel, acLineSegment, data, defaultValuesConfig) {
         if (utils_2.isNumericI7(data.laenge) && data.laenge <= 0) {
             data.flag_impedanzlos = 1;
@@ -3000,12 +2958,12 @@ class ConverterI7 {
         else {
             acLineSegment.bch = 0;
         }
-        for (const terminalUUID of acLineSegment.terminalsUUIDs) {
+        for (const terminal of acLineSegment.terminals.values()) {
             if (utils_2.isNumericI7(data.ir) && data.ir > 0) {
-                this.setConductingEquipmentCurrentLimit(cimModel, acLineSegment.name, cimModel.terminals.get(terminalUUID), data.ir);
+                this.setConductingEquipmentCurrentLimit(cimModel, acLineSegment.name, terminal, data.ir);
             }
             else if (assetType && assetType.ratedCurrent && assetType.ratedCurrent !== 0) {
-                this.setConductingEquipmentCurrentLimit(cimModel, acLineSegment.name, cimModel.terminals.get(terminalUUID), assetType.ratedCurrent);
+                this.setConductingEquipmentCurrentLimit(cimModel, acLineSegment.name, terminal, assetType.ratedCurrent);
             }
             const psrType = utils_1.createIfNotExitsPSRType(cimModel, data.typ);
             acLineSegment.psrTypeUUID = psrType.mrid;
@@ -3057,7 +3015,7 @@ class ConverterI7 {
         let terminal;
         if (object instanceof ConnectivityNode_1.ConnectivityNode) {
             const cn = object;
-            terminal = new Terminal_1.Terminal(utils_1.generateUUID(), 'T');
+            terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation(['Terminal_T', `_${cimModel.terminals.size}`.toString()]));
             terminal.setConnectivityNode(cn);
             cn.addTerminal(terminal);
             cimModel.addTerminal(terminal);
@@ -3085,11 +3043,12 @@ class ConverterI7 {
             const frameBD = this.getConnectedBoundaryModel(anschlussUUID);
             if (frameBD) {
                 const cimModelBD = frameBD.cimModel;
+                frame.addDependentModel(rdf_xml_1.RDF_XML.PROFILE_EQ, frameBD.getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD));
                 const object = cimModelBD.getObject(anschlussUUID);
                 let cn;
                 if (object instanceof ConnectivityNode_1.ConnectivityNode) {
                     cn = object;
-                    terminal = new Terminal_1.Terminal(utils_1.generateUUID(), 'T');
+                    terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation(['Terminal_T', `_${cimModel.terminals.size}`.toString()]));
                     terminal.connectivityNodeUUID = cn.mrid;
                     terminal.phases = phase;
                     terminal.connected = true;
@@ -3098,10 +3057,15 @@ class ConverterI7 {
                 }
                 else if (object instanceof Terminal_1.Terminal) {
                     terminal = object;
-                    cn = terminal.connectivityNode;
-                    cn === null || cn === void 0 ? void 0 : cn.terminals.delete(terminal.mrid);
-                    terminal.setConnectivityNode(undefined);
-                    terminal.setConnectivityNodeUUID(cn.getUUID());
+                    cn = terminal.getConnectivityNode();
+                    if (cn === undefined) {
+                        frameBD.cimModel.getConnectivityNode(terminal.getConnectivityNodeUUID());
+                    }
+                    if (cn !== undefined) {
+                        cn.terminals.delete(terminal.mrid);
+                        terminal.setConnectivityNodeUUID(cn.getUUID());
+                        terminal.setConnectivityNode(undefined);
+                    }
                     cimModelBD.terminals.delete(terminal.mrid);
                     cimModel.addTerminal(terminal);
                 }
@@ -3135,17 +3099,17 @@ class ConverterI7 {
         let equivalentInjection = undefined;
         frame.cimModel.equivalentInjections.forEach((equivinj, uuid) => {
             var _a;
-            if (equivinj.name.match(frame.tsoName).length > 0 && ((_a = equivinj.terminals.values()) === null || _a === void 0 ? void 0 : _a.next().value.getConnectivityNodeUUID()) === cn.getUUID()) {
+            if (equivinj.name.match(frame.tsoName) && equivinj.name.match(frame.tsoName).length > 0 && ((_a = equivinj.terminals.values()) === null || _a === void 0 ? void 0 : _a.next().value.getConnectivityNodeUUID()) === cn.getUUID()) {
                 equivinj_exists = true;
             }
         });
         if (!equivinj_exists) {
-            let tmp_terminal = new Terminal_1.Terminal(utils_1.generateUUID(), 'T');
+            let tmp_terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation(['Terminal_BD-T', `_${frame.cimModel.equivalentInjections.size}`.toString()]));
             tmp_terminal.setConnectivityNodeUUID(cn.mrid);
             tmp_terminal.phases = PhaseCode_1.PhaseCode.ABC;
             tmp_terminal.connected = true;
             tmp_terminal.sequenceNumber = 1;
-            equivalentInjection = new EquivalentInjection_1.EquivalentInjection(utils_1.generateUUID(), `BDInj_${frame.tsoName}`);
+            equivalentInjection = new EquivalentInjection_1.EquivalentInjection(utils_1.generateUUID(), util_create_1.createNotation([cn.name, '', '_BD-EI', `_${frame.cimModel.equivalentInjections.size}`.toString()]));
             equivalentInjection.p = 0;
             equivalentInjection.q = 0;
             equivalentInjection.regulationStatus = false;
@@ -3306,13 +3270,14 @@ class ConverterI7 {
                 this.addDefaultObjectsLoadModel(frame.cimModel, defaultValuesConfig);
                 this.addDefaultObjectsGeo(frame.cimModel, defaultValuesConfig);
                 frame.initProfileXmlSerializers([rdf_xml_1.RDF_XML.PROFILE_GL, rdf_xml_1.RDF_XML.PROFILE_EQ_BD], tempDirPath);
+                frame.addDependentModel(rdf_xml_1.RDF_XML.PROFILE_GL, frame.getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD));
             }
             this.exportFramesBoundary = this.associateGeoRegionsToExportFrames(boundaryFrames);
             const gridFrames = this.initExportFrames(gridExports, geoRegions, allSubGeoRegions);
             for (const frame of gridFrames) {
                 this.addDefaultObjectsLoadModel(frame.cimModel, defaultValuesConfig);
                 this.addDefaultObjectsGeo(frame.cimModel, defaultValuesConfig);
-                frame.initProfileXmlSerializers([rdf_xml_1.RDF_XML.PROFILE_EQ, rdf_xml_1.RDF_XML.PROFILE_SSH, rdf_xml_1.RDF_XML.PROFILE_GL, rdf_xml_1.RDF_XML.PROFILE_AMPI7, rdf_xml_1.RDF_XML.PROFILE_DY], tempDirPath);
+                frame.initProfileXmlSerializers([rdf_xml_1.RDF_XML.PROFILE_EQ, rdf_xml_1.RDF_XML.PROFILE_SSH, rdf_xml_1.RDF_XML.PROFILE_GL, rdf_xml_1.RDF_XML.PROFILE_AMPI7, rdf_xml_1.RDF_XML.PROFILE_DY, rdf_xml_1.RDF_XML.PROFILE_SV], tempDirPath);
             }
             this.exportFrames = this.associateGeoRegionsToExportFrames(gridFrames);
         });
@@ -3327,7 +3292,7 @@ class ConverterI7 {
             for (const exportObject of exportEntry.objects) {
                 switch (exportEntry.objectType) {
                     case data_structures_i7_1.ExportObjectType.georegion: {
-                        const geoRegion = geoRegions.find(elem => elem.name === exportObject.name);
+                        const geoRegion = geoRegions.find(elem => elem.name.match(exportObject.name));
                         if (!geoRegion) {
                             this.logger.error(`Kein ${exportEntry.objectType} mit dem Namen ${exportObject.name} gefunden.`);
                             continue;
@@ -3339,7 +3304,7 @@ class ConverterI7 {
                         break;
                     }
                     case data_structures_i7_1.ExportObjectType.subgeoregion: {
-                        const subGeoRegion = subGeoRegions.find(elem => elem.name === exportObject.name);
+                        const subGeoRegion = subGeoRegions.find(elem => elem.name.match(exportObject.name));
                         if (!subGeoRegion) {
                             this.logger.error(`Kein ${exportEntry.objectType} mit dem Namen ${exportObject.name} gefunden.`);
                             continue;