diff --git a/Zway/Devices/CommandClasses/Battery.cs b/Zway/Devices/CommandClasses/Battery.cs
index 459fe8e..71f5f1b 100644
--- a/Zway/Devices/CommandClasses/Battery.cs
+++ b/Zway/Devices/CommandClasses/Battery.cs
@@ -54,7 +54,7 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level },
+        { "Level", this.Level },
       };
     }
   }
diff --git a/Zway/Devices/CommandClasses/CentralScene.cs b/Zway/Devices/CommandClasses/CentralScene.cs
index 8ab5db7..55e475f 100644
--- a/Zway/Devices/CommandClasses/CentralScene.cs
+++ b/Zway/Devices/CommandClasses/CentralScene.cs
@@ -78,8 +78,8 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "scene", this.Scene },
-        { "key", this.Key },
+        { "Scene", this.Scene },
+        { "Key", this.Key },
       };
     }
   }
diff --git a/Zway/Devices/CommandClasses/CommandClassSubs/Configurationsub.cs b/Zway/Devices/CommandClasses/CommandClassSubs/Configurationsub.cs
index 00571b7..bcc3b89 100644
--- a/Zway/Devices/CommandClasses/CommandClassSubs/Configurationsub.cs
+++ b/Zway/Devices/CommandClasses/CommandClassSubs/Configurationsub.cs
@@ -61,8 +61,8 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level },
-        { "size", this.Size },
+        { "Level", this.Level },
+        { "Size", this.Size },
       };
     }
   }
diff --git a/Zway/Devices/CommandClasses/CommandClassSubs/MeterSub.cs b/Zway/Devices/CommandClasses/CommandClassSubs/MeterSub.cs
index 5e96d75..562510d 100644
--- a/Zway/Devices/CommandClasses/CommandClassSubs/MeterSub.cs
+++ b/Zway/Devices/CommandClasses/CommandClassSubs/MeterSub.cs
@@ -52,9 +52,9 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level },
-        { "type", this.Type },
-        { "scale", this.Scale },
+        { "Level", this.Level },
+        { "Type", this.Type },
+        { "Scale", this.Scale },
       };
     }
   }
diff --git a/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs b/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs
index de1104e..0423e02 100644
--- a/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs
+++ b/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs
@@ -52,9 +52,9 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level },
-        { "type", this.Type },
-        { "scale", this.Scale },
+        { "Level", this.Level },
+        { "Type", this.Type },
+        { "Scale", this.Scale },
       };
     }
   }
diff --git a/Zway/Devices/CommandClasses/CommandClassSubs/ThermostatSetPointSub.cs b/Zway/Devices/CommandClasses/CommandClassSubs/ThermostatSetPointSub.cs
index 50d970d..cb9c139 100644
--- a/Zway/Devices/CommandClasses/CommandClassSubs/ThermostatSetPointSub.cs
+++ b/Zway/Devices/CommandClasses/CommandClassSubs/ThermostatSetPointSub.cs
@@ -82,12 +82,12 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level },
-        { "type", this.Type },
-        { "scale", this.Scale },
-        { "tempmax", this.TempMax },
-        { "tempmin", this.TempMin },
-        { "hasminmax", this.HasMinMax },
+        { "Level", this.Level },
+        { "Type", this.Type },
+        { "Scale", this.Scale },
+        { "TempMax", this.TempMax },
+        { "TempMin", this.TempMin },
+        { "HasMinMax", this.HasMinMax },
       };
     }
   }
diff --git a/Zway/Devices/CommandClasses/Indicator.cs b/Zway/Devices/CommandClasses/Indicator.cs
index f0444b2..6ffc536 100644
--- a/Zway/Devices/CommandClasses/Indicator.cs
+++ b/Zway/Devices/CommandClasses/Indicator.cs
@@ -50,7 +50,7 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level },
+        { "Level", this.Level },
       };
     }
   }
diff --git a/Zway/Devices/CommandClasses/SwitchBinary.cs b/Zway/Devices/CommandClasses/SwitchBinary.cs
index f965b02..2dedcfa 100644
--- a/Zway/Devices/CommandClasses/SwitchBinary.cs
+++ b/Zway/Devices/CommandClasses/SwitchBinary.cs
@@ -51,7 +51,7 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level }
+        { "Level", this.Level }
       };
     }
   }
diff --git a/Zway/Devices/CommandClasses/SwitchMultilevel.cs b/Zway/Devices/CommandClasses/SwitchMultilevel.cs
index c42caf4..d663771 100644
--- a/Zway/Devices/CommandClasses/SwitchMultilevel.cs
+++ b/Zway/Devices/CommandClasses/SwitchMultilevel.cs
@@ -54,7 +54,7 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level }
+        { "Level", this.Level }
       };
     }
   }
diff --git a/Zway/Devices/CommandClasses/ThermostatMode.cs b/Zway/Devices/CommandClasses/ThermostatMode.cs
index 75cc9f4..b83a4bd 100644
--- a/Zway/Devices/CommandClasses/ThermostatMode.cs
+++ b/Zway/Devices/CommandClasses/ThermostatMode.cs
@@ -71,8 +71,8 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
         modes.Add(item.Key.ToString(), item.Value);
       }
       Dictionary<String, Object> json = new Dictionary<String, Object> {
-        { "level", this.Level },
-        { "modes", modes }
+        { "Level", this.Level },
+        { "ValidModes", modes }
       };
       return json;
     }
diff --git a/Zway/Devices/CommandClasses/Wakeup.cs b/Zway/Devices/CommandClasses/Wakeup.cs
index 8f1b197..509505b 100644
--- a/Zway/Devices/CommandClasses/Wakeup.cs
+++ b/Zway/Devices/CommandClasses/Wakeup.cs
@@ -124,13 +124,13 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        {"interval", this.Interval },
-        {"againstnode", this.AgainstNode },
-        { "wakeupmin", this.WakeupMin },
-        { "wakeupmax", this.WakeupMax },
-        { "wakeupdefault", this.WakeupDefault },
-        { "lastwakeup", this.LastWakeup.ToString() },
-        { "lastsleep", this.LastSleep.ToString() }
+        { "Interval", this.Interval },
+        { "AgainstNode", this.AgainstNode },
+        { "WakeupMin", this.WakeupMin },
+        { "WakeupMax", this.WakeupMax },
+        { "WakeupDefault", this.WakeupDefault },
+        { "LastWakeup", this.LastWakeup.ToString() },
+        { "LastSleep", this.LastSleep.ToString() }
       };
     }
   }
diff --git a/Zway/Properties/AssemblyInfo.cs b/Zway/Properties/AssemblyInfo.cs
index 3902101..e206ba6 100644
--- a/Zway/Properties/AssemblyInfo.cs
+++ b/Zway/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.3.0")]
-[assembly: AssemblyFileVersion("1.3.3.0")]
+[assembly: AssemblyVersion("1.3.4.0")]
+[assembly: AssemblyFileVersion("1.3.4.0")]
diff --git a/Zway/bin/Release/Zway.dll b/Zway/bin/Release/Zway.dll
index 5af0810..875a364 100644
Binary files a/Zway/bin/Release/Zway.dll and b/Zway/bin/Release/Zway.dll differ