diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index 9c13baae1..3c31852d5 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -3204,8 +3204,8 @@ ReplaceEventMap($$$)
     my ($re, $val, $modifier) = split(":", $rv, 3);
     next if(!defined($val));
     if($dir) {  # event -> GivenName
-      if($str =~ m/$re/) {
-        $str =~ s/$re/$val/;
+      if($str =~ m/\b$re\b/) {
+        $str =~ s/\b$re\b/$val/;
         $changed = 1;
         last;
       }