24 files changed, 111 insertions, 111 deletions

diff --git a/matchbox/Makefile.am b/matchbox/Makefile.am
index f0cb6f9..3ca055c 100644
--- a/matchbox/Makefile.am
+++ b/matchbox/Makefile.am
@@ -15,8 +15,8 @@ source = \
   mb-wm-debug.c \
   mb-wm-client.h \
   mb-wm-client.c \
-  mb-wm-client-base.h \
-  mb-wm-client-base.c \
+  mb-wm-window-type-simple.h \
+  mb-wm-window-type-simple.c \
   mb-wm-client-window.h \
   mb-wm-client-window.c \
   mb-wm-root-window.h \
@@ -42,22 +42,22 @@ source = \
 
 # Client window types...
 source += \
-  mb-wm-client-app.h \
-  mb-wm-client-app.c \
-  mb-wm-client-panel.h \
-  mb-wm-client-panel.c \
-  mb-wm-client-dialog.h \
-  mb-wm-client-dialog.c \
-  mb-wm-client-note.h \
-  mb-wm-client-note.c \
-  mb-wm-client-input.h \
-  mb-wm-client-input.c \
-  mb-wm-client-desktop.h \
-  mb-wm-client-desktop.c \
-  mb-wm-client-menu.h \
-  mb-wm-client-menu.c \
-  mb-wm-client-override.h \
-  mb-wm-client-override.c
+  mb-wm-window-type-app.h \
+  mb-wm-window-type-app.c \
+  mb-wm-window-type-panel.h \
+  mb-wm-window-type-panel.c \
+  mb-wm-window-type-dialog.h \
+  mb-wm-window-type-dialog.c \
+  mb-wm-window-type-note.h \
+  mb-wm-window-type-note.c \
+  mb-wm-window-type-input.h \
+  mb-wm-window-type-input.c \
+  mb-wm-window-type-desktop.h \
+  mb-wm-window-type-desktop.c \
+  mb-wm-window-type-menu.h \
+  mb-wm-window-type-menu.c \
+  mb-wm-window-type-override.h \
+  mb-wm-window-type-override.c
 
 
 # Compositing...
diff --git a/matchbox/matchbox.h b/matchbox/matchbox.h
index 0c703b2..fc3232e 100644
--- a/matchbox/matchbox.h
+++ b/matchbox/matchbox.h
@@ -54,15 +54,15 @@
 #include <matchbox/mb-wm-client-window.h>
 #include <matchbox/mb-wm-root-window.h>
 #include <matchbox/mb-wm-client.h>
-#include <matchbox/mb-wm-client-base.h>
-#include <matchbox/mb-wm-client-app.h>
-#include <matchbox/mb-wm-client-desktop.h>
-#include <matchbox/mb-wm-client-dialog.h>
-#include <matchbox/mb-wm-client-input.h>
-#include <matchbox/mb-wm-client-menu.h>
-#include <matchbox/mb-wm-client-note.h>
-#include <matchbox/mb-wm-client-override.h>
-#include <matchbox/mb-wm-client-panel.h>
+#include <matchbox/mb-wm-window-type-simple.h>
+#include <matchbox/mb-wm-window-type-app.h>
+#include <matchbox/mb-wm-window-type-desktop.h>
+#include <matchbox/mb-wm-window-type-dialog.h>
+#include <matchbox/mb-wm-window-type-input.h>
+#include <matchbox/mb-wm-window-type-menu.h>
+#include <matchbox/mb-wm-window-type-note.h>
+#include <matchbox/mb-wm-window-type-override.h>
+#include <matchbox/mb-wm-window-type-panel.h>
 #include <matchbox/mb-wm-layout.h>
 #include <matchbox/mb-wm-stack.h>
 #include <matchbox/mb-wm-manager.h>
diff --git a/matchbox/mb-wm-client.c b/matchbox/mb-wm-client.c
index 256867c..8d5cb4b 100644
--- a/matchbox/mb-wm-client.c
+++ b/matchbox/mb-wm-client.c
@@ -329,7 +329,7 @@ mb_wm_client_on_property_change (MBWMClientWindow        *window,
   return False;
 }
 
