@@ -1181,7 +1181,7 @@ else if (state[i] == prop_atoms.net_wm_state_below)
                 self->below = TRUE;
             else if (state[i] == prop_atoms.net_wm_state_demands_attention)
                 self->demands_attention = TRUE;
-            else if (state[i] == prop_atoms.openbox_wm_state_undecorated)
+            else if (state[i] == prop_atoms.ob_wm_state_undecorated)
                 self->undecorated = TRUE;
         }
 
@@ -2296,7 +2296,7 @@ netstate[num++] = prop_atoms.net_wm_state_below;
     if (self->demands_attention)
         netstate[num++] = prop_atoms.net_wm_state_demands_attention;
     if (self->undecorated)
-        netstate[num++] = prop_atoms.openbox_wm_state_undecorated;
+        netstate[num++] = prop_atoms.ob_wm_state_undecorated;
     PROP_SETA32(self->window, net_wm_state, atom, netstate, num);
 
     if (self->frame)
@@ -3224,7 +3224,7 @@ else if (state == prop_atoms.net_wm_state_demands_attention)
                 action = self->demands_attention ?
                     prop_atoms.net_wm_state_remove :
                     prop_atoms.net_wm_state_add;
-            else if (state == prop_atoms.openbox_wm_state_undecorated)
+            else if (state == prop_atoms.ob_wm_state_undecorated)
                 action = undecorated ? prop_atoms.net_wm_state_remove :
                     prop_atoms.net_wm_state_add;
         }
@@ -3254,7 +3254,7 @@ above = FALSE;
                 below = TRUE;
             } else if (state == prop_atoms.net_wm_state_demands_attention) {
                 demands_attention = TRUE;
-            } else if (state == prop_atoms.openbox_wm_state_undecorated) {
+            } else if (state == prop_atoms.ob_wm_state_undecorated) {
                 undecorated = TRUE;
             }
 
@@ -3281,7 +3281,7 @@ } else if (state == prop_atoms.net_wm_state_below) {
                 below = FALSE;
             } else if (state == prop_atoms.net_wm_state_demands_attention) {
                 demands_attention = FALSE;
-            } else if (state == prop_atoms.openbox_wm_state_undecorated) {
+            } else if (state == prop_atoms.ob_wm_state_undecorated) {
                 undecorated = FALSE;
             }
         }

@@ -681,7 +681,7 @@ if (d > 0)
                 screen_set_num_desktops(d);
         } else if (msgtype == prop_atoms.net_showing_desktop) {
             screen_show_desktop(e->xclient.data.l[0] != 0, NULL);
-        } else if (msgtype == prop_atoms.openbox_control) {
+        } else if (msgtype == prop_atoms.ob_control) {
             if (e->xclient.data.l[0] == 1)
                 ob_reconfigure();
             else if (e->xclient.data.l[0] == 2)

@@ -150,7 +150,7 @@ /* Send client message telling the OB process to:
          * remote_control = 1 -> reconfigure 
          * remote_control = 2 -> restart */
         PROP_MSG(RootWindow(ob_display, ob_screen),
-                 openbox_control, remote_control, 0, 0, 0);
+                 ob_control, remote_control, 0, 0, 0);
         XCloseDisplay(ob_display);
         exit(EXIT_SUCCESS);
     }
@@ -242,7 +242,7 @@ g_message(_("Unable to find a valid config file, using some simple defaults"));
 
                 if (config_type != NULL)
                     PROP_SETS(RootWindow(ob_display, ob_screen),
-                              openbox_config, config_type);
+                              ob_config, config_type);
 
                 /* we're done with parsing now, kill it */
                 parse_shutdown(i);

@@ -170,10 +170,10 @@ CREATE(rootpmapid, "_XROOTPMAP_ID");
     CREATE(esetrootid, "ESETROOT_PMAP_ID");
 */
 
-    CREATE(openbox_pid, "_OPENBOX_PID");
-    CREATE(openbox_config, "_OPENBOX_CONFIG");
-    CREATE(openbox_wm_state_undecorated, "_OB_WM_STATE_UNDECORATED");
-    CREATE(openbox_control, "_OPENBOX_CONTROL");
+    CREATE(ob_pid, "_OB_PID");
+    CREATE(ob_config, "_OB_CONFIG");
+    CREATE(ob_wm_state_undecorated, "_OB_WM_STATE_UNDECORATED");
+    CREATE(ob_control, "_OB_CONTROL");
 }
 
 #include <X11/Xutil.h>

@@ -190,10 +190,10 @@ */
 
     /* Openbox specific atoms */
      
-    Atom openbox_wm_state_undecorated;
-    Atom openbox_pid;
-    Atom openbox_config;
-    Atom openbox_control;
+    Atom ob_wm_state_undecorated;
+    Atom ob_pid; /* this is depreecated in favour of ob_control */
+    Atom ob_config;
+    Atom ob_control;
 } Atoms;
 Atoms prop_atoms;
 

@@ -196,7 +196,7 @@ 
     /* set the OPENBOX_PID hint */
     pid = getpid();
     PROP_SET32(RootWindow(ob_display, ob_screen),
-               openbox_pid, cardinal, pid);
+               ob_pid, cardinal, pid);
 
     /* set supporting window */
     PROP_SET32(RootWindow(ob_display, ob_screen),
@@ -289,10 +289,10 @@ supported[i++] = prop_atoms.kde_wm_change_state;
     supported[i++] = prop_atoms.kde_net_wm_frame_strut;
     supported[i++] = prop_atoms.kde_net_wm_window_type_override;
 
-    supported[i++] = prop_atoms.openbox_wm_state_undecorated;
-    supported[i++] = prop_atoms.openbox_pid;
-    supported[i++] = prop_atoms.openbox_config;
-    supported[i++] = prop_atoms.openbox_control;
+    supported[i++] = prop_atoms.ob_wm_state_undecorated;
+    supported[i++] = prop_atoms.ob_pid;
+    supported[i++] = prop_atoms.ob_config;
+    supported[i++] = prop_atoms.ob_control;
     g_assert(i == num_support);
 
     PROP_SETA32(RootWindow(ob_display, ob_screen),
@@ -373,7 +373,7 @@ XSelectInput(ob_display, RootWindow(ob_display, ob_screen),
                  NoEventMask);
 
     /* we're not running here no more! */
-    PROP_ERASE(RootWindow(ob_display, ob_screen), openbox_pid);
+    PROP_ERASE(RootWindow(ob_display, ob_screen), ob_pid);
     /* not without us */
     PROP_ERASE(RootWindow(ob_display, ob_screen), net_supported);
     /* don't keep this mode */