diff --git a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/dto/SystemInformationBlockAllWpm.java b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/dto/SystemInformationBlockAllWpm.java
index c62d58ae110..c08e632a3a8 100755
--- a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/dto/SystemInformationBlockAllWpm.java
+++ b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/dto/SystemInformationBlockAllWpm.java
@@ -44,9 +44,12 @@ public class SystemInformationBlockAllWpm extends SystemInformationBlock {
     public short temperatureAreaCooling;
     public short temperatureAreaCoolingSetPoint;
 
+    // The following three values are only available for WPM3
     public short temperatureCollectorSolar;
     public short temperatureCylinderSolar;
     public int runtimeSolar;
+
+    // The following three values are only available for WPMsystem and WPM3
     public short temperatureExtHeatSource;
     public short temperatureExtHeatSourceSetPoint;
     public int runtimeExtHeatSource;
@@ -57,6 +60,7 @@ public class SystemInformationBlockAllWpm extends SystemInformationBlock {
     public short temperatureSourceMin;
     public short pressureSource;
 
+    // The following three values are only available for WPM3i
     public short temperatureHotgas;
     public short pressureHigh;
     public short pressureLow;
diff --git a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/handler/StiebelEltronHandler.java b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/handler/StiebelEltronHandler.java
index 1dc5ec6d325..60dbf95ae52 100644
--- a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/handler/StiebelEltronHandler.java
+++ b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/handler/StiebelEltronHandler.java
@@ -30,7 +30,7 @@ import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemInformationBl
 import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemParameterBlock;
 import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemStateBlock;
 import org.openhab.binding.modbus.stiebeleltron.internal.parser.EnergyBlockParser;
-import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemInfromationBlockParser;
+import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemInformationBlockParser;
 import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemParameterBlockParser;
 import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemStateBlockParser;
 import org.openhab.core.io.transport.modbus.AsyncModbusFailure;
@@ -134,7 +134,7 @@ public class StiebelEltronHandler extends BaseThingHandler {
     /**
      * Parser used to convert incoming raw messages into system blocks
      */
-    private final SystemInfromationBlockParser systemInformationBlockParser = new SystemInfromationBlockParser();
+    private final SystemInformationBlockParser systemInformationBlockParser = new SystemInformationBlockParser();
     /**
      * Parser used to convert incoming raw messages into system state blocks
      */
diff --git a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/handler/StiebelEltronHandlerWpm.java b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/handler/StiebelEltronHandlerWpm.java
index 2a13edb1475..e805db1fc72 100755
--- a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/handler/StiebelEltronHandlerWpm.java
+++ b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/handler/StiebelEltronHandlerWpm.java
@@ -30,7 +30,7 @@ import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemInformationBl
 import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemParameterBlockAllWpm;
 import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemStateBlockAllWpm;
 import org.openhab.binding.modbus.stiebeleltron.internal.parser.EnergyBlockParser;
-import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemInfromationBlockAllWpmParser;
+import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemInformationBlockAllWpmParser;
 import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemParameterBlockAllWpmParser;
 import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemStateBlockParserAllWpm;
 import org.openhab.core.io.transport.modbus.AsyncModbusFailure;
@@ -137,7 +137,7 @@ public class StiebelEltronHandlerWpm extends BaseThingHandler {
     /**
      * Parser used to convert incoming raw messages into system blocks
      */
-    private final SystemInfromationBlockAllWpmParser systemInformationBlockParser = new SystemInfromationBlockAllWpmParser();
+    private final SystemInformationBlockAllWpmParser systemInformationBlockParser = new SystemInformationBlockAllWpmParser();
     /**
      * Parser used to convert incoming raw messages into system parameter blocks
      */
diff --git a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/handler/StiebelEltronHandlerWpm3.java b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/handler/StiebelEltronHandlerWpm3.java
index 07a76b8010a..bf520365913 100755
--- a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/handler/StiebelEltronHandlerWpm3.java
+++ b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/handler/StiebelEltronHandlerWpm3.java
@@ -30,7 +30,7 @@ import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemInformationBl
 import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemParameterBlockAllWpm;
 import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemStateBlockAllWpm;
 import org.openhab.binding.modbus.stiebeleltron.internal.parser.EnergyBlockParser;
-import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemInfromationBlockAllWpmParser;
+import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemInformationBlockAllWpmParser;
 import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemParameterBlockAllWpmParser;
 import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemStateBlockParserAllWpm;
 import org.openhab.core.io.transport.modbus.AsyncModbusFailure;
@@ -137,7 +137,7 @@ public class StiebelEltronHandlerWpm3 extends BaseThingHandler {
     /**
      * Parser used to convert incoming raw messages into system blocks
      */
-    private final SystemInfromationBlockAllWpmParser systemInformationBlockParser = new SystemInfromationBlockAllWpmParser();
+    private final SystemInformationBlockAllWpmParser systemInformationBlockParser = new SystemInformationBlockAllWpmParser();
     /**
      * Parser used to convert incoming raw messages into system parameter blocks
      */
diff --git a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/handler/StiebelEltronHandlerWpm3i.java b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/handler/StiebelEltronHandlerWpm3i.java
index 765fb7d8f32..fecab804f96 100755
--- a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/handler/StiebelEltronHandlerWpm3i.java
+++ b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/handler/StiebelEltronHandlerWpm3i.java
@@ -32,7 +32,7 @@ import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemParameterBloc
 import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemStateBlockAllWpm;
 import org.openhab.binding.modbus.stiebeleltron.internal.parser.EnergyBlockParser;
 import org.openhab.binding.modbus.stiebeleltron.internal.parser.RuntimeBlockParser;
-import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemInfromationBlockAllWpmParser;
+import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemInformationBlockAllWpmParser;
 import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemParameterBlockAllWpmParser;
 import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemStateBlockParserAllWpm;
 import org.openhab.core.io.transport.modbus.AsyncModbusFailure;
@@ -139,7 +139,7 @@ public class StiebelEltronHandlerWpm3i extends BaseThingHandler {
     /**
      * Parser used to convert incoming raw messages into system blocks
      */
-    private final SystemInfromationBlockAllWpmParser systemInformationBlockParser = new SystemInfromationBlockAllWpmParser();
+    private final SystemInformationBlockAllWpmParser systemInformationBlockParser = new SystemInformationBlockAllWpmParser();
     /**
      * Parser used to convert incoming raw messages into system parameter blocks
      */
diff --git a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/SystemInformationBlockAllWpmParser.java b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/SystemInformationBlockAllWpmParser.java
index 20e6f01521f..2d5481d3805 100755
--- a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/SystemInformationBlockAllWpmParser.java
+++ b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/SystemInformationBlockAllWpmParser.java
@@ -23,7 +23,7 @@ import org.openhab.core.io.transport.modbus.ModbusRegisterArray;
  *
  */
 @NonNullByDefault
-public class SystemInfromationBlockAllWpmParser extends AbstractBaseParser {
+public class SystemInformationBlockAllWpmParser extends AbstractBaseParser {
 
     public SystemInformationBlockAllWpm parse(ModbusRegisterArray raw) {
         SystemInformationBlockAllWpm block = new SystemInformationBlockAllWpm();
diff --git a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/SystemInformationBlockParser.java b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/SystemInformationBlockParser.java
index 6372ca4900e..dff84b477d2 100644
--- a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/SystemInformationBlockParser.java
+++ b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/SystemInformationBlockParser.java
@@ -24,7 +24,7 @@ import org.openhab.core.io.transport.modbus.ModbusRegisterArray;
  *
  */
 @NonNullByDefault
-public class SystemInfromationBlockParser extends AbstractBaseParser {
+public class SystemInformationBlockParser extends AbstractBaseParser {
 
     public SystemInformationBlock parse(ModbusRegisterArray raw) {
         SystemInformationBlock block = new SystemInformationBlock();