diff --git a/code-generation/language-java/src/main/resources/templates/java/enum-template.java.ftlh b/code-generation/language-java/src/main/resources/templates/java/enum-template.java.ftlh
index 24da7f185bc..c4f9ed47a68 100644
--- a/code-generation/language-java/src/main/resources/templates/java/enum-template.java.ftlh
+++ b/code-generation/language-java/src/main/resources/templates/java/enum-template.java.ftlh
@@ -129,9 +129,15 @@ public enum ${type.name} {
 
     public static ${type.name} firstEnumForField${constantName?cap_first}(${helper.getLanguageTypeNameForTypeReference(type.getConstantType(constantName), true)} fieldValue) {
         for (${type.name} _val : ${type.name}.values()) {
+        <#if type.name == "String" || helper.getLanguageTypeNameForTypeReference(type.getConstantType(constantName), true) == "String">
+            if(_val.get${constantName?cap_first}().equals(fieldValue)) {
+                return _val;
+            }
+        <#else>
             if(_val.get${constantName?cap_first}() == fieldValue) {
                 return _val;
             }
+        </#if>
         }
         return null;
     }
@@ -139,9 +145,15 @@ public enum ${type.name} {
     public static List<${type.name}> enumsForField${constantName?cap_first}(${helper.getLanguageTypeNameForTypeReference(type.getConstantType(constantName), true)} fieldValue) {
         List<${type.name}> _values = new ArrayList();
         for (${type.name} _val : ${type.name}.values()) {
+        <#if type.name == "String" || helper.getLanguageTypeNameForTypeReference(type.getConstantType(constantName), true) == "String">
+            if(_val.get${constantName?cap_first}().equals(fieldValue)) {
+                _values.add(_val);
+            }
+        <#else>
             if(_val.get${constantName?cap_first}() == fieldValue) {
                 _values.add(_val);
             }
+        </#if>
         }
         return _values;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java
index c8cde0fcb0f..55d0bef9b40 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java
@@ -1660,7 +1660,7 @@ public String getVendorName() {
 
   public static BACnetVendorId firstEnumForFieldVendorName(String fieldValue) {
     for (BACnetVendorId _val : BACnetVendorId.values()) {
-      if (_val.getVendorName() == fieldValue) {
+      if (_val.getVendorName().equals(fieldValue)) {
         return _val;
       }
     }
@@ -1670,7 +1670,7 @@ public static BACnetVendorId firstEnumForFieldVendorName(String fieldValue) {
   public static List<BACnetVendorId> enumsForFieldVendorName(String fieldValue) {
     List<BACnetVendorId> _values = new ArrayList();
     for (BACnetVendorId _val : BACnetVendorId.values()) {
-      if (_val.getVendorName() == fieldValue) {
+      if (_val.getVendorName().equals(fieldValue)) {
         _values.add(_val);
       }
     }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/Parameter.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/Parameter.java
index 437aad1fde2..330695773b1 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/Parameter.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/Parameter.java
@@ -2141,7 +2141,7 @@ public String getForm() {
 
   public static Parameter firstEnumForFieldForm(String fieldValue) {
     for (Parameter _val : Parameter.values()) {
-      if (_val.getForm() == fieldValue) {
+      if (_val.getForm().equals(fieldValue)) {
         return _val;
       }
     }
@@ -2151,7 +2151,7 @@ public static Parameter firstEnumForFieldForm(String fieldValue) {
   public static List<Parameter> enumsForFieldForm(String fieldValue) {
     List<Parameter> _values = new ArrayList();
     for (Parameter _val : Parameter.values()) {
-      if (_val.getForm() == fieldValue) {
+      if (_val.getForm().equals(fieldValue)) {
         _values.add(_val);
       }
     }
@@ -2187,7 +2187,7 @@ public String getParameterDescription() {
 
   public static Parameter firstEnumForFieldParameterDescription(String fieldValue) {
     for (Parameter _val : Parameter.values()) {
-      if (_val.getParameterDescription() == fieldValue) {
+      if (_val.getParameterDescription().equals(fieldValue)) {
         return _val;
       }
     }
@@ -2197,7 +2197,7 @@ public static Parameter firstEnumForFieldParameterDescription(String fieldValue)
   public static List<Parameter> enumsForFieldParameterDescription(String fieldValue) {
     List<Parameter> _values = new ArrayList();
     for (Parameter _val : Parameter.values()) {
-      if (_val.getParameterDescription() == fieldValue) {
+      if (_val.getParameterDescription().equals(fieldValue)) {
         _values.add(_val);
       }
     }
@@ -2233,7 +2233,7 @@ public String getGroup() {
 
   public static Parameter firstEnumForFieldGroup(String fieldValue) {
     for (Parameter _val : Parameter.values()) {
-      if (_val.getGroup() == fieldValue) {
+      if (_val.getGroup().equals(fieldValue)) {
         return _val;
       }
     }
@@ -2243,7 +2243,7 @@ public static Parameter firstEnumForFieldGroup(String fieldValue) {
   public static List<Parameter> enumsForFieldGroup(String fieldValue) {
     List<Parameter> _values = new ArrayList();
     for (Parameter _val : Parameter.values()) {
-      if (_val.getGroup() == fieldValue) {
+      if (_val.getGroup().equals(fieldValue)) {
         _values.add(_val);
       }
     }
diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ProtectionLevel.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ProtectionLevel.java
index 1bfa6f917fc..ca6ab4aac3f 100644
--- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ProtectionLevel.java
+++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ProtectionLevel.java
@@ -57,7 +57,7 @@ public String getDescription() {
 
   public static ProtectionLevel firstEnumForFieldDescription(String fieldValue) {
     for (ProtectionLevel _val : ProtectionLevel.values()) {
-      if (_val.getDescription() == fieldValue) {
+      if (_val.getDescription().equals(fieldValue)) {
         return _val;
       }
     }
@@ -67,7 +67,7 @@ public static ProtectionLevel firstEnumForFieldDescription(String fieldValue) {
   public static List<ProtectionLevel> enumsForFieldDescription(String fieldValue) {
     List<ProtectionLevel> _values = new ArrayList();
     for (ProtectionLevel _val : ProtectionLevel.values()) {
-      if (_val.getDescription() == fieldValue) {
+      if (_val.getDescription().equals(fieldValue)) {
         _values.add(_val);
       }
     }
diff --git a/plc4j/drivers/can/src/main/generated/org/apache/plc4x/java/genericcan/readwrite/GenericCANDataType.java b/plc4j/drivers/can/src/main/generated/org/apache/plc4x/java/genericcan/readwrite/GenericCANDataType.java
index 7715476da12..2fcbae9a11c 100644
--- a/plc4j/drivers/can/src/main/generated/org/apache/plc4x/java/genericcan/readwrite/GenericCANDataType.java
+++ b/plc4j/drivers/can/src/main/generated/org/apache/plc4x/java/genericcan/readwrite/GenericCANDataType.java
@@ -75,7 +75,7 @@ public String getPlcValueName() {
 
   public static GenericCANDataType firstEnumForFieldPlcValueName(String fieldValue) {
     for (GenericCANDataType _val : GenericCANDataType.values()) {
-      if (_val.getPlcValueName() == fieldValue) {
+      if (_val.getPlcValueName().equals(fieldValue)) {
         return _val;
       }
     }
@@ -85,7 +85,7 @@ public static GenericCANDataType firstEnumForFieldPlcValueName(String fieldValue
   public static List<GenericCANDataType> enumsForFieldPlcValueName(String fieldValue) {
     List<GenericCANDataType> _values = new ArrayList();
     for (GenericCANDataType _val : GenericCANDataType.values()) {
-      if (_val.getPlcValueName() == fieldValue) {
+      if (_val.getPlcValueName().equals(fieldValue)) {
         _values.add(_val);
       }
     }
diff --git a/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/CANOpenDataType.java b/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/CANOpenDataType.java
index 807a385d6da..64d18bd3278 100644
--- a/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/CANOpenDataType.java
+++ b/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/CANOpenDataType.java
@@ -80,7 +80,7 @@ public String getPlcValueName() {
 
   public static CANOpenDataType firstEnumForFieldPlcValueName(String fieldValue) {
     for (CANOpenDataType _val : CANOpenDataType.values()) {
-      if (_val.getPlcValueName() == fieldValue) {
+      if (_val.getPlcValueName().equals(fieldValue)) {
         return _val;
       }
     }
@@ -90,7 +90,7 @@ public static CANOpenDataType firstEnumForFieldPlcValueName(String fieldValue) {
   public static List<CANOpenDataType> enumsForFieldPlcValueName(String fieldValue) {
     List<CANOpenDataType> _values = new ArrayList();
     for (CANOpenDataType _val : CANOpenDataType.values()) {
-      if (_val.getPlcValueName() == fieldValue) {
+      if (_val.getPlcValueName().equals(fieldValue)) {
         _values.add(_val);
       }
     }
diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/AccessLevel.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/AccessLevel.java
index 11e069beeb1..e71441bb742 100644
--- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/AccessLevel.java
+++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/AccessLevel.java
@@ -60,7 +60,7 @@ public String getPurpose() {
 
   public static AccessLevel firstEnumForFieldPurpose(String fieldValue) {
     for (AccessLevel _val : AccessLevel.values()) {
-      if (_val.getPurpose() == fieldValue) {
+      if (_val.getPurpose().equals(fieldValue)) {
         return _val;
       }
     }
@@ -70,7 +70,7 @@ public static AccessLevel firstEnumForFieldPurpose(String fieldValue) {
   public static List<AccessLevel> enumsForFieldPurpose(String fieldValue) {
     List<AccessLevel> _values = new ArrayList();
     for (AccessLevel _val : AccessLevel.values()) {
-      if (_val.getPurpose() == fieldValue) {
+      if (_val.getPurpose().equals(fieldValue)) {
         _values.add(_val);
       }
     }
diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapointMainType.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapointMainType.java
index 1000c64348a..678baf472e6 100644
--- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapointMainType.java
+++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapointMainType.java
@@ -149,7 +149,7 @@ public String getName() {
 
   public static KnxDatapointMainType firstEnumForFieldName(String fieldValue) {
     for (KnxDatapointMainType _val : KnxDatapointMainType.values()) {
-      if (_val.getName() == fieldValue) {
+      if (_val.getName().equals(fieldValue)) {
         return _val;
       }
     }
@@ -159,7 +159,7 @@ public static KnxDatapointMainType firstEnumForFieldName(String fieldValue) {
   public static List<KnxDatapointMainType> enumsForFieldName(String fieldValue) {
     List<KnxDatapointMainType> _values = new ArrayList();
     for (KnxDatapointMainType _val : KnxDatapointMainType.values()) {
-      if (_val.getName() == fieldValue) {
+      if (_val.getName().equals(fieldValue)) {
         _values.add(_val);
       }
     }
diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapointType.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapointType.java
index d4e49202d5e..7ca4fbd0526 100644
--- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapointType.java
+++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapointType.java
@@ -1207,7 +1207,7 @@ public String getName() {
 
   public static KnxDatapointType firstEnumForFieldName(String fieldValue) {
     for (KnxDatapointType _val : KnxDatapointType.values()) {
-      if (_val.getName() == fieldValue) {
+      if (_val.getName().equals(fieldValue)) {
         return _val;
       }
     }
@@ -1217,7 +1217,7 @@ public static KnxDatapointType firstEnumForFieldName(String fieldValue) {
   public static List<KnxDatapointType> enumsForFieldName(String fieldValue) {
     List<KnxDatapointType> _values = new ArrayList();
     for (KnxDatapointType _val : KnxDatapointType.values()) {
-      if (_val.getName() == fieldValue) {
+      if (_val.getName().equals(fieldValue)) {
         _values.add(_val);
       }
     }
diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxInterfaceObjectProperty.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxInterfaceObjectProperty.java
index 4dd73ea6969..e6c63906c09 100644
--- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxInterfaceObjectProperty.java
+++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxInterfaceObjectProperty.java
@@ -1385,7 +1385,7 @@ public String getName() {
 
   public static KnxInterfaceObjectProperty firstEnumForFieldName(String fieldValue) {
     for (KnxInterfaceObjectProperty _val : KnxInterfaceObjectProperty.values()) {
-      if (_val.getName() == fieldValue) {
+      if (_val.getName().equals(fieldValue)) {
         return _val;
       }
     }
@@ -1395,7 +1395,7 @@ public static KnxInterfaceObjectProperty firstEnumForFieldName(String fieldValue
   public static List<KnxInterfaceObjectProperty> enumsForFieldName(String fieldValue) {
     List<KnxInterfaceObjectProperty> _values = new ArrayList();
     for (KnxInterfaceObjectProperty _val : KnxInterfaceObjectProperty.values()) {
-      if (_val.getName() == fieldValue) {
+      if (_val.getName().equals(fieldValue)) {
         _values.add(_val);
       }
     }
diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxInterfaceObjectType.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxInterfaceObjectType.java
index a8739f71bdc..e110ab7f881 100644
--- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxInterfaceObjectType.java
+++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxInterfaceObjectType.java
@@ -82,7 +82,7 @@ public String getCode() {
 
   public static KnxInterfaceObjectType firstEnumForFieldCode(String fieldValue) {
     for (KnxInterfaceObjectType _val : KnxInterfaceObjectType.values()) {
-      if (_val.getCode() == fieldValue) {
+      if (_val.getCode().equals(fieldValue)) {
         return _val;
       }
     }
@@ -92,7 +92,7 @@ public static KnxInterfaceObjectType firstEnumForFieldCode(String fieldValue) {
   public static List<KnxInterfaceObjectType> enumsForFieldCode(String fieldValue) {
     List<KnxInterfaceObjectType> _values = new ArrayList();
     for (KnxInterfaceObjectType _val : KnxInterfaceObjectType.values()) {
-      if (_val.getCode() == fieldValue) {
+      if (_val.getCode().equals(fieldValue)) {
         _values.add(_val);
       }
     }
@@ -105,7 +105,7 @@ public String getName() {
 
   public static KnxInterfaceObjectType firstEnumForFieldName(String fieldValue) {
     for (KnxInterfaceObjectType _val : KnxInterfaceObjectType.values()) {
-      if (_val.getName() == fieldValue) {
+      if (_val.getName().equals(fieldValue)) {
         return _val;
       }
     }
@@ -115,7 +115,7 @@ public static KnxInterfaceObjectType firstEnumForFieldName(String fieldValue) {
   public static List<KnxInterfaceObjectType> enumsForFieldName(String fieldValue) {
     List<KnxInterfaceObjectType> _values = new ArrayList();
     for (KnxInterfaceObjectType _val : KnxInterfaceObjectType.values()) {
-      if (_val.getName() == fieldValue) {
+      if (_val.getName().equals(fieldValue)) {
         _values.add(_val);
       }
     }
diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java
index 4bdeb3e3f1d..161490ecc30 100644
--- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java
+++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java
@@ -757,7 +757,7 @@ public String getName() {
 
   public static KnxManufacturer firstEnumForFieldName(String fieldValue) {
     for (KnxManufacturer _val : KnxManufacturer.values()) {
-      if (_val.getName() == fieldValue) {
+      if (_val.getName().equals(fieldValue)) {
         return _val;
       }
     }
@@ -767,7 +767,7 @@ public static KnxManufacturer firstEnumForFieldName(String fieldValue) {
   public static List<KnxManufacturer> enumsForFieldName(String fieldValue) {
     List<KnxManufacturer> _values = new ArrayList();
     for (KnxManufacturer _val : KnxManufacturer.values()) {
-      if (_val.getName() == fieldValue) {
+      if (_val.getName().equals(fieldValue)) {
         _values.add(_val);
       }
     }
diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxPropertyDataType.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxPropertyDataType.java
index 68519c3860c..1a449888d95 100644
--- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxPropertyDataType.java
+++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxPropertyDataType.java
@@ -153,7 +153,7 @@ public String getName() {
 
   public static KnxPropertyDataType firstEnumForFieldName(String fieldValue) {
     for (KnxPropertyDataType _val : KnxPropertyDataType.values()) {
-      if (_val.getName() == fieldValue) {
+      if (_val.getName().equals(fieldValue)) {
         return _val;
       }
     }
@@ -163,7 +163,7 @@ public static KnxPropertyDataType firstEnumForFieldName(String fieldValue) {
   public static List<KnxPropertyDataType> enumsForFieldName(String fieldValue) {
     List<KnxPropertyDataType> _values = new ArrayList();
     for (KnxPropertyDataType _val : KnxPropertyDataType.values()) {
-      if (_val.getName() == fieldValue) {
+      if (_val.getName().equals(fieldValue)) {
         _values.add(_val);
       }
     }
diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/SupportedPhysicalMedia.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/SupportedPhysicalMedia.java
index 5423dd369d9..0e4f84059cb 100644
--- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/SupportedPhysicalMedia.java
+++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/SupportedPhysicalMedia.java
@@ -105,7 +105,7 @@ public String getDescription() {
 
   public static SupportedPhysicalMedia firstEnumForFieldDescription(String fieldValue) {
     for (SupportedPhysicalMedia _val : SupportedPhysicalMedia.values()) {
-      if (_val.getDescription() == fieldValue) {
+      if (_val.getDescription().equals(fieldValue)) {
         return _val;
       }
     }
@@ -115,7 +115,7 @@ public static SupportedPhysicalMedia firstEnumForFieldDescription(String fieldVa
   public static List<SupportedPhysicalMedia> enumsForFieldDescription(String fieldValue) {
     List<SupportedPhysicalMedia> _values = new ArrayList();
     for (SupportedPhysicalMedia _val : SupportedPhysicalMedia.values()) {
-      if (_val.getDescription() == fieldValue) {
+      if (_val.getDescription().equals(fieldValue)) {
         _values.add(_val);
       }
     }
diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/VirtualLanPriority.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/VirtualLanPriority.java
index db3ef75648a..4a8438ef1a7 100644
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/VirtualLanPriority.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/VirtualLanPriority.java
@@ -61,7 +61,7 @@ public String getAcronym() {
 
   public static VirtualLanPriority firstEnumForFieldAcronym(String fieldValue) {
     for (VirtualLanPriority _val : VirtualLanPriority.values()) {
-      if (_val.getAcronym() == fieldValue) {
+      if (_val.getAcronym().equals(fieldValue)) {
         return _val;
       }
     }
@@ -71,7 +71,7 @@ public static VirtualLanPriority firstEnumForFieldAcronym(String fieldValue) {
   public static List<VirtualLanPriority> enumsForFieldAcronym(String fieldValue) {
     List<VirtualLanPriority> _values = new ArrayList();
     for (VirtualLanPriority _val : VirtualLanPriority.values()) {
-      if (_val.getAcronym() == fieldValue) {
+      if (_val.getAcronym().equals(fieldValue)) {
         _values.add(_val);
       }
     }
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/MemoryArea.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/MemoryArea.java
index 15eb3030d92..0a244f9910f 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/MemoryArea.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/MemoryArea.java
@@ -62,7 +62,7 @@ public String getShortName() {
 
   public static MemoryArea firstEnumForFieldShortName(String fieldValue) {
     for (MemoryArea _val : MemoryArea.values()) {
-      if (_val.getShortName() == fieldValue) {
+      if (_val.getShortName().equals(fieldValue)) {
         return _val;
       }
     }
@@ -72,7 +72,7 @@ public static MemoryArea firstEnumForFieldShortName(String fieldValue) {
   public static List<MemoryArea> enumsForFieldShortName(String fieldValue) {
     List<MemoryArea> _values = new ArrayList();
     for (MemoryArea _val : MemoryArea.values()) {
-      if (_val.getShortName() == fieldValue) {
+      if (_val.getShortName().equals(fieldValue)) {
         _values.add(_val);
       }
     }
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TransportSize.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TransportSize.java
index 90c3a72635e..4b70936705e 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TransportSize.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TransportSize.java
@@ -630,7 +630,7 @@ public String getDataProtocolId() {
 
   public static TransportSize firstEnumForFieldDataProtocolId(String fieldValue) {
     for (TransportSize _val : TransportSize.values()) {
-      if (_val.getDataProtocolId() == fieldValue) {
+      if (_val.getDataProtocolId().equals(fieldValue)) {
         return _val;
       }
     }
@@ -640,7 +640,7 @@ public static TransportSize firstEnumForFieldDataProtocolId(String fieldValue) {
   public static List<TransportSize> enumsForFieldDataProtocolId(String fieldValue) {
     List<TransportSize> _values = new ArrayList();
     for (TransportSize _val : TransportSize.values()) {
-      if (_val.getDataProtocolId() == fieldValue) {
+      if (_val.getDataProtocolId().equals(fieldValue)) {
         _values.add(_val);
       }
     }