diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm
index 3655a8179..758ef1198 100755
--- a/fhem/FHEM/10_ZWave.pm
+++ b/fhem/FHEM/10_ZWave.pm
@@ -1997,7 +1997,7 @@ ZWave_SetClasses($$$$)
 
   my $def = $modules{ZWave}{defptr}{"$homeId $id"};
   if(!$def) {
-    $type6 = $zw_type6{$type6} if($type6 && $zw_type6{$type6});
+    $type6 = $zw_type6{$type6} if($type6 && $zw_type6{lc($type6)});
     $id = hex($id);
     return "UNDEFINED ZWave_${type6}_$id ZWave $homeId $id $classes"
   }
diff --git a/fhem/FHEM/ZWLib.pm b/fhem/FHEM/ZWLib.pm
index 5b01d370b..a5be96732 100644
--- a/fhem/FHEM/ZWLib.pm
+++ b/fhem/FHEM/ZWLib.pm
@@ -130,7 +130,7 @@ use vars qw(%zw_type6);
   '07' => 'SENSOR_NOTIFICATION',
   '08' => 'THERMOSTAT',
   '09' => 'WINDOW_COVERING',
-  '0F' => 'REPEATER_SLAVE',
+  '0f' => 'REPEATER_SLAVE',
   '10' => 'SWITCH_BINARY',
   '11' => 'SWITCH_MULTILEVEL',
   '12' => 'SWITCH_REMOTE',
@@ -146,7 +146,7 @@ use vars qw(%zw_type6);
   '31' => 'METER',
   '40' => 'ENTRY_CONTROL',
   '50' => 'SEMI_INTEROPERABLE',
-  'A1' => 'SENSOR_ALARM',
+  'a1' => 'SENSOR_ALARM',
   'ff' => 'NON_INTEROPERABLE',
 );