From 861010949ae0cc233475b7d104fb6e8df2b228e1 Mon Sep 17 00:00:00 2001
From: lisrte <laurent.issertial@rte-france.com>
Date: Thu, 4 Jul 2024 16:13:20 +0200
Subject: [PATCH] Rename remaining lib to model

Signed-off-by: lisrte <laurent.issertial@rte-france.com>
---
 .../java/com/powsybl/dynawaltz/builders/BuilderReports.java | 6 +++---
 .../java/com/powsybl/dynawaltz/builders/ModelConfigs.java   | 4 ++--
 .../TapChangerAutomationSystemBuilder.java                  | 2 +-
 .../TapChangerBlockingAutomationSystemBuilder.java          | 2 +-
 .../UnderVoltageAutomationSystemBuilder.java                | 2 +-
 .../DynamicOverloadManagementSystemBuilder.java             | 2 +-
 .../DynamicTwoLevelsOverloadManagementSystemBuilder.java    | 2 +-
 .../PhaseShifterBlockingIAutomationSystemBuilder.java       | 2 +-
 .../phaseshifters/PhaseShifterIAutomationSystemBuilder.java | 2 +-
 .../phaseshifters/PhaseShifterPAutomationSystemBuilder.java | 2 +-
 .../powsybl/dynawaltz/models/buses/InfiniteBusBuilder.java  | 2 +-
 .../powsybl/dynawaltz/models/buses/StandardBusBuilder.java  | 2 +-
 .../models/generators/GeneratorFictitiousBuilder.java       | 2 +-
 .../models/generators/GridFormingConverterBuilder.java      | 2 +-
 .../models/generators/SynchronizedGeneratorBuilder.java     | 2 +-
 .../models/generators/SynchronousGeneratorBuilder.java      | 2 +-
 .../powsybl/dynawaltz/models/generators/WeccBuilder.java    | 2 +-
 .../com/powsybl/dynawaltz/models/hvdc/HvdcPBuilder.java     | 2 +-
 .../com/powsybl/dynawaltz/models/hvdc/HvdcVscBuilder.java   | 2 +-
 .../com/powsybl/dynawaltz/models/lines/LineBuilder.java     | 2 +-
 .../com/powsybl/dynawaltz/models/loads/BaseLoadBuilder.java | 2 +-
 .../dynawaltz/models/loads/LoadOneTransformerBuilder.java   | 2 +-
 .../models/loads/LoadOneTransformerTapChangerBuilder.java   | 2 +-
 .../dynawaltz/models/loads/LoadTwoTransformersBuilder.java  | 2 +-
 .../models/loads/LoadTwoTransformersTapChangersBuilder.java | 2 +-
 .../powsybl/dynawaltz/models/shunts/BaseShuntBuilder.java   | 2 +-
 .../models/svarcs/BaseStaticVarCompensatorBuilder.java      | 2 +-
 .../models/transformers/TransformerFixedRatioBuilder.java   | 2 +-
 28 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuilderReports.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuilderReports.java
index a9f210f25..e2b482857 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuilderReports.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuilderReports.java
@@ -29,11 +29,11 @@ public static void reportBuilderNotFound(ReportNode reportNode, String lib) {
                 .add();
     }
 
