diff --git a/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/models/hvdc/HvdcPvGroovyExtension.groovy b/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/models/hvdc/HvdcPGroovyExtension.groovy
similarity index 67%
rename from dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/models/hvdc/HvdcPvGroovyExtension.groovy
rename to dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/models/hvdc/HvdcPGroovyExtension.groovy
index 7760e8cc8..33d9613f8 100644
--- a/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/models/hvdc/HvdcPvGroovyExtension.groovy
+++ b/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/models/hvdc/HvdcPGroovyExtension.groovy
@@ -12,24 +12,24 @@ import com.powsybl.dynamicsimulation.DynamicModel
 import com.powsybl.dynamicsimulation.groovy.DynamicModelGroovyExtension
 import com.powsybl.dynawaltz.dsl.AbstractEquipmentGroovyExtension
 import com.powsybl.dynawaltz.dsl.EquipmentConfig
-import com.powsybl.dynawaltz.models.hvdc.HvdcPv
-import com.powsybl.dynawaltz.models.hvdc.HvdcPvDangling
+import com.powsybl.dynawaltz.models.hvdc.HvdcP
+import com.powsybl.dynawaltz.models.hvdc.HvdcPDangling
 import com.powsybl.iidm.network.Network
 
 /**
  * @author Laurent Issertial <laurent.issertial at rte-france.com>
  */
 @AutoService(DynamicModelGroovyExtension.class)
