From 88fd1741e735b190e75b1d1891d8dcab93882bbe Mon Sep 17 00:00:00 2001
From: Etienne LESOT <etienne.lesot@rte-france.com>
Date: Tue, 22 Jul 2025 16:49:40 +0200
Subject: [PATCH 1/6] rename twt columns

Signed-off-by: Etienne LESOT <etienne.lesot@rte-france.com>
---
 ...WindingsTransformerModificationEntity.java | 168 +++++------
 .../changesets/changelog_20250722T140307Z.xml | 268 ++++++++++++++++++
 .../db/changelog/db.changelog-master.yaml     |   3 +
 3 files changed, 355 insertions(+), 84 deletions(-)
 create mode 100644 src/main/resources/db/changelog/changesets/changelog_20250722T140307Z.xml

diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java
index 8d206265c..82d41e7ef 100644
--- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java
+++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java
@@ -41,7 +41,7 @@ public class TwoWindingsTransformerModificationEntity extends BranchModification
     @Embedded
     @AttributeOverrides(value = {
         @AttributeOverride(name = "value", column = @Column(name = "g")),
-        @AttributeOverride(name = "opType", column = @Column(name = "gOp"))
+        @AttributeOverride(name = "opType", column = @Column(name = "g_op"))
     })
     private DoubleModificationEmbedded g;
 
@@ -49,127 +49,127 @@ public class TwoWindingsTransformerModificationEntity extends BranchModification
     @Embedded
     @AttributeOverrides(value = {
         @AttributeOverride(name = "value", column = @Column(name = "b")),
-        @AttributeOverride(name = "opType", column = @Column(name = "bOp"))
+        @AttributeOverride(name = "opType", column = @Column(name = "b_op"))
     })
     private DoubleModificationEmbedded b;
 
-    @Column(name = "ratedU1")
+    @Column(name = "rated_u1")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "ratedU1")),
-        @AttributeOverride(name = "opType", column = @Column(name = "ratedU1_op"))
+        @AttributeOverride(name = "value", column = @Column(name = "rated_u1")),
+        @AttributeOverride(name = "opType", column = @Column(name = "rated_u1_op"))
     })
     private DoubleModificationEmbedded ratedU1;
 
-    @Column(name = "ratedU2")
+    @Column(name = "rated_u2")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "ratedU2")),
-        @AttributeOverride(name = "opType", column = @Column(name = "ratedU2_op"))
+        @AttributeOverride(name = "value", column = @Column(name = "rated_u2")),
+        @AttributeOverride(name = "opType", column = @Column(name = "rated_u2_op"))
     })
     private DoubleModificationEmbedded ratedU2;
 
-    @Column(name = "rateds")
+    @Column(name = "rated_s")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "rateds")),
-        @AttributeOverride(name = "opType", column = @Column(name = "ratedsOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "rated_s")),
+        @AttributeOverride(name = "opType", column = @Column(name = "rateds_op"))
     })
     private DoubleModificationEmbedded ratedS;
 
-    @Column(name = "ratioTapChangerEnabled")
+    @Column(name = "ratio_tap_changer_enabled")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "ratioTapChangerEnabled")),
-        @AttributeOverride(name = "opType", column = @Column(name = "ratioTapChangerEnabledOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "ratio_tap_changer_enabled")),
+        @AttributeOverride(name = "opType", column = @Column(name = "ratio_tap_changer_enabled_op"))
     })
     private BooleanModificationEmbedded ratioTapChangerEnabled;
 
-    @Column(name = "ratiotapchangerregulationtype")
+    @Column(name = "ratio_tap_changer_regulation_type")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "ratiotapchangerregulationtype")),
-        @AttributeOverride(name = "opType", column = @Column(name = "ratiotapchangerregulationtypeOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "ratio_tap_changer_regulation_type")),
+        @AttributeOverride(name = "opType", column = @Column(name = "ratio_tap_changer_regulation_type_op"))
     })
     private EnumModificationEmbedded<VoltageRegulationType> ratioTapChangerRegulationType;
 
-    @Column(name = "ratiotapchangerregulationside")
+    @Column(name = "ratio_tap_changer_regulation_side")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "ratiotapchangerregulationside")),
-        @AttributeOverride(name = "opType", column = @Column(name = "ratiotapchangerregulationsideOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "ratio_tap_changer_regulation_side")),
+        @AttributeOverride(name = "opType", column = @Column(name = "ratio_tap_changer_regulation_side_Op"))
     })
     private EnumModificationEmbedded<RegulationSide> ratioTapChangerRegulationSide;
 
-    @Column(name = "ratiotapchangerlowtapposition")
+    @Column(name = "ratio_tap_changer_low_tap_position")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "ratiotapchangerlowtapposition")),
-        @AttributeOverride(name = "opType", column = @Column(name = "ratiotapchangerlowtappositionOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "ratio_tap_changer_low_tap_position")),
+        @AttributeOverride(name = "opType", column = @Column(name = "ratio_tap_changer_low_tap_position_op"))
     })
     private IntegerModificationEmbedded ratioTapChangerLowTapPosition;
 
-    @Column(name = "ratiotapchangertapposition")
+    @Column(name = "ratio_tap_changer_tap_position")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "ratiotapchangertapposition")),
-        @AttributeOverride(name = "opType", column = @Column(name = "ratiotapchangertappositionOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "ratio_tap_changer_tap_position")),
+        @AttributeOverride(name = "opType", column = @Column(name = "ratio_tap_changer_tap_position_op"))
     })
     private IntegerModificationEmbedded ratioTapChangerTapPosition;
 