-    public static void reportLibNotFound(ReportNode reportNode, String builderName, String lib) {
+    public static void reportModelNotFound(ReportNode reportNode, String builderName, String modelName) {
         reportNode.newReportNode()
-                .withMessageTemplate("libNotFound", "Library ${lib} not found for ${builderName}")
+                .withMessageTemplate("modelNotFound", "Model ${lib} not found for ${builderName}")
                 .withUntypedValue("builderName", builderName)
-                .withUntypedValue("lib", lib)
+                .withUntypedValue("modelName", modelName)
                 .withSeverity(TypedValue.INFO_SEVERITY)
                 .add();
     }
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigs.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigs.java
index 70d5f18bd..394f2dab4 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigs.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigs.java
@@ -39,8 +39,8 @@ public ModelConfig getDefaultModelConfig() {
         return defaultModelConfig;
     }
 
-    public ModelConfig getModelConfig(String libName) {
-        return modelConfigMap.get(libName);
+    public ModelConfig getModelConfig(String modelName) {
+        return modelConfigMap.get(modelName);
     }
 
     public Set<ModelInfo> getModelInfos() {
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerAutomationSystemBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerAutomationSystemBuilder.java
index 1693463f2..ed81808c1 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerAutomationSystemBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerAutomationSystemBuilder.java
@@ -42,7 +42,7 @@ public static TapChangerAutomationSystemBuilder of(Network network, String model
     public static TapChangerAutomationSystemBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, TapChangerAutomationSystemBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, TapChangerAutomationSystemBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new TapChangerAutomationSystemBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerBlockingAutomationSystemBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerBlockingAutomationSystemBuilder.java
index 76aee5c14..01949cec0 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerBlockingAutomationSystemBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerBlockingAutomationSystemBuilder.java
@@ -44,7 +44,7 @@ public static TapChangerBlockingAutomationSystemBuilder of(Network network, Stri
     public static TapChangerBlockingAutomationSystemBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, TapChangerBlockingAutomationSystemBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, TapChangerBlockingAutomationSystemBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new TapChangerBlockingAutomationSystemBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/UnderVoltageAutomationSystemBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/UnderVoltageAutomationSystemBuilder.java
index 280f97256..0585187e7 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/UnderVoltageAutomationSystemBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/UnderVoltageAutomationSystemBuilder.java
@@ -40,7 +40,7 @@ public static UnderVoltageAutomationSystemBuilder of(Network network, String mod
     public static UnderVoltageAutomationSystemBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, UnderVoltageAutomationSystemBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, UnderVoltageAutomationSystemBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new UnderVoltageAutomationSystemBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicOverloadManagementSystemBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicOverloadManagementSystemBuilder.java
index db628a614..204bd1d97 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicOverloadManagementSystemBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicOverloadManagementSystemBuilder.java
@@ -37,7 +37,7 @@ public static DynamicOverloadManagementSystemBuilder of(Network network, String
     public static DynamicOverloadManagementSystemBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, DynamicOverloadManagementSystemBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, DynamicOverloadManagementSystemBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new DynamicOverloadManagementSystemBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicTwoLevelsOverloadManagementSystemBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicTwoLevelsOverloadManagementSystemBuilder.java
index 52c7a07f1..39104e7f5 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicTwoLevelsOverloadManagementSystemBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicTwoLevelsOverloadManagementSystemBuilder.java
@@ -41,7 +41,7 @@ public static DynamicTwoLevelsOverloadManagementSystemBuilder of(Network network
     public static DynamicTwoLevelsOverloadManagementSystemBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, DynamicTwoLevelsOverloadManagementSystemBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, DynamicTwoLevelsOverloadManagementSystemBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new DynamicTwoLevelsOverloadManagementSystemBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterBlockingIAutomationSystemBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterBlockingIAutomationSystemBuilder.java
index 1c0e89957..80da2cf96 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterBlockingIAutomationSystemBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterBlockingIAutomationSystemBuilder.java
@@ -37,7 +37,7 @@ public static PhaseShifterBlockingIAutomationSystemBuilder of(Network network, S
     public static PhaseShifterBlockingIAutomationSystemBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, PhaseShifterBlockingIAutomationSystemBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, PhaseShifterBlockingIAutomationSystemBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new PhaseShifterBlockingIAutomationSystemBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterIAutomationSystemBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterIAutomationSystemBuilder.java
index dae17ee8f..938002507 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterIAutomationSystemBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterIAutomationSystemBuilder.java
@@ -36,7 +36,7 @@ public static PhaseShifterIAutomationSystemBuilder of(Network network, String mo
     public static PhaseShifterIAutomationSystemBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, PhaseShifterIAutomationSystemBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, PhaseShifterIAutomationSystemBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new PhaseShifterIAutomationSystemBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterPAutomationSystemBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterPAutomationSystemBuilder.java
index 179453bf7..9fd913d1e 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterPAutomationSystemBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterPAutomationSystemBuilder.java
@@ -36,7 +36,7 @@ public static PhaseShifterPAutomationSystemBuilder of(Network network, String mo
     public static PhaseShifterPAutomationSystemBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, PhaseShifterPAutomationSystemBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, PhaseShifterPAutomationSystemBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new PhaseShifterPAutomationSystemBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/InfiniteBusBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/InfiniteBusBuilder.java
index 2b8b83958..136517343 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/InfiniteBusBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/InfiniteBusBuilder.java
@@ -36,7 +36,7 @@ public static InfiniteBusBuilder of(Network network, String modelName) {
     public static InfiniteBusBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, InfiniteBusBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, InfiniteBusBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new InfiniteBusBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/StandardBusBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/StandardBusBuilder.java
index 3ff9b13aa..b923c501f 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/StandardBusBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/StandardBusBuilder.java
@@ -36,7 +36,7 @@ public static StandardBusBuilder of(Network network, String modelName) {
     public static StandardBusBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, StandardBusBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, StandardBusBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new StandardBusBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorFictitiousBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorFictitiousBuilder.java
index 572276a3a..e385df16f 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorFictitiousBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorFictitiousBuilder.java
@@ -36,7 +36,7 @@ public static GeneratorFictitiousBuilder of(Network network, String modelName) {
     public static GeneratorFictitiousBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, GeneratorFictitiousBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, GeneratorFictitiousBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new GeneratorFictitiousBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GridFormingConverterBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GridFormingConverterBuilder.java
index 88df10f30..1918c81a3 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GridFormingConverterBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GridFormingConverterBuilder.java
@@ -36,7 +36,7 @@ public static GridFormingConverterBuilder of(Network network, String modelName)
     public static GridFormingConverterBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, GridFormingConverterBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, GridFormingConverterBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new GridFormingConverterBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronizedGeneratorBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronizedGeneratorBuilder.java
index fca4f385c..7c857021b 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronizedGeneratorBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronizedGeneratorBuilder.java
@@ -36,7 +36,7 @@ public static SynchronizedGeneratorBuilder of(Network network, String modelName)
     public static SynchronizedGeneratorBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, SynchronizedGeneratorBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, SynchronizedGeneratorBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new SynchronizedGeneratorBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGeneratorBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGeneratorBuilder.java
index 1c8be373d..86d29a2e1 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGeneratorBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGeneratorBuilder.java
@@ -37,7 +37,7 @@ public static SynchronousGeneratorBuilder of(Network network, String modelName)
     public static SynchronousGeneratorBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, SynchronousGeneratorBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, SynchronousGeneratorBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new SynchronousGeneratorBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/WeccBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/WeccBuilder.java
index 8c375abb5..b5e4a5f3a 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/WeccBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/WeccBuilder.java
@@ -36,7 +36,7 @@ public static WeccBuilder of(Network network, String modelName) {
     public static WeccBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, WeccBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, WeccBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new WeccBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPBuilder.java
index 256a0dcee..dd1eb8b17 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPBuilder.java
@@ -38,7 +38,7 @@ public static HvdcPBuilder of(Network network, String modelName) {
     public static HvdcPBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, HvdcPBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, HvdcPBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new HvdcPBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcVscBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcVscBuilder.java
index b7ab27202..a91312a0c 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcVscBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcVscBuilder.java
@@ -38,7 +38,7 @@ public static HvdcVscBuilder of(Network network, String modelName) {
     public static HvdcVscBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, HvdcVscBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, HvdcVscBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new HvdcVscBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/LineBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/LineBuilder.java
index 1017876f7..fbe15180f 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/LineBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/LineBuilder.java
@@ -38,7 +38,7 @@ public static LineBuilder of(Network network, String modelName) {
     public static LineBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, LineBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, LineBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new LineBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/BaseLoadBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/BaseLoadBuilder.java
index 5b722423b..e262dd90b 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/BaseLoadBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/BaseLoadBuilder.java
@@ -36,7 +36,7 @@ public static BaseLoadBuilder of(Network network, String modelName) {
     public static BaseLoadBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, BaseLoadBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, BaseLoadBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new BaseLoadBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerBuilder.java
index 693cf4e18..d268132b3 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerBuilder.java
@@ -36,7 +36,7 @@ public static LoadOneTransformerBuilder of(Network network, String modelName) {
     public static LoadOneTransformerBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, LoadOneTransformerBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, LoadOneTransformerBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new LoadOneTransformerBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerTapChangerBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerTapChangerBuilder.java
index b7987612e..c052f346f 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerTapChangerBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerTapChangerBuilder.java
@@ -36,7 +36,7 @@ public static LoadOneTransformerTapChangerBuilder of(Network network, String mod
     public static LoadOneTransformerTapChangerBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, LoadOneTransformerTapChangerBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, LoadOneTransformerTapChangerBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new LoadOneTransformerTapChangerBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersBuilder.java
index 1565f8af0..20e80ae17 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersBuilder.java
@@ -36,7 +36,7 @@ public static LoadTwoTransformersBuilder of(Network network, String modelName) {
     public static LoadTwoTransformersBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, LoadTwoTransformersBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, LoadTwoTransformersBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new LoadTwoTransformersBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersTapChangersBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersTapChangersBuilder.java
index a4137b79e..f49c76e8b 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersTapChangersBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersTapChangersBuilder.java
@@ -36,7 +36,7 @@ public static LoadTwoTransformersTapChangersBuilder of(Network network, String m
     public static LoadTwoTransformersTapChangersBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, LoadTwoTransformersTapChangersBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, LoadTwoTransformersTapChangersBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new LoadTwoTransformersTapChangersBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/shunts/BaseShuntBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/shunts/BaseShuntBuilder.java
index 97fb989e3..847c5089a 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/shunts/BaseShuntBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/shunts/BaseShuntBuilder.java
@@ -38,7 +38,7 @@ public static BaseShuntBuilder of(Network network, String modelName) {
     public static BaseShuntBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, BaseShuntBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, BaseShuntBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new BaseShuntBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svarcs/BaseStaticVarCompensatorBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svarcs/BaseStaticVarCompensatorBuilder.java
index 225c483cd..5d7ab0e05 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svarcs/BaseStaticVarCompensatorBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svarcs/BaseStaticVarCompensatorBuilder.java
@@ -38,7 +38,7 @@ public static BaseStaticVarCompensatorBuilder of(Network network, String modelNa
     public static BaseStaticVarCompensatorBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, BaseStaticVarCompensatorBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, BaseStaticVarCompensatorBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new BaseStaticVarCompensatorBuilder(network, modelConfig, reportNode);
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TransformerFixedRatioBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TransformerFixedRatioBuilder.java
index 49dfd9465..5d9bf4014 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TransformerFixedRatioBuilder.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TransformerFixedRatioBuilder.java
@@ -38,7 +38,7 @@ public static TransformerFixedRatioBuilder of(Network network, String modelName)
     public static TransformerFixedRatioBuilder of(Network network, String modelName, ReportNode reportNode) {
         ModelConfig modelConfig = MODEL_CONFIGS.getModelConfig(modelName);
         if (modelConfig == null) {
-            BuilderReports.reportLibNotFound(reportNode, TransformerFixedRatioBuilder.class.getSimpleName(), modelName);
+            BuilderReports.reportModelNotFound(reportNode, TransformerFixedRatioBuilder.class.getSimpleName(), modelName);
             return null;
         }
         return new TransformerFixedRatioBuilder(network, modelConfig, reportNode);