-class HvdcPvGroovyExtension extends AbstractEquipmentGroovyExtension<DynamicModel> implements DynamicModelGroovyExtension {
+class HvdcPGroovyExtension extends AbstractEquipmentGroovyExtension<DynamicModel> implements DynamicModelGroovyExtension {
 
-    protected static final String HVDC_PV = "hvdcPv"
+    protected static final String HVDC_P = "hvdcP"
 
-    HvdcPvGroovyExtension() {
-        super(HVDC_PV)
+    HvdcPGroovyExtension() {
+        super(HVDC_P)
     }
 
-    protected HvdcPvGroovyExtension(URL config) {
-        super(HVDC_PV, config)
+    protected HvdcPGroovyExtension(URL config) {
+        super(HVDC_P, config)
     }
 
     @Override
@@ -44,12 +44,12 @@ class HvdcPvGroovyExtension extends AbstractEquipmentGroovyExtension<DynamicMode
         }
 
         @Override
-        HvdcPv build() {
+        HvdcP build() {
             checkData()
             if (equipmentConfig.isDangling()) {
-                new HvdcPvDangling(dynamicModelId, hvdc, parameterSetId, equipmentConfig.lib, danglingSide)
+                new HvdcPDangling(dynamicModelId, hvdc, parameterSetId, equipmentConfig.lib, danglingSide)
             } else {
-                new HvdcPv(dynamicModelId, hvdc, parameterSetId, equipmentConfig.lib)
+                new HvdcP(dynamicModelId, hvdc, parameterSetId, equipmentConfig.lib)
             }
         }
     }
diff --git a/dynawaltz-dsl/src/main/resources/models.json b/dynawaltz-dsl/src/main/resources/models.json
index 6b9337592..f58bf7fd2 100644
--- a/dynawaltz-dsl/src/main/resources/models.json
+++ b/dynawaltz-dsl/src/main/resources/models.json
@@ -96,7 +96,7 @@
       "lib": "GeneratorPVDiagramPQ"
     }
   ],
-  "hvdcPv": [
+  "hvdcP": [
     {
       "lib": "HvdcPV"
     },
diff --git a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/DynamicModelsSupplierTest.java b/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/DynamicModelsSupplierTest.java
index c94e7ecf7..a3c0d956c 100644
--- a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/DynamicModelsSupplierTest.java
+++ b/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/DynamicModelsSupplierTest.java
@@ -22,8 +22,8 @@
 import com.powsybl.dynawaltz.models.buses.InfiniteBus;
 import com.powsybl.dynawaltz.models.buses.StandardBus;
 import com.powsybl.dynawaltz.models.generators.*;
-import com.powsybl.dynawaltz.models.hvdc.HvdcPv;
-import com.powsybl.dynawaltz.models.hvdc.HvdcPvDangling;
+import com.powsybl.dynawaltz.models.hvdc.HvdcP;
+import com.powsybl.dynawaltz.models.hvdc.HvdcPDangling;
 import com.powsybl.dynawaltz.models.hvdc.HvdcVsc;
 import com.powsybl.dynawaltz.models.hvdc.HvdcVscDangling;
 import com.powsybl.dynawaltz.models.lines.StandardLine;
@@ -107,9 +107,9 @@ void assertPureDynamicBlackBoxModel(BlackBoxModel bbm, String dynamicId, String
     private static Stream<Arguments> provideEquipmentModelData() {
         return Stream.of(
                 Arguments.of("/dynamicModels/bus.groovy", StandardBus.class, EurostagTutorialExample1Factory.create(), "NGEN", "BBM_NGEN", "SB", "Bus"),
-                Arguments.of("/dynamicModels/hvdcPv.groovy", HvdcPv.class, HvdcTestNetwork.createVsc(), "L", "BBM_HVDC_L", "HVDC", "HvdcPV"),
+                Arguments.of("/dynamicModels/hvdcP.groovy", HvdcP.class, HvdcTestNetwork.createVsc(), "L", "BBM_HVDC_L", "HVDC", "HvdcPV"),
                 Arguments.of("/dynamicModels/hvdcVsc.groovy", HvdcVsc.class, HvdcTestNetwork.createVsc(), "L", "BBM_HVDC_L", "HVDC", "HvdcVSC"),
-                Arguments.of("/dynamicModels/hvdcPvDangling.groovy", HvdcPvDangling.class, HvdcTestNetwork.createVsc(), "L", "BBM_HVDC_L", "HVDC", "HvdcPVDanglingDiagramPQ"),
+                Arguments.of("/dynamicModels/hvdcPDangling.groovy", HvdcPDangling.class, HvdcTestNetwork.createVsc(), "L", "BBM_HVDC_L", "HVDC", "HvdcPVDanglingDiagramPQ"),
                 Arguments.of("/dynamicModels/hvdcVscDangling.groovy", HvdcVscDangling.class, HvdcTestNetwork.createVsc(), "L", "BBM_HVDC_L", "HVDC", "HvdcVSCDanglingUdc"),
                 Arguments.of("/dynamicModels/loadAB.groovy", BaseLoad.class, EurostagTutorialExample1Factory.create(), "LOAD", "LOAD", "LAB", "LoadAlphaBetaRestorative"),
                 Arguments.of("/dynamicModels/loadABControllable.groovy", BaseLoadControllable.class, EurostagTutorialExample1Factory.create(), "LOAD", "LOAD", "LAB", "LoadAlphaBeta"),
diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/hvdcPv.groovy b/dynawaltz-dsl/src/test/resources/dynamicModels/hvdcP.groovy
similarity index 100%
rename from dynawaltz-dsl/src/test/resources/dynamicModels/hvdcPv.groovy
rename to dynawaltz-dsl/src/test/resources/dynamicModels/hvdcP.groovy
diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/hvdcPvDangling.groovy b/dynawaltz-dsl/src/test/resources/dynamicModels/hvdcPDangling.groovy
similarity index 100%
rename from dynawaltz-dsl/src/test/resources/dynamicModels/hvdcPvDangling.groovy
rename to dynawaltz-dsl/src/test/resources/dynamicModels/hvdcPDangling.groovy
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPv.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcP.java
similarity index 83%
rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPv.java
rename to dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcP.java
index 022388c2e..97e717546 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPv.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcP.java
@@ -13,9 +13,9 @@
 /**
  * @author Laurent Issertial <laurent.issertial at rte-france.com>
  */
-public class HvdcPv extends AbstractHvdc {
+public class HvdcP extends AbstractHvdc {
 
-    public HvdcPv(String dynamicModelId, HvdcLine hvdc, String parameterSetId, String hvdcLib) {
+    public HvdcP(String dynamicModelId, HvdcLine hvdc, String parameterSetId, String hvdcLib) {
         super(dynamicModelId, hvdc, parameterSetId, hvdcLib);
     }
 
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPvDangling.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPDangling.java
similarity index 90%
rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPvDangling.java
rename to dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPDangling.java
index 33b2e7e8d..69c2c3d0d 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPvDangling.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPDangling.java
@@ -17,11 +17,11 @@
 /**
  * @author Laurent Issertial <laurent.issertial at rte-france.com>
  */
-public class HvdcPvDangling extends HvdcPv {
+public class HvdcPDangling extends HvdcP {
 
     private final DanglingSide danglingSide;
 
-    public HvdcPvDangling(String dynamicModelId, HvdcLine hvdc, String parameterSetId, String hvdcLib, Side danglingSide) {
+    public HvdcPDangling(String dynamicModelId, HvdcLine hvdc, String parameterSetId, String hvdcLib, Side danglingSide) {
         super(dynamicModelId, hvdc, parameterSetId, hvdcLib);
         this.danglingSide = new DanglingSide(TERMINAL_PREFIX, danglingSide);
     }
diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectHvdcEventXmlTest.java b/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectHvdcEventXmlTest.java
index 0c67ade65..1f183a326 100644
--- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectHvdcEventXmlTest.java
+++ b/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectHvdcEventXmlTest.java
@@ -10,8 +10,8 @@
 import com.powsybl.dynawaltz.models.BlackBoxModel;
 import com.powsybl.dynawaltz.models.Side;
 import com.powsybl.dynawaltz.models.events.EventHvdcDisconnection;
-import com.powsybl.dynawaltz.models.hvdc.HvdcPv;
-import com.powsybl.dynawaltz.models.hvdc.HvdcPvDangling;
+import com.powsybl.dynawaltz.models.hvdc.HvdcP;
+import com.powsybl.dynawaltz.models.hvdc.HvdcPDangling;
 import com.powsybl.dynawaltz.models.hvdc.HvdcVsc;
 import com.powsybl.dynawaltz.models.hvdc.HvdcVscDangling;
 import com.powsybl.iidm.network.Network;
@@ -71,13 +71,13 @@ private static Stream<Arguments> provideModels() {
                         null,
                         (Function<Network, BlackBoxModel>) n -> new EventHvdcDisconnection(n.getHvdcLine(HVDC_NAME), 1)),
                 Arguments.of("disconnect_hvdc_pv_dyd.xml",
-                        (Function<Network, BlackBoxModel>) n -> new HvdcPv(DYN_HVDC_NAME, n.getHvdcLine(HVDC_NAME), "hvdc", "HvdcPV"),
+                        (Function<Network, BlackBoxModel>) n -> new HvdcP(DYN_HVDC_NAME, n.getHvdcLine(HVDC_NAME), "hvdc", "HvdcPV"),
                         (Function<Network, BlackBoxModel>) n -> new EventHvdcDisconnection(n.getHvdcLine(HVDC_NAME), 1, true, false)),
                 Arguments.of("disconnect_hvdc_vsc_dyd.xml",
                         (Function<Network, BlackBoxModel>) n -> new HvdcVsc(DYN_HVDC_NAME, n.getHvdcLine(HVDC_NAME), "hvdc", "HvdcVsc"),
                         (Function<Network, BlackBoxModel>) n -> new EventHvdcDisconnection(n.getHvdcLine(HVDC_NAME), 1, false, true)),
                 Arguments.of("disconnect_hvdc_pv_dangling_dyd.xml",
-                        (Function<Network, BlackBoxModel>) n -> new HvdcPvDangling(DYN_HVDC_NAME, n.getHvdcLine(HVDC_NAME), "hvdc", "HvdcPVDangling", Side.TWO),
+                        (Function<Network, BlackBoxModel>) n -> new HvdcPDangling(DYN_HVDC_NAME, n.getHvdcLine(HVDC_NAME), "hvdc", "HvdcPVDangling", Side.TWO),
                         (Function<Network, BlackBoxModel>) n -> new EventHvdcDisconnection(n.getHvdcLine(HVDC_NAME), 1, true, false)),
                 Arguments.of("disconnect_hvdc_vsc_dangling_dyd.xml",
                         (Function<Network, BlackBoxModel>) n -> new HvdcVscDangling(DYN_HVDC_NAME, n.getHvdcLine(HVDC_NAME), "hvdc", "HvdcVSCDanglingUdc", Side.ONE),
diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectionExceptionXmlTest.java b/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectionExceptionXmlTest.java
index edf4f40d6..e97dfd452 100644
--- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectionExceptionXmlTest.java
+++ b/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectionExceptionXmlTest.java
@@ -11,7 +11,7 @@
 import com.powsybl.dynawaltz.models.BlackBoxModel;
 import com.powsybl.dynawaltz.models.Side;
 import com.powsybl.dynawaltz.models.events.EventHvdcDisconnection;
-import com.powsybl.dynawaltz.models.hvdc.HvdcPvDangling;
+import com.powsybl.dynawaltz.models.hvdc.HvdcPDangling;
 import com.powsybl.dynawaltz.models.hvdc.HvdcVscDangling;
 import com.powsybl.iidm.network.HvdcLine;
 import com.powsybl.iidm.network.test.HvdcTestNetwork;
@@ -61,7 +61,7 @@ private static Stream<Arguments> provideModels() {
         return Stream.of(
                 Arguments.of("Equipment HvdcPVDangling side 1 is dangling and can't be disconnected with an event",
                         Side.ONE,
-                        (BiFunction<HvdcLine, Side, BlackBoxModel>) (hvdc, side) -> new HvdcPvDangling("BBM_L", hvdc, "hvdc", "HvdcPVDangling", side)),
+                        (BiFunction<HvdcLine, Side, BlackBoxModel>) (hvdc, side) -> new HvdcPDangling("BBM_L", hvdc, "hvdc", "HvdcPVDangling", side)),
                 Arguments.of("Equipment HvdcVSCDanglingUdc side 2 is dangling and can't be disconnected with an event",
                         Side.TWO,
                         (BiFunction<HvdcLine, Side, BlackBoxModel>) (hvdc, side) -> new HvdcVscDangling("BBM_L", hvdc, "hvdc", "HvdcVSCDanglingUdc", side))
diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/HvdcXmlTest.java b/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/HvdcXmlTest.java
index dd910e0c9..b34997d77 100644
--- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/HvdcXmlTest.java
+++ b/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/HvdcXmlTest.java
@@ -9,8 +9,8 @@
 
 import com.powsybl.dynawaltz.models.BlackBoxModel;
 import com.powsybl.dynawaltz.models.Side;
-import com.powsybl.dynawaltz.models.hvdc.HvdcPv;
-import com.powsybl.dynawaltz.models.hvdc.HvdcPvDangling;
+import com.powsybl.dynawaltz.models.hvdc.HvdcP;
+import com.powsybl.dynawaltz.models.hvdc.HvdcPDangling;
 import com.powsybl.dynawaltz.models.hvdc.HvdcVsc;
 import com.powsybl.dynawaltz.models.hvdc.HvdcVscDangling;
 import com.powsybl.iidm.network.Network;
@@ -60,9 +60,9 @@ void writeHvdcModel(String dydName, Function< Network, BlackBoxModel> constructo
 
     private static Stream<Arguments> provideHvdc() {
         return Stream.of(
-                Arguments.of("hvdc_pv_dyd.xml", (Function<Network, BlackBoxModel>) n -> new HvdcPv(DYN_NAME, n.getHvdcLine(HVDC_NAME), "hv", "HvdcPV")),
+                Arguments.of("hvdc_p_dyd.xml", (Function<Network, BlackBoxModel>) n -> new HvdcP(DYN_NAME, n.getHvdcLine(HVDC_NAME), "hv", "HvdcPV")),
                 Arguments.of("hvdc_vsc_dyd.xml", (Function<Network, BlackBoxModel>) n -> new HvdcVsc(DYN_NAME, n.getHvdcLine(HVDC_NAME), "hv", "HvdcVSC")),
-                Arguments.of("hvdc_pv_dangling_dyd.xml", (Function<Network, BlackBoxModel>) n -> new HvdcPvDangling(DYN_NAME, n.getHvdcLine(HVDC_NAME), "hv", "HvdcPVDangling", Side.ONE)),
+                Arguments.of("hvdc_p_dangling_dyd.xml", (Function<Network, BlackBoxModel>) n -> new HvdcPDangling(DYN_NAME, n.getHvdcLine(HVDC_NAME), "hv", "HvdcPVDangling", Side.ONE)),
                 Arguments.of("hvdc_vsc_dangling_dyd.xml", (Function<Network, BlackBoxModel>) n -> new HvdcVscDangling(DYN_NAME, n.getHvdcLine(HVDC_NAME), "hv", "HvdcVSCDanglingP", Side.TWO))
         );
     }
diff --git a/dynawaltz/src/test/resources/hvdc_pv_dangling_dyd.xml b/dynawaltz/src/test/resources/hvdc_p_dangling_dyd.xml
similarity index 100%
rename from dynawaltz/src/test/resources/hvdc_pv_dangling_dyd.xml
rename to dynawaltz/src/test/resources/hvdc_p_dangling_dyd.xml
diff --git a/dynawaltz/src/test/resources/hvdc_pv_dyd.xml b/dynawaltz/src/test/resources/hvdc_p_dyd.xml
similarity index 100%
rename from dynawaltz/src/test/resources/hvdc_pv_dyd.xml
rename to dynawaltz/src/test/resources/hvdc_p_dyd.xml