diff --git a/po/xfwm4.pot b/po/xfwm4.pot
index 5c4457306d95c041565c8f21f137bff4dc440958..8b4a4428c9525c164676f8123cf97bf0352eedea 100644
--- a/po/xfwm4.pot
+++ b/po/xfwm4.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-24 00:51+0100\n"
+"POT-Creation-Date: 2004-11-24 00:58+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/display.c b/src/display.c
index fd51081229b1a580ac343f2c20a7bbf408a27e8d..e2e8578ffa8e5e1840fe77770f271a5e64c9513a 100644
--- a/src/display.c
+++ b/src/display.c
@@ -54,10 +54,10 @@ myDisplayInitAtoms (DisplayInfo *display_info)
 {
     char *atom_names[] = {
         "GNOME_PANEL_DESKTOP_AREA",
-        "KDE_NET_WM_CONTEXT_HELP",
-        "KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR",
+        "_KDE_NET_WM_CONTEXT_HELP",
+        "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR",
         "KWM_WIN_ICON",
-        "MOTIF_WM_HINTS",
+        "_MOTIF_WM_HINTS",
         "_NET_ACTIVE_WINDOW",
         "_NET_CLIENT_LIST",
         "_NET_CLIENT_LIST_STACKING",
@@ -137,7 +137,7 @@ myDisplayInitAtoms (DisplayInfo *display_info)
         "WM_HINTS",
         "WM_PROTOCOLS",
         "WM_STATE",
-        "WM_TAKEFOCUS",
+        "WM_TAKE_FOCUS",
         "WM_TRANSIENT_FOR",
         "WM_WINDOW_ROLE",
         "_XROOTPMAP",
diff --git a/src/display.h b/src/display.h
index cbde3573089a02785c5999ddef4ca3232516a121..87afc12faba64c7a0adb2d504997c81d01d3e1f5 100644
--- a/src/display.h
+++ b/src/display.h
@@ -141,7 +141,7 @@
 #define WM_HINTS                                                81
 #define WM_PROTOCOLS                                            82
 #define WM_STATE                                                83
-#define WM_TAKEFOCUS                                            84
+#define WM_TAKE_FOCUS                                           84
 #define WM_TRANSIENT_FOR                                        85
 #define WM_WINDOW_ROLE                                          86
 #define XROOTPMAP                                               87
diff --git a/src/focus.c b/src/focus.c
index 5d37c692e990b058f000776ef112d9551d7bdef5..5c46e7572519b30d484bdcab5ae30fc212bc1292 100644
--- a/src/focus.c
+++ b/src/focus.c
@@ -461,7 +461,7 @@ clientSetFocus (ScreenInfo *screen_info, Client * c, Time timestamp, unsigned sh
         }
         if (FLAG_TEST(c->wm_flags, WM_FLAG_TAKEFOCUS))
         {
-            sendClientMessage (c->screen_info, c->window, display_info->atoms[WM_TAKEFOCUS], timestamp);
+            sendClientMessage (c->screen_info, c->window, display_info->atoms[WM_TAKE_FOCUS], timestamp);
         }
         if (FLAG_TEST(c->flags, CLIENT_FLAG_DEMANDS_ATTENTION))
         {
diff --git a/src/hints.c b/src/hints.c
index ebf5563c96fb2191691f237f6af015a463412e51..0bc1f5c29e92c46002a1c4c35ada3812f3b844b5 100644
--- a/src/hints.c
+++ b/src/hints.c
@@ -132,7 +132,7 @@ getWMProtocols (DisplayInfo *display_info, Window w)
     {
         for (i = 0, ap = protocols; i < n; i++, ap++)
         {
-            if (*ap == (Atom) display_info->atoms[WM_TAKEFOCUS])
+            if (*ap == (Atom) display_info->atoms[WM_TAKE_FOCUS])
             {
                 result |= WM_PROTOCOLS_TAKE_FOCUS;
             }
@@ -155,7 +155,7 @@ getWMProtocols (DisplayInfo *display_info, Window w)
         {
             for (i = 0, ap = protocols; i < nitems; i++, ap++)
             {
-                if (*ap == (Atom) display_info->atoms[WM_TAKEFOCUS])
+                if (*ap == (Atom) display_info->atoms[WM_TAKE_FOCUS])
                 {
                     result |= WM_PROTOCOLS_TAKE_FOCUS;
                 }