-MBWindowManagerClient* 	/* FIXME: rename to mb_wm_client_base/class_new ? */
+MBWindowManagerClient* 	/* FIXME: rename to mb_wm_window_type_simple/class_new ? */
 mb_wm_client_new (MBWMManager *wm, MBWMClientWindow *win)
 {
   MBWindowManagerClient *client = NULL;
diff --git a/matchbox/mb-wm-layout.c b/matchbox/mb-wm-layout.c
index 2dd1074..5433dcc 100644
--- a/matchbox/mb-wm-layout.c
+++ b/matchbox/mb-wm-layout.c
@@ -1,5 +1,5 @@
 #include "matchbox.h"
-#include "mb-wm-client-input.h"
+#include "mb-wm-window-type-input.h"
 
 static void
 mb_wm_layout_real_update (MBWMLayout * layout);
diff --git a/matchbox/mb-wm-manager.c b/matchbox/mb-wm-manager.c
index ad58ac6..a8eb9c9 100644
--- a/matchbox/mb-wm-manager.c
+++ b/matchbox/mb-wm-manager.c
@@ -19,18 +19,18 @@
  *
  */
 #include "matchbox.h"
-#include "mb-wm-client-app.h"
-#include "mb-wm-client-panel.h"
-#include "mb-wm-client-dialog.h"
-#include "mb-wm-client-desktop.h"
-#include "mb-wm-client-input.h"
-#include "mb-wm-client-note.h"
-#include "mb-wm-client-menu.h"
+#include "mb-wm-window-type-app.h"
+#include "mb-wm-window-type-panel.h"
+#include "mb-wm-window-type-dialog.h"
+#include "mb-wm-window-type-desktop.h"
+#include "mb-wm-window-type-input.h"
+#include "mb-wm-window-type-note.h"
+#include "mb-wm-window-type-menu.h"
 #include "mb-wm-theme.h"
 
 #if ENABLE_COMPOSITE
 # include "mb-wm-comp-mgr.h"
-# include "mb-wm-client-override.h"
+# include "mb-wm-window-type-override.h"
 # include <X11/extensions/Xdamage.h>
 # include <X11/extensions/Xrender.h>
 # include <X11/extensions/Xcomposite.h>
diff --git a/matchbox/mb-wm-root-window.c b/matchbox/mb-wm-root-window.c
index 3af19c2..af08c0f 100644
--- a/matchbox/mb-wm-root-window.c
+++ b/matchbox/mb-wm-root-window.c
@@ -21,8 +21,8 @@
 #include "matchbox.h"
 
 #include "mb-wm-theme.h"
-#include "mb-wm-client-dialog.h"
-#include "mb-wm-client-app.h"
+#include "mb-wm-window-type-dialog.h"
+#include "mb-wm-window-type-app.h"
 
 #include <X11/Xmd.h>
 
diff --git a/matchbox/mb-wm-client-app.c b/matchbox/mb-wm-window-type-app.c
index 2b16936..814efda 100644
--- a/matchbox/mb-wm-client-app.c
+++ b/matchbox/mb-wm-window-type-app.c
@@ -1,4 +1,4 @@
-#include "mb-wm-client-app.h"
+#include "mb-wm-window-type-app.h"
 
 #include "mb-wm-theme.h"
 
@@ -119,7 +119,7 @@ mb_wm_client_app_class_type ()
 	mb_wm_client_app_destroy,
 	mb_wm_client_app_class_init
       };
-      type = mb_wm_object_register_class (&info, MB_WM_TYPE_CLIENT_BASE, 0);
+      type = mb_wm_object_register_class (&info, MB_WM_TYPE_WINDOW_TYPE_SIMPLE, 0);
     }
 
   return type;
diff --git a/matchbox/mb-wm-client-app.h b/matchbox/mb-wm-window-type-app.h
index 59602b7..e33d9aa 100644
--- a/matchbox/mb-wm-client-app.h
+++ b/matchbox/mb-wm-window-type-app.h
@@ -33,12 +33,12 @@ typedef struct MBWMClientAppClass MBWMClientAppClass;
 
 struct MBWMClientApp
 {
-  MBWMClientBase    parent;
+  MBWMWindowTypeSimple    parent;
 };
 
 struct MBWMClientAppClass
 {
-  MBWMClientBaseClass parent;
+  MBWMWindowTypeSimpleClass parent;
 
 };
 
