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/java/org/gridsuite/modification/server/entities/equipment/creation/TwoWindingsTransformerCreationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/TwoWindingsTransformerCreationEntity.java
index d2d99bab8..d697e5623 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 = "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 2184b79ce..52448b8c1 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_voltage_level_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_voltage_level_id")),
+        @AttributeOverride(name = "opType", column = @Column(name = "ratio_tap_changer_terminal_ref_voltage_level_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,92 +180,92 @@ 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_voltage_level_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_voltage_level_id")),
+        @AttributeOverride(name = "opType", column = @Column(name = "phase_tap_changer_terminal_ref_voltage_level_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;
 
@@ -287,15 +287,15 @@ public class TwoWindingsTransformerModificationEntity extends BranchModification
 
     @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..7a185ecc7
--- /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_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_voltage_level_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_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_voltage_level_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/changesets/changelog_20250723T063314Z.xml b/src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml
new file mode 100644
index 000000000..56bb1aee5
--- /dev/null
+++ b/src/main/resources/db/changelog/changesets/changelog_20250723T063314Z.xml
@@ -0,0 +1,113 @@
+<?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-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-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"
+                       tableName="tap_changer_step_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 eeb4860f1..01425b053 100644
--- a/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -378,3 +378,9 @@ databaseChangeLog:
   - include:
       file: changesets/changelog_20250722T125427Z.xml
       relativeToChangelogFile: true
+  - include:
+      file: changesets/changelog_20250722T140307Z.xml
+      relativeToChangelogFile: true
+  - include:
+      file: changesets/changelog_20250723T063314Z.xml
+      relativeToChangelogFile: true