diff --git a/docs/commandref.html b/docs/commandref.html
index c04a3d303..c239205ea 100644
--- a/docs/commandref.html
+++ b/docs/commandref.html
@@ -618,7 +618,7 @@ split in multiple lines<br><br>
     Examples:
     <pre>
       define WS300Device  WS300   /dev/ttyUSB1
-      define ash2200-1    WS300   0
+      define ash2200.1    WS300   0
       define ks300        WS300   8
       define ws300        WS300   9
     </pre>
diff --git a/test/fhem.cfg b/test/fhem.cfg
index 36f0911d8..25337df3f 100644
--- a/test/fhem.cfg
+++ b/test/fhem.cfg
@@ -6,8 +6,8 @@ attr global modpath .
 
 define FHZ FHZ none
 
-define floor-lamp    FS20 1234 00
-define window-lamp   FS20 1234 02
+define floor.lamp    FS20 1234 00
+define window.lamp   FS20 1234 02
 define marqee        FS20 1234 07
 define cellar        FS20 1234 13
 define btn4          FS20 1234 03
diff --git a/test/fhem.save b/test/fhem.save
index 374666347..869d678de 100644
--- a/test/fhem.save
+++ b/test/fhem.save
@@ -1,9 +1,8 @@
-#Sun Apr 22 14:04:14 2007
+#Tue Apr 24 09:13:44 2007
 setstate FHZ fhtbuf: 1c
 setstate FHZ 2006-02-12 14:03:39 fhtbuf 23
 setstate FHZ 2006-03-26 08:47:36 init2 deadbeefdeadbe
 setstate FHZ 2006-03-26 08:47:36 serial deadbeef
-setstate blink Next: 14:04:17
 setstate btn4 on
 setstate btn4 2006-04-12 15:19:33 state on
 setstate cellar on-for-timer 2
diff --git a/test/fhem_small.cfg b/test/fhem_small.cfg
index b1954574b..83331c744 100644
--- a/test/fhem_small.cfg
+++ b/test/fhem_small.cfg
@@ -6,9 +6,9 @@ attr global modpath .
 attr global pidfilename test/fhz.pid
 define FHZ FHZ none
 
-define floor-lamp    FS20 1234 00
-define window-lamps  FS20 1234 01
-define cellar-lamp   FS20 1234 13
+define floor.lamp    FS20 1234 00
+define window.lamps  FS20 1234 01
+define cellar.lamp   FS20 1234 13
 define btn4          FS20 1234 03
 
 define wz FHT 1235
diff --git a/test/fhem_small.save b/test/fhem_small.save
index c67dad2c7..a13a7aa24 100644
--- a/test/fhem_small.save
+++ b/test/fhem_small.save
@@ -2,16 +2,16 @@
 setstate FHZ Initialized
 setstate btn4 off
 setstate btn4 2006-04-15 11:46:39 state off
-setstate cellar-lamp on
-setstate cellar-lamp 2006-03-29 12:05:34 state on
-setstate floor-lamp on
-setstate floor-lamp 2007-01-26 10:40:17 state on
+setstate cellar.lamp on
+setstate cellar.lamp 2006-03-29 12:05:34 state on
+setstate floor.lamp on
+setstate floor.lamp 2007-01-26 10:40:17 state on
 setstate global <no definition>
 setstate n_btn4 active
 setstate tf1 HMS100TF: T:  20.3°C, H: 31.3%, Bat: ok
 setstate tf1 2006-04-11 09:48:48 HMS100TF T:  20.3°C, H: 31.3%, Bat: ok
-setstate window-lamps on
-setstate window-lamps 2006-03-29 12:05:34 state on
+setstate window.lamps on
+setstate window.lamps 2006-03-29 12:05:34 state on
 setstate wz measured-temp: 22.4 (Celsius)
 setstate wz 2006-03-29 23:04:17 actuator 00%
 setstate wz 2006-03-26 08:52:30 day-temp 22.0 (Celsius)