-    @Column(name = "ratiotapchangerregulating")
+    @Column(name = "ratio_tap_changer_regulating")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "ratiotapchangerregulating")),
-        @AttributeOverride(name = "opType", column = @Column(name = "ratiotapchangerregulatingOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "ratio_tap_changer_regulating")),
+        @AttributeOverride(name = "opType", column = @Column(name = "ratio_tap_changer_regulating_op"))
     })
     private BooleanModificationEmbedded ratioTapChangerRegulating;
 
-    @Column(name = "ratiotapchangertargetdeadband")
+    @Column(name = "ratio_tap_changer_target_deadband")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "ratiotapchangertargetdeadband")),
-        @AttributeOverride(name = "opType", column = @Column(name = "ratiotapchangertargetdeadbandOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "ratio_tap_changer_target_deadband")),
+        @AttributeOverride(name = "opType", column = @Column(name = "ratio_tap_changer_target_deadband_op"))
     })
     private DoubleModificationEmbedded ratioTapChangerTargetDeadband;
 
-    @Column(name = "ratiotapchangerterminalrefconnectableid")
+    @Column(name = "ratio_tap_changer_terminal_ref_connectable_id")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "ratiotapchangerterminalrefconnectableid")),
-        @AttributeOverride(name = "opType", column = @Column(name = "ratiotapchangerterminalrefconnectableidOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "ratio_tap_changer_terminal_ref_connectable_id")),
+        @AttributeOverride(name = "opType", column = @Column(name = "ratio_tap_changer_terminal_ref_connectable_id_op"))
     })
     private StringModificationEmbedded ratioTapChangerTerminalRefConnectableId;
 
-    @Column(name = "ratiotapchangerterminalrefvoltagelevelid")
+    @Column(name = "ratio_tap_changer_terminal_ref_voltagelevel_id")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "ratiotapchangerterminalrefvoltagelevelid")),
-        @AttributeOverride(name = "opType", column = @Column(name = "ratiotapchangerterminalrefvoltagelevelidOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "ratio_tap_changer_terminal_ref_voltagelevel_id")),
+        @AttributeOverride(name = "opType", column = @Column(name = "ratio_tap_changer_terminal_ref_voltagelevel_id_op"))
     })
     private StringModificationEmbedded ratioTapChangerTerminalRefVoltageLevelId;
 
-    @Column(name = "ratiotapchangerterminalreftype")
+    @Column(name = "ratio_tap_changer_terminal_ref_type")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "ratiotapchangerterminalreftype")),
-        @AttributeOverride(name = "opType", column = @Column(name = "ratiotapchangerterminalreftypeOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "ratio_tap_changer_terminal_ref_type")),
+        @AttributeOverride(name = "opType", column = @Column(name = "ratio_tap_changer_terminal_ref_type_op"))
     })
     private StringModificationEmbedded ratioTapChangerTerminalRefType;
 
-    @Column(name = "ratiotapchangerloadtapchangingcapabilities")
+    @Column(name = "ratio_tap_changer_load_tap_changing_capabilities")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "ratiotapchangerloadtapchangingcapabilities")),
-        @AttributeOverride(name = "opType", column = @Column(name = "ratiotapchangerloadtapchangingcapabilitiesOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "ratio_tap_changer_load_tap_changing_capabilities")),
+        @AttributeOverride(name = "opType", column = @Column(name = "ratio_tap_changer_load_tap_changing_capabilities_op"))
     })
     private BooleanModificationEmbedded ratioTapChangerLoadTapChangingCapabilities;
 
-    @Column(name = "ratiotapchangertargetv")
+    @Column(name = "ratio_tap_changer_target_v")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "ratiotapchangertargetv")),
-        @AttributeOverride(name = "opType", column = @Column(name = "ratiotapchangertargetvOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "ratio_tap_changer_target_v")),
+        @AttributeOverride(name = "opType", column = @Column(name = "ratio_tap_changer_target_v_op"))
     })
     private DoubleModificationEmbedded ratioTapChangerTargetV;
 
@@ -180,106 +180,106 @@ public class TwoWindingsTransformerModificationEntity extends BranchModification
     )
     private List<TapChangerStepCreationEmbeddable> tapChangerSteps;
 
-    @Column(name = "phasetapchangerenabled")
+    @Column(name = "phase_tap_changer_enabled")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "phasetapchangerenabled")),
-        @AttributeOverride(name = "opType", column = @Column(name = "phasetapchangerenabledOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "phase_tap_changer_enabled")),
+        @AttributeOverride(name = "opType", column = @Column(name = "phase_tap_changer_enabled_op"))
     })
     private BooleanModificationEmbedded phaseTapChangerEnabled;
 
-    @Column(name = "phasetapchangerregulationtype")
+    @Column(name = "phase_tap_changer_regulation_type")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "phasetapchangerregulationtype")),
-        @AttributeOverride(name = "opType", column = @Column(name = "phasetapchangerregulationtypeOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "phase_tap_changer_regulation_type")),
+        @AttributeOverride(name = "opType", column = @Column(name = "phase_tap_changer_regulation_type_op"))
     })
     private EnumModificationEmbedded<VoltageRegulationType> phaseTapChangerRegulationType;
 
-    @Column(name = "phasetapchangerregulationside")
+    @Column(name = "phase_tap_changer_regulation_side")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "phasetapchangerregulationside")),
-        @AttributeOverride(name = "opType", column = @Column(name = "phasetapchangerregulationsideOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "phase_tap_changer_regulation_side")),
+        @AttributeOverride(name = "opType", column = @Column(name = "phase_tap_changer_regulation_side_op"))
     })
     private EnumModificationEmbedded<RegulationSide> phaseTapChangerRegulationSide;
 
-    @Column(name = "phasetapchangerlowtapposition")
+    @Column(name = "phase_tap_changer_low_tap_position")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "phasetapchangerlowtapposition")),
-        @AttributeOverride(name = "opType", column = @Column(name = "phasetapchangerlowtappositionOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "phase_tap_changer_low_tap_position")),
+        @AttributeOverride(name = "opType", column = @Column(name = "phase_tap_changer_low_tap_position_op"))
     })
     private IntegerModificationEmbedded phaseTapChangerLowTapPosition;
 