diff --git a/matchbox/mb-wm-client-desktop.c b/matchbox/mb-wm-window-type-desktop.c
index 56b4e3b..11603e0 100644
--- a/matchbox/mb-wm-client-desktop.c
+++ b/matchbox/mb-wm-window-type-desktop.c
@@ -1,4 +1,4 @@
-#include "mb-wm-client-desktop.h"
+#include "mb-wm-window-type-desktop.h"
 #include "mb-wm-theme.h"
 
 static Bool
@@ -94,7 +94,7 @@ mb_wm_client_desktop_class_type ()
 	mb_wm_client_desktop_destroy,
 	mb_wm_client_desktop_class_init
       };
-      type = mb_wm_object_register_class (&info, MB_WM_TYPE_CLIENT_BASE, 0);
+      type = mb_wm_object_register_class (&info, MB_WM_TYPE_WINDOW_TYPE_SIMPLE, 0);
     }
 
   return type;
diff --git a/matchbox/mb-wm-client-desktop.h b/matchbox/mb-wm-window-type-desktop.h
index ae602d8..ee8d157 100644
--- a/matchbox/mb-wm-client-desktop.h
+++ b/matchbox/mb-wm-window-type-desktop.h
@@ -33,12 +33,12 @@ typedef struct MBWMClientDesktopClass MBWMClientDesktopClass;
 
 struct MBWMClientDesktop
 {
-  MBWMClientBase    parent;
+  MBWMWindowTypeSimple    parent;
 };
 
 struct MBWMClientDesktopClass
 {
-  MBWMClientBaseClass parent;
+  MBWMWindowTypeSimpleClass parent;
 };
 
 MBWindowManagerClient*
diff --git a/matchbox/mb-wm-client-dialog.c b/matchbox/mb-wm-window-type-dialog.c
index 3bf2f04..53d57d2 100644
--- a/matchbox/mb-wm-client-dialog.c
+++ b/matchbox/mb-wm-window-type-dialog.c
@@ -1,4 +1,4 @@
-#include "mb-wm-client-dialog.h"
+#include "mb-wm-window-type-dialog.h"
 #include "mb-wm-manager.h"
 
 #include "mb-wm-theme.h"
@@ -192,7 +192,7 @@ mb_wm_client_dialog_class_type ()
 	mb_wm_client_dialog_class_init
       };
 
-      type = mb_wm_object_register_class (&info, MB_WM_TYPE_CLIENT_BASE, 0);
+      type = mb_wm_object_register_class (&info, MB_WM_TYPE_WINDOW_TYPE_SIMPLE, 0);
     }
 
   return type;
diff --git a/matchbox/mb-wm-client-dialog.h b/matchbox/mb-wm-window-type-dialog.h
index c68e689..d512cf2 100644
--- a/matchbox/mb-wm-client-dialog.h
+++ b/matchbox/mb-wm-window-type-dialog.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_DIALOG_H
 #define _HAVE_MB_CLIENT_DIALOG_H
 
-#include <matchbox/mb-wm-client-base.h>
+#include <matchbox/mb-wm-window-type-simple.h>
 #include <matchbox/mb-wm-decor.h>
 
 #define MB_WM_CLIENT_DIALOG(c) ((MBWMClientDialog*)(c))
@@ -34,13 +34,13 @@ typedef struct MBWMClientDialogClass MBWMClientDialogClass;
 
 struct MBWMClientDialog
 {
-  MBWMClientBase    parent;
+  MBWMWindowTypeSimple    parent;
   MBWMDecorButton  *button_close;
 };
 
 struct MBWMClientDialogClass
 {
-  MBWMClientBaseClass parent;
+  MBWMWindowTypeSimpleClass parent;
 };
 
 MBWindowManagerClient*
