renaming from gedit to pluma

21 files changed, 2219 insertions, 2219 deletions

diff --git a/plugin-loaders/c/Makefile.am b/plugin-loaders/c/Makefile.am
index 7760aefe..37df5cd3 100755
--- a/plugin-loaders/c/Makefile.am
+++ b/plugin-loaders/c/Makefile.am
@@ -1,24 +1,24 @@
 # C plugin loader
 
-loaderdir = $(libdir)/gedit-2/plugin-loaders
+loaderdir = $(libdir)/pluma-2/plugin-loaders
 
 INCLUDES = \
 	-I$(top_srcdir) 						\
-	$(GEDIT_CFLAGS) 						\
+	$(PLUMA_CFLAGS) 						\
 	$(WARN_CFLAGS)							\
 	$(DISABLE_DEPRECATED_CFLAGS)					\
-	-DGEDIT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+	-DPLUMA_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
 
 loader_LTLIBRARIES = libcloader.la
 
 NOINST_H_FILES = \
-	gedit-plugin-loader-c.h
+	pluma-plugin-loader-c.h
 
 libcloader_la_SOURCES = \
-	gedit-plugin-loader-c.c 	\
+	pluma-plugin-loader-c.c 	\
 	$(NOINST_H_FILES)
 
 libcloader_la_LDFLAGS = $(LOADER_LIBTOOL_FLAGS)
-libcloader_la_LIBADD = $(GEDIT_LIBS)
+libcloader_la_LIBADD = $(PLUMA_LIBS)
 
 -include $(top_srcdir)/git.mk
diff --git a/plugin-loaders/c/gedit-plugin-loader-c.h b/plugin-loaders/c/gedit-plugin-loader-c.h
deleted file mode 100755
index 70420546..00000000
--- a/plugin-loaders/c/gedit-plugin-loader-c.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * gedit-plugin-loader-c.h
- * This file is part of gedit
- *
- * Copyright (C) 2008 - Jesse van den Kieboom
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, 
- * Boston, MA 02111-1307, USA. 
- */
-
-#ifndef __GEDIT_PLUGIN_LOADER_C_H__
-#define __GEDIT_PLUGIN_LOADER_C_H__
-
-#include <gedit/gedit-plugin-loader.h>
-
-G_BEGIN_DECLS
-
-#define GEDIT_TYPE_PLUGIN_LOADER_C		(gedit_plugin_loader_c_get_type ())
-#define GEDIT_PLUGIN_LOADER_C(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GEDIT_TYPE_PLUGIN_LOADER_C, GeditPluginLoaderC))
-#define GEDIT_PLUGIN_LOADER_C_CONST(obj)	(G_TYPE_CHECK_INSTANCE_CAST ((obj), GEDIT_TYPE_PLUGIN_LOADER_C, GeditPluginLoaderC const))
-#define GEDIT_PLUGIN_LOADER_C_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GEDIT_TYPE_PLUGIN_LOADER_C, GeditPluginLoaderCClass))
-#define GEDIT_IS_PLUGIN_LOADER_C(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEDIT_TYPE_PLUGIN_LOADER_C))
-#define GEDIT_IS_PLUGIN_LOADER_C_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GEDIT_TYPE_PLUGIN_LOADER_C))
-#define GEDIT_PLUGIN_LOADER_C_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GEDIT_TYPE_PLUGIN_LOADER_C, GeditPluginLoaderCClass))
-
-typedef struct _GeditPluginLoaderC		GeditPluginLoaderC;
-typedef struct _GeditPluginLoaderCClass		GeditPluginLoaderCClass;
-typedef struct _GeditPluginLoaderCPrivate	GeditPluginLoaderCPrivate;
-
-struct _GeditPluginLoaderC {
-	GObject parent;
-	
-	GeditPluginLoaderCPrivate *priv;
-};
-
-struct _GeditPluginLoaderCClass {
-	GObjectClass parent_class;
-};
-
-GType gedit_plugin_loader_c_get_type (void) G_GNUC_CONST;
-GeditPluginLoaderC *gedit_plugin_loader_c_new(void);
-
-/* All the loaders must implement this function */
-G_MODULE_EXPORT GType register_gedit_plugin_loader (GTypeModule * module);
-
-G_END_DECLS
-
-#endif /* __GEDIT_PLUGIN_LOADER_C_H__ */
diff --git a/plugin-loaders/c/gedit-plugin-loader-c.c b/plugin-loaders/c/pluma-plugin-loader-c.c
index 37b3d059..09f0cccd 100755
--- a/plugin-loaders/c/gedit-plugin-loader-c.c
+++ b/plugin-loaders/c/pluma-plugin-loader-c.c
@@ -1,6 +1,6 @@
 /*
- * gedit-plugin-loader-c.c
- * This file is part of gedit
+ * pluma-plugin-loader-c.c
+ * This file is part of pluma
  *
  * Copyright (C) 2008 - Jesse van den Kieboom
  *
@@ -20,46 +20,46 @@
  * Boston, MA 02111-1307, USA. 
  */
 
-#include "gedit-plugin-loader-c.h"
-#include <gedit/gedit-object-module.h>
+#include "pluma-plugin-loader-c.h"
+#include <pluma/pluma-object-module.h>
 
-#define GEDIT_PLUGIN_LOADER_C_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GEDIT_TYPE_PLUGIN_LOADER_C, GeditPluginLoaderCPrivate))
+#define PLUMA_PLUGIN_LOADER_C_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), PLUMA_TYPE_PLUGIN_LOADER_C, PlumaPluginLoaderCPrivate))
 
-struct _GeditPluginLoaderCPrivate
+struct _PlumaPluginLoaderCPrivate
 {
 	GHashTable *loaded_plugins;
 };
 
-static void gedit_plugin_loader_iface_init (gpointer g_iface, gpointer iface_data);
+static void pluma_plugin_loader_iface_init (gpointer g_iface, gpointer iface_data);
 
-GEDIT_PLUGIN_LOADER_REGISTER_TYPE (GeditPluginLoaderC, gedit_plugin_loader_c, G_TYPE_OBJECT, gedit_plugin_loader_iface_init);
+PLUMA_PLUGIN_LOADER_REGISTER_TYPE (PlumaPluginLoaderC, pluma_plugin_loader_c, G_TYPE_OBJECT, pluma_plugin_loader_iface_init);
 
 
 static const gchar *
-gedit_plugin_loader_iface_get_id (void)
+pluma_plugin_loader_iface_get_id (void)
 {
 	return "C";
 }
 