-    @Column(name = "phasetapchangertapposition")
+    @Column(name = "phase_tap_changer_tap_position")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "phasetapchangertapposition")),
-        @AttributeOverride(name = "opType", column = @Column(name = "phasetapchangertappositionOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "phase_tap_changer_tap_position")),
+        @AttributeOverride(name = "opType", column = @Column(name = "phase_tap_changer_tap_position_op"))
     })
     private IntegerModificationEmbedded phaseTapChangerTapPosition;
 
-    @Column(name = "phasetapchangertargetdeadband")
+    @Column(name = "phase_tap_changer_target_deadband")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "phasetapchangertargetdeadband")),
-        @AttributeOverride(name = "opType", column = @Column(name = "phasetapchangertargetdeadbandOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "phase_tap_changer_target_deadband")),
+        @AttributeOverride(name = "opType", column = @Column(name = "phase_tap_changer_target_deadband_op"))
     })
     private DoubleModificationEmbedded phaseTapChangerTargetDeadband;
 
-    @Column(name = "phasetapchangerterminalrefconnectableid")
+    @Column(name = "phase_tap_changer_terminal_ref_connectable_id")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "phasetapchangerterminalrefconnectableid")),
-        @AttributeOverride(name = "opType", column = @Column(name = "phasetapchangerterminalrefconnectableidOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "phase_tap_changer_terminal_ref_connectable_id")),
+        @AttributeOverride(name = "opType", column = @Column(name = "phase_tap_changer_terminal_ref_connectable_id_op"))
     })
     private StringModificationEmbedded phaseTapChangerTerminalRefConnectableId;
 
-    @Column(name = "phasetapchangerterminalrefvoltagelevelid")
+    @Column(name = "phase_tap_changer_terminal_ref_voltagelevel_id")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "phasetapchangerterminalrefvoltagelevelid")),
-        @AttributeOverride(name = "opType", column = @Column(name = "phasetapchangerterminalrefvoltagelevelidOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "phase_tap_changer_terminal_ref_voltagelevel_id")),
+        @AttributeOverride(name = "opType", column = @Column(name = "phase_tap_changer_terminal_ref_voltagelevel_id_op"))
     })
     private StringModificationEmbedded phaseTapChangerTerminalRefVoltageLevelId;
 
-    @Column(name = "phasetapchangerterminalreftype")
+    @Column(name = "phase_tap_changer_terminal_ref_type")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "phasetapchangerterminalreftype")),
-        @AttributeOverride(name = "opType", column = @Column(name = "phasetapchangerterminalreftypeOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "phase_tap_changer_terminal_ref_type")),
+        @AttributeOverride(name = "opType", column = @Column(name = "phase_tap_changer_terminal_ref_type_op"))
     })
     private StringModificationEmbedded phaseTapChangerTerminalRefType;
 
-    @Column(name = "phasetapchangerregulationmode")
+    @Column(name = "phase_tap_changer_regulation_mode")
     @Enumerated(EnumType.STRING)
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "phasetapchangerregulationmode")),
-        @AttributeOverride(name = "opType", column = @Column(name = "phasetapchangerregulationmodeOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "phase_tap_changer_regulation_mode")),
+        @AttributeOverride(name = "opType", column = @Column(name = "phase_tap_changer_regulation_mode_op"))
     })
     private EnumModificationEmbedded<PhaseTapChanger.RegulationMode> phaseTapChangerRegulationMode;
 
-    @Column(name = "phasetapchangerregulationvalue")
+    @Column(name = "phase_tap_changer_regulation_value")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "phasetapchangerregulationvalue")),
-        @AttributeOverride(name = "opType", column = @Column(name = "phasetapchangerregulationvalueOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "phase_tap_changer_regulation_value")),
+        @AttributeOverride(name = "opType", column = @Column(name = "phase_tap_changer_regulation_value_op"))
     })
     private DoubleModificationEmbedded phaseTapChangerRegulationValue;
 
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "phasetapchangertobeestimated")),
-        @AttributeOverride(name = "opType", column = @Column(name = "phasetapchangertobeestimatedOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "phase_tap_changer_to_be_estimated")),
+        @AttributeOverride(name = "opType", column = @Column(name = "phase_tap_changer_to_be_estimated_op"))
     })
     private BooleanModificationEmbedded phaseTapChangerToBeEstimated;
 
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "ratiotapchangertobeestimated")),
-        @AttributeOverride(name = "opType", column = @Column(name = "ratiotapchangertobeestimatedOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "ratio_tap_changer_to_be_estimated")),
+        @AttributeOverride(name = "opType", column = @Column(name = "ratio_tap_changer_to_be_estimated_op"))
     })
     private BooleanModificationEmbedded ratioTapChangerToBeEstimated;
 