diff --git a/matchbox/mb-wm-client-input.c b/matchbox/mb-wm-window-type-input.c
index 3e3fdae..c492935 100644
--- a/matchbox/mb-wm-client-input.c
+++ b/matchbox/mb-wm-window-type-input.c
@@ -1,4 +1,4 @@
-#include "mb-wm-client-input.h"
+#include "mb-wm-window-type-input.h"
 
 static void
 mb_wm_client_input_detransitise (MBWindowManagerClient *client);
@@ -92,7 +92,7 @@ mb_wm_client_input_class_type ()
 	mb_wm_client_input_destroy,
 	mb_wm_client_input_class_init
       };
-      type = mb_wm_object_register_class (&info, MB_WM_TYPE_CLIENT_BASE, 0);
+      type = mb_wm_object_register_class (&info, MB_WM_TYPE_WINDOW_TYPE_SIMPLE, 0);
     }
 
   return type;
diff --git a/matchbox/mb-wm-client-input.h b/matchbox/mb-wm-window-type-input.h
index d255be4..4800825 100644
--- a/matchbox/mb-wm-client-input.h
+++ b/matchbox/mb-wm-window-type-input.h
@@ -33,14 +33,14 @@ typedef struct MBWMClientInputClass MBWMClientInputClass;
 
 struct MBWMClientInput
 {
-  MBWMClientBase    parent;
+  MBWMWindowTypeSimple    parent;
 
   MBGeometry        transient_geom;
 };
 
 struct MBWMClientInputClass
 {
-  MBWMClientBaseClass parent;
+  MBWMWindowTypeSimpleClass parent;
 };
 
 MBWindowManagerClient*
diff --git a/matchbox/mb-wm-client-menu.c b/matchbox/mb-wm-window-type-menu.c
index 031fe89..a7c3732 100644
--- a/matchbox/mb-wm-client-menu.c
+++ b/matchbox/mb-wm-window-type-menu.c
@@ -1,4 +1,4 @@
-#include "mb-wm-client-menu.h"
+#include "mb-wm-window-type-menu.h"
 
 #include "mb-wm-theme.h"
 
@@ -111,7 +111,7 @@ mb_wm_client_menu_class_type ()
 	mb_wm_client_menu_class_init
       };
 
-      type = mb_wm_object_register_class (&info, MB_WM_TYPE_CLIENT_BASE, 0);
+      type = mb_wm_object_register_class (&info, MB_WM_TYPE_WINDOW_TYPE_SIMPLE, 0);
     }
 
   return type;
diff --git a/matchbox/mb-wm-client-menu.h b/matchbox/mb-wm-window-type-menu.h
index 7e0ef06..473c873 100644
--- a/matchbox/mb-wm-client-menu.h
+++ b/matchbox/mb-wm-window-type-menu.h
@@ -33,12 +33,12 @@ typedef struct MBWMClientMenuClass MBWMClientMenuClass;
 
 struct MBWMClientMenu
 {
-  MBWMClientBase    parent;
+  MBWMWindowTypeSimple    parent;
 };
 
 struct MBWMClientMenuClass
 {
-  MBWMClientBaseClass parent;
+  MBWMWindowTypeSimpleClass parent;
 };
 
 MBWindowManagerClient*
diff --git a/matchbox/mb-wm-client-note.c b/matchbox/mb-wm-window-type-note.c
index 43e7036..8381827 100644
--- a/matchbox/mb-wm-client-note.c
+++ b/matchbox/mb-wm-window-type-note.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "mb-wm-client-note.h"
+#include "mb-wm-window-type-note.h"
 
 #include "mb-wm-theme.h"
 
diff --git a/matchbox/mb-wm-client-note.h b/matchbox/mb-wm-window-type-note.h
index fe49096..56b221f 100644
--- a/matchbox/mb-wm-client-note.h
+++ b/matchbox/mb-wm-window-type-note.h
@@ -22,7 +22,7 @@
 #define _HAVE_MB_CLIENT_NOTE_H
 
 #include <matchbox/matchbox.h>
