diff --git a/src/event.c b/src/event.c
index a8152d8..96465e1 100644
--- a/src/event.c
+++ b/src/event.c
@@ -206,10 +206,10 @@ clientmessageevent(XClientMessageEvent *ev)
         || (mess_t == wmfs_cmd && ev->data.l[4] == True))
      {
           XGetWindowProperty(dpy, ROOT, net_atom[wmfs_function], 0, 4096,
-                             False, net_atom[utf8_string], &rt, &rf, &ir, &il, &ret);
+                    False, net_atom[utf8_string], &rt, &rf, &ir, &il, &ret);
 
           XGetWindowProperty(dpy, ROOT, net_atom[wmfs_cmd], 0, 4096,
-                             False, net_atom[utf8_string], &rt, &rf, &ir, &il, &ret_cmd);
+                    False, net_atom[utf8_string], &rt, &rf, &ir, &il, &ret_cmd);
 
           if((func = name_to_func((char*)ret, func_list)))
                func((uicb_t)ret_cmd);
diff --git a/src/ewmh.c b/src/ewmh.c
index 1a3496e..ff5ccac 100644
--- a/src/ewmh.c
+++ b/src/ewmh.c
@@ -43,7 +43,7 @@ void
 ewmh_init_hints(void)
 {
      int i = 1, j, showing_desk = 0;
-     char root_name[] = "WMFS "WMFS_VERSION;
+     char root_name[] = WMFS_VERSION;
      char class[] = "wmfs", st[64];
      long pid = (long)getpid();
 
diff --git a/src/structs.h b/src/structs.h
index 57d419e..150e2b5 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -127,9 +127,9 @@ enum
      wmfs_nmaster,
      wmfs_set_screen,
      wmfs_screen_count,
-     wmfs_statustext,
      wmfs_function,
      wmfs_cmd,
+     wmfs_statustext,
      net_last
 };
 
diff --git a/src/wmfs.c b/src/wmfs.c
index 134f900..47dffed 100644
--- a/src/wmfs.c
+++ b/src/wmfs.c
@@ -302,7 +302,9 @@ exec_uicb_function(char *func, char *cmd)
      XChangeProperty(dpy, ROOT, ATOM("_WMFS_CMD"), ATOM("UTF8_STRING"),
                      8, PropModeReplace, (uchar*)cmd, strlen(cmd));
 
-     send_client_event(data, "_WMFS_FUNCTION");
+     /* send_client_event(data, "_WMFS_FUNCTION"); */
+     send_client_event(data, "_WMFS_CMD");
+
 
      return;
 }