diff --git a/src/main/resources/db/changelog/changesets/changelog_20250722T140307Z.xml b/src/main/resources/db/changelog/changesets/changelog_20250722T140307Z.xml
new file mode 100644
index 000000000..b0b7f0423
--- /dev/null
+++ b/src/main/resources/db/changelog/changesets/changelog_20250722T140307Z.xml
@@ -0,0 +1,268 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+    <changeSet author="lesoteti (generated)" id="1753193038896-31">
+        <renameColumn  newColumnName="phase_tap_changer_enabled"
+                       oldColumnName="phasetapchangerenabled"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-32">
+        <renameColumn  newColumnName="phase_tap_changer_enabled_op"
+                       oldColumnName="phasetapchangerenabled_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-33">
+        <renameColumn  newColumnName="phase_tap_changer_low_tap_position"
+                       oldColumnName="phasetapchangerlowtapposition"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-34">
+        <renameColumn  newColumnName="phase_tap_changer_low_tap_position_op"
+                       oldColumnName="phasetapchangerlowtapposition_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-35">
+        <renameColumn  newColumnName="phase_tap_changer_regulation_mode"
+                       oldColumnName="phasetapchangerregulationmode"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-36">
+        <renameColumn  newColumnName="phase_tap_changer_regulation_mode_op"
+                       oldColumnName="phasetapchangerregulationmode_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-37">
+        <renameColumn  newColumnName="phase_tap_changer_regulation_side"
+                       oldColumnName="phasetapchangerregulationside"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-38">
+        <renameColumn  newColumnName="phase_tap_changer_regulation_side_op"
+                       oldColumnName="phasetapchangerregulationside_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-39">
+        <renameColumn  newColumnName="phase_tap_changer_regulation_type"
+                       oldColumnName="phasetapchangerregulationtype"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-40">
+        <renameColumn  newColumnName="phase_tap_changer_regulation_type_op"
+                       oldColumnName="phasetapchangerregulationtype_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-41">
+        <renameColumn  newColumnName="phase_tap_changer_regulation_value"
+                       oldColumnName="phasetapchangerregulationvalue"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-42">
+        <renameColumn  newColumnName="phase_tap_changer_regulation_value_op"
+                       oldColumnName="phasetapchangerregulationvalue_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-43">
+        <renameColumn  newColumnName="phase_tap_changer_tap_position"
+                       oldColumnName="phasetapchangertapposition"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-44">
+        <renameColumn  newColumnName="phase_tap_changer_tap_position_op"
+                       oldColumnName="phasetapchangertapposition_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-45">
+        <renameColumn  newColumnName="phase_tap_changer_target_deadband"
+                       oldColumnName="phasetapchangertargetdeadband"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-46">
+        <renameColumn  newColumnName="phase_tap_changer_target_deadband_op"
+                       oldColumnName="phasetapchangertargetdeadband_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-47">
+        <renameColumn  newColumnName="phase_tap_changer_terminal_ref_connectable_id"
+                       oldColumnName="phasetapchangerterminalrefconnectableid"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-48">
+        <renameColumn  newColumnName="phase_tap_changer_terminal_ref_connectable_id_op"
+                       oldColumnName="phasetapchangerterminalrefconnectableid_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-49">
+        <renameColumn  newColumnName="phase_tap_changer_terminal_ref_type"
+                       oldColumnName="phasetapchangerterminalreftype"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-50">
+        <renameColumn  newColumnName="phase_tap_changer_terminal_ref_type_op"
+                       oldColumnName="phasetapchangerterminalreftype_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-51">
+        <renameColumn  newColumnName="phase_tap_changer_terminal_ref_voltagelevel_id"
+                       oldColumnName="phasetapchangerterminalrefvoltagelevelid"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-52">
+        <renameColumn  newColumnName="phase_tap_changer_terminal_ref_voltagelevel_id_op"
+                       oldColumnName="phasetapchangerterminalrefvoltagelevelid_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-53">
+        <renameColumn  newColumnName="phase_tap_changer_to_be_estimated"
+                       oldColumnName="phasetapchangertobeestimated"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-54">
+        <renameColumn  newColumnName="phase_tap_changer_to_be_estimated_op"
+                       oldColumnName="phasetapchangertobeestimated_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-55">
+        <renameColumn  newColumnName="rated_s"
+                       oldColumnName="rateds"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-56">
+        <renameColumn  newColumnName="rated_u1"
+                       oldColumnName="ratedu1"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-57">
+        <renameColumn  newColumnName="rated_u1_op"
+                       oldColumnName="ratedu1_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-58">
+        <renameColumn  newColumnName="rated_u2"
+                       oldColumnName="ratedu2"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-59">
+        <renameColumn  newColumnName="rated_u2_op"
+                       oldColumnName="ratedu2_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-60">
+        <renameColumn  newColumnName="ratio_tap_changer_load_tap_changing_capabilities"
+                       oldColumnName="ratiotapchangerloadtapchangingcapabilities"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-61">
+        <renameColumn  newColumnName="ratio_tap_changer_load_tap_changing_capabilities_op"
+                       oldColumnName="ratiotapchangerloadtapchangingcapabilities_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-62">
+        <renameColumn  newColumnName="ratio_tap_changer_low_tap_position"
+                       oldColumnName="ratiotapchangerlowtapposition"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-63">
+        <renameColumn  newColumnName="ratio_tap_changer_low_tap_position_op"
+                       oldColumnName="ratiotapchangerlowtapposition_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-64">
+        <renameColumn  newColumnName="ratio_tap_changer_regulating"
+                       oldColumnName="ratiotapchangerregulating"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-65">
+        <renameColumn  newColumnName="ratio_tap_changer_regulating_op"
+                       oldColumnName="ratiotapchangerregulating_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-66">
+        <renameColumn  newColumnName="ratio_tap_changer_regulation_side"
+                       oldColumnName="ratiotapchangerregulationside"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-67">
+        <renameColumn  newColumnName="ratio_tap_changer_regulation_side_op"
+                       oldColumnName="ratiotapchangerregulationside_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-68">
+        <renameColumn  newColumnName="ratio_tap_changer_regulation_type"
+                       oldColumnName="ratiotapchangerregulationtype"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-69">
+        <renameColumn  newColumnName="ratio_tap_changer_regulation_type_op"
+                       oldColumnName="ratiotapchangerregulationtype_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-70">
+        <renameColumn  newColumnName="ratio_tap_changer_tap_position"
+                       oldColumnName="ratiotapchangertapposition"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-71">
+        <renameColumn  newColumnName="ratio_tap_changer_tap_position_op"
+                       oldColumnName="ratiotapchangertapposition_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-72">
+        <renameColumn  newColumnName="ratio_tap_changer_target_deadband"
+                       oldColumnName="ratiotapchangertargetdeadband"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-73">
+        <renameColumn  newColumnName="ratio_tap_changer_target_deadband_op"
+                       oldColumnName="ratiotapchangertargetdeadband_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-74">
+        <renameColumn  newColumnName="ratio_tap_changer_target_v"
+                       oldColumnName="ratiotapchangertargetv"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-75">
+        <renameColumn  newColumnName="ratio_tap_changer_target_v_op"
+                       oldColumnName="ratiotapchangertargetv_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-76">
+        <renameColumn  newColumnName="ratio_tap_changer_terminal_ref_connectable_id"
+                       oldColumnName="ratiotapchangerterminalrefconnectableid"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-77">
+        <renameColumn  newColumnName="ratio_tap_changer_terminal_ref_connectable_id_op"
+                       oldColumnName="ratiotapchangerterminalrefconnectableid_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-78">
+        <renameColumn  newColumnName="ratio_tap_changer_terminal_ref_type"
+                       oldColumnName="ratiotapchangerterminalreftype"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-79">
+        <renameColumn  newColumnName="ratio_tap_changer_terminal_ref_type_op"
+                       oldColumnName="ratiotapchangerterminalreftype_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-80">
+        <renameColumn  newColumnName="ratio_tap_changer_terminal_ref_voltagelevel_id"
+                       oldColumnName="ratiotapchangerterminalrefvoltagelevelid"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-81">
+        <renameColumn  newColumnName="ratio_tap_changer_terminal_ref_voltagelevel_id_op"
+                       oldColumnName="ratiotapchangerterminalrefvoltagelevelid_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-82">
+        <renameColumn  newColumnName="ratio_tap_changer_to_be_estimated"
+                       oldColumnName="ratiotapchangertobeestimated"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753193038896-83">
+        <renameColumn  newColumnName="ratio_tap_changer_to_be_estimated_op"
+                       oldColumnName="ratiotapchangertobeestimated_op"
+                       tableName="two_windings_transformer_modification"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml
index 4949fb094..f3557990d 100644
--- a/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -372,3 +372,6 @@ databaseChangeLog:
   - include:
       file: changesets/changelog_20250620T115827Z.xml
       relativeToChangelogFile: true