-#include <matchbox/mb-wm-client-dialog.h>
+#include <matchbox/mb-wm-window-type-dialog.h>
 
 typedef struct MBWMClientNote      MBWMClientNote;
 typedef struct MBWMClientNoteClass MBWMClientNoteClass;
diff --git a/matchbox/mb-wm-client-override.c b/matchbox/mb-wm-window-type-override.c
index 350c8db..7324e05 100644
--- a/matchbox/mb-wm-client-override.c
+++ b/matchbox/mb-wm-window-type-override.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "mb-wm-client-override.h"
+#include "mb-wm-window-type-override.h"
 
 #include "mb-wm-theme.h"
 
diff --git a/matchbox/mb-wm-client-override.h b/matchbox/mb-wm-window-type-override.h
index b37338b..b37338b 100644
--- a/matchbox/mb-wm-client-override.h
+++ b/matchbox/mb-wm-window-type-override.h
diff --git a/matchbox/mb-wm-client-panel.c b/matchbox/mb-wm-window-type-panel.c
index 4e43eb4..dea8f8d 100644
--- a/matchbox/mb-wm-client-panel.c
+++ b/matchbox/mb-wm-window-type-panel.c
@@ -1,4 +1,4 @@
-#include "mb-wm-client-panel.h"
+#include "mb-wm-window-type-panel.h"
 #include "mb-wm-theme.h"
 
 static void
@@ -84,7 +84,7 @@ mb_wm_client_panel_init (MBWMObject *this, va_list vap)
       win->geometry.y = y;
       win->geometry.width  = w;
       win->geometry.height = h;
-      
+
       mb_wm_client_geometry_mark_dirty (client);
     }
 
@@ -142,7 +142,7 @@ mb_wm_client_panel_class_type ()
 	mb_wm_client_panel_class_init
       };
 
-      type = mb_wm_object_register_class (&info, MB_WM_TYPE_CLIENT_BASE, 0);
+      type = mb_wm_object_register_class (&info, MB_WM_TYPE_WINDOW_TYPE_SIMPLE, 0);
     }
 
   return type;
diff --git a/matchbox/mb-wm-client-panel.h b/matchbox/mb-wm-window-type-panel.h
index aeb9c4c..d06d0e1 100644
--- a/matchbox/mb-wm-client-panel.h
+++ b/matchbox/mb-wm-window-type-panel.h
@@ -34,12 +34,12 @@ typedef struct MBWMClientPanelClass MBWMClientPanelClass;
 
 struct MBWMClientPanel
 {
-  MBWMClientBase parent;
+  MBWMWindowTypeSimple parent;
 };
 
 struct MBWMClientPanelClass
 {
-  MBWMClientBaseClass parent;
+  MBWMWindowTypeSimpleClass parent;
 };
 
 MBWindowManagerClient*
diff --git a/matchbox/mb-wm-client-base.c b/matchbox/mb-wm-window-type-simple.c
index bb0311b..562ee17 100644
--- a/matchbox/mb-wm-client-base.c
+++ b/matchbox/mb-wm-window-type-simple.c
@@ -32,31 +32,31 @@
 #endif
 
 static void
-mb_wm_client_base_realize (MBWindowManagerClient *client);
+mb_wm_window_type_simple_realize (MBWindowManagerClient *client);
 
 static void