-static GeditPlugin *
-gedit_plugin_loader_iface_load (GeditPluginLoader *loader,
-				GeditPluginInfo   *info,
+static PlumaPlugin *
+pluma_plugin_loader_iface_load (PlumaPluginLoader *loader,
+				PlumaPluginInfo   *info,
 				const gchar       *path)
 {
-	GeditPluginLoaderC *cloader = GEDIT_PLUGIN_LOADER_C (loader);
-	GeditObjectModule *module;
+	PlumaPluginLoaderC *cloader = PLUMA_PLUGIN_LOADER_C (loader);
+	PlumaObjectModule *module;
 	const gchar *module_name;
-	GeditPlugin *result;
+	PlumaPlugin *result;
 
-	module = (GeditObjectModule *)g_hash_table_lookup (cloader->priv->loaded_plugins, info);
-	module_name = gedit_plugin_info_get_module_name (info);
+	module = (PlumaObjectModule *)g_hash_table_lookup (cloader->priv->loaded_plugins, info);
+	module_name = pluma_plugin_info_get_module_name (info);
 
 	if (module == NULL)
 	{
 		/* For now we force all modules to be resident */
-		module = gedit_object_module_new (module_name,
+		module = pluma_object_module_new (module_name,
 						  path,
-						  "register_gedit_plugin",
+						  "register_pluma_plugin",
 						  TRUE);
 
 		/* Infos are available for all the lifetime of the loader.
@@ -70,7 +70,7 @@ gedit_plugin_loader_iface_load (GeditPluginLoader *loader,
 
 	if (!g_type_module_use (G_TYPE_MODULE (module)))
 	{
-		g_warning ("Could not load plugin module: %s", gedit_plugin_info_get_name (info));
+		g_warning ("Could not load plugin module: %s", pluma_plugin_info_get_name (info));
 
 		return NULL;
 	}
@@ -78,14 +78,14 @@ gedit_plugin_loader_iface_load (GeditPluginLoader *loader,
 	/* TODO: for now we force data-dir-name = module-name... if needed we can
 	 * add a datadir field to the plugin descriptor file.
 	 */
-	result = (GeditPlugin *)gedit_object_module_new_object (module,
+	result = (PlumaPlugin *)pluma_object_module_new_object (module,
 								"install-dir", path,
 								"data-dir-name", module_name,
 								NULL);
 
 	if (!result)
 	{
-		g_warning ("Could not create plugin object: %s", gedit_plugin_info_get_name (info));
+		g_warning ("Could not create plugin object: %s", pluma_plugin_info_get_name (info));
 		g_type_module_unuse (G_TYPE_MODULE (module));
 		
 		return NULL;
@@ -97,10 +97,10 @@ gedit_plugin_loader_iface_load (GeditPluginLoader *loader,
 }
 
 static void
-gedit_plugin_loader_iface_unload (GeditPluginLoader *loader,
-				  GeditPluginInfo   *info)
+pluma_plugin_loader_iface_unload (PlumaPluginLoader *loader,
+				  PlumaPluginInfo   *info)
 {
-	//GeditPluginLoaderC *cloader = GEDIT_PLUGIN_LOADER_C (loader);
+	//PlumaPluginLoaderC *cloader = PLUMA_PLUGIN_LOADER_C (loader);
 	
 	/* this is a no-op, since the type module will be properly unused as
 	   the last reference to the plugin dies. When the plugin is activated
@@ -108,20 +108,20 @@ gedit_plugin_loader_iface_unload (GeditPluginLoader *loader,
 }
 
 static void
-gedit_plugin_loader_iface_init (gpointer g_iface, 
+pluma_plugin_loader_iface_init (gpointer g_iface, 
 				gpointer iface_data)
 {
-	GeditPluginLoaderInterface *iface = (GeditPluginLoaderInterface *)g_iface;
+	PlumaPluginLoaderInterface *iface = (PlumaPluginLoaderInterface *)g_iface;
 	
-	iface->get_id = gedit_plugin_loader_iface_get_id;
-	iface->load = gedit_plugin_loader_iface_load;
-	iface->unload = gedit_plugin_loader_iface_unload;
+	iface->get_id = pluma_plugin_loader_iface_get_id;
+	iface->load = pluma_plugin_loader_iface_load;
+	iface->unload = pluma_plugin_loader_iface_unload;
 }
 
 static void
-gedit_plugin_loader_c_finalize (GObject *object)
+pluma_plugin_loader_c_finalize (GObject *object)
 {
-	GeditPluginLoaderC *cloader = GEDIT_PLUGIN_LOADER_C (object);
+	PlumaPluginLoaderC *cloader = PLUMA_PLUGIN_LOADER_C (object);
 	GList *infos;
 	GList *item;
 
@@ -132,9 +132,9 @@ gedit_plugin_loader_c_finalize (GObject *object)
 	
 	for (item = infos; item; item = item->next)
 	{
-		GeditPluginInfo *info = (GeditPluginInfo *)item->data;
+		PlumaPluginInfo *info = (PlumaPluginInfo *)item->data;
 
-		if (gedit_plugin_info_is_active (info))
+		if (pluma_plugin_info_is_active (info))
 		{
 			g_warning ("There are still C plugins loaded during destruction");
 			break;
@@ -145,38 +145,38 @@ gedit_plugin_loader_c_finalize (GObject *object)
 
 	g_hash_table_destroy (cloader->priv->loaded_plugins);
 	
-	G_OBJECT_CLASS (gedit_plugin_loader_c_parent_class)->finalize (object);
+	G_OBJECT_CLASS (pluma_plugin_loader_c_parent_class)->finalize (object);
 }
 
 static void
-gedit_plugin_loader_c_class_init (GeditPluginLoaderCClass *klass)
+pluma_plugin_loader_c_class_init (PlumaPluginLoaderCClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	
-	object_class->finalize = gedit_plugin_loader_c_finalize;
+	object_class->finalize = pluma_plugin_loader_c_finalize;
 
-	g_type_class_add_private (object_class, sizeof (GeditPluginLoaderCPrivate));
+	g_type_class_add_private (object_class, sizeof (PlumaPluginLoaderCPrivate));
 }
 
 static void
-gedit_plugin_loader_c_class_finalize (GeditPluginLoaderCClass *klass)
+pluma_plugin_loader_c_class_finalize (PlumaPluginLoaderCClass *klass)
 {
 }
 
 static void
-gedit_plugin_loader_c_init (GeditPluginLoaderC *self)
+pluma_plugin_loader_c_init (PlumaPluginLoaderC *self)
 {
-	self->priv = GEDIT_PLUGIN_LOADER_C_GET_PRIVATE (self);
+	self->priv = PLUMA_PLUGIN_LOADER_C_GET_PRIVATE (self);
 	
-	/* loaded_plugins maps GeditPluginInfo to a GeditObjectModule */
+	/* loaded_plugins maps PlumaPluginInfo to a PlumaObjectModule */
 	self->priv->loaded_plugins = g_hash_table_new (g_direct_hash,
 						       g_direct_equal);
 }
 
-GeditPluginLoaderC *
-gedit_plugin_loader_c_new ()
+PlumaPluginLoaderC *
+pluma_plugin_loader_c_new ()
 {
-	GObject *loader = g_object_new (GEDIT_TYPE_PLUGIN_LOADER_C, NULL);
+	GObject *loader = g_object_new (PLUMA_TYPE_PLUGIN_LOADER_C, NULL);
 
-	return GEDIT_PLUGIN_LOADER_C (loader);
+	return PLUMA_PLUGIN_LOADER_C (loader);
 }
diff --git a/plugin-loaders/c/pluma-plugin-loader-c.h b/plugin-loaders/c/pluma-plugin-loader-c.h
new file mode 100755
index 00000000..1877039f
--- /dev/null
+++ b/plugin-loaders/c/pluma-plugin-loader-c.h
@@ -0,0 +1,60 @@
+/*
+ * pluma-plugin-loader-c.h
+ * This file is part of pluma
+ *
+ * Copyright (C) 2008 - Jesse van den Kieboom
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, 
+ * Boston, MA 02111-1307, USA. 
+ */
+
+#ifndef __PLUMA_PLUGIN_LOADER_C_H__
+#define __PLUMA_PLUGIN_LOADER_C_H__
+
+#include <pluma/pluma-plugin-loader.h>
+
+G_BEGIN_DECLS
+
+#define PLUMA_TYPE_PLUGIN_LOADER_C		(pluma_plugin_loader_c_get_type ())
+#define PLUMA_PLUGIN_LOADER_C(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), PLUMA_TYPE_PLUGIN_LOADER_C, PlumaPluginLoaderC))
+#define PLUMA_PLUGIN_LOADER_C_CONST(obj)	(G_TYPE_CHECK_INSTANCE_CAST ((obj), PLUMA_TYPE_PLUGIN_LOADER_C, PlumaPluginLoaderC const))
+#define PLUMA_PLUGIN_LOADER_C_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), PLUMA_TYPE_PLUGIN_LOADER_C, PlumaPluginLoaderCClass))
+#define PLUMA_IS_PLUGIN_LOADER_C(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), PLUMA_TYPE_PLUGIN_LOADER_C))
+#define PLUMA_IS_PLUGIN_LOADER_C_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), PLUMA_TYPE_PLUGIN_LOADER_C))
+#define PLUMA_PLUGIN_LOADER_C_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), PLUMA_TYPE_PLUGIN_LOADER_C, PlumaPluginLoaderCClass))
+
+typedef struct _PlumaPluginLoaderC		PlumaPluginLoaderC;
+typedef struct _PlumaPluginLoaderCClass		PlumaPluginLoaderCClass;
+typedef struct _PlumaPluginLoaderCPrivate	PlumaPluginLoaderCPrivate;
+
+struct _PlumaPluginLoaderC {
+	GObject parent;
+	
+	PlumaPluginLoaderCPrivate *priv;
+};
+
+struct _PlumaPluginLoaderCClass {
+	GObjectClass parent_class;
+};
+
+GType pluma_plugin_loader_c_get_type (void) G_GNUC_CONST;
+PlumaPluginLoaderC *pluma_plugin_loader_c_new(void);
+
+/* All the loaders must implement this function */
+G_MODULE_EXPORT GType register_pluma_plugin_loader (GTypeModule * module);
+
+G_END_DECLS
+
+#endif /* __PLUMA_PLUGIN_LOADER_C_H__ */
diff --git a/plugin-loaders/python/Makefile.am b/plugin-loaders/python/Makefile.am
index 174d57dc..64667363 100755
--- a/plugin-loaders/python/Makefile.am
+++ b/plugin-loaders/python/Makefile.am
@@ -1,36 +1,36 @@
 # C plugin loader
 
 SUBDIRS = bindings
-loaderdir = $(libdir)/gedit-2/plugin-loaders
+loaderdir = $(libdir)/pluma-2/plugin-loaders
 
 INCLUDES = \
 	-I$(top_srcdir) 						\
 	-I$(top_builddir)						\
-	-I$(top_srcdir)/gedit						\
-	-I$(top_builddir)/gedit						\
-	$(GEDIT_CFLAGS) 						\
+	-I$(top_srcdir)/pluma						\
+	-I$(top_builddir)/pluma						\
+	$(PLUMA_CFLAGS) 						\
 	$(WARN_CFLAGS)							\
 	$(DISABLE_DEPRECATED_CFLAGS)					\
 	$(PYGTK_CFLAGS)							\
 	$(PYTHON_CFLAGS)						\
-	-DGEDIT_PLUGINS_LIBS_DIR=\"$(GEDIT_PLUGINS_LIBS_DIR)\"		\
-	-DGEDIT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+	-DPLUMA_PLUGINS_LIBS_DIR=\"$(PLUMA_PLUGINS_LIBS_DIR)\"		\
+	-DPLUMA_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
 
 loader_LTLIBRARIES = libpythonloader.la
 
 
 NOINST_H_FILES = \
-	gedit-plugin-loader-python.h	\
-	gedit-plugin-python.h
+	pluma-plugin-loader-python.h	\
+	pluma-plugin-python.h
 
 libpythonloader_la_SOURCES = \
-	gedit-plugin-loader-python.c 	\
-	gedit-plugin-python.c		\
+	pluma-plugin-loader-python.c 	\
+	pluma-plugin-python.c		\
 	$(NOINST_H_FILES)
 
 libpythonloader_la_LDFLAGS = $(LOADER_LIBTOOL_FLAGS)
 libpythonloader_la_LIBADD = \
-	$(GEDIT_LIBS) 			\
-	bindings/gedit.la
+	$(PLUMA_LIBS) 			\
+	bindings/pluma.la
 
 -include $(top_srcdir)/git.mk
diff --git a/plugin-loaders/python/bindings/Makefile.am b/plugin-loaders/python/bindings/Makefile.am
index 47183a55..f9493e2d 100755
--- a/plugin-loaders/python/bindings/Makefile.am
+++ b/plugin-loaders/python/bindings/Makefile.am
@@ -1,39 +1,39 @@
 ## Process this file with automake to produce Makefile.in
 
 noinst_LTLIBRARIES = \
-	gedit.la
+	pluma.la
 
-nodist_gedit_la_SOURCES = 	\
-	gedit.c			\
-	geditutils.c		\
-	geditcommands.c
+nodist_pluma_la_SOURCES = 	\
+	pluma.c			\
+	plumautils.c		\
+	plumacommands.c
 
-gedit_la_LDFLAGS = \
+pluma_la_LDFLAGS = \
 	-module -avoid-version
 
-gedit_la_LIBADD = \
+pluma_la_LIBADD = \
 	$(PYTHON_LIB_LOC)       \
 	$(PYTHON_LIBS)		\
 	$(PYTHON_EXTRA_LIBS)	\
 	$(PYGTK_LIBS)
 
-gedit_la_CFLAGS = \
+pluma_la_CFLAGS = \
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
-	-I$(top_srcdir)/gedit				\
-	-I$(top_builddir)/gedit				\
+	-I$(top_srcdir)/pluma				\
+	-I$(top_builddir)/pluma				\
 	-I$(top_srcdir)/plugin-loaders/python		\
 	-I$(top_builddir)/plugin-loaders/python		\
-	$(GEDIT_CFLAGS)					\
+	$(PLUMA_CFLAGS)					\
 	$(NO_STRICT_ALIASING_CFLAGS)			\
 	$(PYGTK_CFLAGS)					\
 	$(PYTHON_CFLAGS)				\
 	$(AM_CFLAGS)
 
-$(top_builddir)/gedit/gedit-enum-types.h:
-	cd $(top_builddir)/gedit && $(MAKE) gedit-enum-types.h
+$(top_builddir)/pluma/pluma-enum-types.h:
+	cd $(top_builddir)/pluma && $(MAKE) pluma-enum-types.h
 
-gedit.c: gedit.defs gedit.override geditplugin.override geditmessage.override $(top_builddir)/gedit/gedit-enum-types.h
+pluma.c: pluma.defs pluma.override plumaplugin.override plumamessage.override $(top_builddir)/pluma/pluma-enum-types.h
 	( cd $(srcdir) && $(PYGTK_CODEGEN) \
 		--register $(PYGTK_DEFSDIR)/pango-types.defs \
 		--register $(PYGTK_DEFSDIR)/gdk-types.defs \
@@ -43,69 +43,69 @@ gedit.c: gedit.defs gedit.override geditplugin.override geditmessage.override $(
 		--override $*.override \
 		--prefix py$* $(<F) ) > $@ 
 
-geditutils.c: geditutils.defs geditutils.override
+plumautils.c: plumautils.defs plumautils.override
 	( cd $(srcdir) && $(PYGTK_CODEGEN) \
 		--override $*.override \
 		--prefix py$* $(<F) ) > $@ 
 
-geditcommands.c: geditcommands.defs geditcommands.override gedit.defs
+plumacommands.c: plumacommands.defs plumacommands.override pluma.defs
 	( cd $(srcdir) && $(PYGTK_CODEGEN) \
-		--register gedit.defs \
+		--register pluma.defs \
 		--register $(PYGTK_DEFSDIR)/gtk-types.defs \
 		--override $*.override \
 		--prefix py$* $(<F) ) > $@ 
 
-BINDING_GEDIT_HEADERS_SRCDIR_IN = \
-	gedit/gedit-app.h		\
-	gedit/gedit-document.h		\
-	gedit/gedit-encodings.h		\
-	gedit/gedit-plugin.h		\
-	plugin-loaders/python/gedit-plugin-python.h \
-	gedit/gedit-view.h		\
-	gedit/gedit-statusbar.h		\
-	gedit/gedit-tab.h 		\
-	gedit/gedit-panel.h 		\
-	gedit/gedit-window.h 		\
-	gedit/gedit-help.h		\
-	gedit/gedit-debug.h		\
-	gedit/gedit-message-type.h	\
-	gedit/gedit-message.h		\
-	gedit/gedit-message-bus.h	\
-	gedit/gedit-language-manager.h
+BINDING_PLUMA_HEADERS_SRCDIR_IN = \
+	pluma/pluma-app.h		\
+	pluma/pluma-document.h		\
+	pluma/pluma-encodings.h		\
+	pluma/pluma-plugin.h		\
+	plugin-loaders/python/pluma-plugin-python.h \
+	pluma/pluma-view.h		\
+	pluma/pluma-statusbar.h		\
+	pluma/pluma-tab.h 		\
+	pluma/pluma-panel.h 		\
+	pluma/pluma-window.h 		\
+	pluma/pluma-help.h		\
+	pluma/pluma-debug.h		\
+	pluma/pluma-message-type.h	\
+	pluma/pluma-message.h		\
+	pluma/pluma-message-bus.h	\
+	pluma/pluma-language-manager.h
 
 BINDING_UTILS_HEADERS_SRCDIR_IN = \
-	gedit/gedit-utils.h
+	pluma/pluma-utils.h
 
 BINDING_COMMANDS_HEADERS_SRCDIR_IN = \
-	gedit/gedit-commands.h
+	pluma/pluma-commands.h
 
 BINDING_HEADERS_BUILDDIR_IN = 
 
-BINDING_GEDIT_HEADERS_SRCDIR	:= $(addprefix $(top_srcdir)/,$(BINDING_GEDIT_HEADERS_SRCDIR_IN))
+BINDING_PLUMA_HEADERS_SRCDIR	:= $(addprefix $(top_srcdir)/,$(BINDING_PLUMA_HEADERS_SRCDIR_IN))
 BINDING_UTILS_HEADERS_SRCDIR	:= $(addprefix $(top_srcdir)/,$(BINDING_UTILS_HEADERS_SRCDIR_IN))
 BINDING_COMMANDS_HEADERS_SRCDIR	:= $(addprefix $(top_srcdir)/,$(BINDING_COMMANDS_HEADERS_SRCDIR_IN))
 
 BINDING_HEADERS_BUILDDIR	:= $(addprefix $(top_builddir)/,$(BINDING_HEADERS_BUILDDIR_IN))
 
 regenerate-python-binding:
-	$(PYGTK_H2DEF) $(sort $(BINDING_GEDIT_HEADERS_SRCDIR) $(BINDING_HEADERS_BUILDDIR)) > gedit.defs.new
-	$(PYGTK_H2DEF) $(sort $(BINDING_UTILS_HEADERS_SRCDIR) $(BINDING_HEADERS_BUILDDIR)) > geditutils.defs.new
-	$(PYGTK_H2DEF) $(sort $(BINDING_COMMANDS_HEADERS_SRCDIR) $(BINDING_HEADERS_BUILDDIR)) > geditcommands.defs.new
+	$(PYGTK_H2DEF) $(sort $(BINDING_PLUMA_HEADERS_SRCDIR) $(BINDING_HEADERS_BUILDDIR)) > pluma.defs.new
+	$(PYGTK_H2DEF) $(sort $(BINDING_UTILS_HEADERS_SRCDIR) $(BINDING_HEADERS_BUILDDIR)) > plumautils.defs.new
+	$(PYGTK_H2DEF) $(sort $(BINDING_COMMANDS_HEADERS_SRCDIR) $(BINDING_HEADERS_BUILDDIR)) > plumacommands.defs.new
 
 BUILT_SOURCES = \
-	gedit.c		\
-	geditutils.c	\
-	geditcommands.c
+	pluma.c		\
+	plumautils.c	\
+	plumacommands.c
 
 EXTRA_DIST = \
-	gedit.override		\
-	gedit.defs		\
-	geditutils.override	\
-	geditutils.defs		\
-	geditcommands.override 	\
-	geditcommands.defs	\
-	geditmessage.override	\
-	geditplugin.override
+	pluma.override		\
+	pluma.defs		\
+	plumautils.override	\
+	plumautils.defs		\
+	plumacommands.override 	\
+	plumacommands.defs	\
+	plumamessage.override	\
+	plumaplugin.override
 
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/plugin-loaders/python/bindings/gedit.defs b/plugin-loaders/python/bindings/gedit.defs
deleted file mode 100755
index 1b116396..00000000
--- a/plugin-loaders/python/bindings/gedit.defs
+++ /dev/null
@@ -1,1461 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object App
-  (in-module "Gedit")
-  (parent "GObject")
-  (c-name "GeditApp")
-  (gtype-id "GEDIT_TYPE_APP")
-)
-
-(define-object Document
-  (in-module "Gedit")
-  (parent "GtkSourceBuffer")
-  (c-name "GeditDocument")
-  (gtype-id "GEDIT_TYPE_DOCUMENT")
-)
-
-(define-object Message
-  (in-module "Gedit")
-  (parent "GObject")
-  (c-name "GeditMessage")
-  (gtype-id "GEDIT_TYPE_MESSAGE")
-)
-
-(define-object MessageBus
-  (in-module "Gedit")
-  (parent "GObject")
-  (c-name "GeditMessageBus")
-  (gtype-id "GEDIT_TYPE_MESSAGE_BUS")
-)
-
-(define-object Panel
-  (in-module "Gedit")
-  (parent "GtkVBox")
-  (c-name "GeditPanel")
-  (gtype-id "GEDIT_TYPE_PANEL")
-)
-
-(define-object __Plugin
-  (in-module "Gedit")
-  (parent "GObject")
-  (c-name "GeditPlugin")
-  (gtype-id "GEDIT_TYPE_PLUGIN")
-)
-
-(define-object Plugin
-  (in-module "Gedit")
-  (parent "GeditPlugin")
-  (c-name "GeditPluginPython")
-  (gtype-id "GEDIT_TYPE_PLUGIN_PYTHON")
-)
-
-(define-object Statusbar
-  (in-module "Gedit")
-  (parent "GtkStatusbar")
-  (c-name "GeditStatusbar")
-  (gtype-id "GEDIT_TYPE_STATUSBAR")
-)
-
-(define-object Tab
-  (in-module "Gedit")
-  (parent "GtkVBox")
-  (c-name "GeditTab")
-  (gtype-id "GEDIT_TYPE_TAB")
-)
-
-(define-object View
-  (in-module "Gedit")
-  (parent "GtkSourceView")
-  (c-name "GeditView")
-  (gtype-id "GEDIT_TYPE_VIEW")
-)
-
-(define-object Window
-  (in-module "Gedit")
-  (parent "GtkWindow")
-  (c-name "GeditWindow")
-  (gtype-id "GEDIT_TYPE_WINDOW")
-)
-
-;; Enumerations and flags ...
-
-(define-flags LockdownMask
-  (in-module "Gedit")
-  (c-name "GeditLockdownMask")
-  (gtype-id "GEDIT_TYPE_LOCKDOWN_MASK")
-  (values
-    '("command-line" "GEDIT_LOCKDOWN_COMMAND_LINE")
-    '("printing" "GEDIT_LOCKDOWN_PRINTING")
-    '("print-setup" "GEDIT_LOCKDOWN_PRINT_SETUP")
-    '("save-to-disk" "GEDIT_LOCKDOWN_SAVE_TO_DISK")
-    '("all" "GEDIT_LOCKDOWN_ALL")
-  )
-)
-
-(define-flags SearchFlags
-  (in-module "Gedit")
-  (c-name "GeditSearchFlags")
-  (gtype-id "GEDIT_TYPE_SEARCH_FLAGS")
-  (values
-    '("dont-set-flags" "GEDIT_SEARCH_DONT_SET_FLAGS")
-    '("entire-word" "GEDIT_SEARCH_ENTIRE_WORD")
-    '("case-sensitive" "GEDIT_SEARCH_CASE_SENSITIVE")
-  )
-)
-
-(define-flags DocumentSaveFlags
-  (in-module "Gedit")
-  (c-name "GeditDocumentSaveFlags")
-  (gtype-id "GEDIT_TYPE_DOCUMENT_SAVE_FLAGS")
-  (values
-    '("ignore-mtime" "GEDIT_DOCUMENT_SAVE_IGNORE_MTIME")
-    '("ignore-backup" "GEDIT_DOCUMENT_SAVE_IGNORE_BACKUP")
-    '("preserve-backup" "GEDIT_DOCUMENT_SAVE_PRESERVE_BACKUP")
-  )
-)
-
-(define-enum TabState
-  (in-module "Gedit")
-  (c-name "GeditTabState")
-  (gtype-id "GEDIT_TYPE_TAB_STATE")
-  (values
-    '("normal" "GEDIT_TAB_STATE_NORMAL")
-    '("loading" "GEDIT_TAB_STATE_LOADING")
-    '("reverting" "GEDIT_TAB_STATE_REVERTING")
-    '("saving" "GEDIT_TAB_STATE_SAVING")
-    '("printing" "GEDIT_TAB_STATE_PRINTING")
-    '("print-previewing" "GEDIT_TAB_STATE_PRINT_PREVIEWING")
-    '("showing-print-preview" "GEDIT_TAB_STATE_SHOWING_PRINT_PREVIEW")
-    '("generic-not-editable" "GEDIT_TAB_STATE_GENERIC_NOT_EDITABLE")
-    '("loading-error" "GEDIT_TAB_STATE_LOADING_ERROR")
-    '("reverting-error" "GEDIT_TAB_STATE_REVERTING_ERROR")
-    '("saving-error" "GEDIT_TAB_STATE_SAVING_ERROR")
-    '("generic-error" "GEDIT_TAB_STATE_GENERIC_ERROR")
-    '("closing" "GEDIT_TAB_STATE_CLOSING")
-  )
-)
-
-(define-flags WindowState
-  (in-module "Gedit")
-  (c-name "GeditWindowState")
-  (gtype-id "GEDIT_TYPE_WINDOW_STATE")
-  (values
-    '("normal" "GEDIT_WINDOW_STATE_NORMAL")
-    '("saving" "GEDIT_WINDOW_STATE_SAVING")
-    '("printing" "GEDIT_WINDOW_STATE_PRINTING")
-    '("loading" "GEDIT_WINDOW_STATE_LOADING")
-    '("error" "GEDIT_WINDOW_STATE_ERROR")
-    '("saving-session" "GEDIT_WINDOW_STATE_SAVING_SESSION")    
-  )
-)
-
-;; Boxed types
-(define-boxed Encoding
-  (in-module "Gedit")
-  (c-name "GeditEncoding")
-  (gtype-id "GEDIT_TYPE_ENCODING")
-  (copy-func "gedit_encoding_copy")
-  (release-func "gedit_encoding_free")
-;;  (fields
-;;    '("gint" "index")
-;;    '("gchar*" "charset")
-;;    '("gchar*" "name")
-;;  )
-)
-
-(define-boxed MessageType
-  (in-module "Gedit")
-  (c-name "GeditMessageType")
-  (gtype-id "GEDIT_TYPE_MESSAGE_TYPE")
-  (copy-func "gedit_message_type_ref")
-  (release-func "gedit_message_type_unref")
-)
-
-
-;; From ../../gedit/gedit-app.h
-
-(define-function gedit_app_get_type
-  (c-name "gedit_app_get_type")
-  (return-type "GType")
-)
-
-(define-function app_get_default
-  (c-name "gedit_app_get_default")
-  (return-type "GeditApp*")
-)
-
-; deprecated version !
-(define-function gedit_app_get_default
-  (c-name "gedit_app_get_default_deprecated")
-  (return-type "GeditApp*")
-)
-
-(define-method create_window
-  (of-object "GeditApp")
-  (c-name "gedit_app_create_window")
-  (return-type "GeditWindow*")
-  (parameters
-    '("GdkScreen*" "screen")
-  )
-)
-
-(define-method get_windows
-  (of-object "GeditApp")
-  (c-name "gedit_app_get_windows")
-  (return-type "const-GList*")
-)
-
-(define-method get_active_window
-  (of-object "GeditApp")
-  (c-name "gedit_app_get_active_window")
-  (return-type "GeditWindow*")
-)
-
-(define-method get_documents
-  (of-object "GeditApp")
-  (c-name "gedit_app_get_documents")
-  (return-type "GList*")
-)
-
-(define-method get_views
-  (of-object "GeditApp")
-  (c-name "gedit_app_get_views")
-  (return-type "GList*")
-)
-
-(define-method get_lockdown
-  (of-object "GeditApp")
-  (c-name "gedit_app_get_lockdown")
-  (return-type "GeditLockdownMask")
-)
-
-
-;; From ../../gedit/gedit-document.h
-
-(define-function document_error_quark
-  (c-name "gedit_document_error_quark")
-  (return-type "GQuark")
-)
-
-(define-function gedit_document_get_type
-  (c-name "gedit_document_get_type")
-  (return-type "GType")
-)
-
-(define-function gedit_document_new
-  (c-name "gedit_document_new")
-  (is-constructor-of "GeditDocument")
-  (return-type "GeditDocument*")
-)
-
-(define-method get_location
-  (of-object "GeditDocument")
-  (c-name "gedit_document_get_location")
-  (return-type "GFile*")
-)
-
-(define-method get_uri
-  (of-object "GeditDocument")
-  (c-name "gedit_document_get_uri")
-  (return-type "gchar*")
-)
-
-(define-method set_uri
-  (of-object "GeditDocument")
-  (c-name "gedit_document_set_uri")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "uri")
-  )
-)
-
-(define-method get_uri_for_display
-  (of-object "GeditDocument")
-  (c-name "gedit_document_get_uri_for_display")
-  (return-type "gchar*")
-)
-
-(define-method get_short_name_for_display
-  (of-object "GeditDocument")
-  (c-name "gedit_document_get_short_name_for_display")
-  (return-type "gchar*")
-)
-
-(define-method get_content_type
-  (of-object "GeditDocument")
-  (c-name "gedit_document_get_content_type")
-  (return-type "gchar*")
-)
-
-(define-method get_mime_type
-  (of-object "GeditDocument")
-  (c-name "gedit_document_get_mime_type")
-  (return-type "gchar*")
-)
-
-(define-method get_readonly
-  (of-object "GeditDocument")
-  (c-name "gedit_document_get_readonly")
-  (return-type "gboolean")
-)
-
-(define-method load
-  (of-object "GeditDocument")
-  (c-name "gedit_document_load")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "uri")
-    '("const-GeditEncoding*" "encoding")
-    '("gint" "line_pos")
-    '("gboolean" "create")
-  )
-)
-
-(define-method insert_file
-  (of-object "GeditDocument")
-  (c-name "gedit_document_insert_file")
-  (return-type "gboolean")
-  (parameters
-    '("GtkTextIter*" "iter")
-    '("const-gchar*" "uri")
-    '("const-GeditEncoding*" "encoding")
-  )
-)
-
-(define-method load_cancel
-  (of-object "GeditDocument")
-  (c-name "gedit_document_load_cancel")
-  (return-type "gboolean")
-)
-
-(define-method save
-  (of-object "GeditDocument")
-  (c-name "gedit_document_save")
-  (parameters
-    '("GeditDocumentSaveFlags" "flags")
-  )
-  (return-type "none")
-)
-
-(define-method save_as
-  (of-object "GeditDocument")
-  (c-name "gedit_document_save_as")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "uri")
-    '("const-GeditEncoding*" "encoding")
-    '("GeditDocumentSaveFlags" "flags")
-  )
-)
-
-(define-method is_untouched
-  (of-object "GeditDocument")
-  (c-name "gedit_document_is_untouched")
-  (return-type "gboolean")
-)
-
-(define-method is_untitled
-  (of-object "GeditDocument")
-  (c-name "gedit_document_is_untitled")
-  (return-type "gboolean")
-)
-
-(define-method is_local
-  (of-object "GeditDocument")
-  (c-name "gedit_document_is_local")
-  (return-type "gboolean")
-)
-
-(define-method get_deleted
-  (of-object "GeditDocument")
-  (c-name "gedit_document_get_deleted")
-  (return-type "gboolean")
-)
-
-(define-method goto_line
-  (of-object "GeditDocument")
-  (c-name "gedit_document_goto_line")
-  (return-type "gboolean")
-  (parameters
-    '("gint" "line")
-  )
-)
-
-(define-method set_search_text
-  (of-object "GeditDocument")
-  (c-name "gedit_document_set_search_text")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "text")
-    '("guint" "flags")
-  )
-)
-
-(define-method get_search_text
-  (of-object "GeditDocument")
-  (c-name "gedit_document_get_search_text")
-  (return-type "gchar*")
-  (parameters
-    '("guint*" "flags")
-  )
-)
-
-(define-method get_can_search_again
-  (of-object "GeditDocument")
-  (c-name "gedit_document_get_can_search_again")
-  (return-type "gboolean")
-)
-
-(define-method search_forward
-  (of-object "GeditDocument")
-  (c-name "gedit_document_search_forward")
-  (return-type "gboolean")
-  (parameters
-    '("const-GtkTextIter*" "start")
-    '("const-GtkTextIter*" "end")
-    '("GtkTextIter*" "match_start")
-    '("GtkTextIter*" "match_end")
-  )
-)
-
-(define-method replace_all
-  (of-object "GeditDocument")
-  (c-name "gedit_document_replace_all")
-  (return-type "gint")
-  (parameters
-    '("const-gchar*" "find")
-    '("const-gchar*" "replace")
-    '("guint" "flags")
-  )
-)
-
-(define-method search_backward
-  (of-object "GeditDocument")
-  (c-name "gedit_document_search_backward")
-  (return-type "gboolean")
-  (parameters
-    '("const-GtkTextIter*" "start")
-    '("const-GtkTextIter*" "end")
-    '("GtkTextIter*" "match_start")
-    '("GtkTextIter*" "match_end")
-  )
-)
-
-(define-method set_language
-  (of-object "GeditDocument")
-  (c-name "gedit_document_set_language")
-  (return-type "none")
-  (parameters
-    '("GtkSourceLanguage*" "lang" (null-ok))
-  )
-)
-
-(define-method get_language
-  (of-object "GeditDocument")
-  (c-name "gedit_document_get_language")
-  (return-type "GtkSourceLanguage*")
-)
-
-(define-method get_encoding
-  (of-object "GeditDocument")
-  (c-name "gedit_document_get_encoding")
-  (return-type "const-GeditEncoding*")
-)
-
-(define-method set_enable_search_highlighting
-  (of-object "GeditDocument")
-  (c-name "gedit_document_set_enable_search_highlighting")
-  (return-type "none")
-  (parameters
-    '("gboolean" "enable")
-  )
-)
-
-(define-method get_enable_search_highlighting
-  (of-object "GeditDocument")
-  (c-name "gedit_document_get_enable_search_highlighting")
-  (return-type "gboolean")
-)
-
-;; From ../../gedit/gedit-encodings.h
-
-(define-function gedit_encoding_get_type
-  (c-name "gedit_encoding_get_type")
-  (return-type "GType")
-)
-
-(define-method copy
-  (of-object "GeditEncoding")
-  (c-name "gedit_encoding_copy")
-  (return-type "GeditEncoding*")
-)
-
-(define-method free
-  (of-object "GeditEncoding")
-  (c-name "gedit_encoding_free")
-  (return-type "none")
-)
-
-(define-function encoding_get_from_charset
-  (c-name "gedit_encoding_get_from_charset")
-  (return-type "const-GeditEncoding*")
-  (parameters
-    '("const-gchar*" "charset")
-  )
-)
-
-; Deprecated version !
-(define-function gedit_encoding_get_from_charset
-  (c-name "gedit_encoding_get_from_charset_deprecated")
-  (return-type "const-GeditEncoding*")
-  (parameters
-    '("const-gchar*" "charset")
-  )
-)
-
-(define-function encoding_get_from_index
-  (c-name "gedit_encoding_get_from_index")
-  (return-type "const-GeditEncoding*")
-  (parameters
-    '("gint" "index")
-  )
-)
-
-; Deprecated version !
-(define-function gedit_encoding_get_from_index
-  (c-name "gedit_encoding_get_from_index_deprecated")
-  (return-type "const-GeditEncoding*")
-  (parameters
-    '("gint" "index")
-  )
-)
-
-(define-method to_string
-  (of-object "GeditEncoding")
-  (c-name "gedit_encoding_to_string")
-  (return-type "gchar*")
-)
-
-(define-method get_name
-  (of-object "GeditEncoding")
-  (c-name "gedit_encoding_get_name")
-  (return-type "const-gchar*")
-)
-
-(define-method get_charset
-  (of-object "GeditEncoding")
-  (c-name "gedit_encoding_get_charset")
-  (return-type "const-gchar*")
-)
-
-(define-function encoding_get_utf8
-  (c-name "gedit_encoding_get_utf8")
-  (return-type "const-GeditEncoding*")
-)
-
-; Deprecated version !
-(define-function gedit_encoding_get_utf8
-  (c-name "gedit_encoding_get_utf8_deprecated")
-  (return-type "const-GeditEncoding*")
-)
-
-(define-function encoding_get_current
-  (c-name "gedit_encoding_get_current")
-  (return-type "const-GeditEncoding*")
-)
-
-; Deprecated version !
-(define-function gedit_encoding_get_current
-  (c-name "gedit_encoding_get_current_deprecated")
-  (return-type "const-GeditEncoding*")
-)
-
-;; From ../../gedit/gedit-help.h
-
-(define-function help_display
-  (c-name "gedit_help_display")
-  (return-type "gboolean")
-  (parameters
-    '("GtkWindow*" "parent")
-    '("const-gchar*" "name")
-    '("const-gchar*" "link_id")
-  )
-)
-
-
-
-;; From ../../gedit/gedit-panel.h
-
-(define-function gedit_panel_get_type
-  (c-name "gedit_panel_get_type")
-  (return-type "GType")
-)
-
-(define-function gedit_panel_new
-  (c-name "gedit_panel_new")
-  (is-constructor-of "GeditPanel")
-  (return-type "GtkWidget*")
-)
-
-(define-method add_item
-  (of-object "GeditPanel")
-  (c-name "gedit_panel_add_item")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "item")
-    '("const-gchar*" "name")
-    '("GtkWidget*" "image")
-  )
-)
-
-(define-method add_item_with_stock_icon
-  (of-object "GeditPanel")
-  (c-name "gedit_panel_add_item_with_stock_icon")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "item")
-    '("const-gchar*" "name")
-    '("const-gchar*" "stock_id")
-  )
-)
-
-(define-method remove_item
-  (of-object "GeditPanel")
-  (c-name "gedit_panel_remove_item")
-  (return-type "gboolean")
-  (parameters
-    '("GtkWidget*" "item")
-  )
-)
-
-(define-method activate_item
-  (of-object "GeditPanel")
-  (c-name "gedit_panel_activate_item")
-  (return-type "gboolean")
-  (parameters
-    '("GtkWidget*" "item")
-  )
-)
-
-(define-method item_is_active
-  (of-object "GeditPanel")
-  (c-name "gedit_panel_item_is_active")
-  (return-type "gboolean")
-  (parameters
-    '("GtkWidget*" "item")
-  )
-)
-
-(define-method get_orientation
-  (of-object "GeditPanel")
-  (c-name "gedit_panel_get_orientation")
-  (return-type "GtkOrientation")
-)
-
-(define-method get_n_items
-  (of-object "GeditPanel")
-  (c-name "gedit_panel_get_n_items")
-  (return-type "gint")
-)
-
-
-;; From ../../gedit/gedit-plugin.h
-
-(define-function gedit_plugin_get_type
-  (c-name "gedit_plugin_get_type")
-  (return-type "GType")
-)
-
-(define-method get_install_dir
-  (of-object "GeditPlugin")
-  (c-name "gedit_plugin_get_install_dir")
-  (return-type "gchar*")
-)
-
-(define-method get_data_dir
-  (of-object "GeditPlugin")
-  (c-name "gedit_plugin_get_data_dir")
-  (return-type "gchar*")
-)
-
-(define-method activate
-  (of-object "GeditPlugin")
-  (c-name "gedit_plugin_activate")
-  (return-type "none")
-  (parameters
-    '("GeditWindow*" "window")
-  )
-)
-
-(define-method deactivate
-  (of-object "GeditPlugin")
-  (c-name "gedit_plugin_deactivate")
-  (return-type "none")
-  (parameters
-    '("GeditWindow*" "window")
-  )
-)
-
-(define-method update_ui
-  (of-object "GeditPlugin")
-  (c-name "gedit_plugin_update_ui")
-  (return-type "none")
-  (parameters
-    '("GeditWindow*" "window")
-  )
-)
-
-(define-method is_configurable
-  (of-object "GeditPlugin")
-  (c-name "gedit_plugin_is_configurable")
-  (return-type "gboolean")
-)
-
-(define-method create_configure_dialog
-  (of-object "GeditPlugin")
-  (c-name "gedit_plugin_create_configure_dialog")
-  (return-type "GtkWidget*")
-)
-
-;; From ../gedit/gedit-plugin-python.h
-
-(define-function gedit_plugin_python_get_type
-  (c-name "gedit_plugin_python_get_type")
-  (return-type "GType")
-)
-
-(define-function gedit_plugin_python_new
-  (c-name "gedit_plugin_python_new")
-  (is-constructor-of "GeditPluginPython")
-  (return-type "GeditPluginPython*")
-)
-
-;; From ../../gedit/gedit-status-bar.h
-
-(define-method flash_message
-  (of-object "GeditStatusbar")
-  (c-name "gedit_statusbar_flash_message")
-  (return-type "none")
-  (parameters
-    '("int" "context_id")
-    '("const-gchar*" "message")
-  )
- )
-
-;; From ../../gedit/gedit-tab.h
-
-(define-function gedit_tab_get_type
-  (c-name "gedit_tab_get_type")
-  (return-type "GType")
-)
-
-(define-method get_view
-  (of-object "GeditTab")
-  (c-name "gedit_tab_get_view")
-  (return-type "GeditView*")
-)
-
-(define-method get_document
-  (of-object "GeditTab")
-  (c-name "gedit_tab_get_document")
-  (return-type "GeditDocument*")
-)
-
-(define-function tab_get_from_document
-  (c-name "gedit_tab_get_from_document")
-  (return-type "GeditTab*")
-  (parameters
-    '("GeditDocument*" "doc")
-  )
-)
-
-; Deprecated version !
-(define-function gedit_tab_get_from_document
-  (c-name "gedit_tab_get_from_document_deprecated")
-  (return-type "GeditTab*")
-  (parameters
-    '("GeditDocument*" "doc")
-  )
-)
-
-(define-method get_state
-  (of-object "GeditTab")
-  (c-name "gedit_tab_get_state")
-  (return-type "GeditTabState")
-)
-
-(define-method set_auto_save_enabled
-  (of-object "GeditTab")
-  (c-name "gedit_tab_set_auto_save_enabled")
-  (return-type "none")
-  (parameters
-    '("gboolean" "enable")
-  )
-)
-
-(define-method get_auto_save_enabled
-  (of-object "GeditTab")
-  (c-name "gedit_tab_get_auto_save_enabled")
-  (return-type "gboolean")
-)
-
-(define-method set_auto_save_interval
-  (of-object "GeditTab")
-  (c-name "gedit_tab_set_auto_save_interval")
-  (return-type "none")
-  (parameters
-    '("gint" "interval")
-  )
-)
-
-(define-method get_auto_save_interval
-  (of-object "GeditTab")
-  (c-name "gedit_tab_get_auto_save_interval")
-  (return-type "gint")
-)
-
-;; From ../../gedit/gedit-view.h
-
-(define-function gedit_view_get_type
-  (c-name "gedit_view_get_type")
-  (return-type "GtkType")
-)
-
-(define-function gedit_view_new
-  (c-name "gedit_view_new")
-  (is-constructor-of "GeditView")
-  (return-type "GtkWidget*")
-  (parameters
-    '("GeditDocument*" "doc")
-  )
-)
-
-(define-method cut_clipboard
-  (of-object "GeditView")
-  (c-name "gedit_view_cut_clipboard")
-  (return-type "none")
-)
-
-(define-method copy_clipboard
-  (of-object "GeditView")
-  (c-name "gedit_view_copy_clipboard")
-  (return-type "none")
-)
-
-(define-method paste_clipboard
-  (of-object "GeditView")
-  (c-name "gedit_view_paste_clipboard")
-  (return-type "none")
-)
-
-(define-method delete_selection
-  (of-object "GeditView")
-  (c-name "gedit_view_delete_selection")
-  (return-type "none")
-)
-
-(define-method select_all
-  (of-object "GeditView")
-  (c-name "gedit_view_select_all")
-  (return-type "none")
-)
-
-(define-method scroll_to_cursor
-  (of-object "GeditView")
-  (c-name "gedit_view_scroll_to_cursor")
-  (return-type "none")
-)
-
-(define-method set_font
-  (of-object "GeditView")
-  (c-name "gedit_view_set_font")
-  (return-type "none")
-  (parameters
-    '("gboolean" "def")
-    '("const-gchar*" "font_name")
-  )
-)
-
-
-
-;; From ../../gedit/gedit-window.h
-
-(define-function gedit_window_get_type
-  (c-name "gedit_window_get_type")
-  (return-type "GType")
-)
-
-(define-method create_tab
-  (of-object "GeditWindow")
-  (c-name "gedit_window_create_tab")
-  (return-type "GeditTab*")
-  (parameters
-    '("gboolean" "jump_to")
-  )
-)
-
-(define-method create_tab_from_uri
-  (of-object "GeditWindow")
-  (c-name "gedit_window_create_tab_from_uri")
-  (return-type "GeditTab*")
-  (parameters
-    '("const-gchar*" "uri")
-    '("const-GeditEncoding*" "encoding" (null-ok))
-    '("gint" "line_pos")
-    '("gboolean" "create")
-    '("gboolean" "jump_to")
-  )
-)
-
-(define-method close_tab
-  (of-object "GeditWindow")
-  (c-name "gedit_window_close_tab")
-  (return-type "none")
-  (parameters
-    '("GeditTab*" "tab")
-  )
-)
-
-(define-method close_tabs
-  (of-object "GeditWindow")
-  (c-name "gedit_window_close_tabs")
-  (return-type "none")
-  (parameters
-    '("const-GList*" "tabs")
-  )
-)
-
-(define-method close_all_tabs
-  (of-object "GeditWindow")
-  (c-name "gedit_window_close_all_tabs")
-  (return-type "none")
-)
-
-(define-method get_active_tab
-  (of-object "GeditWindow")
-  (c-name "gedit_window_get_active_tab")
-  (return-type "GeditTab*")
-)
-
-(define-method set_active_tab
-  (of-object "GeditWindow")
-  (c-name "gedit_window_set_active_tab")
-  (return-type "none")
-  (parameters
-    '("GeditTab*" "tab")
-  )
-)
-
-(define-method get_active_view
-  (of-object "GeditWindow")
-  (c-name "gedit_window_get_active_view")
-  (return-type "GeditView*")
-)
-
-(define-method get_active_document
-  (of-object "GeditWindow")
-  (c-name "gedit_window_get_active_document")
-  (return-type "GeditDocument*")
-)
-
-(define-method get_documents
-  (of-object "GeditWindow")
-  (c-name "gedit_window_get_documents")
-  (return-type "GList*")
-)
-
-(define-method get_unsaved_documents
-  (of-object "GeditWindow")
-  (c-name "gedit_window_get_unsaved_documents")
-  (return-type "GList*")
-)
-
-(define-method get_views
-  (of-object "GeditWindow")
-  (c-name "gedit_window_get_views")
-  (return-type "GList*")
-)
-
-(define-method get_group
-  (of-object "GeditWindow")
-  (c-name "gedit_window_get_group")
-  (return-type "GtkWindowGroup*")
-)
-
-(define-method get_side_panel
-  (of-object "GeditWindow")
-  (c-name "gedit_window_get_side_panel")
-  (return-type "GeditPanel*")
-)
-
-(define-method get_bottom_panel
-  (of-object "GeditWindow")
-  (c-name "gedit_window_get_bottom_panel")
-  (return-type "GeditPanel*")
-)
-
-(define-method get_statusbar
-  (of-object "GeditWindow")
-  (c-name "gedit_window_get_statusbar")
-  (return-type "GtkWidget*")
-)
-
-(define-method get_ui_manager
-  (of-object "GeditWindow")
-  (c-name "gedit_window_get_ui_manager")
-  (return-type "GtkUIManager*")
-)
-
-(define-method get_state
-  (of-object "GeditWindow")
-  (c-name "gedit_window_get_state")
-  (return-type "GeditWindowState")
-)
-
-(define-method get_message_bus
-  (of-object "GeditWindow")
-  (c-name "gedit_window_get_message_bus")
-  (return-type "GeditMessageBus*")
-)
-
-(define-method get_tab_from_uri
-  (of-object "GeditWindow")
-  (c-name "gedit_window_get_tab_from_uri")
-  (return-type "GeditTab*")
-  (parameters
-    '("const-gchar*" "uri")
-  )
-)
-
-;; From gedit-language-manager.h
-
-(define-function get_language_manager
-  (c-name "gedit_get_language_manager")
-  (return-type "GtkSourceLanguageManager*")
-)
-
-(define-function language_manager_list_languages_sorted
-  (c-name "gedit_language_manager_list_languages_sorted")
-  (return-type "GSList*")
-  (parameters
-    '("GtkSourceLanguageManager*" "lm")
-    '("gboolean" "include_hidden")
-  )
-)
-
-
-;; From gedit-message-bus.h
-
-(define-function gedit_message_bus_get_type
-  (c-name "gedit_message_bus_get_type")
-  (return-type "GType")
-)
-
-(define-function message_bus_get_default
-  (c-name "gedit_message_bus_get_default")
-  (return-type "GeditMessageBus*")
-)
-
-(define-function gedit_message_bus_new
-  (c-name "gedit_message_bus_new")
-  (is-constructor-of "GeditMessageBus")
-  (return-type "GeditMessageBus*")
-)
-
-(define-method lookup
-  (of-object "GeditMessageBus")
-  (c-name "gedit_message_bus_lookup")
-  (return-type "GeditMessageType*")
-  (parameters
-    '("const-gchar*" "object_path")
-    '("const-gchar*" "method")
-  )
-)
-
-(define-method register
-  (of-object "GeditMessageBus")
-  (c-name "gedit_message_bus_register")
-  (return-type "GeditMessageType*")
-  (parameters
-    '("const-gchar*" "object_path")
-    '("const-gchar*" "method")
-    '("guint" "num_optional")
-  )
-  (varargs #t)
-)
-
-(define-method unregister
-  (of-object "GeditMessageBus")
-  (c-name "gedit_message_bus_unregister")
-  (return-type "none")
-  (parameters
-    '("GeditMessageType*" "message_type")
-  )
-)
-
-(define-method unregister_all
-  (of-object "GeditMessageBus")
-  (c-name "gedit_message_bus_unregister_all")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "object_path")
-  )
-)
-
-(define-method is_registered
-  (of-object "GeditMessageBus")
-  (c-name "gedit_message_bus_is_registered")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "object_path")
-    '("const-gchar*" "method")
-  )
-)
-
-(define-method connect
-  (of-object "GeditMessageBus")
-  (c-name "gedit_message_bus_connect")
-  (return-type "guint")
-  (parameters
-    '("const-gchar*" "object_path")
-    '("const-gchar*" "method")
-    '("GeditMessageCallback" "callback")
-    '("gpointer" "userdata")
-    '("GDestroyNotify" "destroy_data")
-  )
-)
-
-(define-method disconnect
-  (of-object "GeditMessageBus")
-  (c-name "gedit_message_bus_disconnect")
-  (return-type "none")
-  (parameters
-    '("guint" "id")
-  )
-)
-
-(define-method disconnect_by_func
-  (of-object "GeditMessageBus")
-  (c-name "gedit_message_bus_disconnect_by_func")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "object_path")
-    '("const-gchar*" "method")
-    '("GeditMessageCallback" "callback")
-    '("gpointer" "userdata")
-  )
-)
-
-(define-method block
-  (of-object "GeditMessageBus")
-  (c-name "gedit_message_bus_block")
-  (return-type "none")
-  (parameters
-    '("guint" "id")
-  )
-)
-
-(define-method block_by_func
-  (of-object "GeditMessageBus")
-  (c-name "gedit_message_bus_block_by_func")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "object_path")
-    '("const-gchar*" "method")
-    '("GeditMessageCallback" "callback")
-    '("gpointer" "userdata")
-  )
-)
-
-(define-method unblock
-  (of-object "GeditMessageBus")
-  (c-name "gedit_message_bus_unblock")
-  (return-type "none")
-  (parameters
-    '("guint" "id")
-  )
-)
-
-(define-method unblock_by_func
-  (of-object "GeditMessageBus")
-  (c-name "gedit_message_bus_unblock_by_func")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "object_path")
-    '("const-gchar*" "method")
-    '("GeditMessageCallback" "callback")
-    '("gpointer" "userdata")
-  )
-)
-
-(define-method send_message
-  (of-object "GeditMessageBus")
-  (c-name "gedit_message_bus_send_message")
-  (return-type "none")
-  (parameters
-    '("GeditMessage*" "message")
-  )
-)
-
-(define-method send_message_sync
-  (of-object "GeditMessageBus")
-  (c-name "gedit_message_bus_send_message_sync")
-  (return-type "none")
-  (parameters
-    '("GeditMessage*" "message")
-  )
-)
-
-(define-method send
-  (of-object "GeditMessageBus")
-  (c-name "gedit_message_bus_send")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "object_path")
-    '("const-gchar*" "method")
-  )
-  (varargs #t)
-)
-
-(define-method send_sync
-  (of-object "GeditMessageBus")
-  (c-name "gedit_message_bus_send_sync")
-  (return-type "GeditMessage*")
-  (parameters
-    '("const-gchar*" "object_path")
-    '("const-gchar*" "method")
-  )
-  (varargs #t)
-)
-
-
-;; From gedit-message-type.h
-
-(define-function gedit_message_type_get_type
-  (c-name "gedit_message_type_get_type")
-  (return-type "GType")
-)
-
-(define-function gedit_message_type_is_supported
-  (c-name "gedit_message_type_is_supported")
-  (return-type "gboolean")
-  (parameters
-    '("GType" "type")
-  )
-)
-
-(define-function gedit_message_type_identifier
-  (c-name "gedit_message_type_identifier")
-  (return-type "gchar*")
-  (parameters
-    '("const-gchar*" "object_path")
-    '("const-gchar*" "method")
-  )
-)
-
-(define-function gedit_message_type_new
-  (c-name "gedit_message_type_new")
-  (is-constructor-of "GeditMessageType")
-  (return-type "GeditMessageType*")
-  (parameters
-    '("const-gchar*" "object_path")
-    '("const-gchar*" "method")
-    '("guint" "num_optional")
-  )
-  (varargs #t)
-)
-
-(define-function gedit_message_type_new_valist
-  (c-name "gedit_message_type_new_valist")
-  (return-type "GeditMessageType*")
-  (parameters
-    '("const-gchar*" "object_path")
-    '("const-gchar*" "method")
-    '("guint" "num_optional")
-    '("va_list" "va_args")
-  )
-)
-
-(define-method ref
-  (of-object "GeditMessageType")
-  (c-name "gedit_message_type_ref")
-  (return-type "GeditMessageType*")
-)
-
-(define-method unref
-  (of-object "GeditMessageType")
-  (c-name "gedit_message_type_unref")
-  (return-type "none")
-)
-
-(define-method instantiate_valist
-  (of-object "GeditMessageType")
-  (c-name "gedit_message_type_instantiate_valist")
-  (return-type "GeditMessage*")
-  (parameters
-    '("va_list" "va_args")
-  )
-)
-
-(define-method instantiate
-  (of-object "GeditMessageType")
-  (c-name "gedit_message_type_instantiate")
-  (return-type "GeditMessage*")
-  (parameters
-  )
-  (varargs #t)
-)
-
-(define-method get_object_path
-  (of-object "GeditMessageType")
-  (c-name "gedit_message_type_get_object_path")
-  (return-type "const-gchar*")
-)
-
-(define-method get_method
-  (of-object "GeditMessageType")
-  (c-name "gedit_message_type_get_method")
-  (return-type "const-gchar*")
-)
-
-(define-method lookup
-  (of-object "GeditMessageType")
-  (c-name "gedit_message_type_lookup")
-  (return-type "GType")
-  (parameters
-    '("const-gchar*" "key")
-  )
-)
-
-(define-method foreach
-  (of-object "GeditMessageType")
-  (c-name "gedit_message_type_foreach")
-  (return-type "none")
-  (parameters
-    '("GeditMessageTypeForeach" "func")
-    '("gpointer" "user_data")
-  )
-)
-
-
-;; From gedit-message.h
-
-(define-function gedit_message_get_type
-  (c-name "gedit_message_get_type")
-  (return-type "GType")
-)
-
-(define-method get
-  (of-object "GeditMessage")
-  (c-name "gedit_message_get")
-  (return-type "none")
-  (parameters
-  )
-  (varargs #t)
-)
-
-(define-method get_valist
-  (of-object "GeditMessage")
-  (c-name "gedit_message_get_valist")
-  (return-type "none")
-  (parameters
-    '("va_list" "var_args")
-  )
-)
-
-(define-method get_value
-  (of-object "GeditMessage")
-  (c-name "gedit_message_get_value")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "key")
-    '("GValue*" "value")
-  )
-)
-
-(define-method set
-  (of-object "GeditMessage")
-  (c-name "gedit_message_set")
-  (return-type "none")
-  (parameters
-  )
-  (varargs #t)
-)
-
-(define-method set_valist
-  (of-object "GeditMessage")
-  (c-name "gedit_message_set_valist")
-  (return-type "none")
-  (parameters
-    '("va_list" "var_args")
-  )
-)
-
-(define-method set_value
-  (of-object "GeditMessage")
-  (c-name "gedit_message_set_value")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "key")
-    '("GValue*" "value")
-  )
-)
-
-(define-method set_valuesv
-  (of-object "GeditMessage")
-  (c-name "gedit_message_set_valuesv")
-  (return-type "none")
-  (parameters
-    '("const-gchar**" "keys")
-    '("GValue*" "values")
-    '("gint" "n_values")
-  )
-)
-
-(define-method get_object_path
-  (of-object "GeditMessage")
-  (c-name "gedit_message_get_object_path")
-  (return-type "const-gchar*")
-)
-
-(define-method get_method
-  (of-object "GeditMessage")
-  (c-name "gedit_message_get_method")
-  (return-type "const-gchar*")
-)
-
-(define-method has_key
-  (of-object "GeditMessage")
-  (c-name "gedit_message_has_key")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "key")
-  )
-)
-
-(define-method get_key_type
-  (of-object "GeditMessage")
-  (c-name "gedit_message_get_key_type")
-  (return-type "GType")
-  (parameters
-    '("const-gchar*" "key")
-  )
-)
-
-(define-method validate
-  (of-object "GeditMessage")
-  (c-name "gedit_message_validate")
-  (return-type "gboolean")
-)
-
-
-;; From ../../gedit/gedit-debug.h
-
-(define-function debug
-  (c-name "gedit_debug")
-  (parameters
-    '("const-gchar*" "message")
-  )
-  (return-type "none")
-)
-
diff --git a/plugin-loaders/python/bindings/pluma.defs b/plugin-loaders/python/bindings/pluma.defs
new file mode 100755
index 00000000..f4e799f1
--- /dev/null
+++ b/plugin-loaders/python/bindings/pluma.defs
@@ -0,0 +1,1461 @@
+;; -*- scheme -*-
+; object definitions ...
+(define-object App
+  (in-module "Pluma")
+  (parent "GObject")
+  (c-name "PlumaApp")
+  (gtype-id "PLUMA_TYPE_APP")
+)
+
+(define-object Document
+  (in-module "Pluma")
+  (parent "GtkSourceBuffer")
+  (c-name "PlumaDocument")
+  (gtype-id "PLUMA_TYPE_DOCUMENT")
+)
+
+(define-object Message
+  (in-module "Pluma")
+  (parent "GObject")
+  (c-name "PlumaMessage")
+  (gtype-id "PLUMA_TYPE_MESSAGE")
+)
+
+(define-object MessageBus
+  (in-module "Pluma")
+  (parent "GObject")
+  (c-name "PlumaMessageBus")
+  (gtype-id "PLUMA_TYPE_MESSAGE_BUS")
+)
+
+(define-object Panel
+  (in-module "Pluma")
+  (parent "GtkVBox")
+  (c-name "PlumaPanel")
+  (gtype-id "PLUMA_TYPE_PANEL")
+)
+
+(define-object __Plugin
+  (in-module "Pluma")
+  (parent "GObject")
+  (c-name "PlumaPlugin")
+  (gtype-id "PLUMA_TYPE_PLUGIN")
+)
+
+(define-object Plugin
+  (in-module "Pluma")
+  (parent "PlumaPlugin")
+  (c-name "PlumaPluginPython")
+  (gtype-id "PLUMA_TYPE_PLUGIN_PYTHON")
+)
+
+(define-object Statusbar
+  (in-module "Pluma")
+  (parent "GtkStatusbar")
+  (c-name "PlumaStatusbar")
+  (gtype-id "PLUMA_TYPE_STATUSBAR")
+)
+
+(define-object Tab
+  (in-module "Pluma")
+  (parent "GtkVBox")
+  (c-name "PlumaTab")
+  (gtype-id "PLUMA_TYPE_TAB")
+)
+
+(define-object View
+  (in-module "Pluma")
+  (parent "GtkSourceView")
+  (c-name "PlumaView")
+  (gtype-id "PLUMA_TYPE_VIEW")
+)
+
+(define-object Window
+  (in-module "Pluma")
+  (parent "GtkWindow")
+  (c-name "PlumaWindow")
+  (gtype-id "PLUMA_TYPE_WINDOW")
+)
+
+;; Enumerations and flags ...
+
+(define-flags LockdownMask
+  (in-module "Pluma")
+  (c-name "PlumaLockdownMask")
+  (gtype-id "PLUMA_TYPE_LOCKDOWN_MASK")
+  (values
+    '("command-line" "PLUMA_LOCKDOWN_COMMAND_LINE")
+    '("printing" "PLUMA_LOCKDOWN_PRINTING")
+    '("print-setup" "PLUMA_LOCKDOWN_PRINT_SETUP")
+    '("save-to-disk" "PLUMA_LOCKDOWN_SAVE_TO_DISK")
+    '("all" "PLUMA_LOCKDOWN_ALL")
+  )
+)
+
+(define-flags SearchFlags
+  (in-module "Pluma")
+  (c-name "PlumaSearchFlags")
+  (gtype-id "PLUMA_TYPE_SEARCH_FLAGS")
+  (values
+    '("dont-set-flags" "PLUMA_SEARCH_DONT_SET_FLAGS")
+    '("entire-word" "PLUMA_SEARCH_ENTIRE_WORD")
+    '("case-sensitive" "PLUMA_SEARCH_CASE_SENSITIVE")
+  )
+)
+
+(define-flags DocumentSaveFlags
+  (in-module "Pluma")
+  (c-name "PlumaDocumentSaveFlags")
+  (gtype-id "PLUMA_TYPE_DOCUMENT_SAVE_FLAGS")
+  (values
+    '("ignore-mtime" "PLUMA_DOCUMENT_SAVE_IGNORE_MTIME")
+    '("ignore-backup" "PLUMA_DOCUMENT_SAVE_IGNORE_BACKUP")
+    '("preserve-backup" "PLUMA_DOCUMENT_SAVE_PRESERVE_BACKUP")
+  )
+)
+
+(define-enum TabState
+  (in-module "Pluma")
+  (c-name "PlumaTabState")
+  (gtype-id "PLUMA_TYPE_TAB_STATE")
+  (values
+    '("normal" "PLUMA_TAB_STATE_NORMAL")
+    '("loading" "PLUMA_TAB_STATE_LOADING")
+    '("reverting" "PLUMA_TAB_STATE_REVERTING")
+    '("saving" "PLUMA_TAB_STATE_SAVING")
+    '("printing" "PLUMA_TAB_STATE_PRINTING")
+    '("print-previewing" "PLUMA_TAB_STATE_PRINT_PREVIEWING")
+    '("showing-print-preview" "PLUMA_TAB_STATE_SHOWING_PRINT_PREVIEW")
+    '("generic-not-editable" "PLUMA_TAB_STATE_GENERIC_NOT_EDITABLE")
+    '("loading-error" "PLUMA_TAB_STATE_LOADING_ERROR")
+    '("reverting-error" "PLUMA_TAB_STATE_REVERTING_ERROR")
+    '("saving-error" "PLUMA_TAB_STATE_SAVING_ERROR")
+    '("generic-error" "PLUMA_TAB_STATE_GENERIC_ERROR")
+    '("closing" "PLUMA_TAB_STATE_CLOSING")
+  )
+)
+
+(define-flags WindowState
+  (in-module "Pluma")
+  (c-name "PlumaWindowState")
+  (gtype-id "PLUMA_TYPE_WINDOW_STATE")
+  (values
+    '("normal" "PLUMA_WINDOW_STATE_NORMAL")
+    '("saving" "PLUMA_WINDOW_STATE_SAVING")
+    '("printing" "PLUMA_WINDOW_STATE_PRINTING")
+    '("loading" "PLUMA_WINDOW_STATE_LOADING")
+    '("error" "PLUMA_WINDOW_STATE_ERROR")
+    '("saving-session" "PLUMA_WINDOW_STATE_SAVING_SESSION")    
+  )
+)
+
+;; Boxed types
+(define-boxed Encoding
+  (in-module "Pluma")
+  (c-name "PlumaEncoding")
+  (gtype-id "PLUMA_TYPE_ENCODING")
+  (copy-func "pluma_encoding_copy")
+  (release-func "pluma_encoding_free")
+;;  (fields
+;;    '("gint" "index")
+;;    '("gchar*" "charset")
+;;    '("gchar*" "name")
+;;  )
+)
+
+(define-boxed MessageType
+  (in-module "Pluma")
+  (c-name "PlumaMessageType")
+  (gtype-id "PLUMA_TYPE_MESSAGE_TYPE")
+  (copy-func "pluma_message_type_ref")
+  (release-func "pluma_message_type_unref")
+)
+
+
+;; From ../../pluma/pluma-app.h
+
+(define-function pluma_app_get_type
+  (c-name "pluma_app_get_type")
+  (return-type "GType")
+)
+
+(define-function app_get_default
+  (c-name "pluma_app_get_default")
+  (return-type "PlumaApp*")
+)
+
+; deprecated version !
+(define-function pluma_app_get_default
+  (c-name "pluma_app_get_default_deprecated")
+  (return-type "PlumaApp*")
+)
+
+(define-method create_window
+  (of-object "PlumaApp")
+  (c-name "pluma_app_create_window")
+  (return-type "PlumaWindow*")
+  (parameters
+    '("GdkScreen*" "screen")
+  )
+)
+
+(define-method get_windows
+  (of-object "PlumaApp")
+  (c-name "pluma_app_get_windows")
+  (return-type "const-GList*")
+)
+
+(define-method get_active_window
+  (of-object "PlumaApp")
+  (c-name "pluma_app_get_active_window")
+  (return-type "PlumaWindow*")
+)
+
+(define-method get_documents
+  (of-object "PlumaApp")
+  (c-name "pluma_app_get_documents")
+  (return-type "GList*")
+)
+
+(define-method get_views
+  (of-object "PlumaApp")
+  (c-name "pluma_app_get_views")
+  (return-type "GList*")
+)
+
+(define-method get_lockdown
+  (of-object "PlumaApp")
+  (c-name "pluma_app_get_lockdown")
+  (return-type "PlumaLockdownMask")
+)
+
+
+;; From ../../pluma/pluma-document.h
+
+(define-function document_error_quark
+  (c-name "pluma_document_error_quark")
+  (return-type "GQuark")
+)
+
+(define-function pluma_document_get_type
+  (c-name "pluma_document_get_type")
+  (return-type "GType")
+)
+
+(define-function pluma_document_new
+  (c-name "pluma_document_new")
+  (is-constructor-of "PlumaDocument")
+  (return-type "PlumaDocument*")
+)
+
+(define-method get_location
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_get_location")
+  (return-type "GFile*")
+)
+
+(define-method get_uri
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_get_uri")
+  (return-type "gchar*")
+)
+
+(define-method set_uri
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_set_uri")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "uri")
+  )
+)
+
+(define-method get_uri_for_display
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_get_uri_for_display")
+  (return-type "gchar*")
+)
+
+(define-method get_short_name_for_display
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_get_short_name_for_display")
+  (return-type "gchar*")
+)
+
+(define-method get_content_type
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_get_content_type")
+  (return-type "gchar*")
+)
+
+(define-method get_mime_type
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_get_mime_type")
+  (return-type "gchar*")
+)
+
+(define-method get_readonly
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_get_readonly")
+  (return-type "gboolean")
+)
+
+(define-method load
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_load")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "uri")
+    '("const-PlumaEncoding*" "encoding")
+    '("gint" "line_pos")
+    '("gboolean" "create")
+  )
+)
+
+(define-method insert_file
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_insert_file")
+  (return-type "gboolean")
+  (parameters
+    '("GtkTextIter*" "iter")
+    '("const-gchar*" "uri")
+    '("const-PlumaEncoding*" "encoding")
+  )
+)
+
+(define-method load_cancel
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_load_cancel")
+  (return-type "gboolean")
+)
+
+(define-method save
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_save")
+  (parameters
+    '("PlumaDocumentSaveFlags" "flags")
+  )
+  (return-type "none")
+)
+
+(define-method save_as
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_save_as")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "uri")
+    '("const-PlumaEncoding*" "encoding")
+    '("PlumaDocumentSaveFlags" "flags")
+  )
+)
+
+(define-method is_untouched
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_is_untouched")
+  (return-type "gboolean")
+)
+
+(define-method is_untitled
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_is_untitled")
+  (return-type "gboolean")
+)
+
+(define-method is_local
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_is_local")
+  (return-type "gboolean")
+)
+
+(define-method get_deleted
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_get_deleted")
+  (return-type "gboolean")
+)
+
+(define-method goto_line
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_goto_line")
+  (return-type "gboolean")
+  (parameters
+    '("gint" "line")
+  )
+)
+
+(define-method set_search_text
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_set_search_text")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "text")
+    '("guint" "flags")
+  )
+)
+
+(define-method get_search_text
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_get_search_text")
+  (return-type "gchar*")
+  (parameters
+    '("guint*" "flags")
+  )
+)
+
+(define-method get_can_search_again
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_get_can_search_again")
+  (return-type "gboolean")
+)
+
+(define-method search_forward
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_search_forward")
+  (return-type "gboolean")
+  (parameters
+    '("const-GtkTextIter*" "start")
+    '("const-GtkTextIter*" "end")
+    '("GtkTextIter*" "match_start")
+    '("GtkTextIter*" "match_end")
+  )
+)
+
+(define-method replace_all
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_replace_all")
+  (return-type "gint")
+  (parameters
+    '("const-gchar*" "find")
+    '("const-gchar*" "replace")
+    '("guint" "flags")
+  )
+)
+
+(define-method search_backward
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_search_backward")
+  (return-type "gboolean")
+  (parameters
+    '("const-GtkTextIter*" "start")
+    '("const-GtkTextIter*" "end")
+    '("GtkTextIter*" "match_start")
+    '("GtkTextIter*" "match_end")
+  )
+)
+
+(define-method set_language
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_set_language")
+  (return-type "none")
+  (parameters
+    '("GtkSourceLanguage*" "lang" (null-ok))
+  )
+)
+
+(define-method get_language
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_get_language")
+  (return-type "GtkSourceLanguage*")
+)
+
+(define-method get_encoding
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_get_encoding")
+  (return-type "const-PlumaEncoding*")
+)
+
+(define-method set_enable_search_highlighting
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_set_enable_search_highlighting")
+  (return-type "none")
+  (parameters
+    '("gboolean" "enable")
+  )
+)
+
+(define-method get_enable_search_highlighting
+  (of-object "PlumaDocument")
+  (c-name "pluma_document_get_enable_search_highlighting")
+  (return-type "gboolean")
+)
+
+;; From ../../pluma/pluma-encodings.h
+
+(define-function pluma_encoding_get_type
+  (c-name "pluma_encoding_get_type")
+  (return-type "GType")
+)
+
+(define-method copy
+  (of-object "PlumaEncoding")
+  (c-name "pluma_encoding_copy")
+  (return-type "PlumaEncoding*")
+)
+
+(define-method free
+  (of-object "PlumaEncoding")
+  (c-name "pluma_encoding_free")
+  (return-type "none")
+)
+
+(define-function encoding_get_from_charset
+  (c-name "pluma_encoding_get_from_charset")
+  (return-type "const-PlumaEncoding*")
+  (parameters
+    '("const-gchar*" "charset")
+  )
+)
+
+; Deprecated version !
+(define-function pluma_encoding_get_from_charset
+  (c-name "pluma_encoding_get_from_charset_deprecated")
+  (return-type "const-PlumaEncoding*")
+  (parameters
+    '("const-gchar*" "charset")
+  )
+)
+
+(define-function encoding_get_from_index
+  (c-name "pluma_encoding_get_from_index")
+  (return-type "const-PlumaEncoding*")
+  (parameters
+    '("gint" "index")
+  )
+)
+
+; Deprecated version !
+(define-function pluma_encoding_get_from_index
+  (c-name "pluma_encoding_get_from_index_deprecated")
+  (return-type "const-PlumaEncoding*")
+  (parameters
+    '("gint" "index")
+  )
+)
+
+(define-method to_string
+  (of-object "PlumaEncoding")
+  (c-name "pluma_encoding_to_string")
+  (return-type "gchar*")
+)
+
+(define-method get_name
+  (of-object "PlumaEncoding")
+  (c-name "pluma_encoding_get_name")
+  (return-type "const-gchar*")
+)
+
+(define-method get_charset
+  (of-object "PlumaEncoding")
+  (c-name "pluma_encoding_get_charset")
+  (return-type "const-gchar*")
+)
+
+(define-function encoding_get_utf8
+  (c-name "pluma_encoding_get_utf8")
+  (return-type "const-PlumaEncoding*")
+)
+
+; Deprecated version !
+(define-function pluma_encoding_get_utf8
+  (c-name "pluma_encoding_get_utf8_deprecated")
+  (return-type "const-PlumaEncoding*")
+)
+
+(define-function encoding_get_current
+  (c-name "pluma_encoding_get_current")
+  (return-type "const-PlumaEncoding*")
+)
+
+; Deprecated version !
+(define-function pluma_encoding_get_current
+  (c-name "pluma_encoding_get_current_deprecated")
+  (return-type "const-PlumaEncoding*")
+)
+
+;; From ../../pluma/pluma-help.h
+
+(define-function help_display
+  (c-name "pluma_help_display")
+  (return-type "gboolean")
+  (parameters
+    '("GtkWindow*" "parent")
+    '("const-gchar*" "name")
+    '("const-gchar*" "link_id")
+  )
+)
+
+
+
+;; From ../../pluma/pluma-panel.h
+
+(define-function pluma_panel_get_type
+  (c-name "pluma_panel_get_type")
+  (return-type "GType")
+)
+
+(define-function pluma_panel_new
+  (c-name "pluma_panel_new")
+  (is-constructor-of "PlumaPanel")
+  (return-type "GtkWidget*")
+)
+
+(define-method add_item
+  (of-object "PlumaPanel")
+  (c-name "pluma_panel_add_item")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "item")
+    '("const-gchar*" "name")
+    '("GtkWidget*" "image")
+  )
+)
+
+(define-method add_item_with_stock_icon
+  (of-object "PlumaPanel")
+  (c-name "pluma_panel_add_item_with_stock_icon")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "item")
+    '("const-gchar*" "name")
+    '("const-gchar*" "stock_id")
+  )
+)
+
+(define-method remove_item
+  (of-object "PlumaPanel")
+  (c-name "pluma_panel_remove_item")
+  (return-type "gboolean")
+  (parameters
+    '("GtkWidget*" "item")
+  )
+)
+
+(define-method activate_item
+  (of-object "PlumaPanel")
+  (c-name "pluma_panel_activate_item")
+  (return-type "gboolean")
+  (parameters
+    '("GtkWidget*" "item")
+  )
+)
+
+(define-method item_is_active
+  (of-object "PlumaPanel")
+  (c-name "pluma_panel_item_is_active")
+  (return-type "gboolean")
+  (parameters
+    '("GtkWidget*" "item")
+  )
+)
+
+(define-method get_orientation
+  (of-object "PlumaPanel")
+  (c-name "pluma_panel_get_orientation")
+  (return-type "GtkOrientation")
+)
+
+(define-method get_n_items
+  (of-object "PlumaPanel")
+  (c-name "pluma_panel_get_n_items")
+  (return-type "gint")
+)
+
+
+;; From ../../pluma/pluma-plugin.h
+
+(define-function pluma_plugin_get_type
+  (c-name "pluma_plugin_get_type")
+  (return-type "GType")
+)
+
+(define-method get_install_dir
+  (of-object "PlumaPlugin")
+  (c-name "pluma_plugin_get_install_dir")
+  (return-type "gchar*")
+)
+
+(define-method get_data_dir
+  (of-object "PlumaPlugin")
+  (c-name "pluma_plugin_get_data_dir")
+  (return-type "gchar*")
+)
+
+(define-method activate
+  (of-object "PlumaPlugin")
+  (c-name "pluma_plugin_activate")
+  (return-type "none")
+  (parameters
+    '("PlumaWindow*" "window")
+  )
+)
+
+(define-method deactivate
+  (of-object "PlumaPlugin")
+  (c-name "pluma_plugin_deactivate")
+  (return-type "none")
+  (parameters
+    '("PlumaWindow*" "window")
+  )
+)
+
+(define-method update_ui
+  (of-object "PlumaPlugin")
+  (c-name "pluma_plugin_update_ui")
+  (return-type "none")
+  (parameters
+    '("PlumaWindow*" "window")
+  )
+)
+
+(define-method is_configurable
+  (of-object "PlumaPlugin")
+  (c-name "pluma_plugin_is_configurable")
+  (return-type "gboolean")
+)
+
+(define-method create_configure_dialog
+  (of-object "PlumaPlugin")
+  (c-name "pluma_plugin_create_configure_dialog")
+  (return-type "GtkWidget*")
+)
+
+;; From ../pluma/pluma-plugin-python.h
+
+(define-function pluma_plugin_python_get_type
+  (c-name "pluma_plugin_python_get_type")
+  (return-type "GType")
+)
+
+(define-function pluma_plugin_python_new
+  (c-name "pluma_plugin_python_new")
+  (is-constructor-of "PlumaPluginPython")
+  (return-type "PlumaPluginPython*")
+)
+
+;; From ../../pluma/pluma-status-bar.h
+
+(define-method flash_message
+  (of-object "PlumaStatusbar")
+  (c-name "pluma_statusbar_flash_message")
+  (return-type "none")
+  (parameters
+    '("int" "context_id")
+    '("const-gchar*" "message")
+  )
+ )
+
+;; From ../../pluma/pluma-tab.h
+
+(define-function pluma_tab_get_type
+  (c-name "pluma_tab_get_type")
+  (return-type "GType")
+)
+
+(define-method get_view
+  (of-object "PlumaTab")
+  (c-name "pluma_tab_get_view")
+  (return-type "PlumaView*")
+)
+
+(define-method get_document
+  (of-object "PlumaTab")
+  (c-name "pluma_tab_get_document")
+  (return-type "PlumaDocument*")
+)
+
+(define-function tab_get_from_document
+  (c-name "pluma_tab_get_from_document")
+  (return-type "PlumaTab*")
+  (parameters
+    '("PlumaDocument*" "doc")
+  )
+)
+
+; Deprecated version !
+(define-function pluma_tab_get_from_document
+  (c-name "pluma_tab_get_from_document_deprecated")
+  (return-type "PlumaTab*")
+  (parameters
+    '("PlumaDocument*" "doc")
+  )
+)
+
+(define-method get_state
+  (of-object "PlumaTab")
+  (c-name "pluma_tab_get_state")
+  (return-type "PlumaTabState")
+)
+
+(define-method set_auto_save_enabled
+  (of-object "PlumaTab")
+  (c-name "pluma_tab_set_auto_save_enabled")
+  (return-type "none")
+  (parameters
+    '("gboolean" "enable")
+  )
+)
+
+(define-method get_auto_save_enabled
+  (of-object "PlumaTab")
+  (c-name "pluma_tab_get_auto_save_enabled")
+  (return-type "gboolean")
+)
+
+(define-method set_auto_save_interval
+  (of-object "PlumaTab")
+  (c-name "pluma_tab_set_auto_save_interval")
+  (return-type "none")
+  (parameters
+    '("gint" "interval")
+  )
+)
+
+(define-method get_auto_save_interval
+  (of-object "PlumaTab")
+  (c-name "pluma_tab_get_auto_save_interval")
+  (return-type "gint")
+)
+
+;; From ../../pluma/pluma-view.h
+
+(define-function pluma_view_get_type
+  (c-name "pluma_view_get_type")
+  (return-type "GtkType")
+)
+
+(define-function pluma_view_new
+  (c-name "pluma_view_new")
+  (is-constructor-of "PlumaView")
+  (return-type "GtkWidget*")
+  (parameters
+    '("PlumaDocument*" "doc")
+  )
+)
+
+(define-method cut_clipboard
+  (of-object "PlumaView")
+  (c-name "pluma_view_cut_clipboard")
+  (return-type "none")
+)
+
+(define-method copy_clipboard
+  (of-object "PlumaView")
+  (c-name "pluma_view_copy_clipboard")
+  (return-type "none")
+)
+
+(define-method paste_clipboard
+  (of-object "PlumaView")
+  (c-name "pluma_view_paste_clipboard")
+  (return-type "none")
+)
+
+(define-method delete_selection
+  (of-object "PlumaView")
+  (c-name "pluma_view_delete_selection")
+  (return-type "none")
+)
+
+(define-method select_all
+  (of-object "PlumaView")
+  (c-name "pluma_view_select_all")
+  (return-type "none")
+)
+
+(define-method scroll_to_cursor
+  (of-object "PlumaView")
+  (c-name "pluma_view_scroll_to_cursor")
+  (return-type "none")
+)
+
+(define-method set_font
+  (of-object "PlumaView")
+  (c-name "pluma_view_set_font")
+  (return-type "none")
+  (parameters
+    '("gboolean" "def")
+    '("const-gchar*" "font_name")
+  )
+)
+
+
+
+;; From ../../pluma/pluma-window.h
+
+(define-function pluma_window_get_type
+  (c-name "pluma_window_get_type")
+  (return-type "GType")
+)
+
+(define-method create_tab
+  (of-object "PlumaWindow")
+  (c-name "pluma_window_create_tab")
+  (return-type "PlumaTab*")
+  (parameters
+    '("gboolean" "jump_to")
+  )
+)
+
+(define-method create_tab_from_uri
+  (of-object "PlumaWindow")
+  (c-name "pluma_window_create_tab_from_uri")
+  (return-type "PlumaTab*")
+  (parameters
+    '("const-gchar*" "uri")
+    '("const-PlumaEncoding*" "encoding" (null-ok))
+    '("gint" "line_pos")
+    '("gboolean" "create")
+    '("gboolean" "jump_to")
+  )
+)
+
+(define-method close_tab
+  (of-object "PlumaWindow")
+  (c-name "pluma_window_close_tab")
+  (return-type "none")
+  (parameters
+    '("PlumaTab*" "tab")
+  )
+)
+
+(define-method close_tabs
+  (of-object "PlumaWindow")
+  (c-name "pluma_window_close_tabs")
+  (return-type "none")
+  (parameters
+    '("const-GList*" "tabs")
+  )
+)
+
+(define-method close_all_tabs
+  (of-object "PlumaWindow")
+  (c-name "pluma_window_close_all_tabs")
+  (return-type "none")
+)
+
+(define-method get_active_tab
+  (of-object "PlumaWindow")
+  (c-name "pluma_window_get_active_tab")
+  (return-type "PlumaTab*")
+)
+
+(define-method set_active_tab
+  (of-object "PlumaWindow")
+  (c-name "pluma_window_set_active_tab")
+  (return-type "none")
+  (parameters
+    '("PlumaTab*" "tab")
+  )
+)
+
+(define-method get_active_view
+  (of-object "PlumaWindow")
+  (c-name "pluma_window_get_active_view")
+  (return-type "PlumaView*")
+)
+
+(define-method get_active_document
+  (of-object "PlumaWindow")
+  (c-name "pluma_window_get_active_document")
+  (return-type "PlumaDocument*")
+)
+
+(define-method get_documents
+  (of-object "PlumaWindow")
+  (c-name "pluma_window_get_documents")
+  (return-type "GList*")
+)
+
+(define-method get_unsaved_documents
+  (of-object "PlumaWindow")
+  (c-name "pluma_window_get_unsaved_documents")
+  (return-type "GList*")
+)
+
+(define-method get_views
+  (of-object "PlumaWindow")
+  (c-name "pluma_window_get_views")
+  (return-type "GList*")
+)
+
+(define-method get_group
+  (of-object "PlumaWindow")
+  (c-name "pluma_window_get_group")
+  (return-type "GtkWindowGroup*")
+)
+
+(define-method get_side_panel
+  (of-object "PlumaWindow")
+  (c-name "pluma_window_get_side_panel")
+  (return-type "PlumaPanel*")
+)
+
+(define-method get_bottom_panel
+  (of-object "PlumaWindow")
+  (c-name "pluma_window_get_bottom_panel")
+  (return-type "PlumaPanel*")
+)
+
+(define-method get_statusbar
+  (of-object "PlumaWindow")
+  (c-name "pluma_window_get_statusbar")
+  (return-type "GtkWidget*")
+)
+
+(define-method get_ui_manager
+  (of-object "PlumaWindow")
+  (c-name "pluma_window_get_ui_manager")
+  (return-type "GtkUIManager*")
+)
+
+(define-method get_state
+  (of-object "PlumaWindow")
+  (c-name "pluma_window_get_state")
+  (return-type "PlumaWindowState")
+)
+
+(define-method get_message_bus
+  (of-object "PlumaWindow")
+  (c-name "pluma_window_get_message_bus")
+  (return-type "PlumaMessageBus*")
+)
+
+(define-method get_tab_from_uri
+  (of-object "PlumaWindow")
+  (c-name "pluma_window_get_tab_from_uri")
+  (return-type "PlumaTab*")
+  (parameters
+    '("const-gchar*" "uri")
+  )
+)
+
+;; From pluma-language-manager.h
+
+(define-function get_language_manager
+  (c-name "pluma_get_language_manager")
+  (return-type "GtkSourceLanguageManager*")
+)
+
+(define-function language_manager_list_languages_sorted
+  (c-name "pluma_language_manager_list_languages_sorted")
+  (return-type "GSList*")
+  (parameters
+    '("GtkSourceLanguageManager*" "lm")
+    '("gboolean" "include_hidden")
+  )
+)
+
+
+;; From pluma-message-bus.h
+
+(define-function pluma_message_bus_get_type
+  (c-name "pluma_message_bus_get_type")
+  (return-type "GType")
+)
+
+(define-function message_bus_get_default
+  (c-name "pluma_message_bus_get_default")
+  (return-type "PlumaMessageBus*")
+)
+
+(define-function pluma_message_bus_new
+  (c-name "pluma_message_bus_new")
+  (is-constructor-of "PlumaMessageBus")
+  (return-type "PlumaMessageBus*")
+)
+
+(define-method lookup
+  (of-object "PlumaMessageBus")
+  (c-name "pluma_message_bus_lookup")
+  (return-type "PlumaMessageType*")
+  (parameters
+    '("const-gchar*" "object_path")
+    '("const-gchar*" "method")
+  )
+)
+
+(define-method register
+  (of-object "PlumaMessageBus")
+  (c-name "pluma_message_bus_register")
+  (return-type "PlumaMessageType*")
+  (parameters
+    '("const-gchar*" "object_path")
+    '("const-gchar*" "method")
+    '("guint" "num_optional")
+  )
+  (varargs #t)
+)
+
+(define-method unregister
+  (of-object "PlumaMessageBus")
+  (c-name "pluma_message_bus_unregister")
+  (return-type "none")
+  (parameters
+    '("PlumaMessageType*" "message_type")
+  )
+)
+
+(define-method unregister_all
+  (of-object "PlumaMessageBus")
+  (c-name "pluma_message_bus_unregister_all")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "object_path")
+  )
+)
+
+(define-method is_registered
+  (of-object "PlumaMessageBus")
+  (c-name "pluma_message_bus_is_registered")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "object_path")
+    '("const-gchar*" "method")
+  )
+)
+
+(define-method connect
+  (of-object "PlumaMessageBus")
+  (c-name "pluma_message_bus_connect")
+  (return-type "guint")
+  (parameters
+    '("const-gchar*" "object_path")
+    '("const-gchar*" "method")
+    '("PlumaMessageCallback" "callback")
+    '("gpointer" "userdata")
+    '("GDestroyNotify" "destroy_data")
+  )
+)
+
+(define-method disconnect
+  (of-object "PlumaMessageBus")
+  (c-name "pluma_message_bus_disconnect")
+  (return-type "none")
+  (parameters
+    '("guint" "id")
+  )
+)
+
+(define-method disconnect_by_func
+  (of-object "PlumaMessageBus")
+  (c-name "pluma_message_bus_disconnect_by_func")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "object_path")
+    '("const-gchar*" "method")
+    '("PlumaMessageCallback" "callback")
+    '("gpointer" "userdata")
+  )
+)
+
+(define-method block
+  (of-object "PlumaMessageBus")
+  (c-name "pluma_message_bus_block")
+  (return-type "none")
+  (parameters
+    '("guint" "id")
+  )
+)
+
+(define-method block_by_func
+  (of-object "PlumaMessageBus")
+  (c-name "pluma_message_bus_block_by_func")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "object_path")
+    '("const-gchar*" "method")
+    '("PlumaMessageCallback" "callback")
+    '("gpointer" "userdata")
+  )
+)
+
+(define-method unblock
+  (of-object "PlumaMessageBus")
+  (c-name "pluma_message_bus_unblock")
+  (return-type "none")
+  (parameters
+    '("guint" "id")
+  )
+)
+
+(define-method unblock_by_func
+  (of-object "PlumaMessageBus")
+  (c-name "pluma_message_bus_unblock_by_func")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "object_path")
+    '("const-gchar*" "method")
+    '("PlumaMessageCallback" "callback")
+    '("gpointer" "userdata")
+  )
+)
+
+(define-method send_message
+  (of-object "PlumaMessageBus")
+  (c-name "pluma_message_bus_send_message")
+  (return-type "none")
+  (parameters
+    '("PlumaMessage*" "message")
+  )
+)
+
+(define-method send_message_sync
+  (of-object "PlumaMessageBus")
+  (c-name "pluma_message_bus_send_message_sync")
+  (return-type "none")
+  (parameters
+    '("PlumaMessage*" "message")
+  )
+)
+
+(define-method send
+  (of-object "PlumaMessageBus")
+  (c-name "pluma_message_bus_send")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "object_path")
+    '("const-gchar*" "method")
+  )
+  (varargs #t)
+)
+
+(define-method send_sync
+  (of-object "PlumaMessageBus")
+  (c-name "pluma_message_bus_send_sync")
+  (return-type "PlumaMessage*")
+  (parameters
+    '("const-gchar*" "object_path")
+    '("const-gchar*" "method")
+  )
+  (varargs #t)
+)
+
+
+;; From pluma-message-type.h
+
+(define-function pluma_message_type_get_type
+  (c-name "pluma_message_type_get_type")
+  (return-type "GType")
+)
+
+(define-function pluma_message_type_is_supported
+  (c-name "pluma_message_type_is_supported")
+  (return-type "gboolean")
+  (parameters
+    '("GType" "type")
+  )
+)
+
+(define-function pluma_message_type_identifier
+  (c-name "pluma_message_type_identifier")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "object_path")
+    '("const-gchar*" "method")
+  )
+)
+
+(define-function pluma_message_type_new
+  (c-name "pluma_message_type_new")
+  (is-constructor-of "PlumaMessageType")
+  (return-type "PlumaMessageType*")
+  (parameters
+    '("const-gchar*" "object_path")
+    '("const-gchar*" "method")
+    '("guint" "num_optional")
+  )
+  (varargs #t)
+)
+
+(define-function pluma_message_type_new_valist
+  (c-name "pluma_message_type_new_valist")
+  (return-type "PlumaMessageType*")
+  (parameters
+    '("const-gchar*" "object_path")
+    '("const-gchar*" "method")
+    '("guint" "num_optional")
+    '("va_list" "va_args")
+  )
+)
+
+(define-method ref
+  (of-object "PlumaMessageType")
+  (c-name "pluma_message_type_ref")
+  (return-type "PlumaMessageType*")
+)
+
+(define-method unref
+  (of-object "PlumaMessageType")
+  (c-name "pluma_message_type_unref")
+  (return-type "none")
+)
+
+(define-method instantiate_valist
+  (of-object "PlumaMessageType")
+  (c-name "pluma_message_type_instantiate_valist")
+  (return-type "PlumaMessage*")
+  (parameters
+    '("va_list" "va_args")
+  )
+)
+
+(define-method instantiate
+  (of-object "PlumaMessageType")
+  (c-name "pluma_message_type_instantiate")
+  (return-type "PlumaMessage*")
+  (parameters
+  )
+  (varargs #t)
+)
+
+(define-method get_object_path
+  (of-object "PlumaMessageType")
+  (c-name "pluma_message_type_get_object_path")
+  (return-type "const-gchar*")
+)
+
+(define-method get_method
+  (of-object "PlumaMessageType")
+  (c-name "pluma_message_type_get_method")
+  (return-type "const-gchar*")
+)
+
+(define-method lookup
+  (of-object "PlumaMessageType")
+  (c-name "pluma_message_type_lookup")
+  (return-type "GType")
+  (parameters
+    '("const-gchar*" "key")
+  )
+)
+
+(define-method foreach
+  (of-object "PlumaMessageType")
+  (c-name "pluma_message_type_foreach")
+  (return-type "none")
+  (parameters
+    '("PlumaMessageTypeForeach" "func")
+    '("gpointer" "user_data")
+  )
+)
+
+
+;; From pluma-message.h
+
+(define-function pluma_message_get_type
+  (c-name "pluma_message_get_type")
+  (return-type "GType")
+)
+
+(define-method get
+  (of-object "PlumaMessage")
+  (c-name "pluma_message_get")
+  (return-type "none")
+  (parameters
+  )
+  (varargs #t)
+)
+
+(define-method get_valist
+  (of-object "PlumaMessage")
+  (c-name "pluma_message_get_valist")
+  (return-type "none")
+  (parameters
+    '("va_list" "var_args")
+  )
+)
+
+(define-method get_value
+  (of-object "PlumaMessage")
+  (c-name "pluma_message_get_value")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "key")
+    '("GValue*" "value")
+  )
+)
+
+(define-method set
+  (of-object "PlumaMessage")
+  (c-name "pluma_message_set")
+  (return-type "none")
+  (parameters
+  )
+  (varargs #t)
+)
+
+(define-method set_valist
+  (of-object "PlumaMessage")
+  (c-name "pluma_message_set_valist")
+  (return-type "none")
+  (parameters
+    '("va_list" "var_args")
+  )
+)
+
+(define-method set_value
+  (of-object "PlumaMessage")
+  (c-name "pluma_message_set_value")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "key")
+    '("GValue*" "value")
+  )
+)
+
+(define-method set_valuesv
+  (of-object "PlumaMessage")
+  (c-name "pluma_message_set_valuesv")
+  (return-type "none")
+  (parameters
+    '("const-gchar**" "keys")
+    '("GValue*" "values")
+    '("gint" "n_values")
+  )
+)
+
+(define-method get_object_path
+  (of-object "PlumaMessage")
+  (c-name "pluma_message_get_object_path")
+  (return-type "const-gchar*")
+)
+
+(define-method get_method
+  (of-object "PlumaMessage")
+  (c-name "pluma_message_get_method")
+  (return-type "const-gchar*")
+)
+
+(define-method has_key
+  (of-object "PlumaMessage")
+  (c-name "pluma_message_has_key")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+  )
+)
+
+(define-method get_key_type
+  (of-object "PlumaMessage")
+  (c-name "pluma_message_get_key_type")
+  (return-type "GType")
+  (parameters
+    '("const-gchar*" "key")
+  )
+)
+
+(define-method validate
+  (of-object "PlumaMessage")
+  (c-name "pluma_message_validate")
+  (return-type "gboolean")
+)
+
+
+;; From ../../pluma/pluma-debug.h
+
+(define-function debug
+  (c-name "pluma_debug")
+  (parameters
+    '("const-gchar*" "message")
+  )
+  (return-type "none")
+)
+
diff --git a/plugin-loaders/python/bindings/gedit.override b/plugin-loaders/python/bindings/pluma.override
index 52c492a4..3de7c069 100755
--- a/plugin-loaders/python/bindings/gedit.override
+++ b/plugin-loaders/python/bindings/pluma.override
@@ -3,19 +3,19 @@ headers
 #include <pygobject.h>
 #include <pygtk/pygtk.h>
 
