8 files changed, 36 insertions, 38 deletions
diff --git a/mate-panel/libmate-panel-applet-private/Makefile.am b/mate-panel/libmate-panel-applet-private/Makefile.am
index 9dd4b631..76d122d0 100644
--- a/mate-panel/libmate-panel-applet-private/Makefile.am
+++ b/mate-panel/libmate-panel-applet-private/Makefile.am
@@ -17,18 +17,18 @@ AM_CPPFLAGS =							\
 AM_CFLAGS = $(WARN_CFLAGS)
 
 libmate_panel_applet_private_la_SOURCES =	\
-	mate-panel-applets-manager-dbus.c	\
-	mate-panel-applets-manager-dbus.h	\
-	mate-panel-applet-container.c	\
-	mate-panel-applet-container.h	\
-	mate-panel-applet-frame-dbus.c	\
-	mate-panel-applet-frame-dbus.h
+	panel-applets-manager-dbus.c	\
+	panel-applets-manager-dbus.h	\
+	panel-applet-container.c	\
+	panel-applet-container.h	\
+	panel-applet-frame-dbus.c	\
+	panel-applet-frame-dbus.h
 
 libmate_panel_applet_private_mini_la_SOURCES =\
-	mate-panel-applet-mini.c		\
-	mate-panel-applets-manager-dbus.c	\
-	mate-panel-applets-manager-dbus.h	\
-	mate-panel-applet-container.c	\
-	mate-panel-applet-container.h
+	panel-applet-mini.c		\
+	panel-applets-manager-dbus.c	\
+	panel-applets-manager-dbus.h	\
+	panel-applet-container.c	\
+	panel-applet-container.h
 
 -include $(top_srcdir)/git.mk
diff --git a/mate-panel/libmate-panel-applet-private/mate-panel-applet-container.c b/mate-panel/libmate-panel-applet-private/panel-applet-container.c
index 3b6a1102..7aa34d6a 100644
--- a/mate-panel/libmate-panel-applet-private/mate-panel-applet-container.c
+++ b/mate-panel/libmate-panel-applet-private/panel-applet-container.c
@@ -1,5 +1,5 @@
 /*
- * mate-panel-applet-container.c: a container for applets.
+ * panel-applet-container.c: a container for applets.
  *
  * Copyright (C) 2010 Carlos Garcia Campos <[email protected]>
  *
@@ -25,7 +25,7 @@
 #if GTK_CHECK_VERSION (3, 0, 0)
 #include <gtk/gtkx.h>
 #endif
-#include "mate-panel-applet-container.h"
+#include "panel-applet-container.h"
 #include "panel-marshal.h"
 
 struct _MatePanelAppletContainerPrivate {
diff --git a/mate-panel/libmate-panel-applet-private/mate-panel-applet-container.h b/mate-panel/libmate-panel-applet-private/panel-applet-container.h
index 8f01db80..108a38c9 100644
--- a/mate-panel/libmate-panel-applet-private/mate-panel-applet-container.h
+++ b/mate-panel/libmate-panel-applet-private/panel-applet-container.h
@@ -1,5 +1,5 @@
 /*
- * mate-panel-applet-container.c: a container for applets.
+ * panel-applet-container.h: a container for applets.
  *
  * Copyright (C) 2010 Carlos Garcia Campos <[email protected]>
  *
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef __MATE_PANEL_APPLET_CONTAINER_H__
-#define __MATE_PANEL_APPLET_CONTAINER_H__
+#ifndef __PANEL_APPLET_CONTAINER_H__
+#define __PANEL_APPLET_CONTAINER_H__
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -116,4 +116,4 @@ GVariant  *mate_panel_applet_container_child_get_finish        (MatePanelAppletC
 }
 #endif
 
-#endif /* __MATE_PANEL_APPLET_CONTAINER_H__ */
+#endif /* __PANEL_APPLET_CONTAINER_H__ */
diff --git a/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c b/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c
index ca70915e..9330db0d 100644
--- a/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c
+++ b/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * mate-panel-applet-frame-dbus.c: panel side container for applets
+ * panel-applet-frame-dbus.c: panel side container for applets
  *
  * Copyright (C) 2001 - 2003 Sun Microsystems, Inc.
  * Copyright (C) 2010 Carlos Garcia Campos <[email protected]>
@@ -29,12 +29,11 @@
 
 #include <string.h>
 
-#include <mate-panel-applet-frame.h>
-#include <mate-panel-applets-manager.h>
+#include <panel-applet-frame.h>
+#include <panel-applets-manager.h>
 