+  - include:
+      file: changesets/changelog_20250722T140307Z.xml
+      relativeToChangelogFile: true

From 5e774edd04a53cdc1f834c1107c466a7ac493dc6 Mon Sep 17 00:00:00 2001
From: Etienne LESOT <etienne.lesot@rte-france.com>
Date: Wed, 23 Jul 2025 09:20:17 +0200
Subject: [PATCH 2/6] rename creation

Signed-off-by: Etienne LESOT <etienne.lesot@rte-france.com>
---
 .../TwoWindingsTransformerCreationEntity.java |  42 +++----
 ...WindingsTransformerModificationEntity.java |  12 +-
 .../changesets/changelog_20250722T140307Z.xml |   8 +-
 .../changesets/changelog_20250723T063314Z.xml | 108 ++++++++++++++++++
 .../db/changelog/db.changelog-master.yaml     |   3 +
 5 files changed, 142 insertions(+), 31 deletions(-)
 create mode 100644 src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml

diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/TwoWindingsTransformerCreationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/TwoWindingsTransformerCreationEntity.java
index 395b93c2f..b644d4638 100644
--- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/TwoWindingsTransformerCreationEntity.java
+++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/TwoWindingsTransformerCreationEntity.java
@@ -38,68 +38,68 @@ public class TwoWindingsTransformerCreationEntity extends BranchCreationEntity {
     @Column(name = "b")
     private double b;
 
-    @Column(name = "ratedU1")
+    @Column(name = "rated_u1")
     private double ratedU1;
 
-    @Column(name = "ratedU2")
+    @Column(name = "rated_u2")
     private double ratedU2;
 
-    @Column(name = "rateds")
+    @Column(name = "rated_s")
     private Double ratedS;
 
-    @Column(name = "phasetapchangerlowtapposition")
+    @Column(name = "phase_tap_changer_low_tap_position")
     private Integer phaseTapChangerLowTapPosition;
 
-    @Column(name = "phasetapchangertapposition")
+    @Column(name = "phase_tap_changer_tap_position")
     private Integer phaseTapChangerTapPosition;
 
-    @Column(name = "phasetapchangerregulating")
+    @Column(name = "phase_tap_changer_regulating")
     private Boolean phaseTapChangerRegulating;
 
-    @Column(name = "phasetapchangertargetdeadband")
+    @Column(name = "phase_tap_changer_target_deadband")
     private Double phaseTapChangerTargetDeadband;
 
-    @Column(name = "phasetapchangerterminalrefconnectableid")
+    @Column(name = "phase_tap_changer_terminal_ref_connectable_id")
     private String phaseTapChangerTerminalRefConnectableId;
 
-    @Column(name = "phasetapchangerterminalrefvoltagelevelid")
+    @Column(name = "phase_tap_changer_terminal_ref_voltage_level_id")
     private String phaseTapChangerTerminalRefVoltageLevelId;
 
-    @Column(name = "phasetapchangerterminalreftype")
+    @Column(name = "phase_tap_changer_terminal_ref_type")
     private String phaseTapChangerTerminalRefType;
 
-    @Column(name = "phasetapchangerregulationmode")
+    @Column(name = "phase_tap_changer_regulation_mode")
     @Enumerated(EnumType.STRING)
     private PhaseTapChanger.RegulationMode phaseTapChangerRegulationMode;
 
-    @Column(name = "phasetapchangerregulationvalue")
+    @Column(name = "phase_tap_changer_regulation_value")
     private Double phaseTapChangerRegulationValue;
 
-    @Column(name = "ratiotapchangerlowtapposition")
+    @Column(name = "ratio_tap_changer_low_tap_position")
     private Integer ratioTapChangerLowTapPosition;
 
-    @Column(name = "ratiotapchangertapposition")
+    @Column(name = "ratio_tap_changer_tap_position")
     private Integer ratioTapChangerTapPosition;
 
-    @Column(name = "ratiotapchangerregulating")
+    @Column(name = "ratio_tap_changer_regulating")
     private Boolean ratioTapChangerRegulating;
 
-    @Column(name = "ratiotapchangertargetdeadband")
+    @Column(name = "ratio_tap_changer_target_deadband")
     private Double ratioTapChangerTargetDeadband;
 
-    @Column(name = "ratiotapchangerterminalrefconnectableid")
+    @Column(name = "ratio_tap_changer_terminal_ref_connectable_id")
     private String ratioTapChangerTerminalRefConnectableId;
 
-    @Column(name = "ratiotapchangerterminalrefvoltagelevelid")
+    @Column(name = "ratio_tap_changer_terminal_ref_voltage_level_id")
     private String ratioTapChangerTerminalRefVoltageLevelId;
 
-    @Column(name = "ratiotapchangerterminalreftype")
+    @Column(name = "ratio_tap_changer_terminal_ref_type")
     private String ratioTapChangerTerminalRefType;
 
-    @Column(name = "ratiotapchangerloadtapchangingcapabilities")
+    @Column(name = "ratio_tap_changer_load_tap_changing_capabilities")
     private Boolean ratioTapChangerLoadTapChangingCapabilities;
 
-    @Column(name = "ratiotapchangertargetv")
+    @Column(name = "ratio_tap_changer_target_v")
     private Double ratioTapChangerTargetV;
 
     @ElementCollection
diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java
index 82d41e7ef..3b8af314c 100644
--- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java
+++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java
@@ -141,11 +141,11 @@ public class TwoWindingsTransformerModificationEntity extends BranchModification
     })
     private StringModificationEmbedded ratioTapChangerTerminalRefConnectableId;
 