-#include <gedit/gedit-language-manager.h>
-#include <gedit/gedit-plugin.h>
-#include <gedit/gedit-app.h>
-#include <gedit/gedit-encodings.h>
-#include <gedit/gedit-enum-types.h>
-#include <gedit/gedit-statusbar.h>
-#include <gedit/gedit-debug.h>
-#include <gedit/gedit-help.h>
+#include <pluma/pluma-language-manager.h>
+#include <pluma/pluma-plugin.h>
+#include <pluma/pluma-app.h>
+#include <pluma/pluma-encodings.h>
+#include <pluma/pluma-enum-types.h>
+#include <pluma/pluma-statusbar.h>
+#include <pluma/pluma-debug.h>
+#include <pluma/pluma-help.h>
 
-#include "gedit-plugin-python.h"
+#include "pluma-plugin-python.h"
 
-void pygedit_register_classes (PyObject *d); 
-void pygedit_add_constants (PyObject *module, const gchar *strip_prefix);
+void pypluma_register_classes (PyObject *d); 
+void pypluma_add_constants (PyObject *module, const gchar *strip_prefix);
 
 static PyObject *
 _helper_wrap_gobject_glist (const GList *list)
@@ -62,10 +62,10 @@ _helper_wrap_gobject_gslist (const GSList *list)
 }
 %%
 include