-#include "mate-panel-applet-container.h"
-
-#include "mate-panel-applet-frame-dbus.h"
+#include "panel-applet-container.h"
+#include "panel-applet-frame-dbus.h"
 
 G_DEFINE_TYPE (MatePanelAppletFrameDBus,
 	       mate_panel_applet_frame_dbus,
diff --git a/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.h b/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.h
index 8b9e62a1..73da38f2 100644
--- a/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.h
+++ b/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.h
@@ -1,5 +1,5 @@
 /*
- * mate-panel-applet-frame-dbus.h: panel side container for applets
+ * panel-applet-frame-dbus.h: panel side container for applets
  *
  * Copyright (C) 2001 - 2003 Sun Microsystems, Inc.
  * Copyright (C) 2010 Vincent Untz <[email protected]>
@@ -23,10 +23,10 @@
  *	Mark McLoughlin <[email protected]>
  */
 
-#ifndef __MATE_PANEL_APPLET_FRAME_DBUS_H__
-#define __MATE_PANEL_APPLET_FRAME_DBUS_H__
+#ifndef __PANEL_APPLET_FRAME_DBUS_H__
+#define __PANEL_APPLET_FRAME_DBUS_H__
 
-#include <mate-panel-applet-frame.h>
+#include <panel-applet-frame.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -62,4 +62,4 @@ gboolean  mate_panel_applet_frame_dbus_load               (const gchar
 }
 #endif
 
-#endif /* __MATE_PANEL_APPLET_FRAME_DBUS_H__ */
+#endif /* __PANEL_APPLET_FRAME_DBUS_H__ */
diff --git a/mate-panel/libmate-panel-applet-private/mate-panel-applet-mini.c b/mate-panel/libmate-panel-applet-private/panel-applet-mini.c
index 13112376..13112376 100644
--- a/mate-panel/libmate-panel-applet-private/mate-panel-applet-mini.c
+++ b/mate-panel/libmate-panel-applet-private/panel-applet-mini.c
diff --git a/mate-panel/libmate-panel-applet-private/mate-panel-applets-manager-dbus.c b/mate-panel/libmate-panel-applet-private/panel-applets-manager-dbus.c
index fc2f817b..695f66fb 100644
--- a/mate-panel/libmate-panel-applet-private/mate-panel-applets-manager-dbus.c
+++ b/mate-panel/libmate-panel-applet-private/panel-applets-manager-dbus.c
@@ -1,5 +1,5 @@
 /*
- * mate-panel-applets-manager-dbus.c
+ * panel-applets-manager-dbus.c
  *
  * Copyright (C) 2010 Carlos Garcia Campos <[email protected]>
  * Copyright (C) 2010 Vincent Untz <[email protected]>
@@ -26,11 +26,10 @@
 #include <gmodule.h>
 #include <string.h>
 
-#include <mate-panel-applets-manager.h>
+#include <panel-applets-manager.h>
 
-#include "mate-panel-applet-frame-dbus.h"
-
-#include "mate-panel-applets-manager-dbus.h"
+#include "panel-applet-frame-dbus.h"
+#include "panel-applets-manager-dbus.h"
 
 G_DEFINE_TYPE_WITH_CODE (MatePanelAppletsManagerDBus,
 			 mate_panel_applets_manager_dbus,
diff --git a/mate-panel/libmate-panel-applet-private/mate-panel-applets-manager-dbus.h b/mate-panel/libmate-panel-applet-private/panel-applets-manager-dbus.h
index 0250ce54..85ab5c53 100644
--- a/mate-panel/libmate-panel-applet-private/mate-panel-applets-manager-dbus.h
+++ b/mate-panel/libmate-panel-applet-private/panel-applets-manager-dbus.h
@@ -1,5 +1,5 @@
 /*
- * mate-panel-applets-manager-dbus.h
+ * panel-applets-manager-dbus.h
  *
  * Copyright (C) 2010 Carlos Garcia Campos <[email protected]>
  * Copyright (C) 2010 Vincent Untz <[email protected]>
@@ -20,10 +20,10 @@
  * 02110-1301, USA.
  */
 
-#ifndef __MATE_PANEL_APPLETS_MANAGER_DBUS_H__
-#define __MATE_PANEL_APPLETS_MANAGER_DBUS_H__
+#ifndef __PANEL_APPLETS_MANAGER_DBUS_H__
+#define __PANEL_APPLETS_MANAGER_DBUS_H__
 
-#include <mate-panel-applets-manager.h>
+#include <panel-applets-manager.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -57,4 +57,4 @@ GType mate_panel_applets_manager_dbus_get_type (void);
 }
 #endif
 
-#endif /* __MATE_PANEL_APPLETS_MANAGER_DBUS_H__ */
+#endif /* __PANEL_APPLETS_MANAGER_DBUS_H__ */