-    @Column(name = "ratio_tap_changer_terminal_ref_voltagelevel_id")
+    @Column(name = "ratio_tap_changer_terminal_ref_voltage_level_id")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "ratio_tap_changer_terminal_ref_voltagelevel_id")),
-        @AttributeOverride(name = "opType", column = @Column(name = "ratio_tap_changer_terminal_ref_voltagelevel_id_op"))
+        @AttributeOverride(name = "value", column = @Column(name = "ratio_tap_changer_terminal_ref_voltage_level_id")),
+        @AttributeOverride(name = "opType", column = @Column(name = "ratio_tap_changer_terminal_ref_voltage_level_id_op"))
     })
     private StringModificationEmbedded ratioTapChangerTerminalRefVoltageLevelId;
 
@@ -236,11 +236,11 @@ public class TwoWindingsTransformerModificationEntity extends BranchModification
     })
     private StringModificationEmbedded phaseTapChangerTerminalRefConnectableId;
 
-    @Column(name = "phase_tap_changer_terminal_ref_voltagelevel_id")
+    @Column(name = "phase_tap_changer_terminal_ref_voltage_level_id")
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "phase_tap_changer_terminal_ref_voltagelevel_id")),
-        @AttributeOverride(name = "opType", column = @Column(name = "phase_tap_changer_terminal_ref_voltagelevel_id_op"))
+        @AttributeOverride(name = "value", column = @Column(name = "phase_tap_changer_terminal_ref_voltage_level_id")),
+        @AttributeOverride(name = "opType", column = @Column(name = "phase_tap_changer_terminal_ref_voltage_level_id_op"))
     })
     private StringModificationEmbedded phaseTapChangerTerminalRefVoltageLevelId;
 
diff --git a/src/main/resources/db/changelog/changesets/changelog_20250722T140307Z.xml b/src/main/resources/db/changelog/changesets/changelog_20250722T140307Z.xml
index b0b7f0423..7a185ecc7 100644
--- a/src/main/resources/db/changelog/changesets/changelog_20250722T140307Z.xml
+++ b/src/main/resources/db/changelog/changesets/changelog_20250722T140307Z.xml
@@ -101,12 +101,12 @@
                        tableName="two_windings_transformer_modification"/>
     </changeSet>
     <changeSet author="lesoteti (generated)" id="1753193038896-51">
-        <renameColumn  newColumnName="phase_tap_changer_terminal_ref_voltagelevel_id"
+        <renameColumn  newColumnName="phase_tap_changer_terminal_ref_voltage_level_id"
                        oldColumnName="phasetapchangerterminalrefvoltagelevelid"
                        tableName="two_windings_transformer_modification"/>
     </changeSet>
     <changeSet author="lesoteti (generated)" id="1753193038896-52">
-        <renameColumn  newColumnName="phase_tap_changer_terminal_ref_voltagelevel_id_op"
+        <renameColumn  newColumnName="phase_tap_changer_terminal_ref_voltage_level_id_op"
                        oldColumnName="phasetapchangerterminalrefvoltagelevelid_op"
                        tableName="two_windings_transformer_modification"/>
     </changeSet>
@@ -246,12 +246,12 @@
                        tableName="two_windings_transformer_modification"/>
     </changeSet>
     <changeSet author="lesoteti (generated)" id="1753193038896-80">
-        <renameColumn  newColumnName="ratio_tap_changer_terminal_ref_voltagelevel_id"
+        <renameColumn  newColumnName="ratio_tap_changer_terminal_ref_voltage_level_id"
                        oldColumnName="ratiotapchangerterminalrefvoltagelevelid"
                        tableName="two_windings_transformer_modification"/>
     </changeSet>
     <changeSet author="lesoteti (generated)" id="1753193038896-81">