-  geditplugin.override
-  geditmessage.override
+  plumaplugin.override
+  plumamessage.override
 %%
-modulename gedit 
+modulename pluma 
 %%
 import gtk.Widget as PyGtkWidget_Type
 import gobject.GObject as PyGObject_Type
@@ -81,51 +81,51 @@ import gtksourceview2.LanguageManager as PyGtkSourceLanguageManager_Type
 %%
 ignore-glob
   *_get_type
-  gedit_document_error_quark
-  gedit_panel_add_item_with_stock_icon
+  pluma_document_error_quark
+  pluma_panel_add_item_with_stock_icon
 %%
-override gedit_app_create_window kwargs
+override pluma_app_create_window kwargs
 static PyObject *
-_wrap_gedit_app_create_window(PyGObject *self, PyObject *args, PyObject *kwargs)
+_wrap_pluma_app_create_window(PyGObject *self, PyObject *args, PyObject *kwargs)
 {
     static char *kwlist[] = { "screen", NULL};
     PyGObject *screen = NULL;
-    GeditWindow *ret;
+    PlumaWindow *ret;
 
     if (!PyArg_ParseTupleAndKeywords(args, kwargs,
 			"|O!", kwlist,
 			&PyGdkScreen_Type, &screen))
         return NULL;
 
-    ret = gedit_app_create_window(GEDIT_APP(self->obj),
+    ret = pluma_app_create_window(PLUMA_APP(self->obj),
 				  screen ? GDK_SCREEN(screen->obj) : NULL);
 
     /* pygobject_new handles NULL checking */
     return pygobject_new((GObject *)ret);
 }
 %%
-override gedit_app_get_windows
+override pluma_app_get_windows
 static PyObject *
-_wrap_gedit_app_get_windows(PyGObject *self)
+_wrap_pluma_app_get_windows(PyGObject *self)
 {
     const GList *list;
     PyObject *py_list;
 
-    list = gedit_app_get_windows (GEDIT_APP (self->obj));
+    list = pluma_app_get_windows (PLUMA_APP (self->obj));
 
     py_list = _helper_wrap_gobject_glist (list);
 
     return py_list;
 }
 %%
-override gedit_app_get_views
+override pluma_app_get_views
 static PyObject *
-_wrap_gedit_app_get_views(PyGObject *self)
+_wrap_pluma_app_get_views(PyGObject *self)
 {
     GList *list;
     PyObject *py_list;
 
-    list = gedit_app_get_views (GEDIT_APP (self->obj));
+    list = pluma_app_get_views (PLUMA_APP (self->obj));
 
     py_list = _helper_wrap_gobject_glist (list);
 
@@ -134,14 +134,14 @@ _wrap_gedit_app_get_views(PyGObject *self)
     return py_list;
 }
 %%
-override gedit_app_get_documents
+override pluma_app_get_documents
 static PyObject *
-_wrap_gedit_app_get_documents(PyGObject *self)
+_wrap_pluma_app_get_documents(PyGObject *self)
 {
     GList *list;
     PyObject *py_list;
 
-    list = gedit_app_get_documents (GEDIT_APP (self->obj));
+    list = pluma_app_get_documents (PLUMA_APP (self->obj));
 
     py_list = _helper_wrap_gobject_glist (list);
 
@@ -150,14 +150,14 @@ _wrap_gedit_app_get_documents(PyGObject *self)
     return py_list;
 }
 %%
-override gedit_window_get_documents
+override pluma_window_get_documents
 static PyObject *
-_wrap_gedit_window_get_documents(PyGObject *self)
+_wrap_pluma_window_get_documents(PyGObject *self)
 {
     GList *list;
     PyObject *py_list;
 
-    list = gedit_window_get_documents (GEDIT_WINDOW (self->obj));
+    list = pluma_window_get_documents (PLUMA_WINDOW (self->obj));
 
     py_list = _helper_wrap_gobject_glist (list);
 
@@ -166,14 +166,14 @@ _wrap_gedit_window_get_documents(PyGObject *self)
     return py_list;
 }
 %%
-override gedit_window_get_unsaved_documents
+override pluma_window_get_unsaved_documents
 static PyObject *
-_wrap_gedit_window_get_unsaved_documents(PyGObject *self)
+_wrap_pluma_window_get_unsaved_documents(PyGObject *self)
 {
     GList *list;
     PyObject *py_list;
 
-    list = gedit_window_get_unsaved_documents (GEDIT_WINDOW (self->obj));
+    list = pluma_window_get_unsaved_documents (PLUMA_WINDOW (self->obj));
 
     py_list = _helper_wrap_gobject_glist (list);
 
@@ -182,14 +182,14 @@ _wrap_gedit_window_get_unsaved_documents(PyGObject *self)
     return py_list;
 }
 %%
-override gedit_window_get_views
+override pluma_window_get_views
 static PyObject *
-_wrap_gedit_window_get_views(PyGObject *self)
+_wrap_pluma_window_get_views(PyGObject *self)
 {
     GList *list;
     PyObject *py_list;
 
-    list = gedit_window_get_views (GEDIT_WINDOW (self->obj));
+    list = pluma_window_get_views (PLUMA_WINDOW (self->obj));
 
     py_list = _helper_wrap_gobject_glist (list);
 
@@ -198,9 +198,9 @@ _wrap_gedit_window_get_views(PyGObject *self)
     return py_list;
 }
 %%
-override gedit_window_close_tabs kwargs
+override pluma_window_close_tabs kwargs
 static PyObject *
-_wrap_gedit_window_close_tabs (PyGObject *self,
+_wrap_pluma_window_close_tabs (PyGObject *self,
 			       PyObject  *args,
 			       PyObject  *kwargs)
 {
@@ -210,7 +210,7 @@ _wrap_gedit_window_close_tabs (PyGObject *self,
 	int len, i;
 
 	if (!PyArg_ParseTupleAndKeywords (args, kwargs,
-					  "O:GeditWindow.close_tabs", kwlist,
+					  "O:PlumaWindow.close_tabs", kwlist,
 					  &list))
 		return NULL;
 
@@ -228,7 +228,7 @@ _wrap_gedit_window_close_tabs (PyGObject *self,
 		item = PySequence_GetItem (list, i);
 		Py_DECREF(item);
 
-		if (!pygobject_check (item, &PyGeditTab_Type))
+		if (!pygobject_check (item, &PyPlumaTab_Type))
 		{
 			PyErr_SetString (PyExc_TypeError,
 					 "sequence item not a Gtkwidget object");
@@ -239,22 +239,22 @@ _wrap_gedit_window_close_tabs (PyGObject *self,
 		glist = g_list_append (glist, pygobject_get (item));
 	}
 
-	gedit_window_close_tabs (GEDIT_WINDOW (self->obj), glist);
+	pluma_window_close_tabs (PLUMA_WINDOW (self->obj), glist);
 
 	g_list_free (glist);
 	Py_INCREF (Py_None);
 	return Py_None;
 }
 %%
-override gedit_document_get_search_text
+override pluma_document_get_search_text
 static PyObject *
-_wrap_gedit_document_get_search_text(PyGObject *self)
+_wrap_pluma_document_get_search_text(PyGObject *self)
 {
     PyObject *tuple, *string;
     guint flags;
     gchar *ret;
 
-    ret = gedit_document_get_search_text (GEDIT_DOCUMENT (self->obj), &flags);
+    ret = pluma_document_get_search_text (PLUMA_DOCUMENT (self->obj), &flags);
 
     tuple = PyTuple_New(2);
     if (ret) {
@@ -271,9 +271,9 @@ _wrap_gedit_document_get_search_text(PyGObject *self)
     return tuple;
 }
 %%
-override gedit_panel_add_item kwargs
+override pluma_panel_add_item kwargs
 static PyObject *
-_wrap_gedit_panel_add_item(PyGObject *self, PyObject *args, PyObject *kwargs)
+_wrap_pluma_panel_add_item(PyGObject *self, PyObject *args, PyObject *kwargs)
 {
     static char *kwlist1[] = { "item", "name", "image", NULL };
     static char *kwlist2[] = { "item", "name", "stock_id", NULL };
@@ -281,16 +281,16 @@ _wrap_gedit_panel_add_item(PyGObject *self, PyObject *args, PyObject *kwargs)
     char *name = NULL;
     char *stock_id = NULL;
 
-    if (PyArg_ParseTupleAndKeywords(args, kwargs, "O!sO!:GeditPanel.add_item", kwlist1, &PyGtkWidget_Type, &item, &name, &PyGtkImage_Type, &image)) {
-        gedit_panel_add_item(GEDIT_PANEL(self->obj), GTK_WIDGET(item->obj), name, GTK_WIDGET(image->obj));
+    if (PyArg_ParseTupleAndKeywords(args, kwargs, "O!sO!:PlumaPanel.add_item", kwlist1, &PyGtkWidget_Type, &item, &name, &PyGtkImage_Type, &image)) {
+        pluma_panel_add_item(PLUMA_PANEL(self->obj), GTK_WIDGET(item->obj), name, GTK_WIDGET(image->obj));
         Py_INCREF(Py_None);
         return Py_None;
     }
 
     PyErr_Clear();
 
-    if (PyArg_ParseTupleAndKeywords(args, kwargs, "O!ss:GeditPanel.add_item", kwlist2, &PyGtkWidget_Type, &item, &name, &stock_id)) {
-        gedit_panel_add_item_with_stock_icon(GEDIT_PANEL(self->obj), GTK_WIDGET(item->obj), name, stock_id);
+    if (PyArg_ParseTupleAndKeywords(args, kwargs, "O!ss:PlumaPanel.add_item", kwlist2, &PyGtkWidget_Type, &item, &name, &stock_id)) {
+        pluma_panel_add_item_with_stock_icon(PLUMA_PANEL(self->obj), GTK_WIDGET(item->obj), name, stock_id);
         Py_INCREF(Py_None);
         return Py_None;
     }
@@ -300,64 +300,64 @@ _wrap_gedit_panel_add_item(PyGObject *self, PyObject *args, PyObject *kwargs)
     return NULL;
 }
 %%
-override gedit_app_get_default_deprecated
+override pluma_app_get_default_deprecated
 /* deprecated wrappers */
 static PyObject *
-_wrap_gedit_app_get_default_deprecated(PyObject *self)
+_wrap_pluma_app_get_default_deprecated(PyObject *self)
 {
-    if (PyErr_Warn(PyExc_DeprecationWarning, "use gedit.app_get_default instead") < 0)
+    if (PyErr_Warn(PyExc_DeprecationWarning, "use pluma.app_get_default instead") < 0)
 	return NULL;
-    return _wrap_gedit_app_get_default(self);
+    return _wrap_pluma_app_get_default(self);
 }
 %%
-override gedit_encoding_get_from_charset_deprecated kwargs
+override pluma_encoding_get_from_charset_deprecated kwargs
 static PyObject *
-_wrap_gedit_encoding_get_from_charset_deprecated(PyObject *self, PyObject *args, PyObject *kwargs)
+_wrap_pluma_encoding_get_from_charset_deprecated(PyObject *self, PyObject *args, PyObject *kwargs)
 {
-    if (PyErr_Warn(PyExc_DeprecationWarning, "use gedit.encoding_get_from_charset instead") < 0)
+    if (PyErr_Warn(PyExc_DeprecationWarning, "use pluma.encoding_get_from_charset instead") < 0)
 	return NULL;
-    return _wrap_gedit_encoding_get_from_charset(self, args, kwargs);
+    return _wrap_pluma_encoding_get_from_charset(self, args, kwargs);
 }
 %%
-override gedit_encoding_get_from_index_deprecated kwargs
+override pluma_encoding_get_from_index_deprecated kwargs
 static PyObject *
-_wrap_gedit_encoding_get_from_index_deprecated(PyObject *self, PyObject *args, PyObject *kwargs)
+_wrap_pluma_encoding_get_from_index_deprecated(PyObject *self, PyObject *args, PyObject *kwargs)
 {
-    if (PyErr_Warn(PyExc_DeprecationWarning, "use gedit.encoding_get_from_index instead") < 0)
+    if (PyErr_Warn(PyExc_DeprecationWarning, "use pluma.encoding_get_from_index instead") < 0)
 	return NULL;
-    return _wrap_gedit_encoding_get_from_index(self, args, kwargs);
+    return _wrap_pluma_encoding_get_from_index(self, args, kwargs);
 }
 %%
-override gedit_encoding_get_utf8_deprecated
+override pluma_encoding_get_utf8_deprecated
 static PyObject *
-_wrap_gedit_encoding_get_utf8_deprecated(PyObject *self)
+_wrap_pluma_encoding_get_utf8_deprecated(PyObject *self)
 {
-    if (PyErr_Warn(PyExc_DeprecationWarning, "use gedit.encoding_get_utf8 instead") < 0)
+    if (PyErr_Warn(PyExc_DeprecationWarning, "use pluma.encoding_get_utf8 instead") < 0)
 	return NULL;
-    return _wrap_gedit_encoding_get_utf8(self);
+    return _wrap_pluma_encoding_get_utf8(self);
 }
 %%
-override gedit_encoding_get_current_deprecated
+override pluma_encoding_get_current_deprecated
 static PyObject *
-_wrap_gedit_encoding_get_current_deprecated(PyObject *self)
+_wrap_pluma_encoding_get_current_deprecated(PyObject *self)
 {
-    if (PyErr_Warn(PyExc_DeprecationWarning, "use gedit.encoding_get_current instead") < 0)
+    if (PyErr_Warn(PyExc_DeprecationWarning, "use pluma.encoding_get_current instead") < 0)
 	return NULL;
-    return _wrap_gedit_encoding_get_current(self);
+    return _wrap_pluma_encoding_get_current(self);
 }
 %%
-override gedit_tab_get_from_document_deprecated kwargs
+override pluma_tab_get_from_document_deprecated kwargs
 static PyObject *
-_wrap_gedit_tab_get_from_document_deprecated(PyObject *self, PyObject *args, PyObject *kwargs)
+_wrap_pluma_tab_get_from_document_deprecated(PyObject *self, PyObject *args, PyObject *kwargs)
 {
-    if (PyErr_Warn(PyExc_DeprecationWarning, "use gedit.tab_get_from_document instead") < 0)
+    if (PyErr_Warn(PyExc_DeprecationWarning, "use pluma.tab_get_from_document instead") < 0)
 	return NULL;
-    return _wrap_gedit_tab_get_from_document(self, args, kwargs);
+    return _wrap_pluma_tab_get_from_document(self, args, kwargs);
 }
 %%
-override gedit_language_manager_list_languages_sorted kwargs
+override pluma_language_manager_list_languages_sorted kwargs
 static PyObject *
-_wrap_gedit_language_manager_list_languages_sorted(PyObject *self, PyObject *args, PyObject *kwargs)
+_wrap_pluma_language_manager_list_languages_sorted(PyObject *self, PyObject *args, PyObject *kwargs)
 {
     static char *kwlist[] = { "lm", "include_hidden", NULL };
     PyGObject *lm;
@@ -371,7 +371,7 @@ _wrap_gedit_language_manager_list_languages_sorted(PyObject *self, PyObject *arg
                                       &include_hidden))
         return NULL;
 
-    list = gedit_language_manager_list_languages_sorted (GTK_SOURCE_LANGUAGE_MANAGER (lm->obj),
+    list = pluma_language_manager_list_languages_sorted (GTK_SOURCE_LANGUAGE_MANAGER (lm->obj),
                                                          include_hidden);
 
     py_list = _helper_wrap_gobject_gslist (list);
@@ -381,16 +381,16 @@ _wrap_gedit_language_manager_list_languages_sorted(PyObject *self, PyObject *arg
     return py_list;
 }
 %%
-override gedit_debug kwargs
+override pluma_debug kwargs
 static PyObject *
-_wrap_gedit_debug(PyObject *self, PyObject *args, PyObject *kwargs)
+_wrap_pluma_debug(PyObject *self, PyObject *args, PyObject *kwargs)
 {
     static char *kwlist[] = { "message", NULL };
     PyObject *traceback_module, *mdict, *func, *traceback, *tuple;
     PyObject *filename, *lineno, *funcname;
     char *message = NULL;
 
-    if (g_getenv ("GEDIT_DEBUG_PLUGINS") == NULL)
+    if (g_getenv ("PLUMA_DEBUG_PLUGINS") == NULL)
     {
         Py_INCREF (Py_None);
         return Py_None;
@@ -423,12 +423,12 @@ _wrap_gedit_debug(PyObject *self, PyObject *args, PyObject *kwargs)
         funcname = PyTuple_GetItem (tuple, 2);
 
         if (message == NULL)
-            gedit_debug (GEDIT_DEBUG_PLUGINS,
+            pluma_debug (PLUMA_DEBUG_PLUGINS,
                          PyString_AsString (filename),
                          PyInt_AsLong (lineno),
                          PyString_AsString (funcname));
         else
-            gedit_debug_message (GEDIT_DEBUG_PLUGINS,
+            pluma_debug_message (PLUMA_DEBUG_PLUGINS,
                                  PyString_AsString (filename),
                                  PyInt_AsLong (lineno),
                                  PyString_AsString (funcname),
@@ -442,18 +442,18 @@ _wrap_gedit_debug(PyObject *self, PyObject *args, PyObject *kwargs)
     return Py_None;
 }
 %%
-override gedit_statusbar_flash_message kwargs
+override pluma_statusbar_flash_message kwargs
 static PyObject *
-_wrap_gedit_statusbar_flash_message(PyGObject *self, PyObject *args, PyObject *kwargs)
+_wrap_pluma_statusbar_flash_message(PyGObject *self, PyObject *args, PyObject *kwargs)
 {
     static char *kwlist[] = { "context_id", "message", NULL };
     int context_id;
     char *message;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"is:GeditStatusbar.flash_message", kwlist, &context_id, &message))
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"is:PlumaStatusbar.flash_message", kwlist, &context_id, &message))
         return NULL;
    
-    gedit_statusbar_flash_message(GEDIT_STATUSBAR(self->obj), context_id, "%s", message);
+    pluma_statusbar_flash_message(PLUMA_STATUSBAR(self->obj), context_id, "%s", message);
 
     Py_INCREF(Py_None);
     return Py_None;
diff --git a/plugin-loaders/python/bindings/geditcommands.defs b/plugin-loaders/python/bindings/plumacommands.defs
index 3808fa43..241b52d6 100755
--- a/plugin-loaders/python/bindings/geditcommands.defs
+++ b/plugin-loaders/python/bindings/plumacommands.defs
@@ -3,43 +3,43 @@
 ;; Enumerations and flags ...
 
 
-;; From ../../gedit/gedit-commands.h
+;; From ../../pluma/pluma-commands.h
 
 (define-function load_uri
-  (c-name "gedit_commands_load_uri")
+  (c-name "pluma_commands_load_uri")
   (return-type "none")
   (parameters
-    '("GeditWindow*" "window")
+    '("PlumaWindow*" "window")
     '("const-gchar*" "uri")
-    '("const-GeditEncoding*" "encoding")
+    '("const-PlumaEncoding*" "encoding")
     '("gint" "line_pos")
   )
 )
 
 (define-function load_uris
-  (c-name "gedit_commands_load_uris")
+  (c-name "pluma_commands_load_uris")
   (return-type "gint")
   (parameters
-    '("GeditWindow*" "window")
+    '("PlumaWindow*" "window")
     '("const-GSList*" "uris")
-    '("const-GeditEncoding*" "encoding")
+    '("const-PlumaEncoding*" "encoding")
     '("gint" "line_pos")
   )
 )
 
 (define-function save_document
-  (c-name "gedit_commands_save_document")
+  (c-name "pluma_commands_save_document")
   (return-type "none")
   (parameters
-    '("GeditWindow*" "window")
-    '("GeditDocument*" "document")
+    '("PlumaWindow*" "window")
+    '("PlumaDocument*" "document")
   )
 )
 
 (define-function save_all_documents
-  (c-name "gedit_commands_save_all_documents")
+  (c-name "pluma_commands_save_all_documents")
   (return-type "none")
   (parameters
-    '("GeditWindow*" "window")
+    '("PlumaWindow*" "window")
   )
 )
diff --git a/plugin-loaders/python/bindings/geditcommands.override b/plugin-loaders/python/bindings/plumacommands.override
index a81f9181..9713b5e0 100755
--- a/plugin-loaders/python/bindings/geditcommands.override
+++ b/plugin-loaders/python/bindings/plumacommands.override
@@ -5,59 +5,59 @@ headers
 #include <pygobject.h>
 #include <pygtk/pygtk.h>
 
-#include "gedit-commands.h"
-#include "gedit-window.h"
+#include "pluma-commands.h"
+#include "pluma-window.h"
 
-void pygeditcommands_register_classes (PyObject *d);
-void pygeditcommands_add_constants (PyObject *module, const gchar *strip_prefix);
+void pyplumacommands_register_classes (PyObject *d);
+void pyplumacommands_add_constants (PyObject *module, const gchar *strip_prefix);
 
 %%
-modulename gedit.commands
+modulename pluma.commands
 %%
-import gedit.Window as PyGeditWindow_Type
-import gedit.Document as PyGeditDocument_Type
+import pluma.Window as PyPlumaWindow_Type
+import pluma.Document as PyPlumaDocument_Type
 %%
 ignore-glob
   _*
 %%
-override gedit_commands_load_uri kwargs 
+override pluma_commands_load_uri kwargs 
 static PyObject *
-_wrap_gedit_commands_load_uri (PyObject *self, PyObject *args, PyObject *kwargs)
+_wrap_pluma_commands_load_uri (PyObject *self, PyObject *args, PyObject *kwargs)
 {
 	static char *kwlist[] = { "window", "uri", "encoding", "line_pos", NULL };
 	PyGObject *window;
 	char *uri;
 	int line_pos = 0;
 	PyObject *py_encoding = NULL;
-	GeditEncoding *encoding = NULL;
+	PlumaEncoding *encoding = NULL;
 
 	if (!PyArg_ParseTupleAndKeywords (args, kwargs, "O!s|Oi:load_uri", 
-	                                  kwlist, &PyGeditWindow_Type, 
+	                                  kwlist, &PyPlumaWindow_Type, 
 	                                  &window, &uri, &py_encoding, 
 	                                  &line_pos))
 		return NULL;
     
 	if (py_encoding != NULL && py_encoding != Py_None)
 	{
-		if (pyg_boxed_check (py_encoding, GEDIT_TYPE_ENCODING))
-			encoding = pyg_boxed_get (py_encoding, GeditEncoding);
+		if (pyg_boxed_check (py_encoding, PLUMA_TYPE_ENCODING))
+			encoding = pyg_boxed_get (py_encoding, PlumaEncoding);
 		else
 		{
 			PyErr_SetString (PyExc_TypeError, 
-			                 "encoding should be a GeditEncoding");
+			                 "encoding should be a PlumaEncoding");
 			return NULL;
 		}
 	}
 
-	gedit_commands_load_uri (GEDIT_WINDOW (window->obj), uri, encoding, 
+	pluma_commands_load_uri (PLUMA_WINDOW (window->obj), uri, encoding, 
 	                        line_pos);
 	Py_INCREF (Py_None);
 	return Py_None;
 }
 %%
-override gedit_commands_load_uris kwargs 
+override pluma_commands_load_uris kwargs 
 static PyObject *
-_wrap_gedit_commands_load_uris (PyObject *self, PyObject *args, PyObject *kwargs)
+_wrap_pluma_commands_load_uris (PyObject *self, PyObject *args, PyObject *kwargs)
 {
 	static char *kwlist[] = { "window", "uris", "encoding", "line_pos", NULL };
 	PyGObject *window;
@@ -66,23 +66,23 @@ _wrap_gedit_commands_load_uris (PyObject *self, PyObject *args, PyObject *kwargs
 	PyObject *py_encoding = NULL;
 	PyObject *list;
 	PyObject *item;
-	GeditEncoding *encoding = NULL;
+	PlumaEncoding *encoding = NULL;
 	int len;
 	int i;
 
 	if (!PyArg_ParseTupleAndKeywords (args, kwargs, "O!O|Oi:load_uri", 
-	                                  kwlist, &PyGeditWindow_Type, 
+	                                  kwlist, &PyPlumaWindow_Type, 
 	                                  &window, &list, &py_encoding, 
 	                                  &line_pos))
 		return NULL;
     
 	if (py_encoding != NULL && py_encoding != Py_None)
 	{
-		if (pyg_boxed_check (py_encoding, GEDIT_TYPE_ENCODING))
-			encoding = pyg_boxed_get (py_encoding, GeditEncoding);
+		if (pyg_boxed_check (py_encoding, PLUMA_TYPE_ENCODING))
+			encoding = pyg_boxed_get (py_encoding, PlumaEncoding);
 		else {
 			PyErr_SetString (PyExc_TypeError, 
-			                 "encoding should be a GeditEncoding");
+			                 "encoding should be a PlumaEncoding");
 			return NULL;
 		}
 	}
@@ -113,7 +113,7 @@ _wrap_gedit_commands_load_uris (PyObject *self, PyObject *args, PyObject *kwargs
 	}
 
 	uris = g_slist_reverse (uris);
-	gedit_commands_load_uris (GEDIT_WINDOW (window->obj), uris, 
+	pluma_commands_load_uris (PLUMA_WINDOW (window->obj), uris, 
 	                          encoding, line_pos);
 	g_slist_free (uris);
 
diff --git a/plugin-loaders/python/bindings/geditmessage.override b/plugin-loaders/python/bindings/plumamessage.override
index 244d60ce..be1090a0 100755
--- a/plugin-loaders/python/bindings/geditmessage.override
+++ b/plugin-loaders/python/bindings/plumamessage.override
@@ -1,8 +1,8 @@
 %%
 headers
 
-#include <gedit/gedit-message-bus.h>
-#include <gedit/gedit-message.h>
+#include <pluma/pluma-message-bus.h>
+#include <pluma/pluma-message.h>
 
 static GType
 _helper_wrap_get_gtype_from_pytype (PyObject *pytype)
@@ -69,7 +69,7 @@ _helper_wrap_get_gvalue_from_pyobject (GValue *gvalue, PyObject *pyvalue)
 }
 
 static int
-_helper_wrap_message_set_value(GeditMessage *message, PyObject *pykey, PyObject *pyvalue)
+_helper_wrap_message_set_value(PlumaMessage *message, PyObject *pykey, PyObject *pyvalue)
 {
     gchar *key;
     GType gtype;
@@ -80,7 +80,7 @@ _helper_wrap_message_set_value(GeditMessage *message, PyObject *pykey, PyObject
     if (key == NULL)
         return 0;
 
-    gtype = gedit_message_get_key_type(message, key);
+    gtype = pluma_message_get_key_type(message, key);
     
     if (gtype == 0) {
         PyErr_SetString(PyExc_TypeError, "invalid key");
@@ -97,7 +97,7 @@ _helper_wrap_message_set_value(GeditMessage *message, PyObject *pykey, PyObject
         return 0;
     }
 
-    gedit_message_set_value(message, key, &value);
+    pluma_message_set_value(message, key, &value);
     g_value_unset(&value);
     g_free (key);
     
@@ -141,34 +141,34 @@ _helper_parse_pairs(PyObject *args, PyObject *kwargs, ParsePairFunc func, gpoint
 }
 
 static void
-_helper_message_set(PyObject *key, PyObject *value, GeditMessage *message)
+_helper_message_set(PyObject *key, PyObject *value, PlumaMessage *message)
 {
     _helper_wrap_message_set_value(message, key, value);
 }
 
 static void
-_helper_message_set_values(GeditMessage *message, PyObject *args, PyObject *kwargs)
+_helper_message_set_values(PlumaMessage *message, PyObject *args, PyObject *kwargs)
 {
     _helper_parse_pairs(args, kwargs, (ParsePairFunc)_helper_message_set, message);
 }
 
-static GeditMessage *
-_helper_wrap_create_message(GeditMessageBus *bus, PyObject *args, PyObject *kwargs)
+static PlumaMessage *
+_helper_wrap_create_message(PlumaMessageBus *bus, PyObject *args, PyObject *kwargs)
 {
     PyObject *pypath, *pymethod, *pydict;
     
-    if (!PyArg_ParseTuple(args, "OO|O:GeditMessage.create", &pypath, &pymethod, &pydict))
+    if (!PyArg_ParseTuple(args, "OO|O:PlumaMessage.create", &pypath, &pymethod, &pydict))
         return NULL;
     
     gchar *object_path = _helper_wrap_get_string(pypath);
     gchar *method = _helper_wrap_get_string(pymethod);
     
-    GeditMessageType *message_type = gedit_message_bus_lookup (bus, object_path, method);
-    GeditMessage *message;
+    PlumaMessageType *message_type = pluma_message_bus_lookup (bus, object_path, method);
+    PlumaMessage *message;
      
     if (message_type)
     {
-        message = gedit_message_type_instantiate(message_type, NULL);
+        message = pluma_message_type_instantiate(message_type, NULL);
         _helper_message_set_values(message, args, kwargs);
     }
     else
@@ -186,12 +186,12 @@ _helper_wrap_create_message(GeditMessageBus *bus, PyObject *args, PyObject *kwar
 typedef struct {
     PyObject *func;
     PyObject *data;
-} PyGeditCustomNotify;
+} PyPlumaCustomNotify;
 
 static void 
-pygedit_custom_destroy_notify(gpointer user_data)
+pypluma_custom_destroy_notify(gpointer user_data)
 {
-    PyGeditCustomNotify *cunote = user_data;
+    PyPlumaCustomNotify *cunote = user_data;
     PyGILState_STATE state;
     
     g_return_if_fail(user_data);
@@ -205,21 +205,21 @@ pygedit_custom_destroy_notify(gpointer user_data)
 %%
 ignore-glob
   *_get_type
-  gedit_message_type_foreach
-  gedit_message_type_instantiate_valist
-  gedit_message_type_new_valist
-  gedit_message_get_valist
-  gedit_message_set_valist
-  gedit_message_set_valuesv
-  gedit_message_bus_disconnect_by_func
-  gedit_message_bus_block_by_func
-  gedit_message_bus_unblock_by_func
+  pluma_message_type_foreach
+  pluma_message_type_instantiate_valist
+  pluma_message_type_new_valist
+  pluma_message_get_valist
+  pluma_message_set_valist
+  pluma_message_set_valuesv
+  pluma_message_bus_disconnect_by_func
+  pluma_message_bus_block_by_func
+  pluma_message_bus_unblock_by_func
 %%
-override gedit_message_type_new kwargs
+override pluma_message_type_new kwargs
 
 typedef struct
 {
-    GeditMessageType *message_type;
+    PlumaMessageType *message_type;
     PyObject *optional;
 } MessageTypeSetInfo;
 
@@ -237,19 +237,19 @@ _message_type_set(PyObject *key, PyObject *value, MessageTypeSetInfo *info)
     
     gboolean optional = info->optional && PySequence_Contains(info->optional, key);
     
-    gedit_message_type_set(info->message_type, optional, k, gtype, NULL);
+    pluma_message_type_set(info->message_type, optional, k, gtype, NULL);
     g_free(k);
 }
 
 static int
-_wrap_gedit_message_type_new(PyGObject *self, PyObject *args, PyObject *kwargs)
+_wrap_pluma_message_type_new(PyGObject *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *pypath, *pymethod, *optional = NULL, *pydict;
     
-    if (!PyArg_ParseTuple(args, "OO|OO:GeditMessageType.new", &pypath, &pymethod, &optional, &pydict))
+    if (!PyArg_ParseTuple(args, "OO|OO:PlumaMessageType.new", &pypath, &pymethod, &optional, &pydict))
         return -1;
     
-    GeditMessageType *message_type = GEDIT_MESSAGE_TYPE(g_object_new(pyg_type_from_object((PyObject *) self), NULL));
+    PlumaMessageType *message_type = PLUMA_MESSAGE_TYPE(g_object_new(pyg_type_from_object((PyObject *) self), NULL));
     
     MessageTypeSetInfo info = {message_type, optional && PySequence_Check(optional) ? optional : NULL};
     _helper_parse_pairs (args, kwargs, (ParsePairFunc)_message_type_set, &info);
@@ -260,21 +260,21 @@ _wrap_gedit_message_type_new(PyGObject *self, PyObject *args, PyObject *kwargs)
     return 0;
 }
 %%
-override gedit_message_type_instantiate kwargs
+override pluma_message_type_instantiate kwargs
 static PyObject *
-_wrap_gedit_message_type_instantiate(PyGObject *self, PyObject *args, PyObject *kwargs)
+_wrap_pluma_message_type_instantiate(PyGObject *self, PyObject *args, PyObject *kwargs)
 {
-    GeditMessageType *message_type = GEDIT_MESSAGE_TYPE (self->obj);
-    GeditMessage *message = gedit_message_type_instantiate(message_type, NULL);
+    PlumaMessageType *message_type = PLUMA_MESSAGE_TYPE (self->obj);
+    PlumaMessage *message = pluma_message_type_instantiate(message_type, NULL);
     
     _helper_message_set_values(message, args, kwargs);
     
     return pygobject_new((GObject *)message);
 }
 %%
-override gedit_message_get args
+override pluma_message_get args
 static PyObject *
-_wrap_gedit_message_get(PyGObject *self, PyObject *args)
+_wrap_pluma_message_get(PyGObject *self, PyObject *args)
 {
     guint len, i;
     PyObject *ret;
@@ -294,7 +294,7 @@ _wrap_gedit_message_get(PyGObject *self, PyObject *args)
 	    return NULL;
 	}
 	
-	gedit_message_get_value (GEDIT_MESSAGE (self->obj), key, &value);
+	pluma_message_get_value (PLUMA_MESSAGE (self->obj), key, &value);
 	g_free (key);
 
 	PyTuple_SetItem(ret, i, pyg_value_as_pyobject(&value, TRUE));
@@ -304,81 +304,81 @@ _wrap_gedit_message_get(PyGObject *self, PyObject *args)
     return ret;
 }
 %%
-override gedit_message_get_value kwargs
+override pluma_message_get_value kwargs
 static PyObject *
-_wrap_gedit_message_get_value(PyGObject *self, PyObject *args, PyObject *kwargs)
+_wrap_pluma_message_get_value(PyGObject *self, PyObject *args, PyObject *kwargs)
 {
     static char *kwlist[] = { "key", NULL };
     const gchar *key;
     PyObject *ret;
     GValue value = { 0, };
     
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:GeditMessage.get_value", kwlist, &key))
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:PlumaMessage.get_value", kwlist, &key))
         return NULL;
 
-    gedit_message_get_value(GEDIT_MESSAGE(self->obj), key, &value);
+    pluma_message_get_value(PLUMA_MESSAGE(self->obj), key, &value);
     ret = pyg_value_as_pyobject(&value, TRUE);
     g_value_unset(&value);
     
     return ret;
 }
 %%
-override gedit_message_set_value kwargs
+override pluma_message_set_value kwargs
 static PyObject *
-_wrap_gedit_message_set_value(PyGObject *self, PyObject *args, PyObject *kwargs)
+_wrap_pluma_message_set_value(PyGObject *self, PyObject *args, PyObject *kwargs)
 {
     static char *kwlist[] = { "key", "value", NULL };
     PyObject *pykey, *pyvalue;
     
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO:GeditMessage.set_value", kwlist, &pykey, &pyvalue))
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO:PlumaMessage.set_value", kwlist, &pykey, &pyvalue))
         return NULL;
     
-    if (!_helper_wrap_message_set_value(GEDIT_MESSAGE(self->obj), pykey, pyvalue))
+    if (!_helper_wrap_message_set_value(PLUMA_MESSAGE(self->obj), pykey, pyvalue))
         return NULL;
     
     Py_INCREF(Py_None);
     return Py_None;
 }
 %%
-override gedit_message_set kwargs
+override pluma_message_set kwargs
 static PyObject *
-_wrap_gedit_message_set (PyGObject *self, PyObject *args, PyObject *kwargs) {
-    _helper_message_set_values(GEDIT_MESSAGE(self->obj), args, kwargs);
+_wrap_pluma_message_set (PyGObject *self, PyObject *args, PyObject *kwargs) {
+    _helper_message_set_values(PLUMA_MESSAGE(self->obj), args, kwargs);
 
     Py_INCREF(Py_None);
     return Py_None;
 }
 %%
-override gedit_message_bus_new
+override pluma_message_bus_new
 static int
-_wrap_gedit_message_bus_new(PyGObject *self)
+_wrap_pluma_message_bus_new(PyGObject *self)
 {
     pygobject_construct (self, NULL);
     
     if (!self->obj) {
-        PyErr_SetString (PyExc_RuntimeError, "could not create gedit.MessageBus object");
+        PyErr_SetString (PyExc_RuntimeError, "could not create pluma.MessageBus object");
         return -1;
     }
 
     return 0;
 }
 %%
-new-constructor GEDIT_TYPE_MESSAGE_BUS
+new-constructor PLUMA_TYPE_MESSAGE_BUS
 %%
-override gedit_message_bus_register kwargs
+override pluma_message_bus_register kwargs
 static PyObject *
-_wrap_gedit_message_bus_register(PyGObject *self, PyObject *args, PyObject *kwargs)
+_wrap_pluma_message_bus_register(PyGObject *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *pypath, *pymethod, *optional = NULL, *pydict;
-    GeditMessageBus *bus = GEDIT_MESSAGE_BUS(self->obj);
+    PlumaMessageBus *bus = PLUMA_MESSAGE_BUS(self->obj);
 
-    if (!PyArg_ParseTuple(args, "OO|OO:GeditMessageBus.register", &pypath, &pymethod, &optional, &pydict))
+    if (!PyArg_ParseTuple(args, "OO|OO:PlumaMessageBus.register", &pypath, &pymethod, &optional, &pydict))
         return NULL;
     
     gchar *object_path = _helper_wrap_get_string(pypath);
     gchar *method = _helper_wrap_get_string(pymethod);
     
-    GeditMessageType *message_type = gedit_message_bus_register(bus, object_path, method, 0, NULL);
+    PlumaMessageType *message_type = pluma_message_bus_register(bus, object_path, method, 0, NULL);
     
     g_free(object_path);
     g_free(method);
@@ -392,15 +392,15 @@ _wrap_gedit_message_bus_register(PyGObject *self, PyObject *args, PyObject *kwar
     MessageTypeSetInfo info = {message_type, optional && PySequence_Check(optional) ? optional : NULL};
     _helper_parse_pairs (args, kwargs, (ParsePairFunc)_message_type_set, &info);
     
-    return pyg_boxed_new(GEDIT_TYPE_MESSAGE_TYPE, message_type, TRUE, TRUE);
+    return pyg_boxed_new(PLUMA_TYPE_MESSAGE_TYPE, message_type, TRUE, TRUE);
 }
 %%
-override gedit_message_bus_connect kwargs
+override pluma_message_bus_connect kwargs
 static void
-pygedit_message_bus_connect_cb(GeditMessageBus *bus, GeditMessage *message, gpointer data)
+pypluma_message_bus_connect_cb(PlumaMessageBus *bus, PlumaMessage *message, gpointer data)
 {
     PyGILState_STATE state;
-    PyGeditCustomNotify *cunote = data;
+    PyPlumaCustomNotify *cunote = data;
     PyObject *pybus, *pymessage, *retobj;
 
     g_assert(cunote->func);
@@ -426,16 +426,16 @@ pygedit_message_bus_connect_cb(GeditMessageBus *bus, GeditMessage *message, gpoi
 }
 
 static PyObject *
-_wrap_gedit_message_bus_connect(PyGObject *self, PyObject *args, PyObject *kwargs) 
+_wrap_pluma_message_bus_connect(PyGObject *self, PyObject *args, PyObject *kwargs) 
 {
     static char *kwlist[] = { "domain", "name", "func", "data", NULL };
     PyObject *pyfunc, *pyarg = NULL;
     const gchar *domain;
     const gchar *name;
-    PyGeditCustomNotify *cunote;
+    PyPlumaCustomNotify *cunote;
 
     if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-				     "ssO|O:GeditMessageBus.connect",
+				     "ssO|O:PlumaMessageBus.connect",
 				     kwlist, &domain, &name, &pyfunc, &pyarg))
         return NULL;
 
@@ -443,63 +443,63 @@ _wrap_gedit_message_bus_connect(PyGObject *self, PyObject *args, PyObject *kwarg
         PyErr_SetString(PyExc_TypeError, "func must be a callable object");
         return NULL;
     }
-    cunote = g_new(PyGeditCustomNotify, 1);
+    cunote = g_new(PyPlumaCustomNotify, 1);
     Py_INCREF(pyfunc);
     cunote->func = pyfunc;
     Py_XINCREF(pyarg);
     cunote->data = pyarg;
 
-    guint id = gedit_message_bus_connect(GEDIT_MESSAGE_BUS(self->obj),
+    guint id = pluma_message_bus_connect(PLUMA_MESSAGE_BUS(self->obj),
                                          domain,
                                          name,
-                                         pygedit_message_bus_connect_cb,
+                                         pypluma_message_bus_connect_cb,
                                          (gpointer)cunote,
-                                         pygedit_custom_destroy_notify);
+                                         pypluma_custom_destroy_notify);
     return PyLong_FromUnsignedLong(id);
 }
 %%
-override gedit_message_bus_send kwargs
+override pluma_message_bus_send kwargs
 static PyObject *
-_wrap_gedit_message_bus_send(PyGObject *self, PyObject *args, PyObject *kwargs)
+_wrap_pluma_message_bus_send(PyGObject *self, PyObject *args, PyObject *kwargs)
 {
     /* create a new message object */
-    GeditMessage *message;
-    GeditMessageBus *bus = GEDIT_MESSAGE_BUS(self->obj);
+    PlumaMessage *message;
+    PlumaMessageBus *bus = PLUMA_MESSAGE_BUS(self->obj);
     message = _helper_wrap_create_message(bus, args, kwargs);
     
     if (!message)
         return NULL;
     
-    gedit_message_bus_send_message(bus, message);
+    pluma_message_bus_send_message(bus, message);
     g_object_unref (message);
     
     Py_INCREF(Py_None);
     return Py_None;
 }
 %%
-override gedit_message_bus_send_sync kwargs
+override pluma_message_bus_send_sync kwargs
 static PyObject *
-_wrap_gedit_message_bus_send_sync(PyGObject *self, PyObject *args, PyObject *kwargs)
+_wrap_pluma_message_bus_send_sync(PyGObject *self, PyObject *args, PyObject *kwargs)
 {
     /* create a new message object */
-    GeditMessage *message;
-    GeditMessageBus *bus = GEDIT_MESSAGE_BUS(self->obj);
+    PlumaMessage *message;
+    PlumaMessageBus *bus = PLUMA_MESSAGE_BUS(self->obj);
     
     message = _helper_wrap_create_message(bus, args, kwargs);
     
     if (!message)
         return NULL;
     
-    gedit_message_bus_send_message_sync(bus, message);
+    pluma_message_bus_send_message_sync(bus, message);
     return pygobject_new((GObject *)message);
 }
 %%
-override-slot GeditMessage.tp_getattro
+override-slot PlumaMessage.tp_getattro
 static PyObject *
-_wrap_gedit_message_tp_getattro(PyObject *self, PyObject *attrname)
+_wrap_pluma_message_tp_getattro(PyObject *self, PyObject *attrname)
 {
-	GeditMessage *message = GEDIT_MESSAGE(((PyGObject *)self)->obj);
-	GeditMessageType *type;
+	PlumaMessage *message = PLUMA_MESSAGE(((PyGObject *)self)->obj);
+	PlumaMessageType *type;
 
 	gchar *name = _helper_wrap_get_string (attrname);
 	gboolean exists;
@@ -513,10 +513,10 @@ _wrap_gedit_message_tp_getattro(PyObject *self, PyObject *attrname)
 	}
 	
 	g_object_get (message, "type", &type, NULL);
-	intype = gedit_message_type_lookup (type, name) != G_TYPE_INVALID;
-	gedit_message_type_unref (type);
+	intype = pluma_message_type_lookup (type, name) != G_TYPE_INVALID;
+	pluma_message_type_unref (type);
 	
-	exists = gedit_message_has_key (message, name);
+	exists = pluma_message_has_key (message, name);
 	
 	if (!intype)
 	{
@@ -525,7 +525,7 @@ _wrap_gedit_message_tp_getattro(PyObject *self, PyObject *attrname)
 	else if (exists)
 	{
 		GValue value = { 0, };
-		gedit_message_get_value (message, name, &value);
+		pluma_message_get_value (message, name, &value);
 		ret = pyg_value_as_pyobject(&value, TRUE);
 		g_value_unset (&value);
 	}
@@ -539,11 +539,11 @@ _wrap_gedit_message_tp_getattro(PyObject *self, PyObject *attrname)
 	return ret;
 }
 %%
-override-slot GeditMessage.tp_setattro
+override-slot PlumaMessage.tp_setattro
 static int
-_wrap_gedit_message_tp_setattro(PyObject *self, PyObject *attrname, PyObject *value)
+_wrap_pluma_message_tp_setattro(PyObject *self, PyObject *attrname, PyObject *value)
 {
-	GeditMessage *message = GEDIT_MESSAGE(((PyGObject *)self)->obj);
+	PlumaMessage *message = PLUMA_MESSAGE(((PyGObject *)self)->obj);
 
 	if (!_helper_wrap_message_set_value(message, attrname, value))
 	{
diff --git a/plugin-loaders/python/bindings/geditplugin.override b/plugin-loaders/python/bindings/plumaplugin.override
index 178ea997..a2aad78f 100755
--- a/plugin-loaders/python/bindings/geditplugin.override
+++ b/plugin-loaders/python/bindings/plumaplugin.override
@@ -1,11 +1,11 @@
 %%
 headers
-#include <gedit/gedit-plugin.h>
-#include <gedit/gedit-window.h>
+#include <pluma/pluma-plugin.h>
+#include <pluma/pluma-window.h>
 %%
-override gedit_plugin_activate kwargs
+override pluma_plugin_activate kwargs
 static PyObject *
-_wrap_gedit_plugin_activate(PyGObject *self, PyObject *args, PyObject *kwargs)
+_wrap_pluma_plugin_activate(PyGObject *self, PyObject *args, PyObject *kwargs)
 {
 	gpointer klass, klass2;
 	static char *kwlist[] = { "window", NULL };
@@ -14,27 +14,27 @@ _wrap_gedit_plugin_activate(PyGObject *self, PyObject *args, PyObject *kwargs)
 	
 	if (!PyArg_ParseTupleAndKeywords (args, 
 					  kwargs,
-					  "O!:GeditPlugin.activate", 
+					  "O!:PlumaPlugin.activate", 
 					  kwlist,
-					  &PyGeditWindow_Type, 
+					  &PyPlumaWindow_Type, 
 					  &window))
 		return NULL;
 
 	klass = g_type_class_ref (pyg_type_from_object (cls));
 	
-	if (GEDIT_IS_PLUGIN_PYTHON_CLASS (klass))
+	if (PLUMA_IS_PLUGIN_PYTHON_CLASS (klass))
 	{
 		klass2 = g_type_class_peek_parent (klass);
 		g_type_class_unref (klass);
 		klass = g_type_class_ref (G_TYPE_FROM_CLASS (klass2));
 	}
 
-	if (GEDIT_PLUGIN_CLASS (klass)->activate)
-		GEDIT_PLUGIN_CLASS (klass)->activate (GEDIT_PLUGIN (self->obj), 
-						      GEDIT_WINDOW (window->obj));
+	if (PLUMA_PLUGIN_CLASS (klass)->activate)
+		PLUMA_PLUGIN_CLASS (klass)->activate (PLUMA_PLUGIN (self->obj), 
+						      PLUMA_WINDOW (window->obj));
 	else {
 		PyErr_SetString (PyExc_NotImplementedError, 
-				 "virtual method GeditPlugin.activate not implemented");
+				 "virtual method PlumaPlugin.activate not implemented");
 		g_type_class_unref (klass);
 		return NULL;
 	}
@@ -45,9 +45,9 @@ _wrap_gedit_plugin_activate(PyGObject *self, PyObject *args, PyObject *kwargs)
 }
 
 %%
-override gedit_plugin_deactivate kwargs
+override pluma_plugin_deactivate kwargs
 static PyObject *
-_wrap_gedit_plugin_deactivate(PyGObject *self, PyObject *args, PyObject *kwargs)
+_wrap_pluma_plugin_deactivate(PyGObject *self, PyObject *args, PyObject *kwargs)
 {
 	gpointer klass, klass2;
 	static char *kwlist[] = {"window", NULL};
@@ -56,27 +56,27 @@ _wrap_gedit_plugin_deactivate(PyGObject *self, PyObject *args, PyObject *kwargs)
 
 	if (!PyArg_ParseTupleAndKeywords (args, 
 					  kwargs,
-					  "O!:GeditPlugin.deactivate", 
+					  "O!:PlumaPlugin.deactivate", 
 					  kwlist,
-					  &PyGeditWindow_Type, 
+					  &PyPlumaWindow_Type, 
 					  &window))
 		return NULL;
 
 	klass = g_type_class_ref (pyg_type_from_object (cls));
 
-	if (GEDIT_IS_PLUGIN_PYTHON_CLASS (klass))
+	if (PLUMA_IS_PLUGIN_PYTHON_CLASS (klass))
 	{
 		klass2 = g_type_class_peek_parent (klass);
 		g_type_class_unref (klass);
 		klass = g_type_class_ref (G_TYPE_FROM_CLASS (klass2));
 	}
 	
-	if (GEDIT_PLUGIN_CLASS (klass)->deactivate)
-		GEDIT_PLUGIN_CLASS (klass)->deactivate (GEDIT_PLUGIN (self->obj), 
-							GEDIT_WINDOW (window->obj));
+	if (PLUMA_PLUGIN_CLASS (klass)->deactivate)
+		PLUMA_PLUGIN_CLASS (klass)->deactivate (PLUMA_PLUGIN (self->obj), 
+							PLUMA_WINDOW (window->obj));
 	else {
 		PyErr_SetString (PyExc_NotImplementedError, 
-				 "virtual method GeditPlugin.deactivate not implemented");
+				 "virtual method PlumaPlugin.deactivate not implemented");
 		g_type_class_unref (klass);
 		return NULL;
 	}
@@ -87,9 +87,9 @@ _wrap_gedit_plugin_deactivate(PyGObject *self, PyObject *args, PyObject *kwargs)
 }
 
 %%
-override gedit_plugin_update_ui kwargs
+override pluma_plugin_update_ui kwargs
 static PyObject *
-_wrap_gedit_plugin_update_ui (PyGObject *self, PyObject *args, PyObject *kwargs)
+_wrap_pluma_plugin_update_ui (PyGObject *self, PyObject *args, PyObject *kwargs)
 {
 	gpointer klass, klass2;
 	static char *kwlist[] = {"window", NULL};
@@ -98,27 +98,27 @@ _wrap_gedit_plugin_update_ui (PyGObject *self, PyObject *args, PyObject *kwargs)
 
 	if (!PyArg_ParseTupleAndKeywords (args, 
 					  kwargs,
-					  "O!:GeditPlugin.update_ui", 
+					  "O!:PlumaPlugin.update_ui", 
 					  kwlist,
-					  &PyGeditWindow_Type, 
+					  &PyPlumaWindow_Type, 
 					  &window))
 		return NULL;
 
 	klass = g_type_class_ref (pyg_type_from_object (cls));
 
-	if (GEDIT_IS_PLUGIN_PYTHON_CLASS (klass))
+	if (PLUMA_IS_PLUGIN_PYTHON_CLASS (klass))
 	{
 		klass2 = g_type_class_peek_parent (klass);
 		g_type_class_unref (klass);
 		klass = g_type_class_ref (G_TYPE_FROM_CLASS (klass2));
 	}
 	
-	if (GEDIT_PLUGIN_CLASS (klass)->update_ui)
-		GEDIT_PLUGIN_CLASS (klass)->update_ui (GEDIT_PLUGIN (self->obj), 
-						       GEDIT_WINDOW (window->obj));
+	if (PLUMA_PLUGIN_CLASS (klass)->update_ui)
+		PLUMA_PLUGIN_CLASS (klass)->update_ui (PLUMA_PLUGIN (self->obj), 
+						       PLUMA_WINDOW (window->obj));
 	else {
 		PyErr_SetString (PyExc_NotImplementedError, 
-				 "virtual method GeditPlugin.update_ui not implemented");
+				 "virtual method PlumaPlugin.update_ui not implemented");
 		g_type_class_unref (klass);
 		return NULL;
 	}
@@ -129,9 +129,9 @@ _wrap_gedit_plugin_update_ui (PyGObject *self, PyObject *args, PyObject *kwargs)
 }
 
 %%
-override gedit_plugin_is_configurable
+override pluma_plugin_is_configurable
 static PyObject *
-_wrap_gedit_plugin_is_configurable (PyGObject *self)
+_wrap_pluma_plugin_is_configurable (PyGObject *self)
 {
 	int ret;
 	gpointer klass, klass2;
@@ -139,18 +139,18 @@ _wrap_gedit_plugin_is_configurable (PyGObject *self)
 
 	klass = g_type_class_ref (pyg_type_from_object (cls));
 
-	if (GEDIT_IS_PLUGIN_PYTHON_CLASS (klass))
+	if (PLUMA_IS_PLUGIN_PYTHON_CLASS (klass))
 	{
 		klass2 = g_type_class_peek_parent (klass);
 		g_type_class_unref (klass);
 		klass = g_type_class_ref (G_TYPE_FROM_CLASS (klass2));
 	}
 	
-	if (GEDIT_PLUGIN_CLASS (klass)->is_configurable)
-		ret = GEDIT_PLUGIN_CLASS (klass)->is_configurable (GEDIT_PLUGIN (self->obj));
+	if (PLUMA_PLUGIN_CLASS (klass)->is_configurable)
+		ret = PLUMA_PLUGIN_CLASS (klass)->is_configurable (PLUMA_PLUGIN (self->obj));
 	else {
 		PyErr_SetString (PyExc_NotImplementedError, 
-				 "virtual method GeditPlugin.is_configurable not implemented");
+				 "virtual method PlumaPlugin.is_configurable not implemented");
 		g_type_class_unref (klass);
 		return NULL;
 	}
@@ -160,9 +160,9 @@ _wrap_gedit_plugin_is_configurable (PyGObject *self)
 }
 
 %%
-override gedit_plugin_configure_dialog
+override pluma_plugin_configure_dialog
 static PyObject *
-_wrap_gedit_plugin_create_configure_dialog (PyGObject *self)
+_wrap_pluma_plugin_create_configure_dialog (PyGObject *self)
 {
 	GtkWidget *ret;
 	gpointer klass, klass2;
@@ -170,18 +170,18 @@ _wrap_gedit_plugin_create_configure_dialog (PyGObject *self)
 
 	klass = g_type_class_ref(pyg_type_from_object (cls));
 
-	if (GEDIT_IS_PLUGIN_PYTHON_CLASS (klass))
+	if (PLUMA_IS_PLUGIN_PYTHON_CLASS (klass))
 	{
 		klass2 = g_type_class_peek_parent (klass);
 		g_type_class_unref (klass);
 		klass = g_type_class_ref (G_TYPE_FROM_CLASS (klass2));
 	}
 	
-	if (GEDIT_PLUGIN_CLASS (klass)->create_configure_dialog)
-		ret = GEDIT_PLUGIN_CLASS (klass)->create_configure_dialog (GEDIT_PLUGIN (self->obj));
+	if (PLUMA_PLUGIN_CLASS (klass)->create_configure_dialog)
+		ret = PLUMA_PLUGIN_CLASS (klass)->create_configure_dialog (PLUMA_PLUGIN (self->obj));
 	else {
 		PyErr_SetString (PyExc_NotImplementedError, 
-				 "virtual method GeditPlugin.create_configure_dialog not implemented");
+				 "virtual method PlumaPlugin.create_configure_dialog not implemented");
 		g_type_class_unref (klass);
 		return NULL;
 	}
diff --git a/plugin-loaders/python/bindings/geditutils.defs b/plugin-loaders/python/bindings/plumautils.defs
index 3482f21c..a9a4738d 100755
--- a/plugin-loaders/python/bindings/geditutils.defs
+++ b/plugin-loaders/python/bindings/plumautils.defs
@@ -1,9 +1,9 @@
 ;; -*- scheme -*-
 
-;; From ../../gedit/gedit-utils.h
+;; From ../../pluma/pluma-utils.h
 
 (define-function uri_has_writable_scheme
-  (c-name "gedit_utils_uri_has_writable_scheme")
+  (c-name "pluma_utils_uri_has_writable_scheme")
   (return-type "gboolean")
   (parameters
     '("const-gchar*" "uri")
@@ -11,7 +11,7 @@
 )
 
 (define-function uri_has_file_scheme
-  (c-name "gedit_utils_uri_has_file_scheme")
+  (c-name "pluma_utils_uri_has_file_scheme")
   (return-type "gboolean")
   (parameters
     '("const-gchar*" "uri")
@@ -19,7 +19,7 @@
 )
 
 (define-function uri_exists
-  (c-name "gedit_utils_uri_exists")
+  (c-name "pluma_utils_uri_exists")
   (return-type "gboolean")
   (parameters
     '("const-gchar*" "text_uri")
@@ -27,7 +27,7 @@
 )
 
 (define-function uri_is_valid
-  (c-name "gedit_utils_is_valid_uri")
+  (c-name "pluma_utils_is_valid_uri")
   (return-type "gboolean")
   (parameters
     '("const-gchar*" "uri")
@@ -35,7 +35,7 @@
 )
 
 (define-function uri_get_dirname
-  (c-name "gedit_utils_uri_get_dirname")
+  (c-name "pluma_utils_uri_get_dirname")
   (return-type "gchar*")
   (parameters
     '("const-char*" "uri")
@@ -43,7 +43,7 @@
 )
 
 (define-function menu_position_under_widget
-  (c-name "gedit_utils_menu_position_under_widget")
+  (c-name "pluma_utils_menu_position_under_widget")
   (return-type "none")
   (parameters
     '("GtkMenu*" "menu")
@@ -55,7 +55,7 @@
 )
 
 (define-function menu_position_under_tree_view
-  (c-name "gedit_utils_menu_position_under_tree_view")
+  (c-name "pluma_utils_menu_position_under_tree_view")
   (return-type "none")
   (parameters
     '("GtkMenu*" "menu")
diff --git a/plugin-loaders/python/bindings/geditutils.override b/plugin-loaders/python/bindings/plumautils.override
index a7bf7fbe..3b2116e9 100755
--- a/plugin-loaders/python/bindings/geditutils.override
+++ b/plugin-loaders/python/bindings/plumautils.override
@@ -5,13 +5,13 @@ headers
 #include <pygobject.h>
 #include <pygtk/pygtk.h>
 
-#include "gedit-utils.h"
+#include "pluma-utils.h"
 
-void pygeditutils_register_classes (PyObject *d);
-void pygeditutils_add_constants (PyObject *module, const gchar *strip_prefix);
+void pyplumautils_register_classes (PyObject *d);
+void pyplumautils_add_constants (PyObject *module, const gchar *strip_prefix);
 
 %%
-modulename gedit.utils
+modulename pluma.utils
 %%
 import gtk.Widget as PyGtkWidget_Type
 import gtk.TreeView as PyGtkTreeView_Type
@@ -20,9 +20,9 @@ import gtk.Menu as PyGtkMenu_Type
 ignore-glob
   _*
 %%
-override gedit_utils_menu_position_under_widget kwargs
+override pluma_utils_menu_position_under_widget kwargs
 static PyObject *
-_wrap_gedit_utils_menu_position_under_widget (PyObject *self,
+_wrap_pluma_utils_menu_position_under_widget (PyObject *self,
 					      PyObject *args,
 					      PyObject *kwargs)
 {
@@ -43,7 +43,7 @@ _wrap_gedit_utils_menu_position_under_widget (PyObject *self,
 	menu   = GTK_MENU (pygobject_get (py_menu));
 	widget = GTK_WIDGET (pygobject_get (py_widget));
 
-	gedit_utils_menu_position_under_widget (menu, &x, &y, &push_in, widget);
+	pluma_utils_menu_position_under_widget (menu, &x, &y, &push_in, widget);
 
 	tuple = PyTuple_New (3);
 	PyTuple_SetItem (tuple, 0, PyInt_FromLong (x));
@@ -52,9 +52,9 @@ _wrap_gedit_utils_menu_position_under_widget (PyObject *self,
 	return tuple;
 }
 %%
-override gedit_utils_menu_position_under_tree_view kwargs
+override pluma_utils_menu_position_under_tree_view kwargs
 static PyObject *
-_wrap_gedit_utils_menu_position_under_tree_view (PyObject *self,
+_wrap_pluma_utils_menu_position_under_tree_view (PyObject *self,
 					         PyObject *args,
 					         PyObject *kwargs)
 {
@@ -75,7 +75,7 @@ _wrap_gedit_utils_menu_position_under_tree_view (PyObject *self,
 	menu = GTK_MENU (pygobject_get (py_menu));
 	view = GTK_TREE_VIEW (pygobject_get (py_view));
 
-	gedit_utils_menu_position_under_widget (menu, &x, &y, &push_in, view);
+	pluma_utils_menu_position_under_widget (menu, &x, &y, &push_in, view);
 
 	tuple = PyTuple_New (3);
 	PyTuple_SetItem (tuple, 0, PyInt_FromLong (x));
diff --git a/plugin-loaders/python/gedit-plugin-loader-python.h b/plugin-loaders/python/gedit-plugin-loader-python.h
deleted file mode 100755
index 35ae241c..00000000
--- a/plugin-loaders/python/gedit-plugin-loader-python.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * gedit-plugin-loader-python.h
- * This file is part of gedit
- *
- * Copyright (C) 2008 - Jesse van den Kieboom
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, 
- * Boston, MA 02111-1307, USA. 
- */
-
-#ifndef __GEDIT_PLUGIN_LOADER_PYTHON_H__
-#define __GEDIT_PLUGIN_LOADER_PYTHON_H__
-
-#include <gedit/gedit-plugin-loader.h>
-
-G_BEGIN_DECLS
-
-#define GEDIT_TYPE_PLUGIN_LOADER_PYTHON		(gedit_plugin_loader_python_get_type ())
-#define GEDIT_PLUGIN_LOADER_PYTHON(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GEDIT_TYPE_PLUGIN_LOADER_PYTHON, GeditPluginLoaderPython))
-#define GEDIT_PLUGIN_LOADER_PYTHON_CONST(obj)	(G_TYPE_CHECK_INSTANCE_CAST ((obj), GEDIT_TYPE_PLUGIN_LOADER_PYTHON, GeditPluginLoaderPython const))
-#define GEDIT_PLUGIN_LOADER_PYTHON_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GEDIT_TYPE_PLUGIN_LOADER_PYTHON, GeditPluginLoaderPythonClass))
-#define GEDIT_IS_PLUGIN_LOADER_PYTHON(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEDIT_TYPE_PLUGIN_LOADER_PYTHON))
-#define GEDIT_IS_PLUGIN_LOADER_PYTHON_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GEDIT_TYPE_PLUGIN_LOADER_PYTHON))
-#define GEDIT_PLUGIN_LOADER_PYTHON_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GEDIT_TYPE_PLUGIN_LOADER_PYTHON, GeditPluginLoaderPythonClass))
-
-typedef struct _GeditPluginLoaderPython		GeditPluginLoaderPython;
-typedef struct _GeditPluginLoaderPythonClass		GeditPluginLoaderPythonClass;
-typedef struct _GeditPluginLoaderPythonPrivate	GeditPluginLoaderPythonPrivate;
-
-struct _GeditPluginLoaderPython {
-	GObject parent;
-	
-	GeditPluginLoaderPythonPrivate *priv;
-};
-
-struct _GeditPluginLoaderPythonClass {
-	GObjectClass parent_class;
-};
-
-GType gedit_plugin_loader_python_get_type (void) G_GNUC_CONST;
-GeditPluginLoaderPython *gedit_plugin_loader_python_new(void);
-
-/* All the loaders must implement this function */
-G_MODULE_EXPORT GType register_gedit_plugin_loader (GTypeModule * module);
-
-G_END_DECLS
-
-#endif /* __GEDIT_PLUGIN_LOADER_PYTHON_H__ */
-
diff --git a/plugin-loaders/python/gedit-plugin-python.h b/plugin-loaders/python/gedit-plugin-python.h
deleted file mode 100755
index e67584b0..00000000
--- a/plugin-loaders/python/gedit-plugin-python.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * gedit-plugin-python.h
- * This file is part of gedit
- *
- * Copyright (C) 2005 - Raphael Slinckx
- * Copyright (C) 2008 - Jesse van den Kieboom
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, 
- * Boston, MA 02111-1307, USA. 
- */
-
-#ifndef __GEDIT_PLUGIN_PYTHON_H__
-#define __GEDIT_PLUGIN_PYTHON_H__
-
-#define NO_IMPORT_PYGOBJECT
-
-#include <glib-object.h>
-#include <pygobject.h>
-
-#include <gedit/gedit-plugin.h>
-
-G_BEGIN_DECLS
-
-/*
- * Type checking and casting macros
- */
-#define GEDIT_TYPE_PLUGIN_PYTHON		(gedit_plugin_python_get_type())
-#define GEDIT_PLUGIN_PYTHON(obj)		(G_TYPE_CHECK_INSTANCE_CAST((obj), GEDIT_TYPE_PLUGIN_PYTHON, GeditPluginPython))
-#define GEDIT_PLUGIN_PYTHON_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST((klass), GEDIT_TYPE_PLUGIN_PYTHON, GeditPluginPythonClass))
-#define GEDIT_IS_PLUGIN_PYTHON(obj)		(G_TYPE_CHECK_INSTANCE_TYPE((obj), GEDIT_TYPE_PLUGIN_PYTHON))
-#define GEDIT_IS_PLUGIN_PYTHON_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GEDIT_TYPE_PLUGIN_PYTHON))
-#define GEDIT_PLUGIN_PYTHON_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), GEDIT_TYPE_PLUGIN_PYTHON, GeditPluginPythonClass))
-
-/* Private structure type */
-typedef struct _GeditPluginPythonPrivate GeditPluginPythonPrivate;
-
-/*
- * Main object structure
- */
-typedef struct _GeditPluginPython GeditPluginPython;
-
-struct _GeditPluginPython 
-{
-	GeditPlugin parent;
-	
-	/*< private > */
-	GeditPluginPythonPrivate *priv;
-};
-
-/*
- * Class definition
- */
-typedef struct _GeditPluginPythonClass GeditPluginPythonClass;
-
-struct _GeditPluginPythonClass 
-{
-	GeditPluginClass parent_class;
-};
-
-/*
- * Public methods
- */
-GType	 gedit_plugin_python_get_type 		(void) G_GNUC_CONST;
-
-
-/* 
- * Private methods
- */
-void	  _gedit_plugin_python_set_instance	(GeditPluginPython *plugin, 
-						 PyObject 	   *instance);
-PyObject *_gedit_plugin_python_get_instance	(GeditPluginPython *plugin);
-
-G_END_DECLS
-
-#endif  /* __GEDIT_PLUGIN_PYTHON_H__ */
-
diff --git a/plugin-loaders/python/gedit-plugin-loader-python.c b/plugin-loaders/python/pluma-plugin-loader-python.c
index 7a9c8d18..140fbb7d 100755
--- a/plugin-loaders/python/gedit-plugin-loader-python.c
+++ b/plugin-loaders/python/pluma-plugin-loader-python.c
@@ -1,6 +1,6 @@
 /*
- * gedit-plugin-loader-python.c
- * This file is part of gedit
+ * pluma-plugin-loader-python.c
+ * This file is part of pluma
  *
  * Copyright (C) 2008 - Jesse van den Kieboom
  *
@@ -20,9 +20,9 @@
  * Boston, MA 02111-1307, USA. 
  */
 
-#include "gedit-plugin-loader-python.h"
-#include "gedit-plugin-python.h"
-#include <gedit/gedit-object-module.h>
+#include "pluma-plugin-loader-python.h"
+#include "pluma-plugin-python.h"
+#include <pluma/pluma-object-module.h>
 
 #define NO_IMPORT_PYGOBJECT
 #define NO_IMPORT_PYGTK
@@ -39,9 +39,9 @@ typedef int Py_ssize_t;
 #define PY_SSIZE_T_MIN INT_MIN
 #endif
 
-#define GEDIT_PLUGIN_LOADER_PYTHON_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GEDIT_TYPE_PLUGIN_LOADER_PYTHON, GeditPluginLoaderPythonPrivate))
+#define PLUMA_PLUGIN_LOADER_PYTHON_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), PLUMA_TYPE_PLUGIN_LOADER_PYTHON, PlumaPluginLoaderPythonPrivate))
 
-struct _GeditPluginLoaderPythonPrivate
+struct _PlumaPluginLoaderPythonPrivate
 {
 	GHashTable *loaded_plugins;
 	guint idle_gc;
@@ -55,29 +55,29 @@ typedef struct
 	gchar    *path;
 } PythonInfo;
 
-static void gedit_plugin_loader_iface_init (gpointer g_iface, gpointer iface_data);
+static void pluma_plugin_loader_iface_init (gpointer g_iface, gpointer iface_data);
 
-/* Exported by pygedit module */
-void pygedit_register_classes (PyObject *d);
-void pygedit_add_constants (PyObject *module, const gchar *strip_prefix);
-extern PyMethodDef pygedit_functions[];
+/* Exported by pypluma module */
+void pypluma_register_classes (PyObject *d);
+void pypluma_add_constants (PyObject *module, const gchar *strip_prefix);
+extern PyMethodDef pypluma_functions[];
 
-/* Exported by pygeditutils module */
-void pygeditutils_register_classes (PyObject *d);
-extern PyMethodDef pygeditutils_functions[];
+/* Exported by pyplumautils module */
+void pyplumautils_register_classes (PyObject *d);
+extern PyMethodDef pyplumautils_functions[];
 
-/* Exported by pygeditcommands module */
-void pygeditcommands_register_classes (PyObject *d);
-extern PyMethodDef pygeditcommands_functions[];
+/* Exported by pyplumacommands module */
+void pyplumacommands_register_classes (PyObject *d);
+extern PyMethodDef pyplumacommands_functions[];
 
 /* We retreive this to check for correct class hierarchy */
-static PyTypeObject *PyGeditPlugin_Type;
+static PyTypeObject *PyPlumaPlugin_Type;
 
-GEDIT_PLUGIN_LOADER_REGISTER_TYPE (GeditPluginLoaderPython, gedit_plugin_loader_python, G_TYPE_OBJECT, gedit_plugin_loader_iface_init);
+PLUMA_PLUGIN_LOADER_REGISTER_TYPE (PlumaPluginLoaderPython, pluma_plugin_loader_python, G_TYPE_OBJECT, pluma_plugin_loader_iface_init);
 
 
 static PyObject *
-find_python_plugin_type (GeditPluginInfo *info,
+find_python_plugin_type (PlumaPluginInfo *info,
 			 PyObject        *pymodule)
 {
 	PyObject *locals, *key, *value;
@@ -90,24 +90,24 @@ find_python_plugin_type (GeditPluginInfo *info,
 		if (!PyType_Check(value))
 			continue;
 
-		if (PyObject_IsSubclass (value, (PyObject*) PyGeditPlugin_Type))
+		if (PyObject_IsSubclass (value, (PyObject*) PyPlumaPlugin_Type))
 			return value;
 	}
 	
-	g_warning ("No GeditPlugin derivative found in Python plugin '%s'",
-		   gedit_plugin_info_get_name (info));
+	g_warning ("No PlumaPlugin derivative found in Python plugin '%s'",
+		   pluma_plugin_info_get_name (info));
 	return NULL;
 }
 
-static GeditPlugin *
-new_plugin_from_info (GeditPluginLoaderPython *loader,
-		      GeditPluginInfo         *info)
+static PlumaPlugin *
+new_plugin_from_info (PlumaPluginLoaderPython *loader,
+		      PlumaPluginInfo         *info)
 {
 	PythonInfo *pyinfo;
 	PyTypeObject *pytype;
 	PyObject *pyobject;
 	PyGObject *pygobject;
-	GeditPlugin *instance;
+	PlumaPlugin *instance;
 	PyObject *emptyarg;
 
 	pyinfo = (PythonInfo *)g_hash_table_lookup (loader->priv->loaded_plugins, info);
@@ -126,7 +126,7 @@ new_plugin_from_info (GeditPluginLoaderPython *loader,
 	
 	if (pyobject == NULL)
 	{
-		g_error ("Could not create instance for %s.", gedit_plugin_info_get_name (info));
+		g_error ("Could not create instance for %s.", pluma_plugin_info_get_name (info));
 		return NULL;
 	}
 
@@ -135,18 +135,18 @@ new_plugin_from_info (GeditPluginLoaderPython *loader,
 	if (pygobject->obj != NULL)
 	{
 		Py_DECREF (pyobject);
-		g_error ("Could not create instance for %s (GObject already initialized).", gedit_plugin_info_get_name (info));
+		g_error ("Could not create instance for %s (GObject already initialized).", pluma_plugin_info_get_name (info));
 		return NULL;
 	}
 	
 	pygobject_construct (pygobject,
 			     "install-dir", pyinfo->path,
-			     "data-dir-name", gedit_plugin_info_get_module_name (info),
+			     "data-dir-name", pluma_plugin_info_get_module_name (info),
 			     NULL);
 	
 	if (pygobject->obj == NULL)
 	{
-		g_error ("Could not create instance for %s (GObject not constructed).", gedit_plugin_info_get_name (info));
+		g_error ("Could not create instance for %s (GObject not constructed).", pluma_plugin_info_get_name (info));
 		Py_DECREF (pyobject);
 
 		return NULL;
@@ -161,20 +161,20 @@ new_plugin_from_info (GeditPluginLoaderPython *loader,
 		Py_DECREF (emptyarg);
 	}
 
-	instance = GEDIT_PLUGIN (pygobject->obj);
+	instance = PLUMA_PLUGIN (pygobject->obj);
 	pyinfo->instance = (PyObject *)pygobject;
 
-	/* make sure to register the python instance for the GeditPluginPython
-	   object to it can wrap the virtual gedit plugin funcs back to python */
-	_gedit_plugin_python_set_instance (GEDIT_PLUGIN_PYTHON (instance), (PyObject *)pygobject);
+	/* make sure to register the python instance for the PlumaPluginPython
+	   object to it can wrap the virtual pluma plugin funcs back to python */
+	_pluma_plugin_python_set_instance (PLUMA_PLUGIN_PYTHON (instance), (PyObject *)pygobject);
 	
 	/* we return a reference here because the other is owned by python */
-	return GEDIT_PLUGIN (g_object_ref (instance));
+	return PLUMA_PLUGIN (g_object_ref (instance));
 }
 
-static GeditPlugin *
-add_python_info (GeditPluginLoaderPython *loader,
-		 GeditPluginInfo         *info,
+static PlumaPlugin *
+add_python_info (PlumaPluginLoaderPython *loader,
+		 PlumaPluginInfo         *info,
 		 PyObject		 *module,
 		 const gchar             *path,
 		 PyObject                *type)
@@ -193,27 +193,27 @@ add_python_info (GeditPluginLoaderPython *loader,
 }
 
 static const gchar *
-gedit_plugin_loader_iface_get_id (void)
+pluma_plugin_loader_iface_get_id (void)
 {
 	return "Python";
 }
 
-static GeditPlugin *
-gedit_plugin_loader_iface_load (GeditPluginLoader *loader,
-				GeditPluginInfo   *info,
+static PlumaPlugin *
+pluma_plugin_loader_iface_load (PlumaPluginLoader *loader,
+				PlumaPluginInfo   *info,
 				const gchar       *path)
 {
-	GeditPluginLoaderPython *pyloader = GEDIT_PLUGIN_LOADER_PYTHON (loader);
+	PlumaPluginLoaderPython *pyloader = PLUMA_PLUGIN_LOADER_PYTHON (loader);
 	PyObject *main_module, *main_locals, *pytype;
 	PyObject *pymodule, *fromlist;
 	gchar *module_name;
-	GeditPlugin *result;
+	PlumaPlugin *result;
 	
 	if (pyloader->priv->init_failed)
 	{
-		g_warning ("Cannot load python plugin Python '%s' since gedit was"
+		g_warning ("Cannot load python plugin Python '%s' since pluma was"
 		           "not able to initialize the Python interpreter.",
-		           gedit_plugin_info_get_name (info));
+		           pluma_plugin_info_get_name (info));
 		return NULL;
 	}
 	
@@ -223,10 +223,10 @@ gedit_plugin_loader_iface_load (GeditPluginLoader *loader,
 	if (result != NULL)
 		return result;
 	
-	main_module = PyImport_AddModule ("gedit.plugins");
+	main_module = PyImport_AddModule ("pluma.plugins");
 	if (main_module == NULL)
 	{
-		g_warning ("Could not get gedit.plugins.");
+		g_warning ("Could not get pluma.plugins.");
 		return NULL;
 	}
 	
@@ -247,7 +247,7 @@ gedit_plugin_loader_iface_load (GeditPluginLoader *loader,
 	/* we need a fromlist to be able to import modules with a '.' in the
 	   name. */
 	fromlist = PyTuple_New(0);
-	module_name = g_strdup (gedit_plugin_info_get_module_name (info));
+	module_name = g_strdup (pluma_plugin_info_get_module_name (info));
 	
 	pymodule = PyImport_ImportModuleEx (module_name, 
 					    main_locals, 
@@ -275,10 +275,10 @@ gedit_plugin_loader_iface_load (GeditPluginLoader *loader,
 }
 
 static void
-gedit_plugin_loader_iface_unload (GeditPluginLoader *loader,
-				  GeditPluginInfo   *info)
+pluma_plugin_loader_iface_unload (PlumaPluginLoader *loader,
+				  PlumaPluginInfo   *info)
 {
-	GeditPluginLoaderPython *pyloader = GEDIT_PLUGIN_LOADER_PYTHON (loader);
+	PlumaPluginLoaderPython *pyloader = PLUMA_PLUGIN_LOADER_PYTHON (loader);
 	PythonInfo *pyinfo;
 	PyGILState_STATE state;
 	
@@ -295,7 +295,7 @@ gedit_plugin_loader_iface_unload (GeditPluginLoader *loader,
 }
 
 static gboolean
-run_gc (GeditPluginLoaderPython *loader)
+run_gc (PlumaPluginLoaderPython *loader)
 {
 	while (PyGC_Collect ())
 		;
@@ -305,14 +305,14 @@ run_gc (GeditPluginLoaderPython *loader)
 }
 
 static void
-gedit_plugin_loader_iface_garbage_collect (GeditPluginLoader *loader)
+pluma_plugin_loader_iface_garbage_collect (PlumaPluginLoader *loader)
 {
-	GeditPluginLoaderPython *pyloader;
+	PlumaPluginLoaderPython *pyloader;
 	
 	if (!Py_IsInitialized())
 		return;
 
-	pyloader = GEDIT_PLUGIN_LOADER_PYTHON (loader);
+	pyloader = PLUMA_PLUGIN_LOADER_PYTHON (loader);
 
 	/*
 	 * We both run the GC right now and we schedule
@@ -327,19 +327,19 @@ gedit_plugin_loader_iface_garbage_collect (GeditPluginLoader *loader)
 }
 
 static void
-gedit_plugin_loader_iface_init (gpointer g_iface, 
+pluma_plugin_loader_iface_init (gpointer g_iface, 
 				gpointer iface_data)
 {
-	GeditPluginLoaderInterface *iface = (GeditPluginLoaderInterface *)g_iface;
+	PlumaPluginLoaderInterface *iface = (PlumaPluginLoaderInterface *)g_iface;
 	
-	iface->get_id = gedit_plugin_loader_iface_get_id;
-	iface->load = gedit_plugin_loader_iface_load;
-	iface->unload = gedit_plugin_loader_iface_unload;
-	iface->garbage_collect = gedit_plugin_loader_iface_garbage_collect;
+	iface->get_id = pluma_plugin_loader_iface_get_id;
+	iface->load = pluma_plugin_loader_iface_load;
+	iface->unload = pluma_plugin_loader_iface_unload;
+	iface->garbage_collect = pluma_plugin_loader_iface_garbage_collect;
 }
 
 static void
-gedit_python_shutdown (GeditPluginLoaderPython *loader)
+pluma_python_shutdown (PlumaPluginLoaderPython *loader)
 {
 	if (!Py_IsInitialized ())
 		return;
@@ -362,7 +362,7 @@ gedit_python_shutdown (GeditPluginLoaderPython *loader)
  *    pygtk.require ("2.0")
  */
 static gboolean
-gedit_check_pygtk2 (void)
+pluma_check_pygtk2 (void)
 {
 	PyObject *pygtk, *mdict, *require;
 
@@ -394,13 +394,13 @@ gedit_check_pygtk2 (void)
  * It's up to the caller to check the result with PyErr_Occurred()
  */
 static void
-gedit_init_pygobject (void)
+pluma_init_pygobject (void)
 {
 	init_pygobject_check (2, 11, 5); /* FIXME: get from config */
 }
 
 static void
-gedit_init_pygtk (void)
+pluma_init_pygtk (void)
 {
 	PyObject *gtk, *mdict, *version, *required_version;
 
@@ -439,7 +439,7 @@ old_gtksourceview_init (void)
 }
 
 static void
-gedit_init_pygtksourceview (void)
+pluma_init_pygtksourceview (void)
 {
 	PyObject *gtksourceview, *mdict, *version, *required_version;
 
@@ -481,13 +481,13 @@ gedit_init_pygtksourceview (void)
 }
 
 static gboolean
-gedit_python_init (GeditPluginLoaderPython *loader)
+pluma_python_init (PlumaPluginLoaderPython *loader)
 {
 	PyObject *mdict, *tuple;
-	PyObject *gedit, *geditutils, *geditcommands, *geditplugins;
+	PyObject *pluma, *plumautils, *plumacommands, *plumaplugins;
 	PyObject *gettext, *install, *gettext_args;
-	//char *argv[] = { "gedit", NULL };
-	char *argv[] = { GEDIT_PLUGINS_LIBS_DIR, NULL };
+	//char *argv[] = { "pluma", NULL };
+	char *argv[] = { PLUMA_PLUGINS_LIBS_DIR, NULL };
 #ifdef HAVE_SIGACTION
 	gint res;
 	struct sigaction old_sigint;
@@ -548,14 +548,14 @@ gedit_python_init (GeditPluginLoaderPython *loader)
 
 	PySys_SetArgv (1, argv);
 
-	if (!gedit_check_pygtk2 ())
+	if (!pluma_check_pygtk2 ())
 	{
 		/* Warning message already printed in check_pygtk2 */
 		goto python_init_error;
 	}
 
 	/* import gobject */	
-	gedit_init_pygobject ();
+	pluma_init_pygobject ();
 	if (PyErr_Occurred ())
 	{
 		g_warning ("Error initializing Python interpreter: could not import pygobject.");
@@ -564,7 +564,7 @@ gedit_python_init (GeditPluginLoaderPython *loader)
 	}
 
 	/* import gtk */
-	gedit_init_pygtk ();
+	pluma_init_pygtk ();
 	if (PyErr_Occurred ())
 	{
 		g_warning ("Error initializing Python interpreter: could not import pygtk.");
@@ -573,7 +573,7 @@ gedit_python_init (GeditPluginLoaderPython *loader)
 	}
 	
 	/* import gtksourceview */
-	gedit_init_pygtksourceview ();
+	pluma_init_pygtksourceview ();
 	if (PyErr_Occurred ())
 	{
 		PyErr_Print ();
@@ -583,47 +583,47 @@ gedit_python_init (GeditPluginLoaderPython *loader)
 		goto python_init_error;
 	}	
 	
-	/* import gedit */
-	gedit = Py_InitModule ("gedit", pygedit_functions);
-	mdict = PyModule_GetDict (gedit);
+	/* import pluma */
+	pluma = Py_InitModule ("pluma", pypluma_functions);
+	mdict = PyModule_GetDict (pluma);
 
-	pygedit_register_classes (mdict);
-	pygedit_add_constants (gedit, "GEDIT_");
+	pypluma_register_classes (mdict);
+	pypluma_add_constants (pluma, "PLUMA_");
 
-	/* gedit version */
+	/* pluma version */
 	tuple = Py_BuildValue("(iii)", 
-			      GEDIT_MAJOR_VERSION,
-			      GEDIT_MINOR_VERSION,
-			      GEDIT_MICRO_VERSION);
+			      PLUMA_MAJOR_VERSION,
+			      PLUMA_MINOR_VERSION,
+			      PLUMA_MICRO_VERSION);
 	PyDict_SetItemString(mdict, "version", tuple);
 	Py_DECREF(tuple);
 	
-	/* Retrieve the Python type for gedit.Plugin */
-	PyGeditPlugin_Type = (PyTypeObject *) PyDict_GetItemString (mdict, "Plugin"); 
-	if (PyGeditPlugin_Type == NULL)
+	/* Retrieve the Python type for pluma.Plugin */
+	PyPlumaPlugin_Type = (PyTypeObject *) PyDict_GetItemString (mdict, "Plugin"); 
+	if (PyPlumaPlugin_Type == NULL)
 	{
 		PyErr_Print ();
 
 		goto python_init_error;
 	}
 
-	/* import gedit.utils */
-	geditutils = Py_InitModule ("gedit.utils", pygeditutils_functions);
-	PyDict_SetItemString (mdict, "utils", geditutils);
+	/* import pluma.utils */
+	plumautils = Py_InitModule ("pluma.utils", pyplumautils_functions);
+	PyDict_SetItemString (mdict, "utils", plumautils);
 
-	/* import gedit.commands */
-	geditcommands = Py_InitModule ("gedit.commands", pygeditcommands_functions);
-	PyDict_SetItemString (mdict, "commands", geditcommands);
+	/* import pluma.commands */
+	plumacommands = Py_InitModule ("pluma.commands", pyplumacommands_functions);
+	PyDict_SetItemString (mdict, "commands", plumacommands);
 
-	/* initialize empty gedit.plugins module */
-	geditplugins = Py_InitModule ("gedit.plugins", NULL);
-	PyDict_SetItemString (mdict, "plugins", geditplugins);
+	/* initialize empty pluma.plugins module */
+	plumaplugins = Py_InitModule ("pluma.plugins", NULL);
+	PyDict_SetItemString (mdict, "plugins", plumaplugins);
 
-	mdict = PyModule_GetDict (geditutils);
-	pygeditutils_register_classes (mdict);
+	mdict = PyModule_GetDict (plumautils);
+	pyplumautils_register_classes (mdict);
 	
-	mdict = PyModule_GetDict (geditcommands);
-	pygeditcommands_register_classes (mdict);
+	mdict = PyModule_GetDict (plumacommands);
+	pyplumacommands_register_classes (mdict);
 
 	/* i18n support */
 	gettext = PyImport_ImportModule ("gettext");
@@ -636,7 +636,7 @@ gedit_python_init (GeditPluginLoaderPython *loader)
 
 	mdict = PyModule_GetDict (gettext);
 	install = PyDict_GetItemString (mdict, "install");
-	gettext_args = Py_BuildValue ("ss", GETTEXT_PACKAGE, GEDIT_LOCALEDIR);
+	gettext_args = Py_BuildValue ("ss", GETTEXT_PACKAGE, PLUMA_LOCALEDIR);
 	PyObject_CallObject (install, gettext_args);
 	Py_DECREF (gettext_args);
 	
@@ -648,38 +648,38 @@ gedit_python_init (GeditPluginLoaderPython *loader)
 python_init_error:
 
 	g_warning ("Please check the installation of all the Python related packages required "
-	           "by gedit and try again.");
+	           "by pluma and try again.");
 
 	PyErr_Clear ();
 
-	gedit_python_shutdown (loader);
+	pluma_python_shutdown (loader);
 
 	return FALSE;
 }
 
 static void
-gedit_plugin_loader_python_finalize (GObject *object)
+pluma_plugin_loader_python_finalize (GObject *object)
 {
-	GeditPluginLoaderPython *pyloader = GEDIT_PLUGIN_LOADER_PYTHON (object);
+	PlumaPluginLoaderPython *pyloader = PLUMA_PLUGIN_LOADER_PYTHON (object);
 	
 	g_hash_table_destroy (pyloader->priv->loaded_plugins);
-	gedit_python_shutdown (pyloader);
+	pluma_python_shutdown (pyloader);
 
-	G_OBJECT_CLASS (gedit_plugin_loader_python_parent_class)->finalize (object);
+	G_OBJECT_CLASS (pluma_plugin_loader_python_parent_class)->finalize (object);
 }
 
 static void
-gedit_plugin_loader_python_class_init (GeditPluginLoaderPythonClass *klass)
+pluma_plugin_loader_python_class_init (PlumaPluginLoaderPythonClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	
-	object_class->finalize = gedit_plugin_loader_python_finalize;
+	object_class->finalize = pluma_plugin_loader_python_finalize;
 
-	g_type_class_add_private (object_class, sizeof (GeditPluginLoaderPythonPrivate));
+	g_type_class_add_private (object_class, sizeof (PlumaPluginLoaderPythonPrivate));
 }
 
 static void
-gedit_plugin_loader_python_class_finalize (GeditPluginLoaderPythonClass *klass)
+pluma_plugin_loader_python_class_finalize (PlumaPluginLoaderPythonClass *klass)
 {
 }
 
@@ -695,25 +695,25 @@ destroy_python_info (PythonInfo *info)
 }
 
 static void
-gedit_plugin_loader_python_init (GeditPluginLoaderPython *self)
+pluma_plugin_loader_python_init (PlumaPluginLoaderPython *self)
 {
-	self->priv = GEDIT_PLUGIN_LOADER_PYTHON_GET_PRIVATE (self);
+	self->priv = PLUMA_PLUGIN_LOADER_PYTHON_GET_PRIVATE (self);
 	
 	/* initialize python interpreter */
-	gedit_python_init (self);
+	pluma_python_init (self);
 
-	/* loaded_plugins maps GeditPluginInfo to a PythonInfo */
+	/* loaded_plugins maps PlumaPluginInfo to a PythonInfo */
 	self->priv->loaded_plugins = g_hash_table_new_full (g_direct_hash,
 						            g_direct_equal,
 						            NULL,
 						            (GDestroyNotify)destroy_python_info);
 }
 
-GeditPluginLoaderPython *
-gedit_plugin_loader_python_new ()
+PlumaPluginLoaderPython *
+pluma_plugin_loader_python_new ()
 {
-	GObject *loader = g_object_new (GEDIT_TYPE_PLUGIN_LOADER_PYTHON, NULL);
+	GObject *loader = g_object_new (PLUMA_TYPE_PLUGIN_LOADER_PYTHON, NULL);
 
-	return GEDIT_PLUGIN_LOADER_PYTHON (loader);
+	return PLUMA_PLUGIN_LOADER_PYTHON (loader);
 }
 
diff --git a/plugin-loaders/python/pluma-plugin-loader-python.h b/plugin-loaders/python/pluma-plugin-loader-python.h
new file mode 100755
index 00000000..884b4895
--- /dev/null
+++ b/plugin-loaders/python/pluma-plugin-loader-python.h
@@ -0,0 +1,61 @@
+/*
+ * pluma-plugin-loader-python.h
+ * This file is part of pluma
+ *
+ * Copyright (C) 2008 - Jesse van den Kieboom
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, 
+ * Boston, MA 02111-1307, USA. 
+ */
+
+#ifndef __PLUMA_PLUGIN_LOADER_PYTHON_H__
+#define __PLUMA_PLUGIN_LOADER_PYTHON_H__
+
+#include <pluma/pluma-plugin-loader.h>
+
+G_BEGIN_DECLS
+
+#define PLUMA_TYPE_PLUGIN_LOADER_PYTHON		(pluma_plugin_loader_python_get_type ())
+#define PLUMA_PLUGIN_LOADER_PYTHON(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), PLUMA_TYPE_PLUGIN_LOADER_PYTHON, PlumaPluginLoaderPython))
+#define PLUMA_PLUGIN_LOADER_PYTHON_CONST(obj)	(G_TYPE_CHECK_INSTANCE_CAST ((obj), PLUMA_TYPE_PLUGIN_LOADER_PYTHON, PlumaPluginLoaderPython const))
+#define PLUMA_PLUGIN_LOADER_PYTHON_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), PLUMA_TYPE_PLUGIN_LOADER_PYTHON, PlumaPluginLoaderPythonClass))
+#define PLUMA_IS_PLUGIN_LOADER_PYTHON(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), PLUMA_TYPE_PLUGIN_LOADER_PYTHON))
+#define PLUMA_IS_PLUGIN_LOADER_PYTHON_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), PLUMA_TYPE_PLUGIN_LOADER_PYTHON))
+#define PLUMA_PLUGIN_LOADER_PYTHON_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), PLUMA_TYPE_PLUGIN_LOADER_PYTHON, PlumaPluginLoaderPythonClass))
+
+typedef struct _PlumaPluginLoaderPython		PlumaPluginLoaderPython;
+typedef struct _PlumaPluginLoaderPythonClass		PlumaPluginLoaderPythonClass;
+typedef struct _PlumaPluginLoaderPythonPrivate	PlumaPluginLoaderPythonPrivate;
+
+struct _PlumaPluginLoaderPython {
+	GObject parent;
+	
+	PlumaPluginLoaderPythonPrivate *priv;
+};
+
+struct _PlumaPluginLoaderPythonClass {
+	GObjectClass parent_class;
+};
+
+GType pluma_plugin_loader_python_get_type (void) G_GNUC_CONST;
+PlumaPluginLoaderPython *pluma_plugin_loader_python_new(void);
+
+/* All the loaders must implement this function */
+G_MODULE_EXPORT GType register_pluma_plugin_loader (GTypeModule * module);
+
+G_END_DECLS
+
+#endif /* __PLUMA_PLUGIN_LOADER_PYTHON_H__ */
+
diff --git a/plugin-loaders/python/gedit-plugin-python.c b/plugin-loaders/python/pluma-plugin-python.c
index 0573828b..c26f81cb 100755
--- a/plugin-loaders/python/gedit-plugin-python.c
+++ b/plugin-loaders/python/pluma-plugin-python.c
@@ -1,6 +1,6 @@
 /*
- * gedit-plugin-python.c
- * This file is part of gedit
+ * pluma-plugin-python.c
+ * This file is part of pluma
  *
  * Copyright (C) 2005 Raphael Slinckx
  * Copyright (C) 2008 Jesse van den Kieboom
@@ -23,30 +23,30 @@
 
 #include <config.h>
 
-#include "gedit-plugin-python.h"
+#include "pluma-plugin-python.h"
 
-#include <gedit/gedit-plugin.h>
-#include <gedit/gedit-debug.h>
+#include <pluma/pluma-plugin.h>
+#include <pluma/pluma-debug.h>
 #include <pygobject.h>
 #include <string.h>
 
-#define GEDIT_PLUGIN_PYTHON_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), GEDIT_TYPE_PLUGIN_PYTHON, GeditPluginPythonPrivate))
+#define PLUMA_PLUGIN_PYTHON_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), PLUMA_TYPE_PLUGIN_PYTHON, PlumaPluginPythonPrivate))
 
 static GObjectClass *parent_class;
 
-struct _GeditPluginPythonPrivate 
+struct _PlumaPluginPythonPrivate 
 {
 	PyObject *instance;
 };
 
-static void	 gedit_plugin_python_class_init		(GeditPluginPythonClass *klass);
-static void	 gedit_plugin_python_init 		(GeditPluginPython      *plugin);
+static void	 pluma_plugin_python_class_init		(PlumaPluginPythonClass *klass);
+static void	 pluma_plugin_python_init 		(PlumaPluginPython      *plugin);
 
-G_DEFINE_TYPE (GeditPluginPython, gedit_plugin_python, GEDIT_TYPE_PLUGIN)
+G_DEFINE_TYPE (PlumaPluginPython, pluma_plugin_python, PLUMA_TYPE_PLUGIN)
 
 static PyObject *
-call_python_method (GeditPluginPythonPrivate *priv,
-		    GeditWindow		     *window,
+call_python_method (PlumaPluginPythonPrivate *priv,
+		    PlumaWindow		     *window,
 		    gchar		     *method)
 {
 	PyObject *py_ret = NULL;
@@ -101,11 +101,11 @@ check_py_object_is_gtk_widget (PyObject *py_obj)
 }
 
 static void
-impl_update_ui (GeditPlugin *plugin,
-		GeditWindow *window)
+impl_update_ui (PlumaPlugin *plugin,
+		PlumaWindow *window)
 {
 	PyGILState_STATE state = pyg_gil_state_ensure ();
-	GeditPluginPythonPrivate *priv = GEDIT_PLUGIN_PYTHON(plugin)->priv;
+	PlumaPluginPythonPrivate *priv = PLUMA_PLUGIN_PYTHON(plugin)->priv;
 	
 	if (PyObject_HasAttrString (priv->instance, "update_ui"))
 	{		
@@ -117,17 +117,17 @@ impl_update_ui (GeditPlugin *plugin,
 		}
 	}
 	else
-		GEDIT_PLUGIN_CLASS (parent_class)->update_ui (plugin, window);
+		PLUMA_PLUGIN_CLASS (parent_class)->update_ui (plugin, window);
 
 	pyg_gil_state_release (state);
 }
 
 static void
-impl_deactivate (GeditPlugin *plugin,
-		 GeditWindow *window)
+impl_deactivate (PlumaPlugin *plugin,
+		 PlumaWindow *window)
 {
 	PyGILState_STATE state = pyg_gil_state_ensure ();
-	GeditPluginPythonPrivate *priv = GEDIT_PLUGIN_PYTHON(plugin)->priv;
+	PlumaPluginPythonPrivate *priv = PLUMA_PLUGIN_PYTHON(plugin)->priv;
 	
 	if (PyObject_HasAttrString (priv->instance, "deactivate"))
 	{		
@@ -139,17 +139,17 @@ impl_deactivate (GeditPlugin *plugin,
 		}
 	}
 	else
-		GEDIT_PLUGIN_CLASS (parent_class)->deactivate (plugin, window);
+		PLUMA_PLUGIN_CLASS (parent_class)->deactivate (plugin, window);
 
 	pyg_gil_state_release (state);
 }
 
 static void
-impl_activate (GeditPlugin *plugin,
-	       GeditWindow *window)
+impl_activate (PlumaPlugin *plugin,
+	       PlumaWindow *window)
 {
 	PyGILState_STATE state = pyg_gil_state_ensure ();
-	GeditPluginPythonPrivate *priv = GEDIT_PLUGIN_PYTHON(plugin)->priv;
+	PlumaPluginPythonPrivate *priv = PLUMA_PLUGIN_PYTHON(plugin)->priv;
 		
 	if (PyObject_HasAttrString (priv->instance, "activate"))
 	{
@@ -161,16 +161,16 @@ impl_activate (GeditPlugin *plugin,
 		}
 	}
 	else
-		GEDIT_PLUGIN_CLASS (parent_class)->activate (plugin, window);
+		PLUMA_PLUGIN_CLASS (parent_class)->activate (plugin, window);
 	
 	pyg_gil_state_release (state);
 }
 
 static GtkWidget *
-impl_create_configure_dialog (GeditPlugin *plugin)
+impl_create_configure_dialog (PlumaPlugin *plugin)
 {
 	PyGILState_STATE state = pyg_gil_state_ensure ();
-	GeditPluginPythonPrivate *priv = GEDIT_PLUGIN_PYTHON(plugin)->priv;
+	PlumaPluginPythonPrivate *priv = PLUMA_PLUGIN_PYTHON(plugin)->priv;
 	GtkWidget *ret = NULL;
 	
 	if (PyObject_HasAttrString (priv->instance, "create_configure_dialog"))
@@ -194,7 +194,7 @@ impl_create_configure_dialog (GeditPlugin *plugin)
 		}
 	}
 	else
-		ret = GEDIT_PLUGIN_CLASS (parent_class)->create_configure_dialog (plugin);
+		ret = PLUMA_PLUGIN_CLASS (parent_class)->create_configure_dialog (plugin);
  
 	pyg_gil_state_release (state);
 	
@@ -202,10 +202,10 @@ impl_create_configure_dialog (GeditPlugin *plugin)
 }
 
 static gboolean
-impl_is_configurable (GeditPlugin *plugin)
+impl_is_configurable (PlumaPlugin *plugin)
 {
 	PyGILState_STATE state = pyg_gil_state_ensure ();
-	GeditPluginPythonPrivate *priv = GEDIT_PLUGIN_PYTHON(plugin)->priv;
+	PlumaPluginPythonPrivate *priv = PLUMA_PLUGIN_PYTHON(plugin)->priv;
 	PyObject *dict = priv->instance->ob_type->tp_dict;	
 	gboolean result;
 	
@@ -222,7 +222,7 @@ impl_is_configurable (GeditPlugin *plugin)
 }
 
 void
-_gedit_plugin_python_set_instance (GeditPluginPython *plugin, 
+_pluma_plugin_python_set_instance (PlumaPluginPython *plugin, 
 				  PyObject 	    *instance)
 {
 	PyGILState_STATE state = pyg_gil_state_ensure ();
@@ -234,43 +234,43 @@ _gedit_plugin_python_set_instance (GeditPluginPython *plugin,
 }
 
 PyObject *
-_gedit_plugin_python_get_instance (GeditPluginPython *plugin)
+_pluma_plugin_python_get_instance (PlumaPluginPython *plugin)
 {
 	return plugin->priv->instance;
 }
 
 static void
-gedit_plugin_python_init (GeditPluginPython *plugin)
+pluma_plugin_python_init (PlumaPluginPython *plugin)
 {
-	plugin->priv = GEDIT_PLUGIN_PYTHON_GET_PRIVATE(plugin);
+	plugin->priv = PLUMA_PLUGIN_PYTHON_GET_PRIVATE(plugin);
 
-	gedit_debug_message (DEBUG_PLUGINS, "Creating Python plugin instance");
+	pluma_debug_message (DEBUG_PLUGINS, "Creating Python plugin instance");
 	plugin->priv->instance = 0;
 }
 
 static void
-gedit_plugin_python_finalize (GObject *object)
+pluma_plugin_python_finalize (GObject *object)
 {
 	PyGILState_STATE state;
 	
-	gedit_debug_message (DEBUG_PLUGINS, "Finalizing Python plugin instance");
+	pluma_debug_message (DEBUG_PLUGINS, "Finalizing Python plugin instance");
 
 	state = pyg_gil_state_ensure ();
-	Py_XDECREF (GEDIT_PLUGIN_PYTHON(object)->priv->instance);
+	Py_XDECREF (PLUMA_PLUGIN_PYTHON(object)->priv->instance);
 	pyg_gil_state_release (state);
 	
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static void
-gedit_plugin_python_class_init (GeditPluginPythonClass *klass)
+pluma_plugin_python_class_init (PlumaPluginPythonClass *klass)
 {
-	GeditPluginClass *plugin_class = GEDIT_PLUGIN_CLASS (klass);
+	PlumaPluginClass *plugin_class = PLUMA_PLUGIN_CLASS (klass);
 
 	parent_class = g_type_class_peek_parent (klass);
 
-	g_type_class_add_private (klass, sizeof (GeditPluginPythonPrivate));
-	G_OBJECT_CLASS (klass)->finalize = gedit_plugin_python_finalize;
+	g_type_class_add_private (klass, sizeof (PlumaPluginPythonPrivate));
+	G_OBJECT_CLASS (klass)->finalize = pluma_plugin_python_finalize;
 
 	plugin_class->activate = impl_activate;
 	plugin_class->deactivate = impl_deactivate;
diff --git a/plugin-loaders/python/pluma-plugin-python.h b/plugin-loaders/python/pluma-plugin-python.h
new file mode 100755
index 00000000..3612cfbb
--- /dev/null
+++ b/plugin-loaders/python/pluma-plugin-python.h
@@ -0,0 +1,88 @@
+/*
+ * pluma-plugin-python.h
+ * This file is part of pluma
+ *
+ * Copyright (C) 2005 - Raphael Slinckx
+ * Copyright (C) 2008 - Jesse van den Kieboom
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, 
+ * Boston, MA 02111-1307, USA. 
+ */
+
+#ifndef __PLUMA_PLUGIN_PYTHON_H__
+#define __PLUMA_PLUGIN_PYTHON_H__
+
+#define NO_IMPORT_PYGOBJECT
+
+#include <glib-object.h>
+#include <pygobject.h>
+
+#include <pluma/pluma-plugin.h>
+
+G_BEGIN_DECLS
+
+/*
+ * Type checking and casting macros
+ */
+#define PLUMA_TYPE_PLUGIN_PYTHON		(pluma_plugin_python_get_type())
+#define PLUMA_PLUGIN_PYTHON(obj)		(G_TYPE_CHECK_INSTANCE_CAST((obj), PLUMA_TYPE_PLUGIN_PYTHON, PlumaPluginPython))
+#define PLUMA_PLUGIN_PYTHON_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST((klass), PLUMA_TYPE_PLUGIN_PYTHON, PlumaPluginPythonClass))
+#define PLUMA_IS_PLUGIN_PYTHON(obj)		(G_TYPE_CHECK_INSTANCE_TYPE((obj), PLUMA_TYPE_PLUGIN_PYTHON))
+#define PLUMA_IS_PLUGIN_PYTHON_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), PLUMA_TYPE_PLUGIN_PYTHON))
+#define PLUMA_PLUGIN_PYTHON_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), PLUMA_TYPE_PLUGIN_PYTHON, PlumaPluginPythonClass))
+
+/* Private structure type */
+typedef struct _PlumaPluginPythonPrivate PlumaPluginPythonPrivate;
+
+/*
+ * Main object structure
+ */
+typedef struct _PlumaPluginPython PlumaPluginPython;
+
+struct _PlumaPluginPython 
+{
+	PlumaPlugin parent;
+	
+	/*< private > */
+	PlumaPluginPythonPrivate *priv;
+};
+
+/*
+ * Class definition
+ */
+typedef struct _PlumaPluginPythonClass PlumaPluginPythonClass;
+
+struct _PlumaPluginPythonClass 
+{
+	PlumaPluginClass parent_class;
+};
+
+/*
+ * Public methods
+ */
+GType	 pluma_plugin_python_get_type 		(void) G_GNUC_CONST;
+
+
+/* 
+ * Private methods
+ */
+void	  _pluma_plugin_python_set_instance	(PlumaPluginPython *plugin, 
+						 PyObject 	   *instance);
+PyObject *_pluma_plugin_python_get_instance	(PlumaPluginPython *plugin);
+
+G_END_DECLS
+
+#endif  /* __PLUMA_PLUGIN_PYTHON_H__ */
+