-mb_wm_client_base_stack (MBWindowManagerClient *client,
+mb_wm_window_type_simple_stack (MBWindowManagerClient *client,
 			 int                    flags);
 static void
-mb_wm_client_base_show (MBWindowManagerClient *client);
+mb_wm_window_type_simple_show (MBWindowManagerClient *client);
 
 static void
-mb_wm_client_base_hide (MBWindowManagerClient *client);
+mb_wm_window_type_simple_hide (MBWindowManagerClient *client);
 
 
 static void
-mb_wm_client_base_display_sync (MBWindowManagerClient *client);
+mb_wm_window_type_simple_display_sync (MBWindowManagerClient *client);
 
 static Bool
-mb_wm_client_base_request_geometry (MBWindowManagerClient *client,
+mb_wm_window_type_simple_request_geometry (MBWindowManagerClient *client,
 				    MBGeometry            *new_geometry,
 				    MBWMClientReqGeomType  flags);
 
 static Bool
-mb_wm_client_base_focus (MBWindowManagerClient *client);
+mb_wm_window_type_simple_focus (MBWindowManagerClient *client);
 
 static void
-mb_wm_client_base_class_init (MBWMObjectClass *klass)
+mb_wm_window_type_simple_class_init (MBWMObjectClass *klass)
 {
   MBWindowManagerClientClass *client;
 
@@ -64,21 +64,21 @@ mb_wm_client_base_class_init (MBWMObjectClass *klass)
 
   client = (MBWindowManagerClientClass *)klass;
 
-  client->realize  = mb_wm_client_base_realize;
-  client->geometry = mb_wm_client_base_request_geometry;
-  client->stack    = mb_wm_client_base_stack;
-  client->show     = mb_wm_client_base_show;
-  client->hide     = mb_wm_client_base_hide;
-  client->sync     = mb_wm_client_base_display_sync;
-  client->focus    = mb_wm_client_base_focus;
+  client->realize  = mb_wm_window_type_simple_realize;
+  client->geometry = mb_wm_window_type_simple_request_geometry;
+  client->stack    = mb_wm_window_type_simple_stack;
+  client->show     = mb_wm_window_type_simple_show;
+  client->hide     = mb_wm_window_type_simple_hide;
+  client->sync     = mb_wm_window_type_simple_display_sync;
+  client->focus    = mb_wm_window_type_simple_focus;
 
 #if MBWM_WANT_DEBUG
-  klass->klass_name = "MBWMClientBase";
+  klass->klass_name = "MBWMWindowTypeSimple";
 #endif
 }
 
 static void
-mb_wm_client_base_destroy (MBWMObject *this)
+mb_wm_window_type_simple_destroy (MBWMObject *this)
 {
   MBWindowManagerClient *parent;
   MBWindowManagerClient *client;
@@ -118,24 +118,24 @@ mb_wm_client_base_destroy (MBWMObject *this)
 }
 
 static int
-mb_wm_client_base_init (MBWMObject *this, va_list vap)
+mb_wm_window_type_simple_init (MBWMObject *this, va_list vap)
 {
   return 1;
 }
 
 int
-mb_wm_client_base_class_type ()
+mb_wm_window_type_simple_class_type ()
 {
   static int type = 0;
 
   if (UNLIKELY(type == 0))
     {
       static MBWMObjectClassInfo info = {
-	sizeof (MBWMClientBaseClass),
-	sizeof (MBWMClientBase),
-	mb_wm_client_base_init,
-	mb_wm_client_base_destroy,
-	mb_wm_client_base_class_init
+	sizeof (MBWMWindowTypeSimpleClass),
+	sizeof (MBWMWindowTypeSimple),
+	mb_wm_window_type_simple_init,
+	mb_wm_window_type_simple_destroy,
+	mb_wm_window_type_simple_class_init
       };
 
       type = mb_wm_object_register_class (&info, MB_WM_TYPE_CLIENT, 0);
@@ -145,7 +145,7 @@ mb_wm_client_base_class_type ()
 }
 
 static void
-mb_wm_client_base_realize (MBWindowManagerClient *client)
+mb_wm_window_type_simple_realize (MBWindowManagerClient *client)
 {
   MBWMManager *wm = client->wmref;
 
@@ -263,7 +263,7 @@ mb_wm_client_base_realize (MBWindowManagerClient *client)
 }
 
 static void
-mb_wm_client_base_stack (MBWindowManagerClient *client,
+mb_wm_window_type_simple_stack (MBWindowManagerClient *client,
 			 int                    flags)
 {
   /* Stack to highest/lowest possible possition in stack */
@@ -278,14 +278,14 @@ mb_wm_client_base_stack (MBWindowManagerClient *client,
 }
 
 static void
-mb_wm_client_base_show (MBWindowManagerClient *client)
+mb_wm_window_type_simple_show (MBWindowManagerClient *client)
 {
   /* mark dirty somehow */
 
 }
 
 static void
-mb_wm_client_base_hide (MBWindowManagerClient *client)
+mb_wm_window_type_simple_hide (MBWindowManagerClient *client)
 {
 
   /* mark dirty somehow */
@@ -293,7 +293,7 @@ mb_wm_client_base_hide (MBWindowManagerClient *client)
 }
 
 static void
-mb_wm_client_base_set_state_props (MBWindowManagerClient *c)
+mb_wm_window_type_simple_set_state_props (MBWindowManagerClient *c)
 {
   unsigned long     flags = c->window->ewmh_state;
   Window            xwin  = c->window->xwindow;
@@ -420,7 +420,7 @@ move_resize_client_xwin (MBWindowManagerClient *client, int x, int y, int w, int
 }
 
 static void
-mb_wm_client_base_display_sync (MBWindowManagerClient *client)
+mb_wm_window_type_simple_display_sync (MBWindowManagerClient *client)
 {
   MBWMManager *wm = client->wmref;
   MBWMClientWindow * win = client->window;
@@ -602,7 +602,7 @@ mb_wm_client_base_display_sync (MBWindowManagerClient *client)
 
 	}
 
-      mb_wm_client_base_set_state_props (client);
+      mb_wm_window_type_simple_set_state_props (client);
       mb_wm_util_untrap_x_errors();
     }
 
@@ -659,7 +659,7 @@ mb_wm_client_base_display_sync (MBWindowManagerClient *client)
 
 /* Note request geometry always called by layout manager */
 static Bool
-mb_wm_client_base_request_geometry (MBWindowManagerClient *client,
+mb_wm_window_type_simple_request_geometry (MBWindowManagerClient *client,
 				    MBGeometry            *new_geometry,
 				    MBWMClientReqGeomType  flags)
 {
@@ -705,7 +705,7 @@ mb_wm_client_base_request_geometry (MBWindowManagerClient *client,
 }
 
 static Bool
-mb_wm_client_base_focus (MBWindowManagerClient *client)
+mb_wm_window_type_simple_focus (MBWindowManagerClient *client)
 {
   static Window     last_focused = None;
   MBWMManager  *wm = client->wmref;
diff --git a/matchbox/mb-wm-client-base.h b/matchbox/mb-wm-window-type-simple.h
index 26ebd63..17fb692 100644
--- a/matchbox/mb-wm-client-base.h
+++ b/matchbox/mb-wm-window-type-simple.h
@@ -18,30 +18,30 @@
  *
  */
 
-#ifndef _HAVE_MB_WM_CLIENT_BASE_H
-#define _HAVE_MB_WM_CLIENT_BASE_H
+#ifndef _HAVE_MB_WM_WINDOW_TYPE_SIMPLE_H
+#define _HAVE_MB_WM_WINDOW_TYPE_SIMPLE_H
 
 #include <matchbox/mb-wm-client.h>
 
-#define MB_WM_CLIENT_BASE(c) ((MBWMClientBase*)(c))
-#define MB_WM_CLIENT_BASE_CLASS(c) ((MBWMClientBaseClass*)(c))
-#define MB_WM_TYPE_CLIENT_BASE (mb_wm_client_base_class_type ())
+#define MB_WM_WINDOW_TYPE_SIMPLE(c) ((MBWMWindowTypeSimple*)(c))
+#define MB_WM_WINDOW_TYPE_SIMPLE_CLASS(c) ((MBWMWindowTypeSimpleClass*)(c))
+#define MB_WM_TYPE_WINDOW_TYPE_SIMPLE (mb_wm_window_type_simple_class_type ())
 
-typedef struct MBWMClientBase
+typedef struct MBWMWindowTypeSimple
 {
   MBWindowManagerClient parent;
 }
-MBWMClientBase;
+MBWMWindowTypeSimple;
 
-typedef struct MBWMClientBaseClass
+typedef struct MBWMWindowTypeSimpleClass
 {
   MBWindowManagerClientClass parent;
 
 }
-MBWMClientBaseClass;
+MBWMWindowTypeSimpleClass;
 
 int
-mb_wm_client_base_class_type ();
+mb_wm_window_type_simple_class_type ();
 
 void base_foo(void);