-        <renameColumn  newColumnName="ratio_tap_changer_terminal_ref_voltagelevel_id_op"
+        <renameColumn  newColumnName="ratio_tap_changer_terminal_ref_voltage_level_id_op"
                        oldColumnName="ratiotapchangerterminalrefvoltagelevelid_op"
                        tableName="two_windings_transformer_modification"/>
     </changeSet>
diff --git a/src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml b/src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml
new file mode 100644
index 000000000..87dbbbcde
--- /dev/null
+++ b/src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml
@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+    <changeSet author="lesoteti (generated)" id="1753252430685-31">
+        <renameColumn  newColumnName="phase_tap_changer_low_tap_position"
+                       oldColumnName="phasetapchangerlowtapposition"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-32">
+        <renameColumn  newColumnName="phase_tap_changer_regulating"
+                       oldColumnName="phasetapchangerregulating"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-33">
+        <renameColumn  newColumnName="phase_tap_changer_regulation_mode"
+                       oldColumnName="phasetapchangerregulationmode"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-34">
+        <renameColumn  newColumnName="phase_tap_changer_regulation_value"
+                       oldColumnName="phasetapchangerregulationvalue"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-35">
+        <renameColumn  newColumnName="phase_tap_changer_tap_position"
+                       oldColumnName="phasetapchangertapposition"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-36">
+        <renameColumn  newColumnName="phase_tap_changer_target_deadband"
+                       oldColumnName="phasetapchangertargetdeadband"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-37">
+        <renameColumn  newColumnName="phase_tap_changer_terminal_ref_connectable_id"
+                       oldColumnName="phasetapchangerterminalrefconnectableid"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-38">
+        <renameColumn  newColumnName="phase_tap_changer_terminal_ref_type"
+                       oldColumnName="phasetapchangerterminalreftype"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-39">
+        <renameColumn  newColumnName="phase_tap_changer_terminal_ref_voltage_level_id"
+                       oldColumnName="phasetapchangerterminalrefvoltagelevelid"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-40">
+        <renameColumn  newColumnName="rated_s"
+                       oldColumnName="rateds"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-41">
+        <renameColumn  newColumnName="rated_u1"
+                       oldColumnName="ratedu1"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-42">
+        <renameColumn  newColumnName="rated_u2"
+                       oldColumnName="ratedu2"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-43">
+        <renameColumn  newColumnName="ratio_tap_changer_load_tap_changing_capabilities"
+                       oldColumnName="ratiotapchangerloadtapchangingcapabilities"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-44">
+        <renameColumn  newColumnName="ratio_tap_changer_low_tap_position"
+                       oldColumnName="ratiotapchangerlowtapposition"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-45">
+        <renameColumn  newColumnName="ratio_tap_changer_regulating"
+                       oldColumnName="ratiotapchangerregulating"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-46">
+        <renameColumn  newColumnName="ratio_tap_changer_tap_position"
+                       oldColumnName="ratiotapchangertapposition"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-47">
+        <renameColumn  newColumnName="ratio_tap_changer_target_deadband"
+                       oldColumnName="ratiotapchangertargetdeadband"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-48">
+        <renameColumn  newColumnName="ratio_tap_changer_target_v"
+                       oldColumnName="ratiotapchangertargetv"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-49">
+        <renameColumn  newColumnName="ratio_tap_changer_terminal_ref_connectable_id"
+                       oldColumnName="ratiotapchangerterminalrefconnectableid"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-50">
+        <renameColumn  newColumnName="ratio_tap_changer_terminal_ref_type"
+                       oldColumnName="ratiotapchangerterminalreftype"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-51">
+        <renameColumn  newColumnName="ratio_tap_changer_terminal_ref_voltage_level_id"
+                       oldColumnName="ratiotapchangerterminalrefvoltagelevelid"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml
index f3557990d..08ac31fd2 100644
--- a/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -375,3 +375,6 @@ databaseChangeLog:
   - include:
       file: changesets/changelog_20250722T140307Z.xml
       relativeToChangelogFile: true
+  - include:
+      file: changesets/changelog_20250723T063314Z.xml
+      relativeToChangelogFile: true

From aa5511441391f892f7096c5474ef39df0709e1ce Mon Sep 17 00:00:00 2001
From: Etienne LESOT <etienne.lesot@rte-france.com>
Date: Thu, 24 Jul 2025 15:54:46 +0200
Subject: [PATCH 3/6] fix merge main

Signed-off-by: Etienne LESOT <etienne.lesot@rte-france.com>
---
 .../changelog/changesets/changelog_20250723T063314Z.xml   | 5 -----
 src/main/resources/db/changelog/db.changelog-master.yaml  | 8 ++++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml b/src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml
index 87dbbbcde..656f901b7 100644
--- a/src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml
+++ b/src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml
@@ -5,11 +5,6 @@
                        oldColumnName="phasetapchangerlowtapposition"
                        tableName="two_windings_transformer_creation"/>
     </changeSet>
-    <changeSet author="lesoteti (generated)" id="1753252430685-32">
-        <renameColumn  newColumnName="phase_tap_changer_regulating"
-                       oldColumnName="phasetapchangerregulating"
-                       tableName="two_windings_transformer_creation"/>
-    </changeSet>
     <changeSet author="lesoteti (generated)" id="1753252430685-33">
         <renameColumn  newColumnName="phase_tap_changer_regulation_mode"
                        oldColumnName="phasetapchangerregulationmode"
diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml
index 03e8b40c8..01425b053 100644
--- a/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -373,14 +373,14 @@ databaseChangeLog:
       file: changesets/changelog_20250620T115827Z.xml
       relativeToChangelogFile: true
   - include:
-      file: changesets/changelog_20250722T140307Z.xml
+      file: changesets/changelog_20250612T094023Z.xml
       relativeToChangelogFile: true
   - include:
-      file: changesets/changelog_20250723T063314Z.xml
+      file: changesets/changelog_20250722T125427Z.xml
       relativeToChangelogFile: true
   - include:
-      file: changesets/changelog_20250612T094023Z.xml
+      file: changesets/changelog_20250722T140307Z.xml
       relativeToChangelogFile: true
   - include:
-      file: changesets/changelog_20250722T125427Z.xml
+      file: changesets/changelog_20250723T063314Z.xml
       relativeToChangelogFile: true

From 97f26e0fddfd0d4a848e2de6acfbc37df32351da Mon Sep 17 00:00:00 2001
From: Etienne LESOT <etienne.lesot@rte-france.com>
Date: Thu, 24 Jul 2025 16:54:03 +0200
Subject: [PATCH 4/6] rename tap changer type

Signed-off-by: Etienne LESOT <etienne.lesot@rte-france.com>
---
 .../creation/TapChangerStepCreationEmbeddable.java         | 2 +-
 .../db/changelog/changesets/changelog_20250723T063314Z.xml | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/TapChangerStepCreationEmbeddable.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/TapChangerStepCreationEmbeddable.java
index e3b5d3ff0..f9b5c7f64 100644
--- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/TapChangerStepCreationEmbeddable.java
+++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/TapChangerStepCreationEmbeddable.java
@@ -25,7 +25,7 @@
 @Embeddable
 public class TapChangerStepCreationEmbeddable {
 
-    @Column(name = "tapchangertype")
+    @Column(name = "tap_changer_type")
     @Enumerated(EnumType.STRING)
     private TapChangerType tapChangerType;
 
diff --git a/src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml b/src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml
index 656f901b7..095f0391c 100644
--- a/src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml
+++ b/src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml
@@ -96,8 +96,13 @@
                        tableName="two_windings_transformer_creation"/>
     </changeSet>
     <changeSet author="lesoteti (generated)" id="1753252430685-51">
+        <renameColumn  newColumnName="tap_changer_type"
+                       oldColumnName="tapchangertype"
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-52">
         <renameColumn  newColumnName="ratio_tap_changer_terminal_ref_voltage_level_id"
                        oldColumnName="ratiotapchangerterminalrefvoltagelevelid"
-                       tableName="two_windings_transformer_creation"/>
+                       tableName="tap_changer_step_creation"/>
     </changeSet>
 </databaseChangeLog>

From 2657a46a7c0c7a36aa3351258a6e71787383e7b4 Mon Sep 17 00:00:00 2001
From: Etienne LESOT <etienne.lesot@rte-france.com>
Date: Fri, 25 Jul 2025 08:36:45 +0200
Subject: [PATCH 5/6] fix

Signed-off-by: Etienne LESOT <etienne.lesot@rte-france.com>
---
 .../changesets/changelog_20250723T063314Z.xml         | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml b/src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml
index 095f0391c..4281690cc 100644
--- a/src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml
+++ b/src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml
@@ -98,11 +98,16 @@
     <changeSet author="lesoteti (generated)" id="1753252430685-51">
         <renameColumn  newColumnName="tap_changer_type"
                        oldColumnName="tapchangertype"
-                       tableName="two_windings_transformer_creation"/>
+                       tableName="tap_changer_step_creation"/>
     </changeSet>
-    <changeSet author="lesoteti (generated)" id="1753252430685-52">
+    <changeSet author="lesoteti (generated)" id="1753252430685-53">
         <renameColumn  newColumnName="ratio_tap_changer_terminal_ref_voltage_level_id"
                        oldColumnName="ratiotapchangerterminalrefvoltagelevelid"
-                       tableName="tap_changer_step_creation"/>
+                       tableName="two_windings_transformer_creation"/>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-52">
+        <renameColumn  newColumnName="tap_changer_type"
+                       oldColumnName="tapchangertype"
+                       tableName="tap_changer_step_modification"/>
     </changeSet>
 </databaseChangeLog>

From 6212a0825ca68e1bb5281488af6d2ef9f3e17422 Mon Sep 17 00:00:00 2001
From: Etienne LESOT <etienne.lesot@rte-france.com>
Date: Fri, 25 Jul 2025 08:40:44 +0200
Subject: [PATCH 6/6] fix

Signed-off-by: Etienne LESOT <etienne.lesot@rte-france.com>
---
 .../changesets/changelog_20250723T063314Z.xml          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml b/src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml
index 4281690cc..56bb1aee5 100644
--- a/src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml
+++ b/src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml
@@ -95,16 +95,16 @@
                        oldColumnName="ratiotapchangerterminalreftype"
                        tableName="two_windings_transformer_creation"/>
     </changeSet>
-    <changeSet author="lesoteti (generated)" id="1753252430685-51">
-        <renameColumn  newColumnName="tap_changer_type"
-                       oldColumnName="tapchangertype"
-                       tableName="tap_changer_step_creation"/>
-    </changeSet>
     <changeSet author="lesoteti (generated)" id="1753252430685-53">
         <renameColumn  newColumnName="ratio_tap_changer_terminal_ref_voltage_level_id"
                        oldColumnName="ratiotapchangerterminalrefvoltagelevelid"
                        tableName="two_windings_transformer_creation"/>
     </changeSet>
+    <changeSet author="lesoteti (generated)" id="1753252430685-51">
+        <renameColumn  newColumnName="tap_changer_type"
+                       oldColumnName="tapchangertype"
+                       tableName="tap_changer_step_creation"/>
+    </changeSet>
     <changeSet author="lesoteti (generated)" id="1753252430685-52">
         <renameColumn  newColumnName="tap_changer_type"
                        oldColumnName="tapchangertype"