diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxProperty.go b/plc4go/protocols/knxnetip/readwrite/model/KnxProperty.go
index 192e37291c3..86cf607dcfe 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxProperty.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxProperty.go
@@ -861,7 +861,7 @@ func KnxPropertyParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer
 		_ = value // TODO: temporary till we fix TIME stuff in golang (see above in the template)
 		readBuffer.CloseContext("KnxProperty")
 		return values.NewPlcBOOL(value), nil
-	case propertyType == KnxPropertyDataType_PDT_BITSET8: // WORD
+	case propertyType == KnxPropertyDataType_PDT_BITSET8: // BYTE
 		// Simple Field (value)
 		value, _valueErr := readBuffer.ReadUint8("value", 8)
 		if _valueErr != nil {
@@ -869,8 +869,8 @@ func KnxPropertyParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer
 		}
 		_ = value // TODO: temporary till we fix TIME stuff in golang (see above in the template)
 		readBuffer.CloseContext("KnxProperty")
-		return values.NewPlcWORD(value), nil
-	case propertyType == KnxPropertyDataType_PDT_BITSET16: // DWORD
+		return values.NewPlcBYTE(value), nil
+	case propertyType == KnxPropertyDataType_PDT_BITSET16: // WORD
 		// Simple Field (value)
 		value, _valueErr := readBuffer.ReadUint16("value", 16)
 		if _valueErr != nil {
@@ -878,7 +878,7 @@ func KnxPropertyParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer
 		}
 		_ = value // TODO: temporary till we fix TIME stuff in golang (see above in the template)
 		readBuffer.CloseContext("KnxProperty")
-		return values.NewPlcDWORD(value), nil
+		return values.NewPlcWORD(value), nil
 	case propertyType == KnxPropertyDataType_PDT_ENUM8: // USINT
 		// Simple Field (value)
 		value, _valueErr := readBuffer.ReadUint8("value", 8)
@@ -1451,12 +1451,12 @@ func KnxPropertySerializeWithWriteBuffer(ctx context.Context, writeBuffer utils.
 		if _err := writeBuffer.WriteBit("value", value.GetBool()); _err != nil {
 			return errors.Wrap(_err, "Error serializing 'value' field")
 		}
-	case propertyType == KnxPropertyDataType_PDT_BITSET8: // WORD
+	case propertyType == KnxPropertyDataType_PDT_BITSET8: // BYTE
 		// Simple Field (value)
 		if _err := writeBuffer.WriteUint8("value", 8, uint8(value.GetUint8())); _err != nil {
 			return errors.Wrap(_err, "Error serializing 'value' field")
 		}
-	case propertyType == KnxPropertyDataType_PDT_BITSET16: // DWORD
+	case propertyType == KnxPropertyDataType_PDT_BITSET16: // WORD
 		// Simple Field (value)
 		if _err := writeBuffer.WriteUint16("value", 16, uint16(value.GetUint16())); _err != nil {
 			return errors.Wrap(_err, "Error serializing 'value' field")
diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxProperty.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxProperty.java
index 1e9662f183b..55e07af5b3c 100644
--- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxProperty.java
+++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxProperty.java
@@ -339,12 +339,12 @@ public static PlcValue staticParse(
 
       boolean value = readSimpleField("value", readBoolean(readBuffer));
       return new PlcBOOL(value);
-    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET8)) { // WORD
+    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET8)) { // BYTE
       short value = readSimpleField("value", readUnsignedShort(readBuffer, 8));
-      return new PlcWORD(value);
-    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET16)) { // DWORD
+      return new PlcBYTE(value);
+    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET16)) { // WORD
       int value = readSimpleField("value", readUnsignedInt(readBuffer, 16));
-      return new PlcDWORD(value);
+      return new PlcWORD(value);
     } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_ENUM8)) { // USINT
       short value = readSimpleField("value", readUnsignedShort(readBuffer, 8));
       return new PlcUSINT(value);
@@ -686,10 +686,10 @@ public static int getLengthInBits(
 
       // Simple field (value)
       lengthInBits += 1;
-    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET8)) { // WORD
+    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET8)) { // BYTE
       // Simple field (value)
       lengthInBits += 8;
-    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET16)) { // DWORD
+    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET16)) { // WORD
       // Simple field (value)
       lengthInBits += 16;
     } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_ENUM8)) { // USINT
@@ -861,10 +861,10 @@ public static void staticSerialize(
 
       // Simple Field (value)
       writeSimpleField("value", (boolean) _value.getBoolean(), writeBoolean(writeBuffer));
-    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET8)) { // WORD
+    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET8)) { // BYTE
       // Simple Field (value)
       writeSimpleField("value", (short) _value.getShort(), writeUnsignedShort(writeBuffer, 8));
-    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET16)) { // DWORD
+    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET16)) { // WORD
       // Simple Field (value)
       writeSimpleField("value", (int) _value.getInteger(), writeUnsignedInt(writeBuffer, 16));
     } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_ENUM8)) { // USINT
diff --git a/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec b/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec
index 90eb692e38c..a95848621a2 100644
--- a/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec
+++ b/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec
@@ -987,10 +987,10 @@
             [reserved uint 7        '0x00']
             [simple   bit           value]
         ]
-        ['PDT_BITSET8' WORD
+        ['PDT_BITSET8' BYTE
             [simple   uint 8        value]
         ]
-        ['PDT_BITSET16' DWORD
+        ['PDT_BITSET16' WORD
             [simple   uint 16        value]
         ]
         ['PDT_ENUM8' USINT