diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17b4083bb..af56acbbe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Refactored validation of entity classes [#1561](https://github.com/ie3-institute/PowerSystemDataModel/issues/1561)
 - Changed `operationTime` to `operationFrom` and `operationUntil` in read the docs [1507](https://github.com/ie3-institute/PowerSystemDataModel/issues/1507)
 - Refactored validation of value classes [#1561](https://github.com/ie3-institute/PowerSystemDataModel/issues/1561)
+- Handled SonarQube Issues [#1588](https://github.com/ie3-institute/PowerSystemDataModel/issues/1588)
 
 ## [8.1.0] - 2025-07-25
 
diff --git a/src/main/java/edu/ie3/datamodel/io/factory/timeseries/TimeBasedSimpleValueFactory.java b/src/main/java/edu/ie3/datamodel/io/factory/timeseries/TimeBasedSimpleValueFactory.java
index c51f12027..cc4733f05 100644
--- a/src/main/java/edu/ie3/datamodel/io/factory/timeseries/TimeBasedSimpleValueFactory.java
+++ b/src/main/java/edu/ie3/datamodel/io/factory/timeseries/TimeBasedSimpleValueFactory.java
@@ -13,7 +13,6 @@
 import edu.ie3.datamodel.models.value.*;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
 
 public class TimeBasedSimpleValueFactory<V extends Value>
     extends TimeBasedValueFactory<SimpleTimeBasedValueData<V>, V> {
diff --git a/src/main/java/edu/ie3/datamodel/io/source/SystemParticipantSource.java b/src/main/java/edu/ie3/datamodel/io/source/SystemParticipantSource.java
index d632e04ba..81f04c338 100644
--- a/src/main/java/edu/ie3/datamodel/io/source/SystemParticipantSource.java
+++ b/src/main/java/edu/ie3/datamodel/io/source/SystemParticipantSource.java
@@ -11,6 +11,7 @@
 import edu.ie3.datamodel.io.factory.EntityData;
 import edu.ie3.datamodel.io.factory.input.NodeAssetInputEntityData;
 import edu.ie3.datamodel.io.factory.input.participant.*;
+import edu.ie3.datamodel.io.naming.FieldNamingStrategy;
 import edu.ie3.datamodel.models.input.EmInput;
 import edu.ie3.datamodel.models.input.NodeInput;
 import edu.ie3.datamodel.models.input.OperatorInput;
@@ -63,7 +64,7 @@ public class SystemParticipantSource extends AssetEntitySource {
                   .andThen(enrich(NODE, nodes, NodeAssetInputEntityData::new))
                   .andThen(
                       enrichWithDefault(
-                          SystemParticipantInputEntityFactory.CONTROLLING_EM,
+                          FieldNamingStrategy.CONTROLLING_EM,
                           emUnits,
                           null,
                           SystemParticipantEntityData::new))
diff --git a/src/main/java/edu/ie3/datamodel/models/input/IdCoordinateInput.java b/src/main/java/edu/ie3/datamodel/models/input/IdCoordinateInput.java
index ea4de14a5..6f7caf41d 100644
--- a/src/main/java/edu/ie3/datamodel/models/input/IdCoordinateInput.java
+++ b/src/main/java/edu/ie3/datamodel/models/input/IdCoordinateInput.java
@@ -8,10 +8,7 @@
 import edu.ie3.util.geo.GeoUtils;
 import org.locationtech.jts.geom.Point;
 
-public sealed class IdCoordinateInput implements InputEntity
-    permits IdCoordinateInput.CosmoIdCoordinateInput,
-        IdCoordinateInput.IconIdCoordinateInput,
-        IdCoordinateInput.SqlIdCoordinateInput {
+public sealed class IdCoordinateInput implements InputEntity {
 
   private final int id;
 
diff --git a/src/main/java/edu/ie3/datamodel/models/input/system/LoadInput.java b/src/main/java/edu/ie3/datamodel/models/input/system/LoadInput.java
index 903013aaa..a4154334d 100644
--- a/src/main/java/edu/ie3/datamodel/models/input/system/LoadInput.java
+++ b/src/main/java/edu/ie3/datamodel/models/input/system/LoadInput.java
@@ -5,7 +5,6 @@
 */
 package edu.ie3.datamodel.models.input.system;
 
-import edu.ie3.datamodel.exceptions.ParsingException;
 import edu.ie3.datamodel.models.*;
 import edu.ie3.datamodel.models.input.EmInput;
 import edu.ie3.datamodel.models.input.NodeInput;
@@ -168,8 +167,7 @@ public LoadInput(
       String powerProfileKey,
       ComparableQuantity<Energy> eConsAnnual,
       ComparableQuantity<Power> sRated,
-      double cosPhiRated)
-      throws ParsingException {
+      double cosPhiRated) {
     this(
         uuid,
         id,
@@ -261,10 +259,7 @@ public String toString() {
 
   /**
    * A builder pattern based approach to create copies of {@link LoadInput} entities with altered
-   * field values. For detailed field descriptions refer to java docs of {@link LoadInput}
-   *
-   * @version 0.1
-   * @since 05.06.20
+   * field values. For detailed field descriptions refer to Javadocs of {@link LoadInput}
    */
   public static class LoadInputCopyBuilder
       extends SystemParticipantInputCopyBuilder<LoadInputCopyBuilder> {
diff --git a/src/main/java/edu/ie3/datamodel/models/value/WeatherValue.java b/src/main/java/edu/ie3/datamodel/models/value/WeatherValue.java
index 552bd7d40..f62fedd8c 100644
--- a/src/main/java/edu/ie3/datamodel/models/value/WeatherValue.java
+++ b/src/main/java/edu/ie3/datamodel/models/value/WeatherValue.java
@@ -15,8 +15,7 @@
 import tech.units.indriya.ComparableQuantity;
 
 /** Describes weather as a combination of solar irradiance, temperature and wind values */
-public sealed class WeatherValue implements Value
-    permits WeatherValue.CosmoWeatherValue, WeatherValue.IconWeatherValue {
+public sealed class WeatherValue implements Value {
   /** The coordinate of this weather value set */
   private final Point coordinate;