[gtranslator] Switch structs from Gtranslator to Gtr



commit 2cd41d925bbc12ce574f4a139d235a9e6957b891
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Thu Feb 4 17:13:01 2010 +0100

    Switch structs from Gtranslator to Gtr

 .../gtr-alternate-language-panel.c                 |   44 ++--
 .../gtr-alternate-language-panel.h                 |   22 +-
 .../gtr-alternate-language-plugin.c                |   38 ++--
 .../gtr-alternate-language-plugin.h                |   24 +-
 plugins/charmap/gtr-charmap-panel.c                |   24 +-
 plugins/charmap/gtr-charmap-panel.h                |   22 +-
 plugins/charmap/gtr-charmap-plugin.c               |   40 ++--
 plugins/charmap/gtr-charmap-plugin.h               |   22 +-
 plugins/dictionary/gtr-dict-panel.c                |   74 +++---
 plugins/dictionary/gtr-dict-panel.h                |   22 +-
 plugins/dictionary/gtr-dictionary-plugin.c         |   20 +-
 plugins/dictionary/gtr-dictionary-plugin.h         |   20 +-
 plugins/fullscreen/gtr-fullscreen-plugin.c         |   18 +-
 plugins/fullscreen/gtr-fullscreen-plugin.h         |   24 +-
 plugins/glossary/glossary-panel.c                  |   22 +-
 plugins/glossary/glossary-panel.h                  |   20 +-
 plugins/insert-params/gtr-insert-params-plugin.c   |   40 ++--
 plugins/insert-params/gtr-insert-params-plugin.h   |   24 +-
 plugins/insert-tags/gtr-insert-tags-plugin.c       |   40 ++--
 plugins/insert-tags/gtr-insert-tags-plugin.h       |   24 +-
 plugins/open-tran/gtr-open-tran-panel.c            |   36 ++--
 plugins/open-tran/gtr-open-tran-panel.h            |   22 +-
 plugins/open-tran/gtr-open-tran-plugin.c           |   34 ++--
 plugins/open-tran/gtr-open-tran-plugin.h           |   24 +-
 .../source-code-view/gtr-source-code-view-plugin.c |   74 +++---
 .../source-code-view/gtr-source-code-view-plugin.h |   28 +-
 plugins/source-code-view/gtr-viewer.c              |   16 +-
 plugins/source-code-view/gtr-viewer.h              |   20 +-
 src/dialogs/gtr-assistant.c                        |   50 ++--
 src/dialogs/gtr-assistant.h                        |   20 +-
 src/dialogs/gtr-close-confirmation-dialog.c        |   50 ++--
 src/dialogs/gtr-close-confirmation-dialog.h        |   30 +-
 src/dialogs/gtr-comment-dialog.c                   |   26 +-
 src/dialogs/gtr-comment-dialog.h                   |   22 +-
 src/dialogs/gtr-header-dialog.c                    |   42 ++--
 src/dialogs/gtr-header-dialog.h                    |   20 +-
 src/dialogs/gtr-jump-dialog.c                      |   26 +-
 src/dialogs/gtr-jump-dialog.h                      |   20 +-
 src/dialogs/gtr-preferences-dialog.c               |  128 +++++-----
 src/dialogs/gtr-preferences-dialog.h               |   28 +-
 src/dialogs/gtr-profile-dialog.c                   |   58 ++--
 src/dialogs/gtr-profile-dialog.h                   |   24 +-
 src/dialogs/gtr-search-dialog.c                    |   76 +++---
 src/dialogs/gtr-search-dialog.h                    |   64 +++---
 src/gtr-actions-documents.c                        |    8 +-
 src/gtr-actions-edit.c                             |   40 ++--
 src/gtr-actions-file.c                             |   90 +++---
 src/gtr-actions-go.c                               |   62 +++---
 src/gtr-actions-help.c                             |    8 +-
 src/gtr-actions-search.c                           |   68 +++---
 src/gtr-actions-view.c                             |    8 +-
 src/gtr-actions.h                                  |   80 +++---
 src/gtr-application.c                              |  108 ++++----
 src/gtr-application.h                              |   58 ++--
 src/gtr-context.c                                  |   36 ++--
 src/gtr-context.h                                  |   20 +-
 src/gtr-header.c                                   |   94 ++++----
 src/gtr-header.h                                   |   74 +++---
 src/gtr-history-entry.c                            |   58 ++--
 src/gtr-history-entry.h                            |   42 ++--
 src/gtr-message-table-model.c                      |   32 ++--
 src/gtr-message-table-model.h                      |   34 ++--
 src/gtr-message-table.c                            |   52 ++--
 src/gtr-message-table.h                            |   24 +-
 src/gtr-msg.c                                      |  142 +++++-----
 src/gtr-msg.h                                      |   78 +++---
 src/gtr-notebook.c                                 |   56 ++--
 src/gtr-notebook.h                                 |   28 +-
 src/gtr-po.c                                       |  172 ++++++------
 src/gtr-po.h                                       |   88 +++---
 src/gtr-prefs-manager-app.c                        |   10 +-
 src/gtr-prefs-manager-private.h                    |    6 +-
 src/gtr-prefs-manager.c                            |   10 +-
 src/gtr-prefs-manager.h                            |    6 +-
 src/gtr-profile.c                                  |   80 +++---
 src/gtr-profile.h                                  |   60 ++--
 src/gtr-statusbar.c                                |   60 ++--
 src/gtr-statusbar.h                                |   38 ++--
 src/gtr-tab.c                                      |  284 ++++++++++----------
 src/gtr-tab.h                                      |  100 ++++----
 src/gtr-utils.c                                    |    4 +-
 src/gtr-view.c                                     |   92 ++++----
 src/gtr-view.h                                     |   40 ++--
 src/gtr-window.c                                   |  280 ++++++++++----------
 src/gtr-window.h                                   |   66 +++---
 src/main.c                                         |    6 +-
 src/plugin-system/gtr-module.c                     |   32 ++--
 src/plugin-system/gtr-module.h                     |   22 +-
 src/plugin-system/gtr-plugin-info-priv.h           |   12 +-
 src/plugin-system/gtr-plugin-info.c                |   68 +++---
 src/plugin-system/gtr-plugin-info.h                |   24 +-
 src/plugin-system/gtr-plugin-manager.c             |  100 ++++----
 src/plugin-system/gtr-plugin-manager.h             |   20 +-
 src/plugin-system/gtr-plugin.c                     |   44 ++--
 src/plugin-system/gtr-plugin.h                     |   42 ++--
 src/plugin-system/gtr-plugins-engine.c             |   88 +++---
 src/plugin-system/gtr-plugins-engine.h             |   54 ++--
 src/translation-memory/berkeley/gtr-berkeley.c     |   80 +++---
 src/translation-memory/berkeley/gtr-berkeley.h     |   20 +-
 src/translation-memory/berkeley/gtr-db-base.c      |   22 +-
 src/translation-memory/berkeley/gtr-db-base.h      |   26 +-
 src/translation-memory/berkeley/gtr-db-keys.c      |   40 ++--
 src/translation-memory/berkeley/gtr-db-keys.h      |   28 +-
 src/translation-memory/berkeley/gtr-db-orig.c      |   36 ++--
 src/translation-memory/berkeley/gtr-db-orig.h      |   28 +-
 src/translation-memory/berkeley/gtr-db-trans.c     |   32 ++--
 src/translation-memory/berkeley/gtr-db-trans.h     |   30 +-
 src/translation-memory/berkeley/gtr-db-words.c     |   26 +-
 src/translation-memory/berkeley/gtr-db-words.h     |   28 +-
 src/translation-memory/gtr-translation-memory-ui.c |   52 ++--
 src/translation-memory/gtr-translation-memory-ui.h |   22 +-
 src/translation-memory/gtr-translation-memory.c    |   34 ++--
 src/translation-memory/gtr-translation-memory.h    |   38 ++--
 113 files changed, 2636 insertions(+), 2636 deletions(-)
---
diff --git a/plugins/alternate-language/gtr-alternate-language-panel.c b/plugins/alternate-language/gtr-alternate-language-panel.c
index 960b9c6..154bf16 100644
--- a/plugins/alternate-language/gtr-alternate-language-panel.c
+++ b/plugins/alternate-language/gtr-alternate-language-panel.c
@@ -39,11 +39,11 @@
 #define GTR_ALTERNATE_LANG_PANEL_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 (object),		       \
 						 GTR_TYPE_ALTERNATE_LANG_PANEL,     \
-						 GtranslatorAlternateLangPanelPrivate))
+						 GtrAlternateLangPanelPrivate))
 
-GTR_PLUGIN_DEFINE_TYPE (GtranslatorAlternateLangPanel,
+GTR_PLUGIN_DEFINE_TYPE (GtrAlternateLangPanel,
 			gtranslator_alternate_lang_panel, GTK_TYPE_VBOX)
-     struct _GtranslatorAlternateLangPanelPrivate
+     struct _GtrAlternateLangPanelPrivate
      {
        GtkWidget *open_button;
        GtkWidget *close_button;
@@ -51,14 +51,14 @@ GTR_PLUGIN_DEFINE_TYPE (GtranslatorAlternateLangPanel,
 
        GtkWidget *status;
 
-       GtranslatorPo *po;
-       GtranslatorMsg *first;
-       GtranslatorTab *tab;
+       GtrPo *po;
+       GtrMsg *first;
+       GtrTab *tab;
      };
 
      static void
        gtranslator_alternate_lang_panel_set_text
-       (GtranslatorAlternateLangPanel * panel, const gchar * text)
+       (GtrAlternateLangPanel * panel, const gchar * text)
 {
   GtkTextBuffer *buf;
 
@@ -68,7 +68,7 @@ GTR_PLUGIN_DEFINE_TYPE (GtranslatorAlternateLangPanel,
 }
 
 static void
-search_message (GtranslatorAlternateLangPanel * panel, GtranslatorMsg * msg)
+search_message (GtrAlternateLangPanel * panel, GtrMsg * msg)
 {
   GList *messages;
   GList *l;
@@ -76,7 +76,7 @@ search_message (GtranslatorAlternateLangPanel * panel, GtranslatorMsg * msg)
   gchar *msgid_collate;
   const gchar *string;
   gchar *string_collate;
-  GtranslatorMsgStatus status;
+  GtrMsgStatus status;
 
   msgid_collate = g_utf8_collate_key (msgid, -1);
   messages = gtranslator_po_get_messages (panel->priv->po);
@@ -124,9 +124,9 @@ search_message (GtranslatorAlternateLangPanel * panel, GtranslatorMsg * msg)
 }
 
 static void
-showed_message_cb (GtranslatorTab * tab,
-		   GtranslatorMsg * msg,
-		   GtranslatorAlternateLangPanel * panel)
+showed_message_cb (GtrTab * tab,
+		   GtrMsg * msg,
+		   GtrAlternateLangPanel * panel)
 {
   if (panel->priv->po == NULL)
     {
@@ -137,7 +137,7 @@ showed_message_cb (GtranslatorTab * tab,
 }
 
 static void
-open_file (GtkWidget * dialog, GtranslatorAlternateLangPanel * panel)
+open_file (GtkWidget * dialog, GtrAlternateLangPanel * panel)
 {
   GError *error = NULL;
   GFile *file;
@@ -176,7 +176,7 @@ open_file (GtkWidget * dialog, GtranslatorAlternateLangPanel * panel)
 
 static void
 gtranslator_file_chooser_analyse (gpointer dialog,
-				  GtranslatorAlternateLangPanel * panel)
+				  GtrAlternateLangPanel * panel)
 {
   gint reply;
 
@@ -199,11 +199,11 @@ gtranslator_file_chooser_analyse (gpointer dialog,
 
 static void
 open_button_clicked_cb (GtkWidget * open_button,
-			GtranslatorAlternateLangPanel * panel)
+			GtrAlternateLangPanel * panel)
 {
   GtkWidget *dialog = NULL;
   gchar *dir;
-  GtranslatorPo *tab_po;
+  GtrPo *tab_po;
   GFile *location, *parent;
 
   if (dialog != NULL)
@@ -239,7 +239,7 @@ open_button_clicked_cb (GtkWidget * open_button,
 
 static void
 close_button_clicked_cb (GtkWidget * close_button,
-			 GtranslatorAlternateLangPanel * panel)
+			 GtrAlternateLangPanel * panel)
 {
   if (panel->priv->po != NULL)
     {
@@ -254,7 +254,7 @@ close_button_clicked_cb (GtkWidget * close_button,
 }
 
 static void
-gtranslator_alternate_lang_panel_draw (GtranslatorAlternateLangPanel * panel)
+gtranslator_alternate_lang_panel_draw (GtrAlternateLangPanel * panel)
 {
   GtkWidget *hbox;
   GtkWidget *buttonbox;
@@ -327,7 +327,7 @@ gtranslator_alternate_lang_panel_draw (GtranslatorAlternateLangPanel * panel)
 }
 
 static void
-gtranslator_alternate_lang_panel_init (GtranslatorAlternateLangPanel * panel)
+gtranslator_alternate_lang_panel_init (GtrAlternateLangPanel * panel)
 {
   panel->priv = GTR_ALTERNATE_LANG_PANEL_GET_PRIVATE (panel);
 
@@ -345,12 +345,12 @@ gtranslator_alternate_lang_panel_finalize (GObject * object)
 
 static void
 gtranslator_alternate_lang_panel_class_init
-  (GtranslatorAlternateLangPanelClass * klass)
+  (GtrAlternateLangPanelClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   g_type_class_add_private (klass,
-			    sizeof (GtranslatorAlternateLangPanelPrivate));
+			    sizeof (GtrAlternateLangPanelPrivate));
 
   object_class->finalize = gtranslator_alternate_lang_panel_finalize;
 }
@@ -360,7 +360,7 @@ gtranslator_alternate_lang_panel_class_init
 GtkWidget *
 gtranslator_alternate_lang_panel_new (GtkWidget * tab)
 {
-  GtranslatorAlternateLangPanel *panel;
+  GtrAlternateLangPanel *panel;
   panel = g_object_new (GTR_TYPE_ALTERNATE_LANG_PANEL, NULL);
 
   panel->priv->tab = GTR_TAB (tab);
diff --git a/plugins/alternate-language/gtr-alternate-language-panel.h b/plugins/alternate-language/gtr-alternate-language-panel.h
index a9ef696..828584f 100644
--- a/plugins/alternate-language/gtr-alternate-language-panel.h
+++ b/plugins/alternate-language/gtr-alternate-language-panel.h
@@ -27,35 +27,35 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_ALTERNATE_LANG_PANEL		(gtranslator_alternate_lang_panel_get_type ())
-#define GTR_ALTERNATE_LANG_PANEL(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_ALTERNATE_LANG_PANEL, GtranslatorAlternateLangPanel))
-#define GTR_ALTERNATE_LANG_PANEL_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_ALTERNATE_LANG_PANEL, GtranslatorAlternateLangPanelClass))
+#define GTR_ALTERNATE_LANG_PANEL(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_ALTERNATE_LANG_PANEL, GtrAlternateLangPanel))
+#define GTR_ALTERNATE_LANG_PANEL_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_ALTERNATE_LANG_PANEL, GtrAlternateLangPanelClass))
 #define GTR_IS_ALTERNATE_LANG_PANEL(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_ALTERNATE_LANG_PANEL))
 #define GTR_IS_ALTERNATE_LANG_PANEL_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_ALTERNATE_LANG_PANEL))
-#define GTR_ALTERNATE_LANG_PANEL_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_ALTERNATE_LANG_PANEL, GtranslatorAlternateLangPanelClass))
+#define GTR_ALTERNATE_LANG_PANEL_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_ALTERNATE_LANG_PANEL, GtrAlternateLangPanelClass))
 /* Private structure type */
-typedef struct _GtranslatorAlternateLangPanelPrivate
-  GtranslatorAlternateLangPanelPrivate;
+typedef struct _GtrAlternateLangPanelPrivate
+  GtrAlternateLangPanelPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorAlternateLangPanel GtranslatorAlternateLangPanel;
+typedef struct _GtrAlternateLangPanel GtrAlternateLangPanel;
 
-struct _GtranslatorAlternateLangPanel
+struct _GtrAlternateLangPanel
 {
   GtkVBox parent_instance;
 
   /*< private > */
-  GtranslatorAlternateLangPanelPrivate *priv;
+  GtrAlternateLangPanelPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorAlternateLangPanelClass
-  GtranslatorAlternateLangPanelClass;
+typedef struct _GtrAlternateLangPanelClass
+  GtrAlternateLangPanelClass;
 
-struct _GtranslatorAlternateLangPanelClass
+struct _GtrAlternateLangPanelClass
 {
   GtkVBoxClass parent_class;
 };
diff --git a/plugins/alternate-language/gtr-alternate-language-plugin.c b/plugins/alternate-language/gtr-alternate-language-plugin.c
index fb55708..422fb9b 100644
--- a/plugins/alternate-language/gtr-alternate-language-plugin.c
+++ b/plugins/alternate-language/gtr-alternate-language-plugin.c
@@ -27,23 +27,23 @@
 
 #include <glib/gi18n-lib.h>
 
-#define WINDOW_DATA_KEY	"GtranslatorAlternateLangPluginWindowData"
-#define TAB_DATA_KEY    "GtranslatorAlternateLangPluginTabData"
+#define WINDOW_DATA_KEY	"GtrAlternateLangPluginWindowData"
+#define TAB_DATA_KEY    "GtrAlternateLangPluginTabData"
 #define MENU_PATH "/MainMenu/ViewMenu/ViewOps_2"
 
 #define GTR_MESSAGE_TABLE_GET_PRIVATE(object) \
 				(G_TYPE_INSTANCE_GET_PRIVATE ((object),	\
 				GTR_TYPE_MESSAGE_TABLE,		\
-				GtranslatorAlternateLangPluginPrivate))
+				GtrAlternateLangPluginPrivate))
 
-GTR_PLUGIN_REGISTER_TYPE_WITH_CODE (GtranslatorAlternateLangPlugin,
+GTR_PLUGIN_REGISTER_TYPE_WITH_CODE (GtrAlternateLangPlugin,
 				    gtranslator_alternate_lang_plugin,
 				    gtranslator_alternate_lang_panel_register_type
 				    (module);)
      static void on_alternate_lang_activated (GtkAction * action,
-					      GtranslatorWindow * window)
+					      GtrWindow * window)
 {
-  GtranslatorTab *tab;
+  GtrTab *tab;
   GtkWidget *alternatelang;
 
   tab = gtranslator_window_get_active_tab (window);
@@ -73,9 +73,9 @@ free_window_data (WindowData * data)
 }
 
 static void
-update_ui_real (GtranslatorWindow * window, WindowData * data)
+update_ui_real (GtrWindow * window, WindowData * data)
 {
-  GtranslatorTab *tab;
+  GtrTab *tab;
   GtkAction *action;
 
   tab = gtranslator_window_get_active_tab (window);
@@ -85,7 +85,7 @@ update_ui_real (GtranslatorWindow * window, WindowData * data)
 }
 
 static void
-gtranslator_alternate_lang_plugin_init (GtranslatorAlternateLangPlugin *
+gtranslator_alternate_lang_plugin_init (GtrAlternateLangPlugin *
 					message_table)
 {
 }
@@ -102,10 +102,10 @@ static void
 create_alternate_lang_plugin_panel (GtkNotebook * notebook,
 				    GtkWidget * child,
 				    guint page_num,
-				    GtranslatorWindow * window)
+				    GtrWindow * window)
 {
   GtkWidget *alternatelang;
-  GtranslatorPo *po;
+  GtrPo *po;
 
   po = gtranslator_tab_get_po (GTR_TAB (child));
 
@@ -122,9 +122,9 @@ create_alternate_lang_plugin_panel (GtkNotebook * notebook,
 }
 
 static void
-impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
+impl_activate (GtrPlugin * plugin, GtrWindow * window)
 {
-  GtranslatorNotebook *notebook;
+  GtrNotebook *notebook;
   GList *tabs = NULL;
   GtkUIManager *manager;
   WindowData *data;
@@ -134,7 +134,7 @@ impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
   manager = gtranslator_window_get_ui_manager (window);
 
   data->action_group =
-    gtk_action_group_new ("GtranslatorAlternateLangPluginActions");
+    gtk_action_group_new ("GtrAlternateLangPluginActions");
   gtk_action_group_set_translation_domain (data->action_group,
 					   GETTEXT_PACKAGE);
   gtk_action_group_add_actions (data->action_group, action_entries,
@@ -173,9 +173,9 @@ impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 }
 
 static void
-impl_deactivate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
+impl_deactivate (GtrPlugin * plugin, GtrWindow * window)
 {
-  GtranslatorNotebook *notebook;
+  GtrNotebook *notebook;
   GtkWidget *alternatelang;
   GList *tabs;
   GtkUIManager *manager;
@@ -217,7 +217,7 @@ impl_deactivate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 }
 
 static void
-impl_update_ui (GtranslatorPlugin * plugin, GtranslatorWindow * window)
+impl_update_ui (GtrPlugin * plugin, GtrWindow * window)
 {
   WindowData *data;
 
@@ -230,10 +230,10 @@ impl_update_ui (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 
 static void
 gtranslator_alternate_lang_plugin_class_init
-  (GtranslatorAlternateLangPluginClass * klass)
+  (GtrAlternateLangPluginClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtranslatorPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
+  GtrPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
 
   object_class->finalize = gtranslator_alternate_lang_plugin_finalize;
 
diff --git a/plugins/alternate-language/gtr-alternate-language-plugin.h b/plugins/alternate-language/gtr-alternate-language-plugin.h
index 1c5714c..edd9003 100644
--- a/plugins/alternate-language/gtr-alternate-language-plugin.h
+++ b/plugins/alternate-language/gtr-alternate-language-plugin.h
@@ -30,34 +30,34 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_ALTERNATE_LANG_PLUGIN		(gtranslator_alternate_lang_get_type ())
-#define GTR_ALTERNATE_LANG_PLUGIN(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_MESSAGEALTERNATE_LANG_PLUGIN, GtranslatorAlternateLangPlugin))
-#define GTR_ALTERNATE_LANG_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_ALTERNATE_LANG_PLUGIN, GtranslatorAlternateLangPluginClass))
+#define GTR_ALTERNATE_LANG_PLUGIN(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_MESSAGEALTERNATE_LANG_PLUGIN, GtrAlternateLangPlugin))
+#define GTR_ALTERNATE_LANG_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_ALTERNATE_LANG_PLUGIN, GtrAlternateLangPluginClass))
 #define GTR_IS_ALTERNATE_LANG_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_ALTERNATE_LANG_PLUGIN))
 #define GTR_IS_ALTERNATE_LANG_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_ALTERNATE_LANG_PLUGIN))
-#define GTR_ALTERNATE_LANG_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_ALTERNATE_LANG_PLUGIN_PLUGIN, GtranslatorAlternateLangPluginClass))
+#define GTR_ALTERNATE_LANG_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_ALTERNATE_LANG_PLUGIN_PLUGIN, GtrAlternateLangPluginClass))
 /* Private structure type */
-typedef struct _GtranslatorAlternateLangPluginPrivate
-  GtranslatorAlternateLangPluginPrivate;
+typedef struct _GtrAlternateLangPluginPrivate
+  GtrAlternateLangPluginPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorAlternateLangPlugin GtranslatorAlternateLangPlugin;
+typedef struct _GtrAlternateLangPlugin GtrAlternateLangPlugin;
 
-struct _GtranslatorAlternateLangPlugin
+struct _GtrAlternateLangPlugin
 {
-  GtranslatorPlugin parent_instance;
+  GtrPlugin parent_instance;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorAlternateLangPluginClass
-  GtranslatorAlternateLangPluginClass;
+typedef struct _GtrAlternateLangPluginClass
+  GtrAlternateLangPluginClass;
 
-struct _GtranslatorAlternateLangPluginClass
+struct _GtrAlternateLangPluginClass
 {
-  GtranslatorPluginClass parent_class;
+  GtrPluginClass parent_class;
 };
 
 /*
diff --git a/plugins/charmap/gtr-charmap-panel.c b/plugins/charmap/gtr-charmap-panel.c
index 396e0a6..be3ecc2 100644
--- a/plugins/charmap/gtr-charmap-panel.c
+++ b/plugins/charmap/gtr-charmap-panel.c
@@ -34,9 +34,9 @@
 #define GTR_CHARMAP_PANEL_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 (object),		       \
 						 GTR_TYPE_CHARMAP_PANEL,     \
-						 GtranslatorCharmapPanelPrivate))
+						 GtrCharmapPanelPrivate))
 
-struct _GtranslatorCharmapPanelPrivate
+struct _GtrCharmapPanelPrivate
 {
 #ifdef HAVE_GUCHARMAP_2
   GucharmapChaptersView *chapters_view;
@@ -47,14 +47,14 @@ struct _GtranslatorCharmapPanelPrivate
 #endif
 };
 
-GTR_PLUGIN_DEFINE_TYPE (GtranslatorCharmapPanel, gtranslator_charmap_panel,
+GTR_PLUGIN_DEFINE_TYPE (GtrCharmapPanel, gtranslator_charmap_panel,
 			GTK_TYPE_VBOX)
 #ifdef HAVE_GUCHARMAP_2
      static void
        on_chapter_view_selection_changed (GtkTreeSelection * selection,
-					  GtranslatorCharmapPanel * panel)
+					  GtrCharmapPanel * panel)
 {
-  GtranslatorCharmapPanelPrivate *priv = panel->priv;
+  GtrCharmapPanelPrivate *priv = panel->priv;
   GucharmapCodepointList *codepoint_list;
   GtkTreeIter iter;
 
@@ -70,7 +70,7 @@ GTR_PLUGIN_DEFINE_TYPE (GtranslatorCharmapPanel, gtranslator_charmap_panel,
 #else
      static void
        on_chapter_changed (GucharmapChapters * chapters,
-			   GtranslatorCharmapPanel * panel)
+			   GtrCharmapPanel * panel)
 {
   gucharmap_table_set_codepoint_list (GUCHARMAP_TABLE (panel->priv->table),
 				      gucharmap_chapters_get_codepoint_list
@@ -79,9 +79,9 @@ GTR_PLUGIN_DEFINE_TYPE (GtranslatorCharmapPanel, gtranslator_charmap_panel,
 #endif /* HAVE_GUCHARMAP_2 */
 
 static void
-gtranslator_charmap_panel_init (GtranslatorCharmapPanel * panel)
+gtranslator_charmap_panel_init (GtrCharmapPanel * panel)
 {
-  GtranslatorCharmapPanelPrivate *priv;
+  GtrCharmapPanelPrivate *priv;
   GtkPaned *paned;
 #ifdef HAVE_GUCHARMAP_2
   GtkWidget *scrolled_window, *view, *chartable;
@@ -168,11 +168,11 @@ gtranslator_charmap_panel_finalize (GObject * object)
 }
 
 static void
-gtranslator_charmap_panel_class_init (GtranslatorCharmapPanelClass * klass)
+gtranslator_charmap_panel_class_init (GtrCharmapPanelClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorCharmapPanelPrivate));
+  g_type_class_add_private (klass, sizeof (GtrCharmapPanelPrivate));
 
   object_class->finalize = gtranslator_charmap_panel_finalize;
 }
@@ -185,13 +185,13 @@ gtranslator_charmap_panel_new (void)
 
 #ifdef HAVE_GUCHARMAP_2
 GucharmapChartable *
-gtranslator_charmap_panel_get_chartable (GtranslatorCharmapPanel * panel)
+gtranslator_charmap_panel_get_chartable (GtrCharmapPanel * panel)
 {
   return panel->priv->chartable;
 }
 #else
 GucharmapTable *
-gtranslator_charmap_panel_get_table (GtranslatorCharmapPanel * panel)
+gtranslator_charmap_panel_get_table (GtrCharmapPanel * panel)
 {
   return GUCHARMAP_TABLE (panel->priv->table);
 }
diff --git a/plugins/charmap/gtr-charmap-panel.h b/plugins/charmap/gtr-charmap-panel.h
index 47f6f36..ade8913 100644
--- a/plugins/charmap/gtr-charmap-panel.h
+++ b/plugins/charmap/gtr-charmap-panel.h
@@ -38,33 +38,33 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_CHARMAP_PANEL		(gtranslator_charmap_panel_get_type ())
-#define GTR_CHARMAP_PANEL(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_CHARMAP_PANEL, GtranslatorCharmapPanel))
-#define GTR_CHARMAP_PANEL_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_CHARMAP_PANEL, GtranslatorCharmapPanelClass))
+#define GTR_CHARMAP_PANEL(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_CHARMAP_PANEL, GtrCharmapPanel))
+#define GTR_CHARMAP_PANEL_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_CHARMAP_PANEL, GtrCharmapPanelClass))
 #define GTR_IS_CHARMAP_PANEL(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_CHARMAP_PANEL))
 #define GTR_IS_CHARMAP_PANEL_CLASS(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_CHARMAP_PANEL))
-#define GTR_CHARMAP_PANEL_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_CHARMAP_PANEL, GtranslatorCharmapPanelClass))
+#define GTR_CHARMAP_PANEL_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_CHARMAP_PANEL, GtrCharmapPanelClass))
 /* Private structure type */
-typedef struct _GtranslatorCharmapPanelPrivate GtranslatorCharmapPanelPrivate;
+typedef struct _GtrCharmapPanelPrivate GtrCharmapPanelPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorCharmapPanel GtranslatorCharmapPanel;
+typedef struct _GtrCharmapPanel GtrCharmapPanel;
 
-struct _GtranslatorCharmapPanel
+struct _GtrCharmapPanel
 {
   GtkVBox parent_instance;
 
   /*< private > */
-  GtranslatorCharmapPanelPrivate *priv;
+  GtrCharmapPanelPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorCharmapPanelClass GtranslatorCharmapPanelClass;
+typedef struct _GtrCharmapPanelClass GtrCharmapPanelClass;
 
-struct _GtranslatorCharmapPanelClass
+struct _GtrCharmapPanelClass
 {
   GtkVBoxClass parent_class;
 };
@@ -80,11 +80,11 @@ gtranslator_charmap_panel_get_type (void)
 
 #ifdef HAVE_GUCHARMAP_2
      GucharmapChartable
-       *gtranslator_charmap_panel_get_chartable (GtranslatorCharmapPanel *
+       *gtranslator_charmap_panel_get_chartable (GtrCharmapPanel *
 						 panel);
 #else
      GucharmapTable
-       *gtranslator_charmap_panel_get_table (GtranslatorCharmapPanel * panel);
+       *gtranslator_charmap_panel_get_table (GtrCharmapPanel * panel);
 #endif
 
 G_END_DECLS
diff --git a/plugins/charmap/gtr-charmap-plugin.c b/plugins/charmap/gtr-charmap-plugin.c
index 1d6be5e..4d5f6f1 100644
--- a/plugins/charmap/gtr-charmap-plugin.c
+++ b/plugins/charmap/gtr-charmap-plugin.c
@@ -38,12 +38,12 @@
 #include <gucharmap/gucharmap-unicode-info.h>
 #endif
 
-#define WINDOW_DATA_KEY	"GtranslatorCharmapPluginWindowData"
+#define WINDOW_DATA_KEY	"GtrCharmapPluginWindowData"
 
 #define GTR_CHARMAP_PLUGIN_GET_PRIVATE(object) \
 				(G_TYPE_INSTANCE_GET_PRIVATE ((object),	\
 				GTR_TYPE_CHARMAP_PLUGIN,		\
-				GtranslatorCharmapPluginPrivate))
+				GtrCharmapPluginPrivate))
 
 typedef struct
 {
@@ -51,20 +51,20 @@ typedef struct
   guint context_id;
 } WindowData;
 
-GTR_PLUGIN_REGISTER_TYPE_WITH_CODE (GtranslatorCharmapPlugin,
+GTR_PLUGIN_REGISTER_TYPE_WITH_CODE (GtrCharmapPlugin,
 				    gtranslator_charmap_plugin,
 				    gtranslator_charmap_panel_register_type
 				    (module);)
-     static void gtranslator_charmap_plugin_init (GtranslatorCharmapPlugin *
+     static void gtranslator_charmap_plugin_init (GtrCharmapPlugin *
 						  plugin)
 {
-  //gtranslator_debug_message (DEBUG_PLUGINS, "GtranslatorCharmapPlugin initializing");
+  //gtranslator_debug_message (DEBUG_PLUGINS, "GtrCharmapPlugin initializing");
 }
 
 static void
 gtranslator_charmap_plugin_finalize (GObject * object)
 {
-  //gtranslator_debug_message (DEBUG_PLUGINS, "GtranslatorCharmapPlugin finalizing");
+  //gtranslator_debug_message (DEBUG_PLUGINS, "GtrCharmapPlugin finalizing");
 
   G_OBJECT_CLASS (gtranslator_charmap_plugin_parent_class)->finalize (object);
 }
@@ -81,9 +81,9 @@ static void
 #else
 on_table_status_message (GucharmapTable * chartable,
 #endif
-			 const gchar * message, GtranslatorWindow * window)
+			 const gchar * message, GtrWindow * window)
 {
-  GtranslatorStatusbar *statusbar;
+  GtrStatusbar *statusbar;
   WindowData *data;
 
   statusbar = GTR_STATUSBAR (gtranslator_window_get_statusbar (window));
@@ -100,10 +100,10 @@ on_table_status_message (GucharmapTable * chartable,
 static void
 #ifdef HAVE_GUCHARMAP_2
 on_table_sync_active_char (GucharmapChartable * chartable,
-			   GParamSpec * psepc, GtranslatorWindow * window)
+			   GParamSpec * psepc, GtrWindow * window)
 #else
 on_table_set_active_char (GucharmapTable * chartable,
-			  gunichar wc, GtranslatorWindow * window)
+			  gunichar wc, GtrWindow * window)
 #endif
 {
   GString *gs;
@@ -143,7 +143,7 @@ on_table_set_active_char (GucharmapTable * chartable,
 
 static gboolean
 on_table_focus_out_event (GtkWidget * drawing_area,
-			  GdkEventFocus * event, GtranslatorWindow * window)
+			  GdkEventFocus * event, GtrWindow * window)
 {
 #ifdef HAVE_GUCHARMAP_2
   GucharmapChartable *chartable;
@@ -170,11 +170,11 @@ on_table_focus_out_event (GtkWidget * drawing_area,
 
 #ifdef HAVE_GUCHARMAP_2
 static void
-on_table_activate (GucharmapChartable * chartable, GtranslatorWindow * window)
+on_table_activate (GucharmapChartable * chartable, GtrWindow * window)
 #else
 static void
 on_table_activate (GucharmapTable * chartable,
-		   gunichar wc, GtranslatorWindow * window)
+		   gunichar wc, GtrWindow * window)
 #endif
 {
   GtkTextView *view;
@@ -213,7 +213,7 @@ on_table_activate (GucharmapTable * chartable,
 }
 
 static GtkWidget *
-create_charmap_panel (GtranslatorWindow * window)
+create_charmap_panel (GtrWindow * window)
 {
   GtkWidget *panel;
 #ifdef HAVE_GUCHARMAP_2
@@ -265,9 +265,9 @@ create_charmap_panel (GtranslatorWindow * window)
 }
 
 static void
-impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
+impl_activate (GtrPlugin * plugin, GtrWindow * window)
 {
-  GtranslatorStatusbar *statusbar;
+  GtrStatusbar *statusbar;
   WindowData *data;
 
   data = g_new (WindowData, 1);
@@ -279,7 +279,7 @@ impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 
   gtranslator_window_add_widget (window,
 				 data->panel,
-				 "GtranslatorCharmapPlugin",
+				 "GtrCharmapPlugin",
 				 _("Character Map"),
 				 "charmap-plugin-icon",
 				 GTR_WINDOW_PLACEMENT_LEFT);
@@ -294,7 +294,7 @@ impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 }
 
 static void
-impl_deactivate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
+impl_deactivate (GtrPlugin * plugin, GtrWindow * window)
 {
   WindowData *data;
 #ifdef HAVE_GUCHARMAP_2
@@ -323,10 +323,10 @@ impl_deactivate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 }
 
 static void
-gtranslator_charmap_plugin_class_init (GtranslatorCharmapPluginClass * klass)
+gtranslator_charmap_plugin_class_init (GtrCharmapPluginClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtranslatorPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
+  GtrPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
 
   object_class->finalize = gtranslator_charmap_plugin_finalize;
 
diff --git a/plugins/charmap/gtr-charmap-plugin.h b/plugins/charmap/gtr-charmap-plugin.h
index e78225a..870e07f 100644
--- a/plugins/charmap/gtr-charmap-plugin.h
+++ b/plugins/charmap/gtr-charmap-plugin.h
@@ -32,33 +32,33 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_CHARMAP_PLUGIN		(gtranslator_charmap_plugin_get_type ())
-#define GTR_CHARMAP_PLUGIN(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_CHARMAP_PLUGIN, GtranslatorCharmapPlugin))
-#define GTR_CHARMAP_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_CHARMAP_PLUGIN, GtranslatorCharmapPluginClass))
+#define GTR_CHARMAP_PLUGIN(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_CHARMAP_PLUGIN, GtrCharmapPlugin))
+#define GTR_CHARMAP_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_CHARMAP_PLUGIN, GtrCharmapPluginClass))
 #define GTR_IS_CHARMAP_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_CHARMAP_PLUGIN))
 #define GTR_IS_CHARMAP_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_CHARMAP_PLUGIN))
-#define GTR_CHARMAP_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_CHARMAP_PLUGIN, GtranslatorCharmapPluginClass))
+#define GTR_CHARMAP_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_CHARMAP_PLUGIN, GtrCharmapPluginClass))
 /* Private structure type */
-typedef struct _GtranslatorCharmapPluginPrivate
-  GtranslatorCharmapPluginPrivate;
+typedef struct _GtrCharmapPluginPrivate
+  GtrCharmapPluginPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorCharmapPlugin GtranslatorCharmapPlugin;
+typedef struct _GtrCharmapPlugin GtrCharmapPlugin;
 
-struct _GtranslatorCharmapPlugin
+struct _GtrCharmapPlugin
 {
-  GtranslatorPlugin parent_instance;
+  GtrPlugin parent_instance;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorCharmapPluginClass GtranslatorCharmapPluginClass;
+typedef struct _GtrCharmapPluginClass GtrCharmapPluginClass;
 
-struct _GtranslatorCharmapPluginClass
+struct _GtrCharmapPluginClass
 {
-  GtranslatorPluginClass parent_class;
+  GtrPluginClass parent_class;
 };
 
 /*
diff --git a/plugins/dictionary/gtr-dict-panel.c b/plugins/dictionary/gtr-dict-panel.c
index 81cec15..e4aebd5 100644
--- a/plugins/dictionary/gtr-dict-panel.c
+++ b/plugins/dictionary/gtr-dict-panel.c
@@ -37,7 +37,7 @@
 #define GTR_DICT_PANEL_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 (object),		       \
 						 GTR_TYPE_DICT_PANEL,     \
-						 GtranslatorDictPanelPrivate))
+						 GtrDictPanelPrivate))
 
 #define DICTIONARY_GCONF_DIR                     "/apps/gtranslator/plugins/dictionary"
 #define DICTIONARY_GCONF_DATABASE_KEY            DICTIONARY_GCONF_DIR "/database"
@@ -52,12 +52,12 @@
 #define GDICT_SIDEBAR_STRATEGIES_PAGE   "strat-chooser"
 #define GDICT_SIDEBAR_SOURCES_PAGE      "source-chooser"
 
-GTR_PLUGIN_DEFINE_TYPE (GtranslatorDictPanel, gtranslator_dict_panel,
+GTR_PLUGIN_DEFINE_TYPE (GtrDictPanel, gtranslator_dict_panel,
 			GTK_TYPE_VBOX)
-     struct _GtranslatorDictPanelPrivate
+     struct _GtrDictPanelPrivate
      {
        GtkPaned *paned;
-       GtranslatorStatusbar *status;
+       GtrStatusbar *status;
 
        GConfClient *gconf_client;
        guint notify_id;
@@ -114,9 +114,9 @@ gdict_gconf_get_string_with_default (GConfClient * client,
 
 static void
 gtranslator_dict_panel_entry_activate_cb (GtkWidget * widget,
-					  GtranslatorDictPanel * panel)
+					  GtrDictPanel * panel)
 {
-  GtranslatorDictPanelPrivate *priv = panel->priv;
+  GtrDictPanelPrivate *priv = panel->priv;
   const gchar *text;
 
   text = gtk_entry_get_text (GTK_ENTRY (priv->entry));
@@ -131,10 +131,10 @@ gtranslator_dict_panel_entry_activate_cb (GtkWidget * widget,
 }
 
 static void
-gtranslator_dict_panel_set_database (GtranslatorDictPanel * panel,
+gtranslator_dict_panel_set_database (GtrDictPanel * panel,
 				     const gchar * database)
 {
-  GtranslatorDictPanelPrivate *priv = panel->priv;
+  GtrDictPanelPrivate *priv = panel->priv;
 
   g_free (priv->database);
 
@@ -149,10 +149,10 @@ gtranslator_dict_panel_set_database (GtranslatorDictPanel * panel,
 }
 
 static void
-gtranslator_dict_panel_set_strategy (GtranslatorDictPanel * panel,
+gtranslator_dict_panel_set_strategy (GtrDictPanel * panel,
 				     const gchar * strategy)
 {
-  GtranslatorDictPanelPrivate *priv = panel->priv;
+  GtrDictPanelPrivate *priv = panel->priv;
 
   g_free (priv->strategy);
 
@@ -165,9 +165,9 @@ gtranslator_dict_panel_set_strategy (GtranslatorDictPanel * panel,
 }
 
 static GdictContext *
-get_context_from_loader (GtranslatorDictPanel * panel)
+get_context_from_loader (GtrDictPanel * panel)
 {
-  GtranslatorDictPanelPrivate *priv = panel->priv;
+  GtrDictPanelPrivate *priv = panel->priv;
   GdictSource *source;
   GdictContext *retval;
 
@@ -220,10 +220,10 @@ get_context_from_loader (GtranslatorDictPanel * panel)
 }
 
 static void
-gtranslator_dict_panel_set_context (GtranslatorDictPanel * panel,
+gtranslator_dict_panel_set_context (GtrDictPanel * panel,
 				    GdictContext * context)
 {
-  GtranslatorDictPanelPrivate *priv = panel->priv;
+  GtrDictPanelPrivate *priv = panel->priv;
 
   if (priv->context)
     {
@@ -249,10 +249,10 @@ gtranslator_dict_panel_set_context (GtranslatorDictPanel * panel,
 }
 
 static void
-gtranslator_dict_panel_set_source_name (GtranslatorDictPanel * panel,
+gtranslator_dict_panel_set_source_name (GtrDictPanel * panel,
 					const gchar * source_name)
 {
-  GtranslatorDictPanelPrivate *priv = panel->priv;
+  GtrDictPanelPrivate *priv = panel->priv;
   GdictContext *context;
 
   if (priv->source_name && source_name &&
@@ -281,7 +281,7 @@ gtranslator_dict_panel_set_source_name (GtranslatorDictPanel * panel,
 static void
 source_activated_cb (GdictSourceChooser * chooser,
 		     const gchar * source_name,
-		     GdictSource * source, GtranslatorDictPanel * panel)
+		     GdictSource * source, GtrDictPanel * panel)
 {
   g_signal_handlers_block_by_func (chooser, source_activated_cb, panel);
   gtranslator_dict_panel_set_source_name (panel, source_name);
@@ -302,9 +302,9 @@ source_activated_cb (GdictSourceChooser * chooser,
 static void
 strategy_activated_cb (GdictStrategyChooser * chooser,
 		       const gchar * strat_name,
-		       const gchar * strat_desc, GtranslatorDictPanel * panel)
+		       const gchar * strat_desc, GtrDictPanel * panel)
 {
-  GtranslatorDictPanelPrivate *priv = panel->priv;
+  GtrDictPanelPrivate *priv = panel->priv;
   gtranslator_dict_panel_set_strategy (panel, strat_name);
 
   if (priv->status)
@@ -321,9 +321,9 @@ strategy_activated_cb (GdictStrategyChooser * chooser,
 static void
 database_activated_cb (GdictDatabaseChooser * chooser,
 		       const gchar * db_name,
-		       const gchar * db_desc, GtranslatorDictPanel * panel)
+		       const gchar * db_desc, GtrDictPanel * panel)
 {
-  GtranslatorDictPanelPrivate *priv = panel->priv;
+  GtrDictPanelPrivate *priv = panel->priv;
   gtranslator_dict_panel_set_database (panel, db_name);
 
   if (priv->status)
@@ -338,10 +338,10 @@ database_activated_cb (GdictDatabaseChooser * chooser,
 }
 
 static void
-gtranslator_dict_panel_set_word (GtranslatorDictPanel * panel,
+gtranslator_dict_panel_set_word (GtrDictPanel * panel,
 				 const gchar * word, const gchar * database)
 {
-  GtranslatorDictPanelPrivate *priv = panel->priv;
+  GtrDictPanelPrivate *priv = panel->priv;
 
   g_free (priv->word);
   priv->word = NULL;
@@ -365,9 +365,9 @@ static void
 speller_word_activated_cb (GdictSpeller * speller,
 			   const gchar * word,
 			   const gchar * db_name,
-			   GtranslatorDictPanel * panel)
+			   GtrDictPanel * panel)
 {
-  GtranslatorDictPanelPrivate *priv = panel->priv;
+  GtrDictPanelPrivate *priv = panel->priv;
   gtk_entry_set_text (GTK_ENTRY (priv->entry), word);
 
   gtranslator_dict_panel_set_word (panel, word, db_name);
@@ -384,9 +384,9 @@ speller_word_activated_cb (GdictSpeller * speller,
 }
 
 static void
-sidebar_page_changed_cb (GdictSidebar * sidebar, GtranslatorDictPanel * panel)
+sidebar_page_changed_cb (GdictSidebar * sidebar, GtrDictPanel * panel)
 {
-  GtranslatorDictPanelPrivate *priv = panel->priv;
+  GtrDictPanelPrivate *priv = panel->priv;
   const gchar *page_id;
   const gchar *message;
 
@@ -453,7 +453,7 @@ store_position (GObject * gobject, GParamSpec * arg1, gpointer user_data)
 static void
 gtranslator_dict_panel_link_clicked (GtkWidget * defbox,
 				     const gchar * link_text,
-				     GtranslatorDictPanel * panel)
+				     GtrDictPanel * panel)
 {
   if (!link_text)
     return;
@@ -467,7 +467,7 @@ gtranslator_dict_panel_link_clicked (GtkWidget * defbox,
 }
 
 static void
-gtranslator_dict_panel_draw (GtranslatorDictPanel * panel)
+gtranslator_dict_panel_draw (GtrDictPanel * panel)
 {
   GtkWidget *vbox;
   GtkWidget *hbox;
@@ -610,7 +610,7 @@ gtranslator_dict_panel_gconf_notify_cb (GConfClient * client,
 					GConfEntry * entry,
 					gpointer user_data)
 {
-  GtranslatorDictPanel *panel = GTR_DICT_PANEL (user_data);
+  GtrDictPanel *panel = GTR_DICT_PANEL (user_data);
 
   if (strcmp (entry->key, DICTIONARY_GCONF_SOURCE_KEY) == 0)
     {
@@ -643,10 +643,10 @@ gtranslator_dict_panel_gconf_notify_cb (GConfClient * client,
 }
 
 static void
-gtranslator_dict_panel_init (GtranslatorDictPanel * panel)
+gtranslator_dict_panel_init (GtrDictPanel * panel)
 {
   gchar *data_dir;
-  GtranslatorDictPanelPrivate *priv;
+  GtrDictPanelPrivate *priv;
   GError *gconf_error;
 
   panel->priv = GTR_DICT_PANEL_GET_PRIVATE (panel);
@@ -701,7 +701,7 @@ gtranslator_dict_panel_init (GtranslatorDictPanel * panel)
 static void
 gtranslator_dict_panel_finalize (GObject * object)
 {
-  GtranslatorDictPanel *panel = GTR_DICT_PANEL (object);
+  GtrDictPanel *panel = GTR_DICT_PANEL (object);
 
   g_free (panel->priv->source_name);
   g_free (panel->priv->word);
@@ -712,20 +712,20 @@ gtranslator_dict_panel_finalize (GObject * object)
 }
 
 static void
-gtranslator_dict_panel_class_init (GtranslatorDictPanelClass * klass)
+gtranslator_dict_panel_class_init (GtrDictPanelClass * klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorDictPanelPrivate));
+  g_type_class_add_private (klass, sizeof (GtrDictPanelPrivate));
 
   gobject_class->finalize = gtranslator_dict_panel_finalize;
 
 }
 
 GtkWidget *
-gtranslator_dict_panel_new (GtranslatorWindow * window)
+gtranslator_dict_panel_new (GtrWindow * window)
 {
-  GtranslatorDictPanel *panel;
+  GtrDictPanel *panel;
 
   panel = g_object_new (GTR_TYPE_DICT_PANEL, NULL);
   panel->priv->status =
diff --git a/plugins/dictionary/gtr-dict-panel.h b/plugins/dictionary/gtr-dict-panel.h
index ef3bd0d..3f73d79 100644
--- a/plugins/dictionary/gtr-dict-panel.h
+++ b/plugins/dictionary/gtr-dict-panel.h
@@ -29,33 +29,33 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_DICT_PANEL		(gtranslator_dict_panel_get_type ())
-#define GTR_DICT_PANEL(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_DICT_PANEL, GtranslatorDictPanel))
-#define GTR_DICT_PANEL_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_DICT_PANEL, GtranslatorDictPanelClass))
+#define GTR_DICT_PANEL(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_DICT_PANEL, GtrDictPanel))
+#define GTR_DICT_PANEL_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_DICT_PANEL, GtrDictPanelClass))
 #define GTR_IS_DICT_PANEL(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_DICT_PANEL))
 #define GTR_IS_DICT_PANEL_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_DICT_PANEL))
-#define GTR_DICT_PANEL_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_DICT_PANEL, GtranslatorDictPanelClass))
+#define GTR_DICT_PANEL_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_DICT_PANEL, GtrDictPanelClass))
 /* Private structure type */
-typedef struct _GtranslatorDictPanelPrivate GtranslatorDictPanelPrivate;
+typedef struct _GtrDictPanelPrivate GtrDictPanelPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorDictPanel GtranslatorDictPanel;
+typedef struct _GtrDictPanel GtrDictPanel;
 
-struct _GtranslatorDictPanel
+struct _GtrDictPanel
 {
   GtkVBox parent_instance;
 
   /*< private > */
-  GtranslatorDictPanelPrivate *priv;
+  GtrDictPanelPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorDictPanelClass GtranslatorDictPanelClass;
+typedef struct _GtrDictPanelClass GtrDictPanelClass;
 
-struct _GtranslatorDictPanelClass
+struct _GtrDictPanelClass
 {
   GtkVBoxClass parent_class;
 };
@@ -69,9 +69,9 @@ gtranslator_dict_panel_get_type (void)
 
      GType gtranslator_dict_panel_register_type (GTypeModule * module);
 
-     GtkWidget *gtranslator_dict_panel_new (GtranslatorWindow * window);
+     GtkWidget *gtranslator_dict_panel_new (GtrWindow * window);
 
-     void gtranslator_dict_panel_set_position (GtranslatorDictPanel * panel,
+     void gtranslator_dict_panel_set_position (GtrDictPanel * panel,
 					       gint pos);
 
 G_END_DECLS
diff --git a/plugins/dictionary/gtr-dictionary-plugin.c b/plugins/dictionary/gtr-dictionary-plugin.c
index 94fb88f..278acd9 100644
--- a/plugins/dictionary/gtr-dictionary-plugin.c
+++ b/plugins/dictionary/gtr-dictionary-plugin.c
@@ -26,12 +26,12 @@
 
 #include <glib/gi18n-lib.h>
 
-#define WINDOW_DATA_KEY	"GtranslatorDictPluginWindowData"
+#define WINDOW_DATA_KEY	"GtrDictPluginWindowData"
 
 #define GTR_DICT_PLUGIN_GET_PRIVATE(object) \
 				(G_TYPE_INSTANCE_GET_PRIVATE ((object),	\
 				GTR_TYPE_DICT_PLUGIN,		\
-				GtranslatorDictPluginPrivate))
+				GtrDictPluginPrivate))
 
 typedef struct
 {
@@ -39,11 +39,11 @@ typedef struct
   guint context_id;
 } WindowData;
 
-GTR_PLUGIN_REGISTER_TYPE_WITH_CODE (GtranslatorDictPlugin,
+GTR_PLUGIN_REGISTER_TYPE_WITH_CODE (GtrDictPlugin,
 				    gtranslator_dict_plugin,
 				    gtranslator_dict_panel_register_type
 				    (module);)
-     static void gtranslator_dict_plugin_init (GtranslatorDictPlugin * plugin)
+     static void gtranslator_dict_plugin_init (GtrDictPlugin * plugin)
 {
 }
 
@@ -63,7 +63,7 @@ free_window_data (WindowData * data)
 
 
 static GtkWidget *
-create_dict_panel (GtranslatorWindow * window)
+create_dict_panel (GtrWindow * window)
 {
   GtkWidget *panel;
 
@@ -75,7 +75,7 @@ create_dict_panel (GtranslatorWindow * window)
 }
 
 static void
-impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
+impl_activate (GtrPlugin * plugin, GtrWindow * window)
 {
   WindowData *data;
 
@@ -88,7 +88,7 @@ impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 
   gtranslator_window_add_widget (window,
 				 data->panel,
-				 "GtranslatorDictionaryPlugin",
+				 "GtrDictionaryPlugin",
 				 _("Dictionary"),
 				 "dictionary-icon",
 				 GTR_WINDOW_PLACEMENT_LEFT);
@@ -99,7 +99,7 @@ impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 }
 
 static void
-impl_deactivate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
+impl_deactivate (GtrPlugin * plugin, GtrWindow * window)
 {
   WindowData *data;
 
@@ -113,10 +113,10 @@ impl_deactivate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 }
 
 static void
-gtranslator_dict_plugin_class_init (GtranslatorDictPluginClass * klass)
+gtranslator_dict_plugin_class_init (GtrDictPluginClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtranslatorPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
+  GtrPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
 
   object_class->finalize = gtranslator_dict_plugin_finalize;
 
diff --git a/plugins/dictionary/gtr-dictionary-plugin.h b/plugins/dictionary/gtr-dictionary-plugin.h
index 52c4320..4e2dcd4 100644
--- a/plugins/dictionary/gtr-dictionary-plugin.h
+++ b/plugins/dictionary/gtr-dictionary-plugin.h
@@ -28,32 +28,32 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_DICT_PLUGIN		(gtranslator_dict_plugin_get_type ())
-#define GTR_DICT_PLUGIN(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_DICT_PLUGIN, GtranslatorDictPlugin))
-#define GTR_DICT_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_Dict_PLUGIN, GtranslatorDictPluginClass))
+#define GTR_DICT_PLUGIN(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_DICT_PLUGIN, GtrDictPlugin))
+#define GTR_DICT_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_Dict_PLUGIN, GtrDictPluginClass))
 #define GTR_IS_DICT_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_Dict_PLUGIN))
 #define GTR_IS_DICT_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_Dict_PLUGIN))
-#define GTR_Dict_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_Dict_PLUGIN, GtranslatorDictPluginClass))
+#define GTR_Dict_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_Dict_PLUGIN, GtrDictPluginClass))
 /* Private structure type */
-typedef struct _GtranslatorDictPluginPrivate GtranslatorDictPluginPrivate;
+typedef struct _GtrDictPluginPrivate GtrDictPluginPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorDictPlugin GtranslatorDictPlugin;
+typedef struct _GtrDictPlugin GtrDictPlugin;
 
-struct _GtranslatorDictPlugin
+struct _GtrDictPlugin
 {
-  GtranslatorPlugin parent_instance;
+  GtrPlugin parent_instance;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorDictPluginClass GtranslatorDictPluginClass;
+typedef struct _GtrDictPluginClass GtrDictPluginClass;
 
-struct _GtranslatorDictPluginClass
+struct _GtrDictPluginClass
 {
-  GtranslatorPluginClass parent_class;
+  GtrPluginClass parent_class;
 };
 
 /*
diff --git a/plugins/fullscreen/gtr-fullscreen-plugin.c b/plugins/fullscreen/gtr-fullscreen-plugin.c
index b2fa5d8..897a0ae 100644
--- a/plugins/fullscreen/gtr-fullscreen-plugin.c
+++ b/plugins/fullscreen/gtr-fullscreen-plugin.c
@@ -27,13 +27,13 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
-#define WINDOW_DATA_KEY "GtranslatorFullscreenPluginWindowData"
+#define WINDOW_DATA_KEY "GtrFullscreenPluginWindowData"
 #define MENU_PATH "/MainMenu/ViewMenu/ViewOps_1"
 
-GTR_PLUGIN_REGISTER_TYPE (GtranslatorFullscreenPlugin,
+GTR_PLUGIN_REGISTER_TYPE (GtrFullscreenPlugin,
 			  gtranslator_fullscreen_plugin)
      static void on_fullscreen_activated (GtkToggleAction * action,
-					  GtranslatorWindow * window)
+					  GtrWindow * window)
 {
   if (gtk_toggle_action_get_active (action))
     gtk_window_fullscreen (GTK_WINDOW (window));
@@ -62,7 +62,7 @@ free_window_data (WindowData * data)
 }
 
 static void
-gtranslator_fullscreen_plugin_init (GtranslatorFullscreenPlugin *
+gtranslator_fullscreen_plugin_init (GtrFullscreenPlugin *
 				    message_table)
 {
 }
@@ -75,7 +75,7 @@ gtranslator_fullscreen_plugin_finalize (GObject * object)
 }
 
 static void
-impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
+impl_activate (GtrPlugin * plugin, GtrWindow * window)
 {
   GtkUIManager *manager;
   WindowData *data;
@@ -88,7 +88,7 @@ impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
   manager = gtranslator_window_get_ui_manager (window);
 
   data->action_group =
-    gtk_action_group_new ("GtranslatorFullscreenPluginActions");
+    gtk_action_group_new ("GtrFullscreenPluginActions");
   gtk_action_group_set_translation_domain (data->action_group,
 					   GETTEXT_PACKAGE);
   gtk_action_group_add_toggle_actions (data->action_group, action_entries,
@@ -118,7 +118,7 @@ impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 }
 
 static void
-impl_deactivate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
+impl_deactivate (GtrPlugin * plugin, GtrWindow * window)
 {
   GtkUIManager *manager;
   WindowData *data;
@@ -136,11 +136,11 @@ impl_deactivate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 }
 
 static void
-gtranslator_fullscreen_plugin_class_init (GtranslatorFullscreenPluginClass *
+gtranslator_fullscreen_plugin_class_init (GtrFullscreenPluginClass *
 					  klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtranslatorPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
+  GtrPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
 
   object_class->finalize = gtranslator_fullscreen_plugin_finalize;
 
diff --git a/plugins/fullscreen/gtr-fullscreen-plugin.h b/plugins/fullscreen/gtr-fullscreen-plugin.h
index 7b6e2f2..734c2eb 100644
--- a/plugins/fullscreen/gtr-fullscreen-plugin.h
+++ b/plugins/fullscreen/gtr-fullscreen-plugin.h
@@ -29,34 +29,34 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_FULLSCREEN_PLUGIN		(gtranslator_fullscreen_get_type ())
-#define GTR_FULLSCREEN_PLUGIN(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_MESSAGEFULLSCREEN_PLUGIN, GtranslatorFullscreenPlugin))
-#define GTR_FULLSCREEN_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_FULLSCREEN_PLUGIN, GtranslatorFullscreenPluginClass))
+#define GTR_FULLSCREEN_PLUGIN(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_MESSAGEFULLSCREEN_PLUGIN, GtrFullscreenPlugin))
+#define GTR_FULLSCREEN_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_FULLSCREEN_PLUGIN, GtrFullscreenPluginClass))
 #define GTR_IS_FULLSCREEN_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_FULLSCREEN_PLUGIN))
 #define GTR_IS_FULLSCREEN_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_FULLSCREEN_PLUGIN))
-#define GTR_FULLSCREEN_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_FULLSCREEN_PLUGIN_PLUGIN, GtranslatorFullscreenPluginClass))
+#define GTR_FULLSCREEN_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_FULLSCREEN_PLUGIN_PLUGIN, GtrFullscreenPluginClass))
 /* Private structure type */
-typedef struct _GtranslatorFullscreenPluginPrivate
-  GtranslatorFullscreenPluginPrivate;
+typedef struct _GtrFullscreenPluginPrivate
+  GtrFullscreenPluginPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorFullscreenPlugin GtranslatorFullscreenPlugin;
+typedef struct _GtrFullscreenPlugin GtrFullscreenPlugin;
 
-struct _GtranslatorFullscreenPlugin
+struct _GtrFullscreenPlugin
 {
-  GtranslatorPlugin parent_instance;
+  GtrPlugin parent_instance;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorFullscreenPluginClass
-  GtranslatorFullscreenPluginClass;
+typedef struct _GtrFullscreenPluginClass
+  GtrFullscreenPluginClass;
 
-struct _GtranslatorFullscreenPluginClass
+struct _GtrFullscreenPluginClass
 {
-  GtranslatorPluginClass parent_class;
+  GtrPluginClass parent_class;
 };
 
 /*
diff --git a/plugins/glossary/glossary-panel.c b/plugins/glossary/glossary-panel.c
index 6483f58..58dc7fc 100644
--- a/plugins/glossary/glossary-panel.c
+++ b/plugins/glossary/glossary-panel.c
@@ -35,9 +35,9 @@
 #define GTR_GLOSSARY_PANEL_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 (object),		       \
 						 GTR_TYPE_GLOSSARY_PANEL,     \
-						 GtranslatorGlossaryPanelPrivate))
+						 GtrGlossaryPanelPrivate))
 
-G_DEFINE_TYPE (GtranslatorGlossaryPanel, gtranslator_glossary_panel,
+G_DEFINE_TYPE (GtrGlossaryPanel, gtranslator_glossary_panel,
 	       GTK_TYPE_VBOX)
 #define XML_FILE_NAME "glossary.xml"
 /*
@@ -58,7 +58,7 @@ G_DEFINE_TYPE (GtranslatorGlossaryPanel, gtranslator_glossary_panel,
        N_COLUMNS
      };
 
-     struct _GtranslatorGlossaryPanelPrivate
+     struct _GtrGlossaryPanelPrivate
      {
        GtkWidget *tree;
        GtkWidget *search_entry;
@@ -116,7 +116,7 @@ G_DEFINE_TYPE (GtranslatorGlossaryPanel, gtranslator_glossary_panel,
 static void
 process_node (xmlNode * root_node)
 {
-  GtranslatorGlossaryPanelPrivate *priv;
+  GtrGlossaryPanelPrivate *priv;
 
   xmlNodePtr cur_node;
 
@@ -125,23 +125,23 @@ process_node (xmlNode * root_node)
 }
 
 static gboolean
-gtranslator_glossary_panel_load_items (GtranslatorGlossaryPanel * panel)
+gtranslator_glossary_panel_load_items (GtrGlossaryPanel * panel)
 {
-  GtranslatorGlossaryPanelPrivate *priv = panel->priv;
+  GtrGlossaryPanelPrivate *priv = panel->priv;
 
   return FALSE;
 }
 
 static void
-gtranslator_glossary_panel_draw (GtranslatorGlossaryPanel * panel)
+gtranslator_glossary_panel_draw (GtrGlossaryPanel * panel)
 {
-  GtranslatorGlossaryPanelPrivate *priv = panel->priv;
+  GtrGlossaryPanelPrivate *priv = panel->priv;
 
   priv->tree = gtk_tree_view_new ();
 }
 
 static void
-gtranslator_glossary_panel_init (GtranslatorGlossaryPanel * panel)
+gtranslator_glossary_panel_init (GtrGlossaryPanel * panel)
 {
   panel->priv = GTR_GLOSSARY_PANEL_GET_PRIVATE (panel);
 
@@ -155,11 +155,11 @@ gtranslator_glossary_panel_finalize (GObject * object)
 }
 
 static void
-gtranslator_glossary_panel_class_init (GtranslatorGlossaryPanelClass * klass)
+gtranslator_glossary_panel_class_init (GtrGlossaryPanelClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorGlossaryPanelPrivate));
+  g_type_class_add_private (klass, sizeof (GtrGlossaryPanelPrivate));
 
   object_class->finalize = gtranslator_glossary_panel_finalize;
 }
diff --git a/plugins/glossary/glossary-panel.h b/plugins/glossary/glossary-panel.h
index d4798f4..79f2e03 100644
--- a/plugins/glossary/glossary-panel.h
+++ b/plugins/glossary/glossary-panel.h
@@ -33,34 +33,34 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_GLOSSARY_PANEL		(gtranslator_glossary_panel_get_type ())
-#define GTR_GLOSSARY_PANEL(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_GLOSSARY_PANEL, GtranslatorGlossaryPanel))
-#define GTR_GLOSSARY_PANEL_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_GLOSSARY_PANEL, GtranslatorGlossaryPanelClass))
+#define GTR_GLOSSARY_PANEL(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_GLOSSARY_PANEL, GtrGlossaryPanel))
+#define GTR_GLOSSARY_PANEL_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_GLOSSARY_PANEL, GtrGlossaryPanelClass))
 #define GTR_IS_GLOSSARY_PANEL(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_GLOSSARY_PANEL))
 #define GTR_IS_GLOSSARY_PANEL_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_GLOSSARY_PANEL))
-#define GTR_GLOSSARY_PANEL_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_GLOSSARY_PANEL, GtranslatorGlossaryPanelClass))
+#define GTR_GLOSSARY_PANEL_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_GLOSSARY_PANEL, GtrGlossaryPanelClass))
 /* Private structure type */
-typedef struct _GtranslatorGlossaryPanelPrivate
-  GtranslatorGlossaryPanelPrivate;
+typedef struct _GtrGlossaryPanelPrivate
+  GtrGlossaryPanelPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorGlossaryPanel GtranslatorGlossaryPanel;
+typedef struct _GtrGlossaryPanel GtrGlossaryPanel;
 
-struct _GtranslatorGlossaryPanel
+struct _GtrGlossaryPanel
 {
   GtkVBox parent_instance;
 
   /*< private > */
-  GtranslatorGlossaryPanelPrivate *priv;
+  GtrGlossaryPanelPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorGlossaryPanelClass GtranslatorGlossaryPanelClass;
+typedef struct _GtrGlossaryPanelClass GtrGlossaryPanelClass;
 
-struct _GtranslatorGlossaryPanelClass
+struct _GtrGlossaryPanelClass
 {
   GtkVBoxClass parent_class;
 };
diff --git a/plugins/insert-params/gtr-insert-params-plugin.c b/plugins/insert-params/gtr-insert-params-plugin.c
index 0949e01..e994d61 100644
--- a/plugins/insert-params/gtr-insert-params-plugin.c
+++ b/plugins/insert-params/gtr-insert-params-plugin.c
@@ -29,9 +29,9 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
-#define WINDOW_DATA_KEY "GtranslatorInsertParamsPluginWindowData"
+#define WINDOW_DATA_KEY "GtrInsertParamsPluginWindowData"
 
-GTR_PLUGIN_REGISTER_TYPE (GtranslatorInsertParamsPlugin,
+GTR_PLUGIN_REGISTER_TYPE (GtrInsertParamsPlugin,
 			  gtranslator_insert_params_plugin)
      static GSList *params = NULL;
      static gint param_position;
@@ -44,9 +44,9 @@ GTR_PLUGIN_REGISTER_TYPE (GtranslatorInsertParamsPlugin,
        "[diouxXeEfFgGaAcsCSpnm]";	// conversion specifier
 
      static void
-       on_next_tag_activated (GtkAction * action, GtranslatorWindow * window)
+       on_next_tag_activated (GtkAction * action, GtrWindow * window)
 {
-  GtranslatorView *view;
+  GtrView *view;
   GtkTextBuffer *buffer;
   GSList *param;
 
@@ -102,7 +102,7 @@ free_window_data (WindowData * data)
 }
 
 static void
-update_ui_real (GtranslatorWindow * window, WindowData * data)
+update_ui_real (GtrWindow * window, WindowData * data)
 {
   GtkTextView *view;
   GtkAction *action;
@@ -121,7 +121,7 @@ update_ui_real (GtranslatorWindow * window, WindowData * data)
 }
 
 static void
-gtranslator_insert_params_plugin_init (GtranslatorInsertParamsPlugin *
+gtranslator_insert_params_plugin_init (GtrInsertParamsPlugin *
 				       message_table)
 {
 }
@@ -140,11 +140,11 @@ gtranslator_insert_params_plugin_finalize (GObject * object)
 }
 
 static void
-on_menuitem_activated (GtkMenuItem * item, GtranslatorWindow * window)
+on_menuitem_activated (GtkMenuItem * item, GtrWindow * window)
 {
   const gchar *name;
   GtkWidget *label;
-  GtranslatorView *view;
+  GtrView *view;
   GtkTextBuffer *buffer;
 
   label = gtk_bin_get_child (GTK_BIN (item));
@@ -160,7 +160,7 @@ on_menuitem_activated (GtkMenuItem * item, GtranslatorWindow * window)
 }
 
 static void
-parse_list (GtranslatorWindow * window)
+parse_list (GtrWindow * window)
 {
   GtkUIManager *manager;
   GtkWidget *insert_params, *next_param;
@@ -203,8 +203,8 @@ parse_list (GtranslatorWindow * window)
 }
 
 static void
-showed_message_cb (GtranslatorTab * tab,
-		   GtranslatorMsg * msg, GtranslatorWindow * window)
+showed_message_cb (GtrTab * tab,
+		   GtrMsg * msg, GtrWindow * window)
 {
   const gchar *msgid;
   GRegex *regex;
@@ -266,19 +266,19 @@ showed_message_cb (GtranslatorTab * tab,
 
 static void
 page_added_cb (GtkNotebook * notebook,
-	       GtkWidget * child, guint page_num, GtranslatorWindow * window)
+	       GtkWidget * child, guint page_num, GtrWindow * window)
 {
   g_signal_connect (child, "showed-message",
 		    G_CALLBACK (showed_message_cb), window);
 }
 
 static void
-impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
+impl_activate (GtrPlugin * plugin, GtrWindow * window)
 {
   GtkUIManager *manager;
   WindowData *data;
   GError *error = NULL;
-  GtranslatorNotebook *notebook;
+  GtrNotebook *notebook;
   GList *tabs = NULL;
 
   g_return_if_fail (GTR_IS_WINDOW (window));
@@ -288,7 +288,7 @@ impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
   manager = gtranslator_window_get_ui_manager (window);
 
   data->action_group =
-    gtk_action_group_new ("GtranslatorInsertParamsPluginActions");
+    gtk_action_group_new ("GtrInsertParamsPluginActions");
   gtk_action_group_set_translation_domain (data->action_group,
 					   GETTEXT_PACKAGE);
   gtk_action_group_add_actions (data->action_group, action_entries,
@@ -332,9 +332,9 @@ impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 }
 
 static void
-impl_deactivate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
+impl_deactivate (GtrPlugin * plugin, GtrWindow * window)
 {
-  GtranslatorNotebook *notebook;
+  GtrNotebook *notebook;
   GtkUIManager *manager;
   WindowData *data;
 
@@ -361,7 +361,7 @@ impl_deactivate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 }
 
 static void
-impl_update_ui (GtranslatorPlugin * plugin, GtranslatorWindow * window)
+impl_update_ui (GtrPlugin * plugin, GtrWindow * window)
 {
   WindowData *data;
 
@@ -374,10 +374,10 @@ impl_update_ui (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 
 static void
 gtranslator_insert_params_plugin_class_init
-  (GtranslatorInsertParamsPluginClass * klass)
+  (GtrInsertParamsPluginClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtranslatorPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
+  GtrPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
 
   object_class->finalize = gtranslator_insert_params_plugin_finalize;
 
diff --git a/plugins/insert-params/gtr-insert-params-plugin.h b/plugins/insert-params/gtr-insert-params-plugin.h
index 4ab9902..722e5c2 100644
--- a/plugins/insert-params/gtr-insert-params-plugin.h
+++ b/plugins/insert-params/gtr-insert-params-plugin.h
@@ -29,34 +29,34 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_INSERT_PARAMS_PLUGIN		(gtranslator_insert_params_get_type ())
-#define GTR_INSERT_PARAMS_PLUGIN(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_MESSAGEINSERT_PARAMS_PLUGIN, GtranslatorInsertParamsPlugin))
-#define GTR_INSERT_PARAMS_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_INSERT_PARAMS_PLUGIN, GtranslatorInsertParamsPluginClass))
+#define GTR_INSERT_PARAMS_PLUGIN(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_MESSAGEINSERT_PARAMS_PLUGIN, GtrInsertParamsPlugin))
+#define GTR_INSERT_PARAMS_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_INSERT_PARAMS_PLUGIN, GtrInsertParamsPluginClass))
 #define GTR_IS_INSERT_PARAMS_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_INSERT_PARAMS_PLUGIN))
 #define GTR_IS_INSERT_PARAMS_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_INSERT_PARAMS_PLUGIN))
-#define GTR_INSERT_PARAMS_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_INSERT_PARAMS_PLUGIN_PLUGIN, GtranslatorInsertParamsPluginClass))
+#define GTR_INSERT_PARAMS_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_INSERT_PARAMS_PLUGIN_PLUGIN, GtrInsertParamsPluginClass))
 /* Private structure type */
-typedef struct _GtranslatorInsertParamsPluginPrivate
-  GtranslatorInsertParamsPluginPrivate;
+typedef struct _GtrInsertParamsPluginPrivate
+  GtrInsertParamsPluginPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorInsertParamsPlugin GtranslatorInsertParamsPlugin;
+typedef struct _GtrInsertParamsPlugin GtrInsertParamsPlugin;
 
-struct _GtranslatorInsertParamsPlugin
+struct _GtrInsertParamsPlugin
 {
-  GtranslatorPlugin parent_instance;
+  GtrPlugin parent_instance;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorInsertParamsPluginClass
-  GtranslatorInsertParamsPluginClass;
+typedef struct _GtrInsertParamsPluginClass
+  GtrInsertParamsPluginClass;
 
-struct _GtranslatorInsertParamsPluginClass
+struct _GtrInsertParamsPluginClass
 {
-  GtranslatorPluginClass parent_class;
+  GtrPluginClass parent_class;
 };
 
 /*
diff --git a/plugins/insert-tags/gtr-insert-tags-plugin.c b/plugins/insert-tags/gtr-insert-tags-plugin.c
index 5b9e38f..3aaf6a5 100644
--- a/plugins/insert-tags/gtr-insert-tags-plugin.c
+++ b/plugins/insert-tags/gtr-insert-tags-plugin.c
@@ -29,17 +29,17 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
-#define WINDOW_DATA_KEY "GtranslatorInsertTagsPluginWindowData"
+#define WINDOW_DATA_KEY "GtrInsertTagsPluginWindowData"
 
-GTR_PLUGIN_REGISTER_TYPE (GtranslatorInsertTagsPlugin,
+GTR_PLUGIN_REGISTER_TYPE (GtrInsertTagsPlugin,
 			  gtranslator_insert_tags_plugin)
      static GSList *tags = NULL;
      static gint tag_position;
 
      static void
-       on_next_tag_activated (GtkAction * action, GtranslatorWindow * window)
+       on_next_tag_activated (GtkAction * action, GtrWindow * window)
 {
-  GtranslatorView *view;
+  GtrView *view;
   GtkTextBuffer *buffer;
   GSList *tag;
 
@@ -95,7 +95,7 @@ free_window_data (WindowData * data)
 }
 
 static void
-update_ui_real (GtranslatorWindow * window, WindowData * data)
+update_ui_real (GtrWindow * window, WindowData * data)
 {
   GtkTextView *view;
   GtkAction *action;
@@ -114,7 +114,7 @@ update_ui_real (GtranslatorWindow * window, WindowData * data)
 }
 
 static void
-gtranslator_insert_tags_plugin_init (GtranslatorInsertTagsPlugin *
+gtranslator_insert_tags_plugin_init (GtrInsertTagsPlugin *
 				     message_table)
 {
 }
@@ -133,11 +133,11 @@ gtranslator_insert_tags_plugin_finalize (GObject * object)
 }
 
 static void
-on_menuitem_activated (GtkMenuItem * item, GtranslatorWindow * window)
+on_menuitem_activated (GtkMenuItem * item, GtrWindow * window)
 {
   const gchar *name;
   GtkWidget *label;
-  GtranslatorView *view;
+  GtrView *view;
   GtkTextBuffer *buffer;
 
   label = gtk_bin_get_child (GTK_BIN (item));
@@ -153,7 +153,7 @@ on_menuitem_activated (GtkMenuItem * item, GtranslatorWindow * window)
 }
 
 static void
-parse_list (GtranslatorWindow * window)
+parse_list (GtrWindow * window)
 {
   GtkUIManager *manager;
   GtkWidget *insert_tags, *next_tag;
@@ -197,8 +197,8 @@ parse_list (GtranslatorWindow * window)
 }
 
 static void
-showed_message_cb (GtranslatorTab * tab,
-		   GtranslatorMsg * msg, GtranslatorWindow * window)
+showed_message_cb (GtrTab * tab,
+		   GtrMsg * msg, GtrWindow * window)
 {
   const gchar *msgid;
   GRegex *regex;
@@ -241,19 +241,19 @@ showed_message_cb (GtranslatorTab * tab,
 
 static void
 page_added_cb (GtkNotebook * notebook,
-	       GtkWidget * child, guint page_num, GtranslatorWindow * window)
+	       GtkWidget * child, guint page_num, GtrWindow * window)
 {
   g_signal_connect (child, "showed-message",
 		    G_CALLBACK (showed_message_cb), window);
 }
 
 static void
-impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
+impl_activate (GtrPlugin * plugin, GtrWindow * window)
 {
   GtkUIManager *manager;
   WindowData *data;
   GError *error = NULL;
-  GtranslatorNotebook *notebook;
+  GtrNotebook *notebook;
   GList *tabs = NULL;
 
   g_return_if_fail (GTR_IS_WINDOW (window));
@@ -263,7 +263,7 @@ impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
   manager = gtranslator_window_get_ui_manager (window);
 
   data->action_group =
-    gtk_action_group_new ("GtranslatorInsertTagsPluginActions");
+    gtk_action_group_new ("GtrInsertTagsPluginActions");
   gtk_action_group_set_translation_domain (data->action_group,
 					   GETTEXT_PACKAGE);
   gtk_action_group_add_actions (data->action_group, action_entries,
@@ -307,9 +307,9 @@ impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 }
 
 static void
-impl_deactivate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
+impl_deactivate (GtrPlugin * plugin, GtrWindow * window)
 {
-  GtranslatorNotebook *notebook;
+  GtrNotebook *notebook;
   GtkUIManager *manager;
   WindowData *data;
 
@@ -336,7 +336,7 @@ impl_deactivate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 }
 
 static void
-impl_update_ui (GtranslatorPlugin * plugin, GtranslatorWindow * window)
+impl_update_ui (GtrPlugin * plugin, GtrWindow * window)
 {
   WindowData *data;
 
@@ -348,11 +348,11 @@ impl_update_ui (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 }
 
 static void
-gtranslator_insert_tags_plugin_class_init (GtranslatorInsertTagsPluginClass *
+gtranslator_insert_tags_plugin_class_init (GtrInsertTagsPluginClass *
 					   klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtranslatorPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
+  GtrPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
 
   object_class->finalize = gtranslator_insert_tags_plugin_finalize;
 
diff --git a/plugins/insert-tags/gtr-insert-tags-plugin.h b/plugins/insert-tags/gtr-insert-tags-plugin.h
index 67ac3bc..e28d236 100644
--- a/plugins/insert-tags/gtr-insert-tags-plugin.h
+++ b/plugins/insert-tags/gtr-insert-tags-plugin.h
@@ -29,34 +29,34 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_INSERT_TAGS_PLUGIN		(gtranslator_insert_tags_get_type ())
-#define GTR_INSERT_TAGS_PLUGIN(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_MESSAGEINSERT_TAGS_PLUGIN, GtranslatorInsertTagsPlugin))
-#define GTR_INSERT_TAGS_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_INSERT_TAGS_PLUGIN, GtranslatorInsertTagsPluginClass))
+#define GTR_INSERT_TAGS_PLUGIN(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_MESSAGEINSERT_TAGS_PLUGIN, GtrInsertTagsPlugin))
+#define GTR_INSERT_TAGS_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_INSERT_TAGS_PLUGIN, GtrInsertTagsPluginClass))
 #define GTR_IS_INSERT_TAGS_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_INSERT_TAGS_PLUGIN))
 #define GTR_IS_INSERT_TAGS_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_INSERT_TAGS_PLUGIN))
-#define GTR_INSERT_TAGS_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_INSERT_TAGS_PLUGIN_PLUGIN, GtranslatorInsertTagsPluginClass))
+#define GTR_INSERT_TAGS_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_INSERT_TAGS_PLUGIN_PLUGIN, GtrInsertTagsPluginClass))
 /* Private structure type */
-typedef struct _GtranslatorInsertTagsPluginPrivate
-  GtranslatorInsertTagsPluginPrivate;
+typedef struct _GtrInsertTagsPluginPrivate
+  GtrInsertTagsPluginPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorInsertTagsPlugin GtranslatorInsertTagsPlugin;
+typedef struct _GtrInsertTagsPlugin GtrInsertTagsPlugin;
 
-struct _GtranslatorInsertTagsPlugin
+struct _GtrInsertTagsPlugin
 {
-  GtranslatorPlugin parent_instance;
+  GtrPlugin parent_instance;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorInsertTagsPluginClass
-  GtranslatorInsertTagsPluginClass;
+typedef struct _GtrInsertTagsPluginClass
+  GtrInsertTagsPluginClass;
 
-struct _GtranslatorInsertTagsPluginClass
+struct _GtrInsertTagsPluginClass
 {
-  GtranslatorPluginClass parent_class;
+  GtrPluginClass parent_class;
 };
 
 /*
diff --git a/plugins/open-tran/gtr-open-tran-panel.c b/plugins/open-tran/gtr-open-tran-panel.c
index 48a71b5..f27298e 100644
--- a/plugins/open-tran/gtr-open-tran-panel.c
+++ b/plugins/open-tran/gtr-open-tran-panel.c
@@ -37,7 +37,7 @@
 #define GTR_OPEN_TRAN_PANEL_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 (object),		       \
 						 GTR_TYPE_OPEN_TRAN_PANEL,     \
-						 GtranslatorOpenTranPanelPrivate))
+						 GtrOpenTranPanelPrivate))
 
 #define GNOME_ICON   PIXMAPSDIR"/gnome.png"
 #define KDE_ICON     PIXMAPSDIR"/kde.ico"
@@ -49,10 +49,10 @@
 #define OPEN_OFFICE_ICON PIXMAPSDIR"/oo-logo.png"
 #define FEDORA_ICON PIXMAPSDIR"/fedora.png"
 
-GTR_PLUGIN_DEFINE_TYPE (GtranslatorOpenTranPanel, gtranslator_open_tran_panel,
+GTR_PLUGIN_DEFINE_TYPE (GtrOpenTranPanel, gtranslator_open_tran_panel,
 			GTK_TYPE_VBOX)
 
-struct _GtranslatorOpenTranPanelPrivate
+struct _GtrOpenTranPanelPrivate
 {
   GConfClient *gconf_client;
 
@@ -63,7 +63,7 @@ struct _GtranslatorOpenTranPanelPrivate
 
   SoupSession *session;
 
-  GtranslatorWindow *window;
+  GtrWindow *window;
 
   gchar *text;
 };
@@ -76,7 +76,7 @@ enum
 };
 
 static void
-show_error_dialog (GtranslatorWindow * parent,
+show_error_dialog (GtrWindow * parent,
 		   const gchar * message_format,
 		   ...)
 {
@@ -119,7 +119,7 @@ create_pixbuf (const gchar * path)
 
 static void
 print_struct_to_tree_view (const gchar * str,
-			   GtranslatorOpenTranPanel * panel)
+			   GtrOpenTranPanel * panel)
 {
   GdkPixbuf *icon;
   GtkTreeIter iter;
@@ -165,7 +165,7 @@ print_struct_to_tree_view (const gchar * str,
 static void
 print_struct_field (gpointer key, gpointer value, gpointer data)
 {
-  GtranslatorOpenTranPanel *panel = GTR_OPEN_TRAN_PANEL (data);
+  GtrOpenTranPanel *panel = GTR_OPEN_TRAN_PANEL (data);
   GHashTable *hash;
   GValueArray *array;
   const gchar *str;
@@ -215,7 +215,7 @@ check_xmlrpc (GValue * value, GType type, ...)
 }
 
 static void
-open_connection (GtranslatorOpenTranPanel * panel,
+open_connection (GtrOpenTranPanel * panel,
 		 const gchar * text,
 		 const gchar * search_code, const gchar * own_code)
 {
@@ -308,7 +308,7 @@ open_connection (GtranslatorOpenTranPanel * panel,
 }
 
 static void
-entry_activate_cb (GtkEntry * entry, GtranslatorOpenTranPanel * panel)
+entry_activate_cb (GtkEntry * entry, GtrOpenTranPanel * panel)
 {
   const gchar *entry_text = NULL;
   const gchar *search_code = NULL;
@@ -347,12 +347,12 @@ entry_activate_cb (GtkEntry * entry, GtranslatorOpenTranPanel * panel)
 }
 
 static void
-gtranslator_open_tran_panel_draw_treeview (GtranslatorOpenTranPanel * panel)
+gtranslator_open_tran_panel_draw_treeview (GtrOpenTranPanel * panel)
 {
   GtkTreeViewColumn *column;
   GtkCellRenderer *renderer;
 
-  GtranslatorOpenTranPanelPrivate *priv = panel->priv;
+  GtrOpenTranPanelPrivate *priv = panel->priv;
 
   priv->store = gtk_list_store_new (N_COLUMNS,
 				    GDK_TYPE_PIXBUF, G_TYPE_STRING);
@@ -388,7 +388,7 @@ gtranslator_open_tran_panel_draw_treeview (GtranslatorOpenTranPanel * panel)
 }
 
 static void
-gtranslator_open_tran_panel_draw (GtranslatorOpenTranPanel * panel)
+gtranslator_open_tran_panel_draw (GtrOpenTranPanel * panel)
 {
   GtkWidget *scrolledwindow;
   GtkWidget *button;
@@ -430,7 +430,7 @@ gtranslator_open_tran_panel_draw (GtranslatorOpenTranPanel * panel)
 }
 
 static void
-gtranslator_open_tran_panel_init (GtranslatorOpenTranPanel * panel)
+gtranslator_open_tran_panel_init (GtrOpenTranPanel * panel)
 {
 
   panel->priv = GTR_OPEN_TRAN_PANEL_GET_PRIVATE (panel);
@@ -444,7 +444,7 @@ gtranslator_open_tran_panel_init (GtranslatorOpenTranPanel * panel)
 static void
 gtranslator_open_tran_panel_dispose (GObject * object)
 {
-  GtranslatorOpenTranPanel *panel = GTR_OPEN_TRAN_PANEL (object);
+  GtrOpenTranPanel *panel = GTR_OPEN_TRAN_PANEL (object);
 
   if (panel->priv->session != NULL)
     {
@@ -455,19 +455,19 @@ gtranslator_open_tran_panel_dispose (GObject * object)
 }
 
 static void
-gtranslator_open_tran_panel_class_init (GtranslatorOpenTranPanelClass * klass)
+gtranslator_open_tran_panel_class_init (GtrOpenTranPanelClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorOpenTranPanelPrivate));
+  g_type_class_add_private (klass, sizeof (GtrOpenTranPanelPrivate));
 
   object_class->dispose = gtranslator_open_tran_panel_dispose;
 }
 
 GtkWidget *
-gtranslator_open_tran_panel_new (GtranslatorWindow * window)
+gtranslator_open_tran_panel_new (GtrWindow * window)
 {
-  GtranslatorOpenTranPanel *panel;
+  GtrOpenTranPanel *panel;
 
   panel = g_object_new (GTR_TYPE_OPEN_TRAN_PANEL, NULL);
 
diff --git a/plugins/open-tran/gtr-open-tran-panel.h b/plugins/open-tran/gtr-open-tran-panel.h
index fba077f..aee5e0c 100644
--- a/plugins/open-tran/gtr-open-tran-panel.h
+++ b/plugins/open-tran/gtr-open-tran-panel.h
@@ -30,38 +30,38 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_OPEN_TRAN_PANEL		(gtranslator_open_tran_panel_get_type ())
-#define GTR_OPEN_TRAN_PANEL(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_OPEN_TRAN_PANEL, GtranslatorOpenTranPanel))
-#define GTR_OPEN_TRAN_PANEL_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_OPEN_TRAN_PANEL, GtranslatorOpenTranPanelClass))
+#define GTR_OPEN_TRAN_PANEL(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_OPEN_TRAN_PANEL, GtrOpenTranPanel))
+#define GTR_OPEN_TRAN_PANEL_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_OPEN_TRAN_PANEL, GtrOpenTranPanelClass))
 #define GTR_IS_OPEN_TRAN_PANEL(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_OPEN_TRAN_PANEL))
 #define GTR_IS_OPEN_TRAN_PANEL_CLASS(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_OPEN_TRAN_PANEL))
-#define GTR_OPEN_TRAN_PANEL_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_OPEN_TRAN_PANEL, GtranslatorOpenTranPanelClass))
+#define GTR_OPEN_TRAN_PANEL_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_OPEN_TRAN_PANEL, GtrOpenTranPanelClass))
 /* Gconf keys */
 #define OPEN_TRAN_BASE_KEY "/apps/gtranslator/plugins/open-tran"
 #define SEARCH_CODE_KEY OPEN_TRAN_BASE_KEY "/search_code"
 #define OWN_CODE_KEY OPEN_TRAN_BASE_KEY "/own_code"
 /* Private structure type */
-typedef struct _GtranslatorOpenTranPanelPrivate
-  GtranslatorOpenTranPanelPrivate;
+typedef struct _GtrOpenTranPanelPrivate
+  GtrOpenTranPanelPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorOpenTranPanel GtranslatorOpenTranPanel;
+typedef struct _GtrOpenTranPanel GtrOpenTranPanel;
 
-struct _GtranslatorOpenTranPanel
+struct _GtrOpenTranPanel
 {
   GtkVBox parent_instance;
 
   /*< private > */
-  GtranslatorOpenTranPanelPrivate *priv;
+  GtrOpenTranPanelPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorOpenTranPanelClass GtranslatorOpenTranPanelClass;
+typedef struct _GtrOpenTranPanelClass GtrOpenTranPanelClass;
 
-struct _GtranslatorOpenTranPanelClass
+struct _GtrOpenTranPanelClass
 {
   GtkVBoxClass parent_class;
 };
@@ -73,7 +73,7 @@ GType
 gtranslator_open_tran_panel_get_type (void)
   G_GNUC_CONST;
      GType gtranslator_open_tran_panel_register_type (GTypeModule * module);
-     GtkWidget *gtranslator_open_tran_panel_new (GtranslatorWindow * window);
+     GtkWidget *gtranslator_open_tran_panel_new (GtrWindow * window);
 
 G_END_DECLS
 #endif /* __OPEN_TRAN_PANEL_H__ */
diff --git a/plugins/open-tran/gtr-open-tran-plugin.c b/plugins/open-tran/gtr-open-tran-plugin.c
index 7bc2f98..83a7ab4 100644
--- a/plugins/open-tran/gtr-open-tran-plugin.c
+++ b/plugins/open-tran/gtr-open-tran-plugin.c
@@ -32,15 +32,15 @@
 #include <gtk/gtk.h>
 
 #define OPEN_TRAN_PLUGIN_ICON "open-tran.png"
-#define WINDOW_DATA_KEY	"GtranslatorOpenTranPluginWindowData"
+#define WINDOW_DATA_KEY	"GtrOpenTranPluginWindowData"
 #define UI_FILE DATADIR"/open-tran-dialog.ui"
 
 #define GTR_OPEN_TRAN_PLUGIN_GET_PRIVATE(object) \
 				(G_TYPE_INSTANCE_GET_PRIVATE ((object),	\
 				GTR_TYPE_OPEN_TRAN_PLUGIN,		\
-				GtranslatorOpenTranPluginPrivate))
+				GtrOpenTranPluginPrivate))
 
-struct _GtranslatorOpenTranPluginPrivate
+struct _GtrOpenTranPluginPrivate
 {
   GConfClient *gconf_client;
 
@@ -58,11 +58,11 @@ typedef struct
   guint context_id;
 } WindowData;
 
-GTR_PLUGIN_REGISTER_TYPE_WITH_CODE (GtranslatorOpenTranPlugin,
+GTR_PLUGIN_REGISTER_TYPE_WITH_CODE (GtrOpenTranPlugin,
 				    gtranslator_open_tran_plugin,
 				    gtranslator_open_tran_panel_register_type
 				    (module);)
-     static void gtranslator_open_tran_plugin_init (GtranslatorOpenTranPlugin
+     static void gtranslator_open_tran_plugin_init (GtrOpenTranPlugin
 						    * plugin)
 {
   plugin->priv = GTR_OPEN_TRAN_PLUGIN_GET_PRIVATE (plugin);
@@ -77,7 +77,7 @@ GTR_PLUGIN_REGISTER_TYPE_WITH_CODE (GtranslatorOpenTranPlugin,
 static void
 gtranslator_open_tran_plugin_finalize (GObject * object)
 {
-  GtranslatorOpenTranPlugin *plugin = GTR_OPEN_TRAN_PLUGIN (object);
+  GtrOpenTranPlugin *plugin = GTR_OPEN_TRAN_PLUGIN (object);
 
   gconf_client_suggest_sync (plugin->priv->gconf_client, NULL);
 
@@ -89,7 +89,7 @@ gtranslator_open_tran_plugin_finalize (GObject * object)
 
 
 static void
-impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
+impl_activate (GtrPlugin * plugin, GtrWindow * window)
 {
   GtkWidget *opentran;
 
@@ -101,7 +101,7 @@ impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 
   gtranslator_window_add_widget (window,
 				 opentran,
-				 "GtranslatorOpenTranPlugin",
+				 "GtrOpenTranPlugin",
 				 _("Open Tran"),
 				 "open-tran-plugin-icon",
 				 GTR_WINDOW_PLACEMENT_LEFT);
@@ -110,7 +110,7 @@ impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 }
 
 static void
-impl_deactivate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
+impl_deactivate (GtrPlugin * plugin, GtrWindow * window)
 {
   GtkWidget *opentran;
 
@@ -124,7 +124,7 @@ impl_deactivate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 }
 
 static void
-get_custom_code (GtranslatorOpenTranPlugin * plugin, gboolean own_code)
+get_custom_code (GtrOpenTranPlugin * plugin, gboolean own_code)
 {
   gchar *type;
   gchar *code;
@@ -152,7 +152,7 @@ get_custom_code (GtranslatorOpenTranPlugin * plugin, gboolean own_code)
 }
 
 static GtkWidget *
-get_configuration_dialog (GtranslatorOpenTranPlugin * plugin)
+get_configuration_dialog (GtrOpenTranPlugin * plugin)
 {
 
   gboolean ret;
@@ -185,7 +185,7 @@ get_configuration_dialog (GtranslatorOpenTranPlugin * plugin)
 }
 
 static void
-ok_button_pressed (GtranslatorOpenTranPlugin * plugin)
+ok_button_pressed (GtrOpenTranPlugin * plugin)
 {
   const gchar *search_code;
   const gchar *own_code;
@@ -214,7 +214,7 @@ ok_button_pressed (GtranslatorOpenTranPlugin * plugin)
 static void
 configure_dialog_response_cb (GtkWidget * widget,
 			      gint response,
-			      GtranslatorOpenTranPlugin * plugin)
+			      GtrOpenTranPlugin * plugin)
 {
   switch (response)
     {
@@ -233,7 +233,7 @@ configure_dialog_response_cb (GtkWidget * widget,
 }
 
 static GtkWidget *
-impl_create_configure_dialog (GtranslatorPlugin * plugin)
+impl_create_configure_dialog (GtrPlugin * plugin)
 {
   GtkWidget *dialog;
 
@@ -250,11 +250,11 @@ impl_create_configure_dialog (GtranslatorPlugin * plugin)
 }
 
 static void
-gtranslator_open_tran_plugin_class_init (GtranslatorOpenTranPluginClass *
+gtranslator_open_tran_plugin_class_init (GtrOpenTranPluginClass *
 					 klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtranslatorPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
+  GtrPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
 
   object_class->finalize = gtranslator_open_tran_plugin_finalize;
 
@@ -263,5 +263,5 @@ gtranslator_open_tran_plugin_class_init (GtranslatorOpenTranPluginClass *
   plugin_class->create_configure_dialog = impl_create_configure_dialog;
 
   g_type_class_add_private (object_class,
-			    sizeof (GtranslatorOpenTranPluginPrivate));
+			    sizeof (GtrOpenTranPluginPrivate));
 }
diff --git a/plugins/open-tran/gtr-open-tran-plugin.h b/plugins/open-tran/gtr-open-tran-plugin.h
index 17cdffd..08c91eb 100644
--- a/plugins/open-tran/gtr-open-tran-plugin.h
+++ b/plugins/open-tran/gtr-open-tran-plugin.h
@@ -29,36 +29,36 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_OPEN_TRAN_PLUGIN		(gtranslator_open_tran_plugin_get_type ())
-#define GTR_OPEN_TRAN_PLUGIN(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_OPEN_TRAN_PLUGIN, GtranslatorOpenTranPlugin))
-#define GTR_OPEN_TRAN_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_OPEN_TRAN_PLUGIN, GtranslatorOpenTranPluginClass))
+#define GTR_OPEN_TRAN_PLUGIN(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_OPEN_TRAN_PLUGIN, GtrOpenTranPlugin))
+#define GTR_OPEN_TRAN_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_OPEN_TRAN_PLUGIN, GtrOpenTranPluginClass))
 #define GTR_IS_OPEN_TRAN_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_OPEN_TRAN_PLUGIN))
 #define GTR_IS_OPEN_TRAN_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_OPEN_TRAN_PLUGIN))
-#define GTR_OPEN_TRAN_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_OPEN_TRAN_PLUGIN, GtranslatorOpenTranPluginClass))
+#define GTR_OPEN_TRAN_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_OPEN_TRAN_PLUGIN, GtrOpenTranPluginClass))
 /* Private structure type */
-typedef struct _GtranslatorOpenTranPluginPrivate
-  GtranslatorOpenTranPluginPrivate;
+typedef struct _GtrOpenTranPluginPrivate
+  GtrOpenTranPluginPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorOpenTranPlugin GtranslatorOpenTranPlugin;
+typedef struct _GtrOpenTranPlugin GtrOpenTranPlugin;
 
-struct _GtranslatorOpenTranPlugin
+struct _GtrOpenTranPlugin
 {
-  GtranslatorPlugin parent_instance;
+  GtrPlugin parent_instance;
 
   /* private */
-  GtranslatorOpenTranPluginPrivate *priv;
+  GtrOpenTranPluginPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorOpenTranPluginClass GtranslatorOpenTranPluginClass;
+typedef struct _GtrOpenTranPluginClass GtrOpenTranPluginClass;
 
-struct _GtranslatorOpenTranPluginClass
+struct _GtrOpenTranPluginClass
 {
-  GtranslatorPluginClass parent_class;
+  GtrPluginClass parent_class;
 };
 
 /*
diff --git a/plugins/source-code-view/gtr-source-code-view-plugin.c b/plugins/source-code-view/gtr-source-code-view-plugin.c
index 4fc16c5..1f8b8f8 100644
--- a/plugins/source-code-view/gtr-source-code-view-plugin.c
+++ b/plugins/source-code-view/gtr-source-code-view-plugin.c
@@ -45,9 +45,9 @@
 #define GTR_SOURCE_CODE_VIEW_PLUGIN_GET_PRIVATE(object) \
 				(G_TYPE_INSTANCE_GET_PRIVATE ((object),	\
 				GTR_TYPE_SOURCE_CODE_VIEW_PLUGIN,		\
-				GtranslatorSourceCodeViewPluginPrivate))
+				GtrSourceCodeViewPluginPrivate))
 
-struct _GtranslatorSourceCodeViewPluginPrivate
+struct _GtrSourceCodeViewPluginPrivate
 {
   GConfClient *gconf_client;
 
@@ -60,16 +60,16 @@ struct _GtranslatorSourceCodeViewPluginPrivate
   GtkWidget *program_cmd_entry;
   GtkWidget *line_cmd_entry;
 
-  GtranslatorWindow *window;
+  GtrWindow *window;
 
   GSList *tags;
 };
 
-GTR_PLUGIN_REGISTER_TYPE (GtranslatorSourceCodeViewPlugin,
+GTR_PLUGIN_REGISTER_TYPE (GtrSourceCodeViewPlugin,
 			  gtranslator_source_code_view_plugin)
      static void insert_link (GtkTextBuffer * buffer, GtkTextIter * iter,
 			      const gchar * path, gint * line,
-			      GtranslatorSourceCodeViewPlugin * plugin,
+			      GtrSourceCodeViewPlugin * plugin,
 			      const gchar * msgid)
 {
   GtkTextTag *tag;
@@ -128,7 +128,7 @@ show_in_editor (const gchar * program_name,
 }
 
 static void
-show_source (GtranslatorSourceCodeViewPlugin * plugin,
+show_source (GtrSourceCodeViewPlugin * plugin,
 	     const gchar * path, gint line)
 {
   gboolean use_editor;
@@ -215,12 +215,12 @@ out:
 }
 
 static void
-follow_if_link (GtranslatorSourceCodeViewPlugin * plugin,
+follow_if_link (GtrSourceCodeViewPlugin * plugin,
 		GtkWidget * text_view, GtkTextIter * iter)
 {
   GSList *tags = NULL, *tagp = NULL;
-  GtranslatorTab *tab;
-  GtranslatorPo *po;
+  GtrTab *tab;
+  GtrPo *po;
   gchar *fullpath;
   gchar *dirname;
   GFile *location, *parent;
@@ -273,7 +273,7 @@ follow_if_link (GtranslatorSourceCodeViewPlugin * plugin,
 
 static gboolean
 event_after (GtkWidget * text_view,
-	     GdkEvent * ev, GtranslatorSourceCodeViewPlugin * plugin)
+	     GdkEvent * ev, GtrSourceCodeViewPlugin * plugin)
 {
   GtkTextIter start, end, iter;
   GtkTextBuffer *buffer;
@@ -392,7 +392,7 @@ visibility_notify_event (GtkWidget * text_view, GdkEventVisibility * event)
 }
 
 static void
-gtranslator_source_code_view_plugin_init (GtranslatorSourceCodeViewPlugin *
+gtranslator_source_code_view_plugin_init (GtrSourceCodeViewPlugin *
 					  plugin)
 {
   plugin->priv = GTR_SOURCE_CODE_VIEW_PLUGIN_GET_PRIVATE (plugin);
@@ -409,7 +409,7 @@ gtranslator_source_code_view_plugin_init (GtranslatorSourceCodeViewPlugin *
 static void
 gtranslator_source_code_view_plugin_finalize (GObject * object)
 {
-  GtranslatorSourceCodeViewPlugin *plugin =
+  GtrSourceCodeViewPlugin *plugin =
     GTR_SOURCE_CODE_VIEW_PLUGIN (object);
 
   gconf_client_suggest_sync (plugin->priv->gconf_client, NULL);
@@ -421,9 +421,9 @@ gtranslator_source_code_view_plugin_finalize (GObject * object)
 }
 
 static void
-showed_message_cb (GtranslatorTab * tab,
-		   GtranslatorMsg * msg,
-		   GtranslatorSourceCodeViewPlugin * plugin)
+showed_message_cb (GtrTab * tab,
+		   GtrMsg * msg,
+		   GtrSourceCodeViewPlugin * plugin)
 {
   const gchar *filename = NULL;
   gint i = 0;
@@ -431,7 +431,7 @@ showed_message_cb (GtranslatorTab * tab,
   GtkTextIter iter;
   GtkTextBuffer *buffer;
   GtkTextView *view;
-  GtranslatorContextPanel *panel;
+  GtrContextPanel *panel;
   GtkTextMark *path_start, *path_end;
 
   panel = gtranslator_tab_get_context_panel (tab);
@@ -465,12 +465,12 @@ showed_message_cb (GtranslatorTab * tab,
 }
 
 static void
-delete_text_and_tags (GtranslatorTab * tab,
-		      GtranslatorSourceCodeViewPlugin * plugin)
+delete_text_and_tags (GtrTab * tab,
+		      GtrSourceCodeViewPlugin * plugin)
 {
   GSList *tagp = NULL, *tags;
   GtkTextBuffer *buffer;
-  GtranslatorContextPanel *panel;
+  GtrContextPanel *panel;
   GtkTextView *view;
   GtkTextIter start, end;
   GtkTextMark *path_start, *path_end;
@@ -515,9 +515,9 @@ delete_text_and_tags (GtranslatorTab * tab,
 }
 
 static void
-message_edition_finished_cb (GtranslatorTab * tab,
-			     GtranslatorMsg * msg,
-			     GtranslatorSourceCodeViewPlugin * plugin)
+message_edition_finished_cb (GtrTab * tab,
+			     GtrMsg * msg,
+			     GtrSourceCodeViewPlugin * plugin)
 {
   delete_text_and_tags (tab, plugin);
 }
@@ -525,9 +525,9 @@ message_edition_finished_cb (GtranslatorTab * tab,
 static void
 page_added_cb (GtkNotebook * notebook,
 	       GtkWidget * child,
-	       guint page_num, GtranslatorSourceCodeViewPlugin * plugin)
+	       guint page_num, GtrSourceCodeViewPlugin * plugin)
 {
-  GtranslatorContextPanel *panel;
+  GtrContextPanel *panel;
   GtkTextView *view;
 
   panel = gtranslator_tab_get_context_panel (GTR_TAB (child));
@@ -549,14 +549,14 @@ page_added_cb (GtkNotebook * notebook,
 
 static void
 use_editor_toggled (GtkToggleButton * button,
-		    GtranslatorSourceCodeViewPlugin * plugin)
+		    GtrSourceCodeViewPlugin * plugin)
 {
   gtk_widget_set_sensitive (plugin->priv->program_box,
 			    gtk_toggle_button_get_active (button));
 }
 
 static GtkWidget *
-get_configuration_dialog (GtranslatorSourceCodeViewPlugin * plugin)
+get_configuration_dialog (GtrSourceCodeViewPlugin * plugin)
 {
 
   gboolean ret;
@@ -625,10 +625,10 @@ get_configuration_dialog (GtranslatorSourceCodeViewPlugin * plugin)
 }
 
 static void
-impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
+impl_activate (GtrPlugin * plugin, GtrWindow * window)
 {
   GtkWidget *notebook;
-  GtranslatorSourceCodeViewPlugin *source_code_view =
+  GtrSourceCodeViewPlugin *source_code_view =
     GTR_SOURCE_CODE_VIEW_PLUGIN (plugin);
   GList *tabs, *l;
 
@@ -651,7 +651,7 @@ impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
   tabs = gtranslator_window_get_all_tabs (window);
   for (l = tabs; l != NULL; l = g_list_next (l))
     {
-      GtranslatorPo *po;
+      GtrPo *po;
       GList *msg;
 
       page_added_cb (GTK_NOTEBOOK (notebook),
@@ -666,11 +666,11 @@ impl_activate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 }
 
 static void
-impl_deactivate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
+impl_deactivate (GtrPlugin * plugin, GtrWindow * window)
 {
   GList *tabs, *l;
   GtkTextView *view;
-  GtranslatorContextPanel *panel;
+  GtrContextPanel *panel;
   GtkWidget *notebook;
 
   tabs = gtranslator_window_get_all_tabs (window);
@@ -697,7 +697,7 @@ impl_deactivate (GtranslatorPlugin * plugin, GtranslatorWindow * window)
 }
 
 static void
-ok_button_pressed (GtranslatorSourceCodeViewPlugin * plugin)
+ok_button_pressed (GtrSourceCodeViewPlugin * plugin)
 {
   const gchar *program_cmd;
   const gchar *line_cmd;
@@ -737,7 +737,7 @@ ok_button_pressed (GtranslatorSourceCodeViewPlugin * plugin)
 static void
 configure_dialog_response_cb (GtkWidget * widget,
 			      gint response,
-			      GtranslatorSourceCodeViewPlugin * plugin)
+			      GtrSourceCodeViewPlugin * plugin)
 {
   switch (response)
     {
@@ -756,7 +756,7 @@ configure_dialog_response_cb (GtkWidget * widget,
 }
 
 static GtkWidget *
-impl_create_configure_dialog (GtranslatorPlugin * plugin)
+impl_create_configure_dialog (GtrPlugin * plugin)
 {
   GtkWidget *dialog;
 
@@ -774,10 +774,10 @@ impl_create_configure_dialog (GtranslatorPlugin * plugin)
 
 static void
 gtranslator_source_code_view_plugin_class_init
-  (GtranslatorSourceCodeViewPluginClass * klass)
+  (GtrSourceCodeViewPluginClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtranslatorPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
+  GtrPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
 
   object_class->finalize = gtranslator_source_code_view_plugin_finalize;
 
@@ -786,5 +786,5 @@ gtranslator_source_code_view_plugin_class_init
   plugin_class->create_configure_dialog = impl_create_configure_dialog;
 
   g_type_class_add_private (object_class,
-			    sizeof (GtranslatorSourceCodeViewPluginPrivate));
+			    sizeof (GtrSourceCodeViewPluginPrivate));
 }
diff --git a/plugins/source-code-view/gtr-source-code-view-plugin.h b/plugins/source-code-view/gtr-source-code-view-plugin.h
index f2b5c7d..bded10f 100644
--- a/plugins/source-code-view/gtr-source-code-view-plugin.h
+++ b/plugins/source-code-view/gtr-source-code-view-plugin.h
@@ -29,38 +29,38 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_SOURCE_CODE_VIEW_PLUGIN		(gtranslator_source_code_view_plugin_get_type ())
-#define GTR_SOURCE_CODE_VIEW_PLUGIN(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_SOURCE_CODE_VIEW_PLUGIN, GtranslatorSourceCodeViewPlugin))
-#define GTR_SOURCE_CODE_VIEW_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_SOURCE_CODE_VIEW_PLUGIN, GtranslatorSourceCodeViewPluginClass))
+#define GTR_SOURCE_CODE_VIEW_PLUGIN(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_SOURCE_CODE_VIEW_PLUGIN, GtrSourceCodeViewPlugin))
+#define GTR_SOURCE_CODE_VIEW_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_SOURCE_CODE_VIEW_PLUGIN, GtrSourceCodeViewPluginClass))
 #define GTR_IS_SOURCE_CODE_VIEW_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_SOURCE_CODE_VIEW_PLUGIN))
 #define GTR_IS_SOURCE_CODE_VIEW_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_SOURCE_CODE_VIEW_PLUGIN))
-#define GTR_SOURCE_CODE_VIEW_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_SOURCE_CODE_VIEW_PLUGIN_PLUGIN, GtranslatorSourceCodeViewPluginClass))
+#define GTR_SOURCE_CODE_VIEW_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_SOURCE_CODE_VIEW_PLUGIN_PLUGIN, GtrSourceCodeViewPluginClass))
 /* Private structure type */
-typedef struct _GtranslatorSourceCodeViewPluginPrivate
-  GtranslatorSourceCodeViewPluginPrivate;
+typedef struct _GtrSourceCodeViewPluginPrivate
+  GtrSourceCodeViewPluginPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorSourceCodeViewPlugin
-  GtranslatorSourceCodeViewPlugin;
+typedef struct _GtrSourceCodeViewPlugin
+  GtrSourceCodeViewPlugin;
 
-struct _GtranslatorSourceCodeViewPlugin
+struct _GtrSourceCodeViewPlugin
 {
-  GtranslatorPlugin parent_instance;
+  GtrPlugin parent_instance;
 
   /* private */
-  GtranslatorSourceCodeViewPluginPrivate *priv;
+  GtrSourceCodeViewPluginPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorSourceCodeViewPluginClass
-  GtranslatorSourceCodeViewPluginClass;
+typedef struct _GtrSourceCodeViewPluginClass
+  GtrSourceCodeViewPluginClass;
 
-struct _GtranslatorSourceCodeViewPluginClass
+struct _GtrSourceCodeViewPluginClass
 {
-  GtranslatorPluginClass parent_class;
+  GtrPluginClass parent_class;
 };
 
 /*
diff --git a/plugins/source-code-view/gtr-viewer.c b/plugins/source-code-view/gtr-viewer.c
index 086bf56..edf3b89 100644
--- a/plugins/source-code-view/gtr-viewer.c
+++ b/plugins/source-code-view/gtr-viewer.c
@@ -35,11 +35,11 @@
 #define GTR_VIEWER_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 	(object),	\
 						 	GTR_TYPE_VIEWER,     \
-						 	GtranslatorViewerPrivate))
+						 	GtrViewerPrivate))
 
 
-G_DEFINE_TYPE (GtranslatorViewer, gtranslator_viewer, GTK_TYPE_DIALOG)
-     struct _GtranslatorViewerPrivate
+G_DEFINE_TYPE (GtrViewer, gtranslator_viewer, GTK_TYPE_DIALOG)
+     struct _GtrViewerPrivate
      {
        GtkWidget *main_box;
        GtkWidget *view;
@@ -56,7 +56,7 @@ G_DEFINE_TYPE (GtranslatorViewer, gtranslator_viewer, GTK_TYPE_DIALOG)
 }
 
 static void
-gtranslator_viewer_init (GtranslatorViewer * dlg)
+gtranslator_viewer_init (GtrViewer * dlg)
 {
   gboolean ret;
   GtkWidget *error_widget;
@@ -133,11 +133,11 @@ gtranslator_viewer_finalize (GObject * object)
 }
 
 static void
-gtranslator_viewer_class_init (GtranslatorViewerClass * klass)
+gtranslator_viewer_class_init (GtrViewerClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorViewerPrivate));
+  g_type_class_add_private (klass, sizeof (GtrViewerPrivate));
 
   object_class->finalize = gtranslator_viewer_finalize;
 }
@@ -412,10 +412,10 @@ jump_to_line (GtkTextView * view, gint line)
 }
 
 void
-gtranslator_show_viewer (GtranslatorWindow * window,
+gtranslator_show_viewer (GtrWindow * window,
 			 const gchar * path, gint line)
 {
-  static GtranslatorViewer *dlg = NULL;
+  static GtrViewer *dlg = NULL;
 
   g_return_if_fail (GTR_IS_WINDOW (window));
 
diff --git a/plugins/source-code-view/gtr-viewer.h b/plugins/source-code-view/gtr-viewer.h
index ab45513..0d3334c 100644
--- a/plugins/source-code-view/gtr-viewer.h
+++ b/plugins/source-code-view/gtr-viewer.h
@@ -30,33 +30,33 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_VIEWER		(gtranslator_viewer_get_type ())
-#define GTR_VIEWER(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_VIEWER, GtranslatorViewer))
-#define GTR_VIEWER_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_VIEWER, GtranslatorViewerClass))
+#define GTR_VIEWER(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_VIEWER, GtrViewer))
+#define GTR_VIEWER_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_VIEWER, GtrViewerClass))
 #define GTR_IS_VIEWER(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_VIEWER))
 #define GTR_IS_VIEWER_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_VIEWER))
-#define GTR_VIEWER_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_VIEWER, GtranslatorViewerClass))
+#define GTR_VIEWER_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_VIEWER, GtrViewerClass))
 /* Private structure type */
-typedef struct _GtranslatorViewerPrivate GtranslatorViewerPrivate;
+typedef struct _GtrViewerPrivate GtrViewerPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorViewer GtranslatorViewer;
+typedef struct _GtrViewer GtrViewer;
 
-struct _GtranslatorViewer
+struct _GtrViewer
 {
   GtkDialog parent_instance;
 
   /*< private > */
-  GtranslatorViewerPrivate *priv;
+  GtrViewerPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorViewerClass GtranslatorViewerClass;
+typedef struct _GtrViewerClass GtrViewerClass;
 
-struct _GtranslatorViewerClass
+struct _GtrViewerClass
 {
   GtkDialogClass parent_class;
 };
@@ -70,7 +70,7 @@ gtranslator_viewer_get_type (void)
 
      GType gtranslator_viewer_register_type (GTypeModule * module);
 
-     void gtranslator_show_viewer (GtranslatorWindow * window,
+     void gtranslator_show_viewer (GtrWindow * window,
 				   const gchar * path, gint line);
 
 G_END_DECLS
diff --git a/src/dialogs/gtr-assistant.c b/src/dialogs/gtr-assistant.c
index d8b901e..cfcc97a 100644
--- a/src/dialogs/gtr-assistant.c
+++ b/src/dialogs/gtr-assistant.c
@@ -42,13 +42,13 @@
 #define GTR_ASSISTANT_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 (object),	\
 						 GTR_TYPE_ASSISTANT,     \
-						 GtranslatorAssistantPrivate))
+						 GtrAssistantPrivate))
 
 
-G_DEFINE_TYPE (GtranslatorAssistant, gtranslator_assistant,
+G_DEFINE_TYPE (GtrAssistant, gtranslator_assistant,
 	       GTK_TYPE_ASSISTANT)
 
-struct _GtranslatorAssistantPrivate
+struct _GtrAssistantPrivate
 {
   /* Profiles Page 1 */
   GtkWidget *profile_name;
@@ -78,7 +78,7 @@ typedef struct _IdleData
 {
   GSList *list;
   GtkProgressBar *progress;
-  GtranslatorTranslationMemory *tm;
+  GtrTranslationMemory *tm;
   GtkWindow *parent;
 } IdleData;
 
@@ -100,7 +100,7 @@ add_to_database (gpointer data_pointer)
       GList *l2 = NULL;
       GFile *location;
       GError *error = NULL;
-      GtranslatorPo *po;
+      GtrPo *po;
 
       po = gtranslator_po_new ();
       location = (GFile *) l->data;
@@ -113,7 +113,7 @@ add_to_database (gpointer data_pointer)
 
       for (l2 = msg_list; l2; l2 = g_list_next (l2))
 	{
-	  GtranslatorMsg *msg;
+	  GtrMsg *msg;
 
 	  msg = GTR_MSG (l2->data);
 	  if (gtranslator_msg_is_translated (msg))
@@ -191,9 +191,9 @@ on_assistant_apply (GtkAssistant * assistant)
   GFile *dir;
   const gchar *dir_name;
   IdleData *data;
-  GtranslatorAssistant *as = GTR_ASSISTANT (assistant);
+  GtrAssistant *as = GTR_ASSISTANT (assistant);
   const gchar *po_name;
-  GtranslatorProfile *profile;
+  GtrProfile *profile;
   GList *profiles_list;
   gulong close_signal_id;
 
@@ -287,7 +287,7 @@ on_assistant_apply (GtkAssistant * assistant)
 static void
 on_assistant_prepare (GtkAssistant * assistant, GtkWidget * page)
 {
-  GtranslatorAssistant *as = GTR_ASSISTANT (assistant);
+  GtrAssistant *as = GTR_ASSISTANT (assistant);
   gchar *string;
   const gchar *database_path;
 
@@ -336,7 +336,7 @@ on_assistant_cancel (GtkAssistant * assistant)
 }
 
 static void
-create_start_page (GtranslatorAssistant * as)
+create_start_page (GtrAssistant * as)
 {
   GtkWidget *box, *label;
 
@@ -358,7 +358,7 @@ create_start_page (GtranslatorAssistant * as)
 }
 
 static void
-on_profile1_entry_changed (GtkWidget * widget, GtranslatorAssistant * as)
+on_profile1_entry_changed (GtkWidget * widget, GtrAssistant * as)
 {
   const gchar *text;
   GtkWidget *current_page;
@@ -425,11 +425,11 @@ on_profile1_entry_changed (GtkWidget * widget, GtranslatorAssistant * as)
 }
 
 static void
-create_profiles_page1 (GtranslatorAssistant * as)
+create_profiles_page1 (GtrAssistant * as)
 {
   GtkWidget *box, *hbox;
   GtkWidget *label;
-  GtranslatorAssistantPrivate *priv = as->priv;
+  GtrAssistantPrivate *priv = as->priv;
 
   box = gtk_vbox_new (FALSE, 6);
   gtk_widget_show (box);
@@ -535,7 +535,7 @@ create_profiles_page1 (GtranslatorAssistant * as)
 }
 
 static void
-on_profile2_entry_changed (GtkWidget * widget, GtranslatorAssistant * as)
+on_profile2_entry_changed (GtkWidget * widget, GtrAssistant * as)
 {
   const gchar *text;
   GtkWidget *current_page;
@@ -590,11 +590,11 @@ on_profile2_entry_changed (GtkWidget * widget, GtranslatorAssistant * as)
 }
 
 static void
-create_profiles_page2 (GtranslatorAssistant * as)
+create_profiles_page2 (GtrAssistant * as)
 {
   GtkWidget *box, *hbox;
   GtkWidget *label;
-  GtranslatorAssistantPrivate *priv = as->priv;
+  GtrAssistantPrivate *priv = as->priv;
 
   box = gtk_vbox_new (FALSE, 6);
   gtk_widget_show (box);
@@ -681,7 +681,7 @@ create_profiles_page2 (GtranslatorAssistant * as)
 }
 
 static void
-on_dir_find_button_clicked (GtkButton * button, GtranslatorAssistant * as)
+on_dir_find_button_clicked (GtkButton * button, GtrAssistant * as)
 {
   GtkWidget *dialog;
   gint res;
@@ -711,11 +711,11 @@ on_dir_find_button_clicked (GtkButton * button, GtranslatorAssistant * as)
 }
 
 static void
-create_database_page (GtranslatorAssistant * as)
+create_database_page (GtrAssistant * as)
 {
   GtkWidget *box, *hbox;
   GtkWidget *label;
-  GtranslatorAssistantPrivate *priv = as->priv;
+  GtrAssistantPrivate *priv = as->priv;
 
   box = gtk_vbox_new (FALSE, 6);
   gtk_widget_show (box);
@@ -771,7 +771,7 @@ create_database_page (GtranslatorAssistant * as)
 }
 
 static void
-create_finish_page (GtranslatorAssistant * as)
+create_finish_page (GtrAssistant * as)
 {
   as->priv->finish_box = gtk_vbox_new (FALSE, 0);
   gtk_widget_show (as->priv->finish_box);
@@ -796,7 +796,7 @@ create_finish_page (GtranslatorAssistant * as)
 }
 
 static void
-gtranslator_assistant_init (GtranslatorAssistant * as)
+gtranslator_assistant_init (GtrAssistant * as)
 {
   as->priv = GTR_ASSISTANT_GET_PRIVATE (as);
 
@@ -818,12 +818,12 @@ gtranslator_assistant_finalize (GObject * object)
 }
 
 static void
-gtranslator_assistant_class_init (GtranslatorAssistantClass * klass)
+gtranslator_assistant_class_init (GtrAssistantClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkAssistantClass *assistant_class = GTK_ASSISTANT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorAssistantPrivate));
+  g_type_class_add_private (klass, sizeof (GtrAssistantPrivate));
 
   object_class->finalize = gtranslator_assistant_finalize;
   assistant_class->prepare = on_assistant_prepare;
@@ -833,9 +833,9 @@ gtranslator_assistant_class_init (GtranslatorAssistantClass * klass)
 }
 
 void
-gtranslator_show_assistant (GtranslatorWindow * window)
+gtranslator_show_assistant (GtrWindow * window)
 {
-  static GtranslatorAssistant *assist = NULL;
+  static GtrAssistant *assist = NULL;
 
   g_return_if_fail (GTR_IS_WINDOW (window));
 
diff --git a/src/dialogs/gtr-assistant.h b/src/dialogs/gtr-assistant.h
index 64cdc0a..18c0363 100644
--- a/src/dialogs/gtr-assistant.h
+++ b/src/dialogs/gtr-assistant.h
@@ -30,33 +30,33 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_ASSISTANT		(gtranslator_assistant_get_type ())
-#define GTR_ASSISTANT(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_ASSISTANT, GtranslatorAssistant))
-#define GTR_ASSISTANT_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_ASSISTANT, GtranslatorAssistantClass))
+#define GTR_ASSISTANT(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_ASSISTANT, GtrAssistant))
+#define GTR_ASSISTANT_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_ASSISTANT, GtrAssistantClass))
 #define GTR_IS_ASSISTANT(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_ASSISTANT))
 #define GTR_IS_ASSISTANT_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_ASSISTANT))
-#define GTR_ASSISTANT_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_ASSISTANT, GtranslatorAssistantClass))
+#define GTR_ASSISTANT_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_ASSISTANT, GtrAssistantClass))
 /* Private structure type */
-typedef struct _GtranslatorAssistantPrivate GtranslatorAssistantPrivate;
+typedef struct _GtrAssistantPrivate GtrAssistantPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorAssistant GtranslatorAssistant;
+typedef struct _GtrAssistant GtrAssistant;
 
-struct _GtranslatorAssistant
+struct _GtrAssistant
 {
   GtkAssistant parent_instance;
 
   /*< private > */
-  GtranslatorAssistantPrivate *priv;
+  GtrAssistantPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorAssistantClass GtranslatorAssistantClass;
+typedef struct _GtrAssistantClass GtrAssistantClass;
 
-struct _GtranslatorAssistantClass
+struct _GtrAssistantClass
 {
   GtkAssistantClass parent_class;
 };
@@ -70,7 +70,7 @@ gtranslator_assistant_get_type (void)
 
      GType gtranslator_assistant_register_type (GTypeModule * module);
 
-     void gtranslator_show_assistant (GtranslatorWindow * window);
+     void gtranslator_show_assistant (GtrWindow * window);
 
 G_END_DECLS
 #endif /* __ASSISTANT_H__ */
diff --git a/src/dialogs/gtr-close-confirmation-dialog.c b/src/dialogs/gtr-close-confirmation-dialog.c
index 0934e2f..f6b32bb 100644
--- a/src/dialogs/gtr-close-confirmation-dialog.c
+++ b/src/dialogs/gtr-close-confirmation-dialog.c
@@ -58,7 +58,7 @@ enum
   N_COLUMNS
 };
 
-struct _GtranslatorCloseConfirmationDialogPrivate
+struct _GtrCloseConfirmationDialogPrivate
 {
   gboolean logout_mode;
 
@@ -73,15 +73,15 @@ struct _GtranslatorCloseConfirmationDialogPrivate
 
 #define GTR_CLOSE_CONFIRMATION_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
 							GTR_TYPE_CLOSE_CONFIRMATION_DIALOG, \
-							GtranslatorCloseConfirmationDialogPrivate))
+							GtrCloseConfirmationDialogPrivate))
 
 #define GET_MODE(priv) (((priv->unsaved_documents != NULL) && \
 			 (priv->unsaved_documents->next == NULL)) ? \
 			  SINGLE_DOC_MODE : MULTIPLE_DOCS_MODE)
 
-G_DEFINE_TYPE (GtranslatorCloseConfirmationDialog,
+G_DEFINE_TYPE (GtrCloseConfirmationDialog,
 	       gtranslator_close_confirmation_dialog, GTK_TYPE_DIALOG)
-     static void set_unsaved_document (GtranslatorCloseConfirmationDialog *
+     static void set_unsaved_document (GtrCloseConfirmationDialog *
 				       dlg, const GList * list);
 
      static GList *get_selected_docs (GtkTreeModel * store);
@@ -90,10 +90,10 @@ G_DEFINE_TYPE (GtranslatorCloseConfirmationDialog,
  *  before the user ones
  */
      static void
-       response_cb (GtranslatorCloseConfirmationDialog * dlg,
+       response_cb (GtrCloseConfirmationDialog * dlg,
 		    gint response_id, gpointer data)
 {
-  GtranslatorCloseConfirmationDialogPrivate *priv;
+  GtrCloseConfirmationDialogPrivate *priv;
 
   g_return_if_fail (GTR_IS_CLOSE_CONFIRMATION_DIALOG (dlg));
 
@@ -120,7 +120,7 @@ G_DEFINE_TYPE (GtranslatorCloseConfirmationDialog,
 }
 
 static void
-set_logout_mode (GtranslatorCloseConfirmationDialog * dlg,
+set_logout_mode (GtrCloseConfirmationDialog * dlg,
 		 gboolean logout_mode)
 {
 
@@ -136,7 +136,7 @@ set_logout_mode (GtranslatorCloseConfirmationDialog * dlg,
 }
 
 static void
-gtranslator_close_confirmation_dialog_init (GtranslatorCloseConfirmationDialog
+gtranslator_close_confirmation_dialog_init (GtrCloseConfirmationDialog
 					    * dlg)
 {
   AtkObject *atk_obj;
@@ -164,7 +164,7 @@ gtranslator_close_confirmation_dialog_init (GtranslatorCloseConfirmationDialog
 static void
 gtranslator_close_confirmation_dialog_finalize (GObject * object)
 {
-  GtranslatorCloseConfirmationDialogPrivate *priv;
+  GtrCloseConfirmationDialogPrivate *priv;
 
   priv = GTR_CLOSE_CONFIRMATION_DIALOG (object)->priv;
 
@@ -185,7 +185,7 @@ gtranslator_close_confirmation_dialog_set_property (GObject * object,
 						    const GValue * value,
 						    GParamSpec * pspec)
 {
-  GtranslatorCloseConfirmationDialog *dlg;
+  GtrCloseConfirmationDialog *dlg;
 
   dlg = GTR_CLOSE_CONFIRMATION_DIALOG (object);
 
@@ -211,7 +211,7 @@ gtranslator_close_confirmation_dialog_get_property (GObject * object,
 						    GValue * value,
 						    GParamSpec * pspec)
 {
-  GtranslatorCloseConfirmationDialogPrivate *priv;
+  GtrCloseConfirmationDialogPrivate *priv;
 
   priv = GTR_CLOSE_CONFIRMATION_DIALOG (object)->priv;
 
@@ -233,7 +233,7 @@ gtranslator_close_confirmation_dialog_get_property (GObject * object,
 
 static void
 gtranslator_close_confirmation_dialog_class_init
-  (GtranslatorCloseConfirmationDialogClass * klass)
+  (GtrCloseConfirmationDialogClass * klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
@@ -245,7 +245,7 @@ gtranslator_close_confirmation_dialog_class_init
 
   g_type_class_add_private (klass,
 			    sizeof
-			    (GtranslatorCloseConfirmationDialogPrivate));
+			    (GtrCloseConfirmationDialogPrivate));
 
   g_object_class_install_property (gobject_class,
 				   PROP_UNSAVED_DOCUMENTS,
@@ -278,7 +278,7 @@ get_selected_docs (GtkTreeModel * store)
   while (valid)
     {
       gboolean to_save;
-      GtranslatorPo *doc;
+      GtrPo *doc;
 
       gtk_tree_model_get (store, &iter,
 			  SAVE_COLUMN, &to_save, DOC_COLUMN, &doc, -1);
@@ -295,7 +295,7 @@ get_selected_docs (GtkTreeModel * store)
 
 GList *
 gtranslator_close_confirmation_dialog_get_selected_documents
-  (GtranslatorCloseConfirmationDialog * dlg)
+  (GtrCloseConfirmationDialog * dlg)
 {
   g_return_val_if_fail (GTR_IS_CLOSE_CONFIRMATION_DIALOG (dlg), NULL);
 
@@ -325,7 +325,7 @@ gtranslator_close_confirmation_dialog_new (GtkWindow * parent,
 
 GtkWidget *
 gtranslator_close_confirmation_dialog_new_single (GtkWindow * parent,
-						  GtranslatorPo * doc,
+						  GtrPo * doc,
 						  gboolean logout_mode)
 {
   GtkWidget *dlg;
@@ -344,13 +344,13 @@ gtranslator_close_confirmation_dialog_new_single (GtkWindow * parent,
 }
 
 static void
-build_single_doc_dialog (GtranslatorCloseConfirmationDialog * dlg)
+build_single_doc_dialog (GtrCloseConfirmationDialog * dlg)
 {
   GtkWidget *hbox;
   GtkWidget *vbox;
   GtkWidget *primary_label;
   GtkWidget *image;
-  GtranslatorPo *doc;
+  GtrPo *doc;
   GFile *location;
   gchar *doc_name;
   gchar *str;
@@ -413,7 +413,7 @@ populate_model (GtkTreeModel * store, GList * docs)
 
   while (docs != NULL)
     {
-      GtranslatorPo *po;
+      GtrPo *po;
       GFile *location;
       gchar *name;
 
@@ -452,7 +452,7 @@ save_toggled (GtkCellRendererToggle * renderer,
 }
 
 static GtkWidget *
-create_treeview (GtranslatorCloseConfirmationDialogPrivate * priv)
+create_treeview (GtrCloseConfirmationDialogPrivate * priv)
 {
   GtkListStore *store;
   GtkWidget *treeview;
@@ -500,9 +500,9 @@ create_treeview (GtranslatorCloseConfirmationDialogPrivate * priv)
 }
 
 static void
-build_multiple_docs_dialog (GtranslatorCloseConfirmationDialog * dlg)
+build_multiple_docs_dialog (GtrCloseConfirmationDialog * dlg)
 {
-  GtranslatorCloseConfirmationDialogPrivate *priv;
+  GtrCloseConfirmationDialogPrivate *priv;
   GtkWidget *hbox;
   GtkWidget *image;
   GtkWidget *vbox;
@@ -608,10 +608,10 @@ build_multiple_docs_dialog (GtranslatorCloseConfirmationDialog * dlg)
 }
 
 static void
-set_unsaved_document (GtranslatorCloseConfirmationDialog * dlg,
+set_unsaved_document (GtrCloseConfirmationDialog * dlg,
 		      const GList * list)
 {
-  GtranslatorCloseConfirmationDialogPrivate *priv;
+  GtrCloseConfirmationDialogPrivate *priv;
 
   g_return_if_fail (list != NULL);
 
@@ -632,7 +632,7 @@ set_unsaved_document (GtranslatorCloseConfirmationDialog * dlg,
 
 const GList *
 gtranslator_close_confirmation_dialog_get_unsaved_documents
-  (GtranslatorCloseConfirmationDialog * dlg)
+  (GtrCloseConfirmationDialog * dlg)
 {
   g_return_val_if_fail (GTR_IS_CLOSE_CONFIRMATION_DIALOG (dlg), NULL);
 
diff --git a/src/dialogs/gtr-close-confirmation-dialog.h b/src/dialogs/gtr-close-confirmation-dialog.h
index 07c70e7..3cfc73c 100644
--- a/src/dialogs/gtr-close-confirmation-dialog.h
+++ b/src/dialogs/gtr-close-confirmation-dialog.h
@@ -35,28 +35,28 @@
 #include "gtr-po.h"
 
 #define GTR_TYPE_CLOSE_CONFIRMATION_DIALOG		(gtranslator_close_confirmation_dialog_get_type ())
-#define GTR_CLOSE_CONFIRMATION_DIALOG(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTR_TYPE_CLOSE_CONFIRMATION_DIALOG, GtranslatorCloseConfirmationDialog))
-#define GTR_CLOSE_CONFIRMATION_DIALOG_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTR_TYPE_CLOSE_CONFIRMATION_DIALOG, GtranslatorCloseConfirmationDialogClass))
+#define GTR_CLOSE_CONFIRMATION_DIALOG(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTR_TYPE_CLOSE_CONFIRMATION_DIALOG, GtrCloseConfirmationDialog))
+#define GTR_CLOSE_CONFIRMATION_DIALOG_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTR_TYPE_CLOSE_CONFIRMATION_DIALOG, GtrCloseConfirmationDialogClass))
 #define GTR_IS_CLOSE_CONFIRMATION_DIALOG(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTR_TYPE_CLOSE_CONFIRMATION_DIALOG))
 #define GTR_IS_CLOSE_CONFIRMATION_DIALOG_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTR_TYPE_CLOSE_CONFIRMATION_DIALOG))
-#define GTR_CLOSE_CONFIRMATION_DIALOG_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj),GTR_TYPE_CLOSE_CONFIRMATION_DIALOG, GtranslatorCloseConfirmationDialogClass))
+#define GTR_CLOSE_CONFIRMATION_DIALOG_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj),GTR_TYPE_CLOSE_CONFIRMATION_DIALOG, GtrCloseConfirmationDialogClass))
 
-typedef struct _GtranslatorCloseConfirmationDialog
-  GtranslatorCloseConfirmationDialog;
-typedef struct _GtranslatorCloseConfirmationDialogClass
-  GtranslatorCloseConfirmationDialogClass;
-typedef struct _GtranslatorCloseConfirmationDialogPrivate
-  GtranslatorCloseConfirmationDialogPrivate;
+typedef struct _GtrCloseConfirmationDialog
+  GtrCloseConfirmationDialog;
+typedef struct _GtrCloseConfirmationDialogClass
+  GtrCloseConfirmationDialogClass;
+typedef struct _GtrCloseConfirmationDialogPrivate
+  GtrCloseConfirmationDialogPrivate;
 
-struct _GtranslatorCloseConfirmationDialog
+struct _GtrCloseConfirmationDialog
 {
   GtkDialog parent;
 
   /*< private > */
-  GtranslatorCloseConfirmationDialogPrivate *priv;
+  GtrCloseConfirmationDialogPrivate *priv;
 };
 
-struct _GtranslatorCloseConfirmationDialogClass
+struct _GtrCloseConfirmationDialogClass
 {
   GtkDialogClass parent_class;
 };
@@ -72,17 +72,17 @@ gtranslator_close_confirmation_dialog_get_type (void)
 							   logout_mode);
      GtkWidget *gtranslator_close_confirmation_dialog_new_single (GtkWindow *
 								  parent,
-								  GtranslatorPo
+								  GtrPo
 								  * doc,
 								  gboolean
 								  logout_mode);
 
      const GList
        *gtranslator_close_confirmation_dialog_get_unsaved_documents
-       (GtranslatorCloseConfirmationDialog * dlg);
+       (GtrCloseConfirmationDialog * dlg);
 
      GList
        *gtranslator_close_confirmation_dialog_get_selected_documents
-       (GtranslatorCloseConfirmationDialog * dlg);
+       (GtrCloseConfirmationDialog * dlg);
 
 #endif /* __GTR_CLOSE_CONFIRMATION_DIALOG_H__ */
diff --git a/src/dialogs/gtr-comment-dialog.c b/src/dialogs/gtr-comment-dialog.c
index a9024ec..4060ef1 100644
--- a/src/dialogs/gtr-comment-dialog.c
+++ b/src/dialogs/gtr-comment-dialog.c
@@ -36,24 +36,24 @@
 #define GTR_COMMENT_DIALOG_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 	(object),	\
 						 	GTR_TYPE_COMMENT_DIALOG,     \
-						 	GtranslatorCommentDialogPrivate))
+						 	GtrCommentDialogPrivate))
 
 
-G_DEFINE_TYPE (GtranslatorCommentDialog, gtranslator_comment_dialog,
+G_DEFINE_TYPE (GtrCommentDialog, gtranslator_comment_dialog,
 	       GTK_TYPE_DIALOG)
-     struct _GtranslatorCommentDialogPrivate
+     struct _GtrCommentDialogPrivate
      {
        GtkWidget *main_box;
        GtkWidget *comment;
      };
 
      static void
-       comment_changed_cb (GtkTextBuffer * buffer, GtranslatorWindow * window)
+       comment_changed_cb (GtkTextBuffer * buffer, GtrWindow * window)
 {
   gchar *text;
   GtkTextIter start, end;
-  GtranslatorTab *tab;
-  GtranslatorPo *po;
+  GtrTab *tab;
+  GtrPo *po;
   GList *msg;
 
   tab = gtranslator_window_get_active_tab (window);
@@ -78,7 +78,7 @@ dialog_response_handler (GtkDialog * dlg, gint res_id)
 }
 
 static void
-gtranslator_comment_dialog_init (GtranslatorCommentDialog * dlg)
+gtranslator_comment_dialog_init (GtrCommentDialog * dlg)
 {
   gboolean ret;
   GtkWidget *error_widget;
@@ -142,22 +142,22 @@ gtranslator_comment_dialog_finalize (GObject * object)
 }
 
 static void
-gtranslator_comment_dialog_class_init (GtranslatorCommentDialogClass * klass)
+gtranslator_comment_dialog_class_init (GtrCommentDialogClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorCommentDialogPrivate));
+  g_type_class_add_private (klass, sizeof (GtrCommentDialogPrivate));
 
   object_class->finalize = gtranslator_comment_dialog_finalize;
 }
 
 void
-gtranslator_show_comment_dialog (GtranslatorWindow * window)
+gtranslator_show_comment_dialog (GtrWindow * window)
 {
-  static GtranslatorCommentDialog *dlg = NULL;
+  static GtrCommentDialog *dlg = NULL;
   static GtkTextBuffer *buf;
-  GtranslatorTab *tab = gtranslator_window_get_active_tab (window);
-  GtranslatorPo *po = gtranslator_tab_get_po (tab);
+  GtrTab *tab = gtranslator_window_get_active_tab (window);
+  GtrPo *po = gtranslator_tab_get_po (tab);
   GList *msg = gtranslator_po_get_current_message (po);
 
   g_return_if_fail (GTR_IS_WINDOW (window));
diff --git a/src/dialogs/gtr-comment-dialog.h b/src/dialogs/gtr-comment-dialog.h
index 3a52083..d39c816 100644
--- a/src/dialogs/gtr-comment-dialog.h
+++ b/src/dialogs/gtr-comment-dialog.h
@@ -31,34 +31,34 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_COMMENT_DIALOG		(gtranslator_comment_dialog_get_type ())
-#define GTR_COMMENT_DIALOG(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_COMMENT_DIALOG, GtranslatorCommentDialog))
-#define GTR_COMMENT_DIALOG_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_COMMENT_DIALOG, GtranslatorCommentDialogClass))
+#define GTR_COMMENT_DIALOG(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_COMMENT_DIALOG, GtrCommentDialog))
+#define GTR_COMMENT_DIALOG_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_COMMENT_DIALOG, GtrCommentDialogClass))
 #define GTR_IS_COMMENT_DIALOG(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_COMMENT_DIALOG))
 #define GTR_IS_COMMENT_DIALOG_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_COMMENT_DIALOG))
-#define GTR_COMMENT_DIALOG_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_COMMENT_DIALOG, GtranslatorCommentDialogClass))
+#define GTR_COMMENT_DIALOG_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_COMMENT_DIALOG, GtrCommentDialogClass))
 /* Private structure type */
-typedef struct _GtranslatorCommentDialogPrivate
-  GtranslatorCommentDialogPrivate;
+typedef struct _GtrCommentDialogPrivate
+  GtrCommentDialogPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorCommentDialog GtranslatorCommentDialog;
+typedef struct _GtrCommentDialog GtrCommentDialog;
 
-struct _GtranslatorCommentDialog
+struct _GtrCommentDialog
 {
   GtkDialog parent_instance;
 
   /*< private > */
-  GtranslatorCommentDialogPrivate *priv;
+  GtrCommentDialogPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorCommentDialogClass GtranslatorCommentDialogClass;
+typedef struct _GtrCommentDialogClass GtrCommentDialogClass;
 
-struct _GtranslatorCommentDialogClass
+struct _GtrCommentDialogClass
 {
   GtkDialogClass parent_class;
 };
@@ -72,7 +72,7 @@ gtranslator_comment_dialog_get_type (void)
 
      GType gtranslator_comment_dialog_register_type (GTypeModule * module);
 
-     void gtranslator_show_comment_dialog (GtranslatorWindow * window);
+     void gtranslator_show_comment_dialog (GtrWindow * window);
 
 G_END_DECLS
 #endif /* __COMMENT_DIALOG_H__ */
diff --git a/src/dialogs/gtr-header-dialog.c b/src/dialogs/gtr-header-dialog.c
index 4bc58a6..c54edb1 100644
--- a/src/dialogs/gtr-header-dialog.c
+++ b/src/dialogs/gtr-header-dialog.c
@@ -37,12 +37,12 @@
 #define GTR_HEADER_DIALOG_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 (object),	\
 						 GTR_TYPE_HEADER_DIALOG,     \
-						 GtranslatorHeaderDialogPrivate))
+						 GtrHeaderDialogPrivate))
 
-G_DEFINE_TYPE (GtranslatorHeaderDialog, gtranslator_header_dialog,
+G_DEFINE_TYPE (GtrHeaderDialog, gtranslator_header_dialog,
 	       GTK_TYPE_DIALOG)
 
-struct _GtranslatorHeaderDialogPrivate
+struct _GtrHeaderDialogPrivate
 {
   GtkWidget *main_box;
   GtkWidget *notebook;
@@ -65,7 +65,7 @@ struct _GtranslatorHeaderDialogPrivate
   GtkWidget *charset;
   GtkWidget *encoding;
 
-  GtranslatorHeader *header;
+  GtrHeader *header;
 };
 
 static void
@@ -75,18 +75,18 @@ gtranslator_header_dialog_finalize (GObject *object)
 }
 
 static void
-gtranslator_header_dialog_class_init (GtranslatorHeaderDialogClass *klass)
+gtranslator_header_dialog_class_init (GtrHeaderDialogClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorHeaderDialogPrivate));
+  g_type_class_add_private (klass, sizeof (GtrHeaderDialogPrivate));
 
   object_class->finalize = gtranslator_header_dialog_finalize;
 }
 
 static void
 take_my_options_checkbutton_toggled (GtkToggleButton *button,
-				     GtranslatorHeaderDialog *dlg)
+				     GtrHeaderDialog *dlg)
 {
   gboolean active;
 
@@ -105,7 +105,7 @@ take_my_options_checkbutton_toggled (GtkToggleButton *button,
 
 static void
 prj_comment_changed (GtkTextBuffer * buffer,
-                     GtranslatorHeaderDialog *dlg)
+                     GtrHeaderDialog *dlg)
 {
   GtkTextIter start, end;
   gchar *text;
@@ -122,7 +122,7 @@ prj_comment_changed (GtkTextBuffer * buffer,
 
 static void
 prj_id_version_changed (GtkWidget *widget,
-			GtranslatorHeaderDialog *dlg)
+			GtrHeaderDialog *dlg)
 {
   const gchar *text;
 
@@ -134,7 +134,7 @@ prj_id_version_changed (GtkWidget *widget,
 
 static void
 rmbt_changed (GtkWidget *widget,
-	      GtranslatorHeaderDialog *dlg)
+	      GtrHeaderDialog *dlg)
 {
   const gchar *text;
 
@@ -146,7 +146,7 @@ rmbt_changed (GtkWidget *widget,
 
 static void
 translator_changed (GtkWidget *widget,
-		    GtranslatorHeaderDialog *dlg)
+		    GtrHeaderDialog *dlg)
 {
   const gchar *name, *email;
 
@@ -159,7 +159,7 @@ translator_changed (GtkWidget *widget,
 
 static void
 language_changed (GtkWidget *widget,
-		  GtranslatorHeaderDialog *dlg)
+		  GtrHeaderDialog *dlg)
 {
   const gchar *language, *lg_email;
 
@@ -171,9 +171,9 @@ language_changed (GtkWidget *widget,
 }
 
 static void
-gtranslator_header_dialog_fill_from_header (GtranslatorHeaderDialog * dlg)
+gtranslator_header_dialog_fill_from_header (GtrHeaderDialog * dlg)
 {
-  GtranslatorHeader *header;
+  GtrHeader *header;
   GtkTextBuffer *buffer;
   gchar *text;
 
@@ -237,7 +237,7 @@ gtranslator_header_dialog_fill_from_header (GtranslatorHeaderDialog * dlg)
 }
 
 static void
-gtranslator_header_dialog_init (GtranslatorHeaderDialog * dlg)
+gtranslator_header_dialog_init (GtrHeaderDialog * dlg)
 {
   gboolean ret;
   GtkWidget *error_widget;
@@ -336,8 +336,8 @@ gtranslator_header_dialog_init (GtranslatorHeaderDialog * dlg)
 }
 
 static void
-set_default_values (GtranslatorHeaderDialog *dlg,
-		    GtranslatorWindow       *window)
+set_default_values (GtrHeaderDialog *dlg,
+		    GtrWindow       *window)
 {
   GtkTextBuffer *buffer;
 
@@ -384,11 +384,11 @@ set_default_values (GtranslatorHeaderDialog *dlg,
 }
 
 void
-gtranslator_show_header_dialog (GtranslatorWindow * window)
+gtranslator_show_header_dialog (GtrWindow * window)
 {
-  static GtranslatorHeaderDialog *dlg = NULL;
-  GtranslatorPo *po;
-  GtranslatorTab *tab;
+  static GtrHeaderDialog *dlg = NULL;
+  GtrPo *po;
+  GtrTab *tab;
 
   tab = gtranslator_window_get_active_tab (window);
   g_return_if_fail (tab != NULL);
diff --git a/src/dialogs/gtr-header-dialog.h b/src/dialogs/gtr-header-dialog.h
index 606f9a3..6c3fb61 100644
--- a/src/dialogs/gtr-header-dialog.h
+++ b/src/dialogs/gtr-header-dialog.h
@@ -30,34 +30,34 @@
  * Type checking and casting macros
  */
 #define GTR_TYPE_HEADER_DIALOG		(gtranslator_header_dialog_get_type ())
-#define GTR_HEADER_DIALOG(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_HEADER_DIALOG, GtranslatorHeaderDialog))
-#define GTR_HEADER_DIALOG_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_HEADER_DIALOG, GtranslatorHeaderDialogClass))
+#define GTR_HEADER_DIALOG(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_HEADER_DIALOG, GtrHeaderDialog))
+#define GTR_HEADER_DIALOG_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_HEADER_DIALOG, GtrHeaderDialogClass))
 #define GTR_IS_HEADER_DIALOG(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_HEADER_DIALOG))
 #define GTR_IS_HEADER_DIALOG_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_HEADER_DIALOG))
-#define GTR_HEADER_DIALOG_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_HEADER_DIALOG, GtranslatorHeaderDialogClass))
+#define GTR_HEADER_DIALOG_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_HEADER_DIALOG, GtrHeaderDialogClass))
 
 /* Private structure type */
-typedef struct _GtranslatorHeaderDialogPrivate GtranslatorHeaderDialogPrivate;
+typedef struct _GtrHeaderDialogPrivate GtrHeaderDialogPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorHeaderDialog GtranslatorHeaderDialog;
+typedef struct _GtrHeaderDialog GtrHeaderDialog;
 
-struct _GtranslatorHeaderDialog
+struct _GtrHeaderDialog
 {
   GtkDialog parent_instance;
 
   /*< private > */
-  GtranslatorHeaderDialogPrivate *priv;
+  GtrHeaderDialogPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorHeaderDialogClass GtranslatorHeaderDialogClass;
+typedef struct _GtrHeaderDialogClass GtrHeaderDialogClass;
 
-struct _GtranslatorHeaderDialogClass
+struct _GtrHeaderDialogClass
 {
   GtkDialogClass parent_class;
 };
@@ -71,6 +71,6 @@ gtranslator_header_dialog_get_type (void)
 
      GType gtranslator_header_dialog_register_type (GTypeModule * module);
 
-     void gtranslator_show_header_dialog (GtranslatorWindow * window);
+     void gtranslator_show_header_dialog (GtrWindow * window);
 
 #endif
diff --git a/src/dialogs/gtr-jump-dialog.c b/src/dialogs/gtr-jump-dialog.c
index f149066..22623e0 100644
--- a/src/dialogs/gtr-jump-dialog.c
+++ b/src/dialogs/gtr-jump-dialog.c
@@ -35,25 +35,25 @@
 #define GTR_JUMP_DIALOG_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 	(object),	\
 						 	GTR_TYPE_JUMP_DIALOG,     \
-						 	GtranslatorJumpDialogPrivate))
+						 	GtrJumpDialogPrivate))
 
 
-G_DEFINE_TYPE (GtranslatorJumpDialog, gtranslator_jump_dialog,
+G_DEFINE_TYPE (GtrJumpDialog, gtranslator_jump_dialog,
 	       GTK_TYPE_DIALOG)
 
-struct _GtranslatorJumpDialogPrivate
+struct _GtrJumpDialogPrivate
 {
   GtkWidget *main_box;
   GtkWidget *jump;
 
-  GtranslatorWindow *window;
+  GtrWindow *window;
 };
 
 static void
 dialog_response_handler (GtkDialog * dlg, gint res_id)
 {
-  GtranslatorJumpDialog *dialog = GTR_JUMP_DIALOG (dlg);
-  GtranslatorTab *tab;
+  GtrJumpDialog *dialog = GTR_JUMP_DIALOG (dlg);
+  GtrTab *tab;
   gint number;
 
   switch (res_id)
@@ -73,7 +73,7 @@ dialog_response_handler (GtkDialog * dlg, gint res_id)
 }
 
 static void
-gtranslator_jump_dialog_init (GtranslatorJumpDialog * dlg)
+gtranslator_jump_dialog_init (GtrJumpDialog * dlg)
 {
   gboolean ret;
   GtkWidget *error_widget;
@@ -140,26 +140,26 @@ gtranslator_jump_dialog_finalize (GObject * object)
 }
 
 static void
-gtranslator_jump_dialog_class_init (GtranslatorJumpDialogClass * klass)
+gtranslator_jump_dialog_class_init (GtrJumpDialogClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorJumpDialogPrivate));
+  g_type_class_add_private (klass, sizeof (GtrJumpDialogPrivate));
 
   object_class->finalize = gtranslator_jump_dialog_finalize;
 }
 
 void
-gtranslator_show_jump_dialog (GtranslatorWindow * window)
+gtranslator_show_jump_dialog (GtrWindow * window)
 {
-  static GtranslatorJumpDialog *dlg = NULL;
+  static GtrJumpDialog *dlg = NULL;
 
   g_return_if_fail (GTR_IS_WINDOW (window));
 
   if (dlg == NULL)
     {
-      GtranslatorTab *tab;
-      GtranslatorPo *po;
+      GtrTab *tab;
+      GtrPo *po;
       gint messages;
 
       dlg = g_object_new (GTR_TYPE_JUMP_DIALOG, NULL);
diff --git a/src/dialogs/gtr-jump-dialog.h b/src/dialogs/gtr-jump-dialog.h
index f88b2f2..941ae3e 100644
--- a/src/dialogs/gtr-jump-dialog.h
+++ b/src/dialogs/gtr-jump-dialog.h
@@ -30,33 +30,33 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_JUMP_DIALOG		(gtranslator_jump_dialog_get_type ())
-#define GTR_JUMP_DIALOG(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_JUMP_DIALOG, GtranslatorJumpDialog))
-#define GTR_JUMP_DIALOG_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_JUMP_DIALOG, GtranslatorJumpDialogClass))
+#define GTR_JUMP_DIALOG(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_JUMP_DIALOG, GtrJumpDialog))
+#define GTR_JUMP_DIALOG_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_JUMP_DIALOG, GtrJumpDialogClass))
 #define GTR_IS_JUMP_DIALOG(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_JUMP_DIALOG))
 #define GTR_IS_JUMP_DIALOG_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_JUMP_DIALOG))
-#define GTR_JUMP_DIALOG_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_JUMP_DIALOG, GtranslatorJumpDialogClass))
+#define GTR_JUMP_DIALOG_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_JUMP_DIALOG, GtrJumpDialogClass))
 /* Private structure type */
-typedef struct _GtranslatorJumpDialogPrivate GtranslatorJumpDialogPrivate;
+typedef struct _GtrJumpDialogPrivate GtrJumpDialogPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorJumpDialog GtranslatorJumpDialog;
+typedef struct _GtrJumpDialog GtrJumpDialog;
 
-struct _GtranslatorJumpDialog
+struct _GtrJumpDialog
 {
   GtkDialog parent_instance;
 
   /*< private > */
-  GtranslatorJumpDialogPrivate *priv;
+  GtrJumpDialogPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorJumpDialogClass GtranslatorJumpDialogClass;
+typedef struct _GtrJumpDialogClass GtrJumpDialogClass;
 
-struct _GtranslatorJumpDialogClass
+struct _GtrJumpDialogClass
 {
   GtkDialogClass parent_class;
 };
@@ -70,7 +70,7 @@ gtranslator_jump_dialog_get_type (void)
 
      GType gtranslator_jump_dialog_register_type (GTypeModule * module);
 
-     void gtranslator_show_jump_dialog (GtranslatorWindow * window);
+     void gtranslator_show_jump_dialog (GtrWindow * window);
 
 G_END_DECLS
 #endif /* __JUMP_DIALOG_H__ */
diff --git a/src/dialogs/gtr-preferences-dialog.c b/src/dialogs/gtr-preferences-dialog.c
index 5efea27..4f7adc3 100644
--- a/src/dialogs/gtr-preferences-dialog.c
+++ b/src/dialogs/gtr-preferences-dialog.c
@@ -48,12 +48,12 @@
 #define GTR_PREFERENCES_DIALOG_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 	(object),	\
 						 	GTR_TYPE_PREFERENCES_DIALOG,     \
-						 	GtranslatorPreferencesDialogPrivate))
+						 	GtrPreferencesDialogPrivate))
 
 
-G_DEFINE_TYPE (GtranslatorPreferencesDialog, gtranslator_preferences_dialog,
+G_DEFINE_TYPE (GtrPreferencesDialog, gtranslator_preferences_dialog,
 	       GTK_TYPE_DIALOG)
-     struct _GtranslatorPreferencesDialogPrivate
+     struct _GtrPreferencesDialogPrivate
      {
        GtkWidget *notebook;
 
@@ -116,11 +116,11 @@ G_DEFINE_TYPE (GtranslatorPreferencesDialog, gtranslator_preferences_dialog,
        GtkWidget *plugins_box;
      };
 
-     static void setup_profile_pages (GtranslatorPreferencesDialog * dlg);
+     static void setup_profile_pages (GtrPreferencesDialog * dlg);
 
      GtkWidget
        *gtranslator_preferences_dialog_get_treeview
-       (GtranslatorPreferencesDialog * dlg)
+       (GtrPreferencesDialog * dlg)
 {
   g_return_val_if_fail (GTR_IS_PREFERENCES_DIALOG (dlg), NULL);
 
@@ -131,7 +131,7 @@ G_DEFINE_TYPE (GtranslatorPreferencesDialog, gtranslator_preferences_dialog,
 
 static void
 warn_if_contains_fuzzy_checkbutton_toggled (GtkToggleButton * button,
-					    GtranslatorPreferencesDialog *
+					    GtrPreferencesDialog *
 					    dlg)
 {
   g_return_if_fail (button ==
@@ -144,7 +144,7 @@ warn_if_contains_fuzzy_checkbutton_toggled (GtkToggleButton * button,
 
 static void
 delete_compiled_checkbutton_toggled (GtkToggleButton * button,
-				     GtranslatorPreferencesDialog * dlg)
+				     GtrPreferencesDialog * dlg)
 {
   g_return_if_fail (button ==
 		    GTK_TOGGLE_BUTTON (dlg->priv->
@@ -155,7 +155,7 @@ delete_compiled_checkbutton_toggled (GtkToggleButton * button,
 }
 
 static void
-setup_files_general_page (GtranslatorPreferencesDialog * dlg)
+setup_files_general_page (GtrPreferencesDialog * dlg)
 {
   /*Set initial value */
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
@@ -178,7 +178,7 @@ setup_files_general_page (GtranslatorPreferencesDialog * dlg)
 
 static void
 autosave_checkbutton_toggled (GtkToggleButton * button,
-			      GtranslatorPreferencesDialog * dlg)
+			      GtrPreferencesDialog * dlg)
 {
   gboolean autosave;
 
@@ -194,7 +194,7 @@ autosave_checkbutton_toggled (GtkToggleButton * button,
 
 static void
 create_backup_checkbutton_toggled (GtkToggleButton * button,
-				   GtranslatorPreferencesDialog * dlg)
+				   GtrPreferencesDialog * dlg)
 {
   gboolean create_backup;
 
@@ -208,7 +208,7 @@ create_backup_checkbutton_toggled (GtkToggleButton * button,
 
 static void
 autosave_interval_spinbutton_value_changed (GtkSpinButton * spin_button,
-					    GtranslatorPreferencesDialog *
+					    GtrPreferencesDialog *
 					    dlg)
 {
   g_return_if_fail (spin_button ==
@@ -220,7 +220,7 @@ autosave_interval_spinbutton_value_changed (GtkSpinButton * spin_button,
 }
 
 static void
-setup_files_autosave_page (GtranslatorPreferencesDialog * dlg)
+setup_files_autosave_page (GtrPreferencesDialog * dlg)
 {
   gboolean autosave, backup;
   gint autosave_interval;
@@ -255,7 +255,7 @@ setup_files_autosave_page (GtranslatorPreferencesDialog * dlg)
 }
 
 static void
-setup_files_pages (GtranslatorPreferencesDialog * dlg)
+setup_files_pages (GtrPreferencesDialog * dlg)
 {
   /*Children */
   setup_files_general_page (dlg);
@@ -266,7 +266,7 @@ setup_files_pages (GtranslatorPreferencesDialog * dlg)
 /***************Editor pages****************/
 static void
 highlight_syntax_checkbutton_toggled (GtkToggleButton * button,
-				      GtranslatorPreferencesDialog * dlg)
+				      GtrPreferencesDialog * dlg)
 {
   g_return_if_fail (button ==
 		    GTK_TOGGLE_BUTTON (dlg->priv->
@@ -278,7 +278,7 @@ highlight_syntax_checkbutton_toggled (GtkToggleButton * button,
 
 static void
 visible_whitespace_checkbutton_toggled (GtkToggleButton * button,
-					GtranslatorPreferencesDialog * dlg)
+					GtrPreferencesDialog * dlg)
 {
   g_return_if_fail (button ==
 		    GTK_TOGGLE_BUTTON (dlg->priv->
@@ -290,7 +290,7 @@ visible_whitespace_checkbutton_toggled (GtkToggleButton * button,
 
 static void
 use_custom_font_checkbutton_toggled (GtkToggleButton * button,
-				     GtranslatorPreferencesDialog * dlg)
+				     GtrPreferencesDialog * dlg)
 {
   gboolean use_custom_font;
 
@@ -306,7 +306,7 @@ use_custom_font_checkbutton_toggled (GtkToggleButton * button,
 }
 
 static void
-editor_font_set (GtkFontButton * button, GtranslatorPreferencesDialog * dlg)
+editor_font_set (GtkFontButton * button, GtrPreferencesDialog * dlg)
 {
   const gchar *editor_font;
 
@@ -323,7 +323,7 @@ editor_font_set (GtkFontButton * button, GtranslatorPreferencesDialog * dlg)
 }
 
 static void
-setup_editor_text_display_page (GtranslatorPreferencesDialog * dlg)
+setup_editor_text_display_page (GtrPreferencesDialog * dlg)
 {
   gboolean use_custom_font;
   const gchar *editor_font;
@@ -369,7 +369,7 @@ setup_editor_text_display_page (GtranslatorPreferencesDialog * dlg)
 
 static void
 unmark_fuzzy_when_changed_checkbutton_toggled (GtkToggleButton * button,
-					       GtranslatorPreferencesDialog *
+					       GtrPreferencesDialog *
 					       dlg)
 {
   g_return_if_fail (button ==
@@ -382,7 +382,7 @@ unmark_fuzzy_when_changed_checkbutton_toggled (GtkToggleButton * button,
 
 static void
 spellcheck_checkbutton_toggled (GtkToggleButton * button,
-				GtranslatorPreferencesDialog * dlg)
+				GtrPreferencesDialog * dlg)
 {
   g_return_if_fail (button ==
 		    GTK_TOGGLE_BUTTON (dlg->priv->spellcheck_checkbutton));
@@ -392,7 +392,7 @@ spellcheck_checkbutton_toggled (GtkToggleButton * button,
 }
 
 static void
-setup_editor_contents (GtranslatorPreferencesDialog * dlg)
+setup_editor_contents (GtrPreferencesDialog * dlg)
 {
   /*Set initial values */
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
@@ -414,7 +414,7 @@ setup_editor_contents (GtranslatorPreferencesDialog * dlg)
 }
 
 static void
-setup_editor_pages (GtranslatorPreferencesDialog * dlg)
+setup_editor_pages (GtrPreferencesDialog * dlg)
 {
   /*Children */
   setup_editor_text_display_page (dlg);
@@ -424,14 +424,14 @@ setup_editor_pages (GtranslatorPreferencesDialog * dlg)
 /***************Profile pages****************/
 static void
 active_toggled_cb (GtkCellRendererToggle * cell_renderer,
-		   gchar * path_str, GtranslatorPreferencesDialog * dlg)
+		   gchar * path_str, GtrPreferencesDialog * dlg)
 {
   GtkTreeIter iter;
   GtkTreePath *path;
   GtkTreeModel *model;
   gboolean active;
   gchar *profile_row;
-  GtranslatorProfile *old_profile_active;
+  GtrProfile *old_profile_active;
   GList *l = NULL, *profiles_list = NULL;
   gchar *filename;
   gchar *config_folder;
@@ -469,8 +469,8 @@ active_toggled_cb (GtkCellRendererToggle * cell_renderer,
 
       for (l = profiles_list; l; l = l->next)
 	{
-	  GtranslatorProfile *profile;
-	  profile = (GtranslatorProfile *) l->data;
+	  GtrProfile *profile;
+	  profile = (GtrProfile *) l->data;
 	  if (!strcmp (gtranslator_profile_get_name (profile), profile_row))
 	    {
 	      gtranslator_application_set_active_profile (GTR_APP, profile);
@@ -484,11 +484,11 @@ active_toggled_cb (GtkCellRendererToggle * cell_renderer,
 }
 
 void
-gtranslator_preferences_fill_profile_treeview (GtranslatorPreferencesDialog *
+gtranslator_preferences_fill_profile_treeview (GtrPreferencesDialog *
 					       dlg, GtkTreeModel * model)
 {
   GtkTreeIter iter;
-  GtranslatorProfile *active_profile;
+  GtrProfile *active_profile;
   GList *l = NULL, *profiles_list = NULL;
 
   gtk_list_store_clear (GTK_LIST_STORE (model));
@@ -501,10 +501,10 @@ gtranslator_preferences_fill_profile_treeview (GtranslatorPreferencesDialog *
   for (l = profiles_list; l; l = l->next)
     {
 
-      GtranslatorProfile *profile;
+      GtrProfile *profile;
       const gchar *profile_name;
 
-      profile = (GtranslatorProfile *) l->data;
+      profile = (GtrProfile *) l->data;
 
       profile_name = gtranslator_profile_get_name (profile);
       gtk_list_store_append (GTK_LIST_STORE (model), &iter);
@@ -526,7 +526,7 @@ gtranslator_preferences_fill_profile_treeview (GtranslatorPreferencesDialog *
 }
 
 static void
-setup_profile_pages (GtranslatorPreferencesDialog * dlg)
+setup_profile_pages (GtrPreferencesDialog * dlg)
 {
 
   GtkTreeViewColumn *name_column, *toggle_column;
@@ -575,7 +575,7 @@ setup_profile_pages (GtranslatorPreferencesDialog * dlg)
 
 /***************Interface pages****************/
 static void
-style_changed_cb (GtkComboBox * combobox, GtranslatorPreferencesDialog * dlg)
+style_changed_cb (GtkComboBox * combobox, GtrPreferencesDialog * dlg)
 {
   g_return_if_fail (combobox == GTK_COMBO_BOX (dlg->priv->gdl_combobox));
 
@@ -585,7 +585,7 @@ style_changed_cb (GtkComboBox * combobox, GtranslatorPreferencesDialog * dlg)
 
 static void
 scheme_color_changed_cb (GtkComboBox * combobox,
-			 GtranslatorPreferencesDialog * dlg)
+			 GtrPreferencesDialog * dlg)
 {
   g_return_if_fail (combobox ==
 		    GTK_COMBO_BOX (dlg->priv->scheme_color_combobox));
@@ -595,7 +595,7 @@ scheme_color_changed_cb (GtkComboBox * combobox,
 }
 
 static void
-setup_interface_pages (GtranslatorPreferencesDialog * dlg)
+setup_interface_pages (GtrPreferencesDialog * dlg)
 {
   gint pane_switcher_style;
   GtkSourceStyleSchemeManager *manager;
@@ -651,9 +651,9 @@ static void
 response_filechooser_cb (GtkDialog * dialog,
 			 gint response_id, gpointer user_data)
 {
-  GtranslatorPreferencesDialog *dlg;
+  GtrPreferencesDialog *dlg;
 
-  dlg = (GtranslatorPreferencesDialog *) user_data;
+  dlg = (GtrPreferencesDialog *) user_data;
 
 
   if (response_id == GTK_RESPONSE_YES)
@@ -675,9 +675,9 @@ static void
 on_search_button_pulsed (GtkButton * button, gpointer data)
 {
   GtkWidget *filechooser;
-  GtranslatorPreferencesDialog *dlg;
+  GtrPreferencesDialog *dlg;
 
-  dlg = (GtranslatorPreferencesDialog *) data;
+  dlg = (GtrPreferencesDialog *) data;
 
   filechooser = gtk_file_chooser_dialog_new ("Select PO directory",
 					     GTK_WINDOW (dlg),
@@ -697,7 +697,7 @@ typedef struct _IdleData
 {
   GSList *list;
   GtkProgressBar *progress;
-  GtranslatorTranslationMemory *tm;
+  GtrTranslationMemory *tm;
   GtkWindow *parent;
 } IdleData;
 
@@ -719,7 +719,7 @@ add_to_database (gpointer data_pointer)
       GList *l2 = NULL;
       GFile *location;
       GError *error = NULL;
-      GtranslatorPo *po;
+      GtrPo *po;
 
       po = gtranslator_po_new ();
       location = (GFile *) l->data;
@@ -732,7 +732,7 @@ add_to_database (gpointer data_pointer)
 
       for (l2 = msg_list; l2; l2 = l2->next)
 	{
-	  GtranslatorMsg *msg;
+	  GtrMsg *msg;
 	  msg = GTR_MSG (l2->data);
 	  if (gtranslator_msg_is_translated (msg))
 	    gtranslator_translation_memory_store (data->tm,
@@ -797,7 +797,7 @@ destroy_idle_data (gpointer data)
 
 static void
 on_add_database_button_pulsed (GtkButton * button,
-			       GtranslatorPreferencesDialog * dlg)
+			       GtrPreferencesDialog * dlg)
 {
   GFile *dir;
   const gchar *dir_name;
@@ -841,7 +841,7 @@ on_use_lang_profile_checkbutton_changed (GtkToggleButton * button,
 
 static void
 tm_lang_entry_changed (GObject * gobject,
-		       GParamSpec * arg1, GtranslatorPreferencesDialog * dlg)
+		       GParamSpec * arg1, GtrPreferencesDialog * dlg)
 {
   const gchar *text;
 
@@ -880,7 +880,7 @@ on_sentence_length_spinbutton_changed (GtkSpinButton * spinbutton,
 static void
 directory_entry_changed (GObject * gobject,
 			 GParamSpec * arg1,
-			 GtranslatorPreferencesDialog * dlg)
+			 GtrPreferencesDialog * dlg)
 {
   const gchar *text;
 
@@ -895,9 +895,9 @@ directory_entry_changed (GObject * gobject,
 
 
 static void
-setup_tm_pages (GtranslatorPreferencesDialog * dlg)
+setup_tm_pages (GtrPreferencesDialog * dlg)
 {
-  GtranslatorProfile *profile;
+  GtrProfile *profile;
   const gchar *language_code;
   const gchar *filename = NULL;
 
@@ -961,7 +961,7 @@ setup_tm_pages (GtranslatorPreferencesDialog * dlg)
 
 /***************Plugins pages****************/
 static void
-setup_plugin_pages (GtranslatorPreferencesDialog * dlg)
+setup_plugin_pages (GtrPreferencesDialog * dlg)
 {
   GtkWidget *alignment;
   GtkWidget *page_content;
@@ -992,23 +992,23 @@ dialog_response_handler (GtkDialog * dlg, gint res_id)
 }
 
 static void
-add_button_pulsed (GtkWidget * button, GtranslatorPreferencesDialog * dlg)
+add_button_pulsed (GtkWidget * button, GtrPreferencesDialog * dlg)
 {
-  GtranslatorProfile *profile;
+  GtrProfile *profile;
   profile = gtranslator_profile_new ();
   gtranslator_show_profile_dialog (dlg, profile, NEW_PROFILE);
 }
 
 static void
-edit_button_pulsed (GtkWidget * button, GtranslatorPreferencesDialog * dlg)
+edit_button_pulsed (GtkWidget * button, GtrPreferencesDialog * dlg)
 {
   GtkTreeIter iter;
   GtkTreeModel *model;
   GtkTreeSelection *selection;
   gchar *profile_row;
   const gchar *old_profile_name;
-  GtranslatorProfile *edited_profile = NULL;
-  GtranslatorProfile *active_profile;
+  GtrProfile *edited_profile = NULL;
+  GtrProfile *active_profile;
   GList *profiles_list = NULL, *l = NULL;
 
   model =
@@ -1028,8 +1028,8 @@ edit_button_pulsed (GtkWidget * button, GtranslatorPreferencesDialog * dlg)
 
       for (l = profiles_list; l; l = l->next)
 	{
-	  GtranslatorProfile *profile;
-	  profile = (GtranslatorProfile *) l->data;
+	  GtrProfile *profile;
+	  profile = (GtrProfile *) l->data;
 	  if (!strcmp (gtranslator_profile_get_name (profile), profile_row))
 	    {
 	      old_profile_name = gtranslator_profile_get_name (profile);
@@ -1043,7 +1043,7 @@ edit_button_pulsed (GtkWidget * button, GtranslatorPreferencesDialog * dlg)
 static void
 delete_confirm_dialog_cb (GtkWidget * dialog,
 			  gint response_id,
-			  GtranslatorPreferencesDialog * dlg)
+			  GtrPreferencesDialog * dlg)
 {
   GtkTreeIter iter;
   GtkTreeModel *model;
@@ -1072,8 +1072,8 @@ delete_confirm_dialog_cb (GtkWidget * dialog,
 
 	  for (l = profiles_list; l; l = l->next)
 	    {
-	      GtranslatorProfile *profile;
-	      profile = (GtranslatorProfile *) l->data;
+	      GtrProfile *profile;
+	      profile = (GtrProfile *) l->data;
 	      if (!strcmp
 		  (gtranslator_profile_get_name (profile), profile_row))
 		{
@@ -1092,13 +1092,13 @@ delete_confirm_dialog_cb (GtkWidget * dialog,
 }
 
 static void
-delete_button_pulsed (GtkWidget * button, GtranslatorPreferencesDialog * dlg)
+delete_button_pulsed (GtkWidget * button, GtrPreferencesDialog * dlg)
 {
   GtkTreeIter iter;
   GtkTreeModel *model;
   GtkTreeSelection *selection;
   gchar *profile_row;
-  GtranslatorProfile *active_profile;
+  GtrProfile *active_profile;
   GtkWidget *dialog;
 
   model =
@@ -1162,7 +1162,7 @@ delete_button_pulsed (GtkWidget * button, GtranslatorPreferencesDialog * dlg)
 }
 
 static void
-gtranslator_preferences_dialog_init (GtranslatorPreferencesDialog * dlg)
+gtranslator_preferences_dialog_init (GtrPreferencesDialog * dlg)
 {
   gboolean ret;
   GtkWidget *error_widget;
@@ -1183,7 +1183,7 @@ gtranslator_preferences_dialog_init (GtranslatorPreferencesDialog * dlg)
 			  GTK_RESPONSE_CLOSE,
 			  GTK_STOCK_HELP, GTK_RESPONSE_HELP, NULL);
 
-  gtk_window_set_title (GTK_WINDOW (dlg), _("Gtranslator Preferences"));
+  gtk_window_set_title (GTK_WINDOW (dlg), _("Gtr Preferences"));
   gtk_window_set_resizable (GTK_WINDOW (dlg), FALSE);
   gtk_dialog_set_has_separator (GTK_DIALOG (dlg), FALSE);
   gtk_window_set_destroy_with_parent (GTK_WINDOW (dlg), TRUE);
@@ -1315,19 +1315,19 @@ gtranslator_preferences_dialog_finalize (GObject * object)
 }
 
 static void
-gtranslator_preferences_dialog_class_init (GtranslatorPreferencesDialogClass *
+gtranslator_preferences_dialog_class_init (GtrPreferencesDialogClass *
 					   klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   g_type_class_add_private (klass,
-			    sizeof (GtranslatorPreferencesDialogPrivate));
+			    sizeof (GtrPreferencesDialogPrivate));
 
   object_class->finalize = gtranslator_preferences_dialog_finalize;
 }
 
 void
-gtranslator_show_preferences_dialog (GtranslatorWindow * window)
+gtranslator_show_preferences_dialog (GtrWindow * window)
 {
   static GtkWidget *dlg = NULL;
 
diff --git a/src/dialogs/gtr-preferences-dialog.h b/src/dialogs/gtr-preferences-dialog.h
index 4981da8..f665e5a 100644
--- a/src/dialogs/gtr-preferences-dialog.h
+++ b/src/dialogs/gtr-preferences-dialog.h
@@ -38,35 +38,35 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_PREFERENCES_DIALOG		(gtranslator_preferences_dialog_get_type ())
-#define GTR_PREFERENCES_DIALOG(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_PREFERENCES_DIALOG, GtranslatorPreferencesDialog))
-#define GTR_PREFERENCES_DIALOG_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_PREFERENCES_DIALOG, GtranslatorPreferencesDialogClass))
+#define GTR_PREFERENCES_DIALOG(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_PREFERENCES_DIALOG, GtrPreferencesDialog))
+#define GTR_PREFERENCES_DIALOG_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_PREFERENCES_DIALOG, GtrPreferencesDialogClass))
 #define GTR_IS_PREFERENCES_DIALOG(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_PREFERENCES_DIALOG))
 #define GTR_IS_PREFERENCES_DIALOG_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_PREFERENCES_DIALOG))
-#define GTR_PREFERENCES_DIALOG_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_PREFERENCES_DIALOG, GtranslatorPreferencesDialogClass))
+#define GTR_PREFERENCES_DIALOG_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_PREFERENCES_DIALOG, GtrPreferencesDialogClass))
 /* Private structure type */
-typedef struct _GtranslatorPreferencesDialogPrivate
-  GtranslatorPreferencesDialogPrivate;
+typedef struct _GtrPreferencesDialogPrivate
+  GtrPreferencesDialogPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorPreferencesDialog GtranslatorPreferencesDialog;
+typedef struct _GtrPreferencesDialog GtrPreferencesDialog;
 
-struct _GtranslatorPreferencesDialog
+struct _GtrPreferencesDialog
 {
   GtkDialog parent_instance;
 
   /*< private > */
-  GtranslatorPreferencesDialogPrivate *priv;
+  GtrPreferencesDialogPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorPreferencesDialogClass
-  GtranslatorPreferencesDialogClass;
+typedef struct _GtrPreferencesDialogClass
+  GtrPreferencesDialogClass;
 
-struct _GtranslatorPreferencesDialogClass
+struct _GtrPreferencesDialogClass
 {
   GtkDialogClass parent_class;
 };
@@ -81,15 +81,15 @@ gtranslator_preferences_dialog_get_type (void)
      GType gtranslator_preferences_dialog_register_type (GTypeModule *
 							 module);
 
-     void gtranslator_show_preferences_dialog (GtranslatorWindow * window);
+     void gtranslator_show_preferences_dialog (GtrWindow * window);
 
      GtkWidget
        *gtranslator_preferences_dialog_get_treeview
-       (GtranslatorPreferencesDialog * dlg);
+       (GtrPreferencesDialog * dlg);
 
      void
        gtranslator_preferences_fill_profile_treeview
-       (GtranslatorPreferencesDialog * dlg, GtkTreeModel * model);
+       (GtrPreferencesDialog * dlg, GtkTreeModel * model);
 
 G_END_DECLS
 #endif /* __PREFERENCES_DIALOG_H__ */
diff --git a/src/dialogs/gtr-profile-dialog.c b/src/dialogs/gtr-profile-dialog.c
index 0dced29..498d95b 100644
--- a/src/dialogs/gtr-profile-dialog.c
+++ b/src/dialogs/gtr-profile-dialog.c
@@ -41,12 +41,12 @@
 #define GTR_PROFILE_DIALOG_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 	(object),	\
 						 	GTR_TYPE_PROFILE_DIALOG,     \
-						 	GtranslatorProfileDialogPrivate))
+						 	GtrProfileDialogPrivate))
 
-G_DEFINE_TYPE (GtranslatorProfileDialog, gtranslator_profile_dialog,
+G_DEFINE_TYPE (GtrProfileDialog, gtranslator_profile_dialog,
 	       GTK_TYPE_DIALOG)
 
-struct _GtranslatorProfileDialogPrivate
+struct _GtrProfileDialogPrivate
 {
   GtkWidget *main_box;
 
@@ -62,10 +62,10 @@ struct _GtranslatorProfileDialogPrivate
   GtkWidget *language_email_entry;
   GtkWidget *plurals_forms_entry;
 
-  GtranslatorPreferencesDialog *prefs_dlg;
+  GtrPreferencesDialog *prefs_dlg;
 
-  GtranslatorProfile *new_profile;
-  GtranslatorProfile *old_profile;
+  GtrProfile *new_profile;
+  GtrProfile *old_profile;
 };
 
 static void
@@ -75,11 +75,11 @@ gtranslator_profile_dialog_finalize (GObject * object)
 }
 
 static void
-gtranslator_profile_dialog_class_init (GtranslatorProfileDialogClass * klass)
+gtranslator_profile_dialog_class_init (GtrProfileDialogClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorProfileDialogPrivate));
+  g_type_class_add_private (klass, sizeof (GtrProfileDialogPrivate));
 
   object_class->finalize = gtranslator_profile_dialog_finalize;
 }
@@ -88,7 +88,7 @@ gtranslator_profile_dialog_class_init (GtranslatorProfileDialogClass * klass)
 static void
 profile_name_entry_changed (GObject * gobject,
 			    GParamSpec * arg1,
-			    GtranslatorProfileDialog * profile_dlg)
+			    GtrProfileDialog * profile_dlg)
 {
   const gchar *text;
 
@@ -104,7 +104,7 @@ profile_name_entry_changed (GObject * gobject,
 static void
 author_name_entry_changed (GObject * gobject,
 			   GParamSpec * arg1,
-			   GtranslatorProfileDialog * profile_dlg)
+			   GtrProfileDialog * profile_dlg)
 {
   const gchar *text;
 
@@ -120,7 +120,7 @@ author_name_entry_changed (GObject * gobject,
 static void
 author_email_entry_changed (GObject * gobject,
 			    GParamSpec * arg1,
-			    GtranslatorProfileDialog * profile_dlg)
+			    GtrProfileDialog * profile_dlg)
 {
   const gchar *text;
 
@@ -136,7 +136,7 @@ author_email_entry_changed (GObject * gobject,
 static void
 language_name_entry_changed (GObject * gobject,
 			     GParamSpec * arg1,
-			     GtranslatorProfileDialog * profile_dlg)
+			     GtrProfileDialog * profile_dlg)
 {
   const gchar *text;
 
@@ -152,7 +152,7 @@ language_name_entry_changed (GObject * gobject,
 static void
 language_code_entry_changed (GObject * gobject,
 			     GParamSpec * arg1,
-			     GtranslatorProfileDialog * profile_dlg)
+			     GtrProfileDialog * profile_dlg)
 {
   const gchar *text;
 
@@ -168,7 +168,7 @@ language_code_entry_changed (GObject * gobject,
 static void
 charset_entry_changed (GObject * gobject,
 		       GParamSpec * arg1,
-		       GtranslatorProfileDialog * profile_dlg)
+		       GtrProfileDialog * profile_dlg)
 {
   const gchar *text;
 
@@ -184,7 +184,7 @@ charset_entry_changed (GObject * gobject,
 static void
 encoding_entry_changed (GObject * gobject,
 			GParamSpec * arg1,
-			GtranslatorProfileDialog * profile_dlg)
+			GtrProfileDialog * profile_dlg)
 {
   const gchar *text;
 
@@ -200,7 +200,7 @@ encoding_entry_changed (GObject * gobject,
 static void
 group_email_entry_changed (GObject * gobject,
 			   GParamSpec * arg1,
-			   GtranslatorProfileDialog * profile_dlg)
+			   GtrProfileDialog * profile_dlg)
 {
   const gchar *text;
 
@@ -216,7 +216,7 @@ group_email_entry_changed (GObject * gobject,
 static void
 plurals_entry_changed (GObject * gobject,
 		       GParamSpec * arg1,
-		       GtranslatorProfileDialog * profile_dlg)
+		       GtrProfileDialog * profile_dlg)
 {
   const gchar *text;
 
@@ -230,10 +230,10 @@ plurals_entry_changed (GObject * gobject,
 }
 
 static void
-save_new_profile (GtkWidget * widget, GtranslatorProfileDialog * profile_dlg)
+save_new_profile (GtkWidget * widget, GtrProfileDialog * profile_dlg)
 {
   GList *profiles_list = NULL, *l = NULL;
-  GtranslatorPreferencesDialog *dlg;
+  GtrPreferencesDialog *dlg;
   gboolean profile_exists;
   GtkWidget *treeview;
   GtkTreeModel *model;
@@ -243,8 +243,8 @@ save_new_profile (GtkWidget * widget, GtranslatorProfileDialog * profile_dlg)
 
   for (l = profiles_list; l; l = l->next)
     {
-      GtranslatorProfile *profile_in_list;
-      profile_in_list = (GtranslatorProfile *) l->data;
+      GtrProfile *profile_in_list;
+      profile_in_list = (GtrProfile *) l->data;
       if (!strcmp (gtranslator_profile_get_name (profile_in_list),
 		   gtranslator_profile_get_name (profile_dlg->priv->
 						 new_profile)))
@@ -306,7 +306,7 @@ save_new_profile (GtkWidget * widget, GtranslatorProfileDialog * profile_dlg)
 
 static void
 save_modified_profile (GtkWidget * widget,
-		       GtranslatorProfileDialog * profile_dlg)
+		       GtrProfileDialog * profile_dlg)
 {
   GtkWidget *treeview;
   GtkTreeModel *model;
@@ -326,7 +326,7 @@ save_modified_profile (GtkWidget * widget,
 }
 
 static void
-destroy_without_changes (GtkWidget * widget, GtranslatorProfileDialog * dlg)
+destroy_without_changes (GtkWidget * widget, GtrProfileDialog * dlg)
 {
   gtranslator_profile_set_name (dlg->priv->new_profile,
 				gtranslator_profile_get_name (dlg->priv->
@@ -363,7 +363,7 @@ destroy_without_changes (GtkWidget * widget, GtranslatorProfileDialog * dlg)
 }
 
 static void
-gtranslator_profile_dialog_init (GtranslatorProfileDialog * dlg)
+gtranslator_profile_dialog_init (GtrProfileDialog * dlg)
 {
   gboolean ret;
   GtkWidget *error_widget;
@@ -375,7 +375,7 @@ gtranslator_profile_dialog_init (GtranslatorProfileDialog * dlg)
 
   dlg->priv = GTR_PROFILE_DIALOG_GET_PRIVATE (dlg);
 
-  gtk_window_set_title (GTK_WINDOW (dlg), _("Gtranslator Profile"));
+  gtk_window_set_title (GTK_WINDOW (dlg), _("Gtr Profile"));
   gtk_window_set_resizable (GTK_WINDOW (dlg), FALSE);
   gtk_dialog_set_has_separator (GTK_DIALOG (dlg), FALSE);
   gtk_window_set_destroy_with_parent (GTK_WINDOW (dlg), TRUE);
@@ -429,12 +429,12 @@ gtranslator_profile_dialog_init (GtranslatorProfileDialog * dlg)
 }
 
 void
-gtranslator_show_profile_dialog (GtranslatorPreferencesDialog * dialog,
-				 GtranslatorProfile * profile, gint action)
+gtranslator_show_profile_dialog (GtrPreferencesDialog * dialog,
+				 GtrProfile * profile, gint action)
 {
-  static GtranslatorProfileDialog *dlg = NULL;
+  static GtrProfileDialog *dlg = NULL;
   GtkButton *ok_button, *cancel_button;
-  GtranslatorProfile *old_profile;
+  GtrProfile *old_profile;
 
   old_profile = gtranslator_profile_new ();
 
diff --git a/src/dialogs/gtr-profile-dialog.h b/src/dialogs/gtr-profile-dialog.h
index 6e07929..d6d559c 100644
--- a/src/dialogs/gtr-profile-dialog.h
+++ b/src/dialogs/gtr-profile-dialog.h
@@ -40,35 +40,35 @@ enum
  * Type checking and casting macros
  */
 #define GTR_TYPE_PROFILE_DIALOG		(gtranslator_profile_dialog_get_type ())
-#define GTR_PROFILE_DIALOG(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_PROFILE_DIALOG, GtranslatorProfileDialog))
-#define GTR_PROFILE_DIALOG_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_PROFILE_DIALOG, GtranslatorProfileDialogClass))
+#define GTR_PROFILE_DIALOG(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_PROFILE_DIALOG, GtrProfileDialog))
+#define GTR_PROFILE_DIALOG_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_PROFILE_DIALOG, GtrProfileDialogClass))
 #define GTR_IS_PROFILE_DIALOG(o)	(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_PROFILE_DIALOG))
 #define GTR_IS_PROFILE_DIALOG_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_PROFILE_DIALOG))
-#define GTR_PROFILE_DIALOG_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_PROFILE_DIALOG, GtranslatorProfileDialogClass))
+#define GTR_PROFILE_DIALOG_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_PROFILE_DIALOG, GtrProfileDialogClass))
 
 /* Private structure type */
-typedef struct _GtranslatorProfileDialogPrivate
-  GtranslatorProfileDialogPrivate;
+typedef struct _GtrProfileDialogPrivate
+  GtrProfileDialogPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorProfileDialog GtranslatorProfileDialog;
+typedef struct _GtrProfileDialog GtrProfileDialog;
 
-struct _GtranslatorProfileDialog
+struct _GtrProfileDialog
 {
   GtkDialog parent_instance;
 
   /*< private > */
-  GtranslatorProfileDialogPrivate *priv;
+  GtrProfileDialogPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorProfileDialogClass GtranslatorProfileDialogClass;
+typedef struct _GtrProfileDialogClass GtrProfileDialogClass;
 
-struct _GtranslatorProfileDialogClass
+struct _GtrProfileDialogClass
 {
   GtkDialogClass parent_class;
 };
@@ -82,9 +82,9 @@ gtranslator_profile_dialog_get_type (void)
 
      GType gtranslator_profile_dialog_register_type (GTypeModule * module);
 
-     void gtranslator_show_profile_dialog (GtranslatorPreferencesDialog *
+     void gtranslator_show_profile_dialog (GtrPreferencesDialog *
 					   dialog,
-					   GtranslatorProfile * profile,
+					   GtrProfile * profile,
 					   gint action);
 
 #endif
diff --git a/src/dialogs/gtr-search-dialog.c b/src/dialogs/gtr-search-dialog.c
index 0b520c8..6c51fef 100644
--- a/src/dialogs/gtr-search-dialog.c
+++ b/src/dialogs/gtr-search-dialog.c
@@ -45,7 +45,7 @@
 
 #define GTR_SEARCH_DIALOG_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), \
 						GTR_TYPE_SEARCH_DIALOG,              \
-						GtranslatorSearchDialogPrivate))
+						GtrSearchDialogPrivate))
 
 /* Signals */
 enum
@@ -56,7 +56,7 @@ enum
 
 static guint dialog_signals[LAST_SIGNAL] = { 0 };
 
-struct _GtranslatorSearchDialogPrivate
+struct _GtrSearchDialogPrivate
 {
   gboolean show_replace;
 
@@ -81,7 +81,7 @@ struct _GtranslatorSearchDialogPrivate
   gboolean glade_error;
 };
 
-G_DEFINE_TYPE (GtranslatorSearchDialog, gtranslator_search_dialog,
+G_DEFINE_TYPE (GtrSearchDialog, gtranslator_search_dialog,
 	       GTK_TYPE_DIALOG)
 enum
 {
@@ -95,7 +95,7 @@ gtranslator_search_dialog_set_property (GObject * object,
 					const GValue * value,
 					GParamSpec * pspec)
 {
-  GtranslatorSearchDialog *dlg = GTR_SEARCH_DIALOG (object);
+  GtrSearchDialog *dlg = GTR_SEARCH_DIALOG (object);
 
   switch (prop_id)
     {
@@ -115,7 +115,7 @@ gtranslator_search_dialog_get_property (GObject * object,
 					guint prop_id,
 					GValue * value, GParamSpec * pspec)
 {
-  GtranslatorSearchDialog *dlg = GTR_SEARCH_DIALOG (object);
+  GtrSearchDialog *dlg = GTR_SEARCH_DIALOG (object);
 
   switch (prop_id)
     {
@@ -129,7 +129,7 @@ gtranslator_search_dialog_get_property (GObject * object,
 }
 
 static gboolean
-show_replace (GtranslatorSearchDialog * dlg)
+show_replace (GtrSearchDialog * dlg)
 {
   gtranslator_search_dialog_set_show_replace (dlg, TRUE);
 
@@ -137,7 +137,7 @@ show_replace (GtranslatorSearchDialog * dlg)
 }
 
 static void
-gtranslator_search_dialog_class_init (GtranslatorSearchDialogClass * klass)
+gtranslator_search_dialog_class_init (GtrSearchDialogClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkBindingSet *binding_set;
@@ -151,7 +151,7 @@ gtranslator_search_dialog_class_init (GtranslatorSearchDialogClass * klass)
     g_signal_new ("show_replace",
 		  G_TYPE_FROM_CLASS (object_class),
 		  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-		  G_STRUCT_OFFSET (GtranslatorSearchDialogClass,
+		  G_STRUCT_OFFSET (GtrSearchDialogClass,
 				   show_replace), NULL, NULL,
 		  gtr_marshal_BOOLEAN__NONE, G_TYPE_BOOLEAN, 0);
 
@@ -163,7 +163,7 @@ gtranslator_search_dialog_class_init (GtranslatorSearchDialogClass * klass)
 							 G_PARAM_READWRITE));
 
   g_type_class_add_private (object_class,
-			    sizeof (GtranslatorSearchDialogPrivate));
+			    sizeof (GtrSearchDialogPrivate));
 
   binding_set = gtk_binding_set_by_class (klass);
 
@@ -211,7 +211,7 @@ insert_text_handler (GtkEditable * editable,
 }
 
 static void
-search_entry_changed (GtkComboBox * combo, GtranslatorSearchDialog * dialog)
+search_entry_changed (GtkComboBox * combo, GtrSearchDialog * dialog)
 {
   GtkWidget *entry;
   const gchar *search_string;
@@ -248,7 +248,7 @@ search_entry_changed (GtkComboBox * combo, GtranslatorSearchDialog * dialog)
  */
 static void
 original_translated_checkbutton_toggled (GtkToggleButton * button,
-					 GtranslatorSearchDialog * dialog)
+					 GtrSearchDialog * dialog)
 {
   gboolean original_text;
   gboolean translated_text;
@@ -272,7 +272,7 @@ original_translated_checkbutton_toggled (GtkToggleButton * button,
 }
 
 static void
-response_handler (GtranslatorSearchDialog * dialog,
+response_handler (GtrSearchDialog * dialog,
 		  gint response_id, gpointer data)
 {
   const gchar *str;
@@ -309,7 +309,7 @@ response_handler (GtranslatorSearchDialog * dialog,
 }
 
 static void
-show_replace_widgets (GtranslatorSearchDialog * dlg, gboolean show_replace)
+show_replace_widgets (GtrSearchDialog * dlg, gboolean show_replace)
 {
   if (show_replace)
     {
@@ -361,7 +361,7 @@ show_replace_widgets (GtranslatorSearchDialog * dlg, gboolean show_replace)
 }
 
 static void
-gtranslator_search_dialog_init (GtranslatorSearchDialog * dlg)
+gtranslator_search_dialog_init (GtrSearchDialog * dlg)
 {
   GtkWidget *content;
   GtkWidget *error_widget;
@@ -436,7 +436,7 @@ gtranslator_search_dialog_init (GtranslatorSearchDialog * dlg)
   gtk_widget_set_size_request (dlg->priv->search_entry, 300, -1);
   gtranslator_history_entry_set_escape_func
     (GTR_HISTORY_ENTRY (dlg->priv->search_entry),
-     (GtranslatorHistoryEntryEscapeFunc)
+     (GtrHistoryEntryEscapeFunc)
      gtranslator_utils_escape_search_text);
 
   dlg->priv->search_text_entry = gtranslator_history_entry_get_entry
@@ -451,7 +451,7 @@ gtranslator_search_dialog_init (GtranslatorSearchDialog * dlg)
     gtranslator_history_entry_new ("gtranslator_replace_with_entry", TRUE);
   gtranslator_history_entry_set_escape_func (GTR_HISTORY_ENTRY
 					     (dlg->priv->replace_entry),
-					     (GtranslatorHistoryEntryEscapeFunc)
+					     (GtrHistoryEntryEscapeFunc)
 					     gtranslator_utils_escape_search_text);
 
   dlg->priv->replace_text_entry = gtranslator_history_entry_get_entry
@@ -526,7 +526,7 @@ gtranslator_search_dialog_init (GtranslatorSearchDialog * dlg)
 GtkWidget *
 gtranslator_search_dialog_new (GtkWindow * parent, gboolean show_replace)
 {
-  GtranslatorSearchDialog *dlg;
+  GtrSearchDialog *dlg;
 
   dlg = g_object_new (GTR_TYPE_SEARCH_DIALOG,
 		      "show-replace", show_replace, NULL);
@@ -538,7 +538,7 @@ gtranslator_search_dialog_new (GtkWindow * parent, gboolean show_replace)
 }
 
 void
-gtranslator_search_dialog_present_with_time (GtranslatorSearchDialog * dialog,
+gtranslator_search_dialog_present_with_time (GtrSearchDialog * dialog,
 					     guint32 timestamp)
 {
   g_return_if_fail (GTR_IS_SEARCH_DIALOG (dialog));
@@ -549,7 +549,7 @@ gtranslator_search_dialog_present_with_time (GtranslatorSearchDialog * dialog,
 }
 
 gboolean
-gtranslator_search_dialog_get_show_replace (GtranslatorSearchDialog * dialog)
+gtranslator_search_dialog_get_show_replace (GtrSearchDialog * dialog)
 {
   g_return_val_if_fail (GTR_IS_SEARCH_DIALOG (dialog), FALSE);
 
@@ -557,7 +557,7 @@ gtranslator_search_dialog_get_show_replace (GtranslatorSearchDialog * dialog)
 }
 
 void
-gtranslator_search_dialog_set_show_replace (GtranslatorSearchDialog * dialog,
+gtranslator_search_dialog_set_show_replace (GtrSearchDialog * dialog,
 					    gboolean show_replace)
 {
   g_return_if_fail (GTR_IS_SEARCH_DIALOG (dialog));
@@ -572,7 +572,7 @@ gtranslator_search_dialog_set_show_replace (GtranslatorSearchDialog * dialog,
 }
 
 void
-gtranslator_search_dialog_set_search_text (GtranslatorSearchDialog * dialog,
+gtranslator_search_dialog_set_search_text (GtrSearchDialog * dialog,
 					   const gchar * text)
 {
   g_return_if_fail (GTR_IS_SEARCH_DIALOG (dialog));
@@ -593,7 +593,7 @@ gtranslator_search_dialog_set_search_text (GtranslatorSearchDialog * dialog,
  * The text must be unescaped before searching.
  */
 const gchar *
-gtranslator_search_dialog_get_search_text (GtranslatorSearchDialog * dialog)
+gtranslator_search_dialog_get_search_text (GtrSearchDialog * dialog)
 {
   g_return_val_if_fail (GTR_IS_SEARCH_DIALOG (dialog), NULL);
 
@@ -601,7 +601,7 @@ gtranslator_search_dialog_get_search_text (GtranslatorSearchDialog * dialog)
 }
 
 void
-gtranslator_search_dialog_set_replace_text (GtranslatorSearchDialog * dialog,
+gtranslator_search_dialog_set_replace_text (GtrSearchDialog * dialog,
 					    const gchar * text)
 {
   g_return_if_fail (GTR_IS_SEARCH_DIALOG (dialog));
@@ -611,7 +611,7 @@ gtranslator_search_dialog_set_replace_text (GtranslatorSearchDialog * dialog,
 }
 
 const gchar *
-gtranslator_search_dialog_get_replace_text (GtranslatorSearchDialog * dialog)
+gtranslator_search_dialog_get_replace_text (GtrSearchDialog * dialog)
 {
   g_return_val_if_fail (GTR_IS_SEARCH_DIALOG (dialog), NULL);
 
@@ -619,7 +619,7 @@ gtranslator_search_dialog_get_replace_text (GtranslatorSearchDialog * dialog)
 }
 
 void
-gtranslator_search_dialog_set_original_text (GtranslatorSearchDialog * dialog,
+gtranslator_search_dialog_set_original_text (GtrSearchDialog * dialog,
 					     gboolean match_case)
 {
   g_return_if_fail (GTR_IS_SEARCH_DIALOG (dialog));
@@ -630,7 +630,7 @@ gtranslator_search_dialog_set_original_text (GtranslatorSearchDialog * dialog,
 }
 
 gboolean
-gtranslator_search_dialog_get_original_text (GtranslatorSearchDialog * dialog)
+gtranslator_search_dialog_get_original_text (GtrSearchDialog * dialog)
 {
   g_return_val_if_fail (GTR_IS_SEARCH_DIALOG (dialog), FALSE);
 
@@ -640,7 +640,7 @@ gtranslator_search_dialog_get_original_text (GtranslatorSearchDialog * dialog)
 }
 
 void
-gtranslator_search_dialog_set_translated_text (GtranslatorSearchDialog *
+gtranslator_search_dialog_set_translated_text (GtrSearchDialog *
 					       dialog, gboolean match_case)
 {
   g_return_if_fail (GTR_IS_SEARCH_DIALOG (dialog));
@@ -651,7 +651,7 @@ gtranslator_search_dialog_set_translated_text (GtranslatorSearchDialog *
 }
 
 gboolean
-gtranslator_search_dialog_get_translated_text (GtranslatorSearchDialog *
+gtranslator_search_dialog_get_translated_text (GtrSearchDialog *
 					       dialog)
 {
   g_return_val_if_fail (GTR_IS_SEARCH_DIALOG (dialog), FALSE);
@@ -663,7 +663,7 @@ gtranslator_search_dialog_get_translated_text (GtranslatorSearchDialog *
 }
 
 void
-gtranslator_search_dialog_set_fuzzy (GtranslatorSearchDialog * dialog,
+gtranslator_search_dialog_set_fuzzy (GtrSearchDialog * dialog,
 				     gboolean match_case)
 {
   g_return_if_fail (GTR_IS_SEARCH_DIALOG (dialog));
@@ -674,7 +674,7 @@ gtranslator_search_dialog_set_fuzzy (GtranslatorSearchDialog * dialog,
 }
 
 gboolean
-gtranslator_search_dialog_get_fuzzy (GtranslatorSearchDialog * dialog)
+gtranslator_search_dialog_get_fuzzy (GtrSearchDialog * dialog)
 {
   g_return_val_if_fail (GTR_IS_SEARCH_DIALOG (dialog), FALSE);
 
@@ -684,7 +684,7 @@ gtranslator_search_dialog_get_fuzzy (GtranslatorSearchDialog * dialog)
 }
 
 void
-gtranslator_search_dialog_set_match_case (GtranslatorSearchDialog * dialog,
+gtranslator_search_dialog_set_match_case (GtrSearchDialog * dialog,
 					  gboolean match_case)
 {
   g_return_if_fail (GTR_IS_SEARCH_DIALOG (dialog));
@@ -695,7 +695,7 @@ gtranslator_search_dialog_set_match_case (GtranslatorSearchDialog * dialog,
 }
 
 gboolean
-gtranslator_search_dialog_get_match_case (GtranslatorSearchDialog * dialog)
+gtranslator_search_dialog_get_match_case (GtrSearchDialog * dialog)
 {
   g_return_val_if_fail (GTR_IS_SEARCH_DIALOG (dialog), FALSE);
 
@@ -705,7 +705,7 @@ gtranslator_search_dialog_get_match_case (GtranslatorSearchDialog * dialog)
 }
 
 void
-gtranslator_search_dialog_set_entire_word (GtranslatorSearchDialog * dialog,
+gtranslator_search_dialog_set_entire_word (GtrSearchDialog * dialog,
 					   gboolean entire_word)
 {
   g_return_if_fail (GTR_IS_SEARCH_DIALOG (dialog));
@@ -716,7 +716,7 @@ gtranslator_search_dialog_set_entire_word (GtranslatorSearchDialog * dialog,
 }
 
 gboolean
-gtranslator_search_dialog_get_entire_word (GtranslatorSearchDialog * dialog)
+gtranslator_search_dialog_get_entire_word (GtrSearchDialog * dialog)
 {
   g_return_val_if_fail (GTR_IS_SEARCH_DIALOG (dialog), FALSE);
 
@@ -726,7 +726,7 @@ gtranslator_search_dialog_get_entire_word (GtranslatorSearchDialog * dialog)
 }
 
 void
-gtranslator_search_dialog_set_backwards (GtranslatorSearchDialog * dialog,
+gtranslator_search_dialog_set_backwards (GtrSearchDialog * dialog,
 					 gboolean backwards)
 {
   g_return_if_fail (GTR_IS_SEARCH_DIALOG (dialog));
@@ -737,7 +737,7 @@ gtranslator_search_dialog_set_backwards (GtranslatorSearchDialog * dialog,
 }
 
 gboolean
-gtranslator_search_dialog_get_backwards (GtranslatorSearchDialog * dialog)
+gtranslator_search_dialog_get_backwards (GtrSearchDialog * dialog)
 {
   g_return_val_if_fail (GTR_IS_SEARCH_DIALOG (dialog), FALSE);
 
@@ -747,7 +747,7 @@ gtranslator_search_dialog_get_backwards (GtranslatorSearchDialog * dialog)
 }
 
 void
-gtranslator_search_dialog_set_wrap_around (GtranslatorSearchDialog * dialog,
+gtranslator_search_dialog_set_wrap_around (GtrSearchDialog * dialog,
 					   gboolean wrap_around)
 {
   g_return_if_fail (GTR_IS_SEARCH_DIALOG (dialog));
@@ -758,7 +758,7 @@ gtranslator_search_dialog_set_wrap_around (GtranslatorSearchDialog * dialog,
 }
 
 gboolean
-gtranslator_search_dialog_get_wrap_around (GtranslatorSearchDialog * dialog)
+gtranslator_search_dialog_get_wrap_around (GtrSearchDialog * dialog)
 {
   g_return_val_if_fail (GTR_IS_SEARCH_DIALOG (dialog), FALSE);
 
diff --git a/src/dialogs/gtr-search-dialog.h b/src/dialogs/gtr-search-dialog.h
index 2385010..5f98e6c 100644
--- a/src/dialogs/gtr-search-dialog.h
+++ b/src/dialogs/gtr-search-dialog.h
@@ -31,39 +31,39 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_SEARCH_DIALOG              (gtranslator_search_dialog_get_type())
-#define GTR_SEARCH_DIALOG(obj)              (G_TYPE_CHECK_INSTANCE_CAST((obj), GTR_TYPE_SEARCH_DIALOG, GtranslatorSearchDialog))
-#define GTR_SEARCH_DIALOG_CONST(obj)        (G_TYPE_CHECK_INSTANCE_CAST((obj), GTR_TYPE_SEARCH_DIALOG, GtranslatorSearchDialog const))
-#define GTR_SEARCH_DIALOG_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), GTR_TYPE_SEARCH_DIALOG, GtranslatorSearchDialogClass))
+#define GTR_SEARCH_DIALOG(obj)              (G_TYPE_CHECK_INSTANCE_CAST((obj), GTR_TYPE_SEARCH_DIALOG, GtrSearchDialog))
+#define GTR_SEARCH_DIALOG_CONST(obj)        (G_TYPE_CHECK_INSTANCE_CAST((obj), GTR_TYPE_SEARCH_DIALOG, GtrSearchDialog const))
+#define GTR_SEARCH_DIALOG_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), GTR_TYPE_SEARCH_DIALOG, GtrSearchDialogClass))
 #define GTR_IS_SEARCH_DIALOG(obj)           (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTR_TYPE_SEARCH_DIALOG))
 #define GTR_IS_SEARCH_DIALOG_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTR_TYPE_SEARCH_DIALOG))
-#define GTR_SEARCH_DIALOG_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS((obj), GTR_TYPE_SEARCH_DIALOG, GtranslatorSearchDialogClass))
+#define GTR_SEARCH_DIALOG_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS((obj), GTR_TYPE_SEARCH_DIALOG, GtrSearchDialogClass))
 /* Private structure type */
-typedef struct _GtranslatorSearchDialogPrivate GtranslatorSearchDialogPrivate;
+typedef struct _GtrSearchDialogPrivate GtrSearchDialogPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorSearchDialog GtranslatorSearchDialog;
+typedef struct _GtrSearchDialog GtrSearchDialog;
 
-struct _GtranslatorSearchDialog
+struct _GtrSearchDialog
 {
   GtkDialog dialog;
 
   /*< private > */
-  GtranslatorSearchDialogPrivate *priv;
+  GtrSearchDialogPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorSearchDialogClass GtranslatorSearchDialogClass;
+typedef struct _GtrSearchDialogClass GtrSearchDialogClass;
 
-struct _GtranslatorSearchDialogClass
+struct _GtrSearchDialogClass
 {
   GtkDialogClass parent_class;
 
   /* Key bindings */
-    gboolean (*show_replace) (GtranslatorSearchDialog * dlg);
+    gboolean (*show_replace) (GtrSearchDialog * dlg);
 };
 
 enum
@@ -83,86 +83,86 @@ gtranslator_search_dialog_get_type (void)
      GtkWidget *gtranslator_search_dialog_new (GtkWindow * parent,
 					       gboolean show_replace);
 
-     void gtranslator_search_dialog_present_with_time (GtranslatorSearchDialog
+     void gtranslator_search_dialog_present_with_time (GtrSearchDialog
 						       * dialog,
 						       guint32 timestamp);
 
      gboolean
-       gtranslator_search_dialog_get_show_replace (GtranslatorSearchDialog *
+       gtranslator_search_dialog_get_show_replace (GtrSearchDialog *
 						   dialog);
 
-     void gtranslator_search_dialog_set_show_replace (GtranslatorSearchDialog
+     void gtranslator_search_dialog_set_show_replace (GtrSearchDialog
 						      * dialog,
 						      gboolean show_replace);
 
-     void gtranslator_search_dialog_set_search_text (GtranslatorSearchDialog *
+     void gtranslator_search_dialog_set_search_text (GtrSearchDialog *
 						     dialog,
 						     const gchar * text);
 
      const gchar
-       *gtranslator_search_dialog_get_search_text (GtranslatorSearchDialog *
+       *gtranslator_search_dialog_get_search_text (GtrSearchDialog *
 						   dialog);
 
-     void gtranslator_search_dialog_set_replace_text (GtranslatorSearchDialog
+     void gtranslator_search_dialog_set_replace_text (GtrSearchDialog
 						      * dialog,
 						      const gchar * text);
 
      const gchar
-       *gtranslator_search_dialog_get_replace_text (GtranslatorSearchDialog *
+       *gtranslator_search_dialog_get_replace_text (GtrSearchDialog *
 						    dialog);
 
-     void gtranslator_search_dialog_set_original_text (GtranslatorSearchDialog
+     void gtranslator_search_dialog_set_original_text (GtrSearchDialog
 						       * dialog,
 						       gboolean match_case);
 
      gboolean
-       gtranslator_search_dialog_get_original_text (GtranslatorSearchDialog *
+       gtranslator_search_dialog_get_original_text (GtrSearchDialog *
 						    dialog);
 
      void
-       gtranslator_search_dialog_set_translated_text (GtranslatorSearchDialog
+       gtranslator_search_dialog_set_translated_text (GtrSearchDialog
 						      * dialog,
 						      gboolean match_case);
 
      gboolean
-       gtranslator_search_dialog_get_translated_text (GtranslatorSearchDialog
+       gtranslator_search_dialog_get_translated_text (GtrSearchDialog
 						      * dialog);
 
-     void gtranslator_search_dialog_set_fuzzy (GtranslatorSearchDialog *
+     void gtranslator_search_dialog_set_fuzzy (GtrSearchDialog *
 					       dialog, gboolean match_case);
 
-     gboolean gtranslator_search_dialog_get_fuzzy (GtranslatorSearchDialog *
+     gboolean gtranslator_search_dialog_get_fuzzy (GtrSearchDialog *
 						   dialog);
 
-     void gtranslator_search_dialog_set_match_case (GtranslatorSearchDialog *
+     void gtranslator_search_dialog_set_match_case (GtrSearchDialog *
 						    dialog,
 						    gboolean match_case);
 
      gboolean
-       gtranslator_search_dialog_get_match_case (GtranslatorSearchDialog *
+       gtranslator_search_dialog_get_match_case (GtrSearchDialog *
 						 dialog);
 
-     void gtranslator_search_dialog_set_entire_word (GtranslatorSearchDialog *
+     void gtranslator_search_dialog_set_entire_word (GtrSearchDialog *
 						     dialog,
 						     gboolean entire_word);
 
      gboolean
-       gtranslator_search_dialog_get_entire_word (GtranslatorSearchDialog *
+       gtranslator_search_dialog_get_entire_word (GtrSearchDialog *
 						  dialog);
 
-     void gtranslator_search_dialog_set_backwards (GtranslatorSearchDialog *
+     void gtranslator_search_dialog_set_backwards (GtrSearchDialog *
 						   dialog,
 						   gboolean backwards);
 
-     gboolean gtranslator_search_dialog_get_backwards (GtranslatorSearchDialog
+     gboolean gtranslator_search_dialog_get_backwards (GtrSearchDialog
 						       * dialog);
 
-     void gtranslator_search_dialog_set_wrap_around (GtranslatorSearchDialog *
+     void gtranslator_search_dialog_set_wrap_around (GtrSearchDialog *
 						     dialog,
 						     gboolean wrap_around);
 
      gboolean
-       gtranslator_search_dialog_get_wrap_around (GtranslatorSearchDialog *
+       gtranslator_search_dialog_get_wrap_around (GtrSearchDialog *
 						  dialog);
 
 G_END_DECLS
diff --git a/src/gtr-actions-documents.c b/src/gtr-actions-documents.c
index 0b04ed7..10b9c90 100644
--- a/src/gtr-actions-documents.c
+++ b/src/gtr-actions-documents.c
@@ -23,18 +23,18 @@
 
 void
 gtranslator_actions_documents_next_document (GtkAction * action,
-					     GtranslatorWindow * window)
+					     GtrWindow * window)
 {
-  GtranslatorNotebook *notebook;
+  GtrNotebook *notebook;
   notebook = gtranslator_window_get_notebook (window);
   gtk_notebook_next_page (GTK_NOTEBOOK (notebook));
 }
 
 void
 gtranslator_actions_documents_previous_document (GtkAction * action,
-						 GtranslatorWindow * window)
+						 GtrWindow * window)
 {
-  GtranslatorNotebook *notebook;
+  GtrNotebook *notebook;
   notebook = gtranslator_window_get_notebook (window);
   gtk_notebook_prev_page (GTK_NOTEBOOK (notebook));
 }
diff --git a/src/gtr-actions-edit.c b/src/gtr-actions-edit.c
index 4e09edb..e1f7db0 100644
--- a/src/gtr-actions-edit.c
+++ b/src/gtr-actions-edit.c
@@ -33,9 +33,9 @@
 #include "gtr-window.h"
 
 void
-gtranslator_actions_edit_undo (GtkAction * action, GtranslatorWindow * window)
+gtranslator_actions_edit_undo (GtkAction * action, GtrWindow * window)
 {
-  GtranslatorView *active_view;
+  GtrView *active_view;
   GtkSourceBuffer *active_document;
 
   active_view = gtranslator_window_get_active_view (window);
@@ -53,9 +53,9 @@ gtranslator_actions_edit_undo (GtkAction * action, GtranslatorWindow * window)
 }
 
 void
-gtranslator_actions_edit_redo (GtkAction * action, GtranslatorWindow * window)
+gtranslator_actions_edit_redo (GtkAction * action, GtrWindow * window)
 {
-  GtranslatorView *active_view;
+  GtrView *active_view;
   GtkSourceBuffer *active_document;
 
   active_view = gtranslator_window_get_active_view (window);
@@ -73,9 +73,9 @@ gtranslator_actions_edit_redo (GtkAction * action, GtranslatorWindow * window)
 }
 
 void
-gtranslator_actions_edit_cut (GtkAction * action, GtranslatorWindow * window)
+gtranslator_actions_edit_cut (GtkAction * action, GtrWindow * window)
 {
-  GtranslatorView *active_view;
+  GtrView *active_view;
 
   active_view = gtranslator_window_get_active_view (window);
   g_return_if_fail (active_view);
@@ -86,9 +86,9 @@ gtranslator_actions_edit_cut (GtkAction * action, GtranslatorWindow * window)
 }
 
 void
-gtranslator_actions_edit_copy (GtkAction * action, GtranslatorWindow * window)
+gtranslator_actions_edit_copy (GtkAction * action, GtrWindow * window)
 {
-  GtranslatorView *active_view;
+  GtrView *active_view;
 
   active_view = gtranslator_window_get_active_view (window);
   g_return_if_fail (active_view);
@@ -100,9 +100,9 @@ gtranslator_actions_edit_copy (GtkAction * action, GtranslatorWindow * window)
 
 void
 gtranslator_actions_edit_paste (GtkAction * action,
-				GtranslatorWindow * window)
+				GtrWindow * window)
 {
-  GtranslatorView *active_view;
+  GtrView *active_view;
 
   active_view = gtranslator_window_get_active_view (window);
   g_return_if_fail (active_view);
@@ -118,9 +118,9 @@ gtranslator_actions_edit_paste (GtkAction * action,
  */
 void
 gtranslator_message_copy_to_translation (GtkAction * action,
-					 GtranslatorWindow * window)
+					 GtrWindow * window)
 {
-  GtranslatorTab *current;
+  GtrTab *current;
 
   current = gtranslator_window_get_active_tab (window);
 
@@ -132,10 +132,10 @@ gtranslator_message_copy_to_translation (GtkAction * action,
  */
 void
 gtranslator_message_status_toggle_fuzzy (GtkAction * action,
-					 GtranslatorWindow * window)
+					 GtrWindow * window)
 {
-  GtranslatorTab *current;
-  GtranslatorPo *po;
+  GtrTab *current;
+  GtrPo *po;
   GList *msg;
 
   current = gtranslator_window_get_active_tab (window);
@@ -155,30 +155,30 @@ gtranslator_message_status_toggle_fuzzy (GtkAction * action,
 
 void
 gtranslator_actions_edit_preferences (GtkAction * action,
-				      GtranslatorWindow * window)
+				      GtrWindow * window)
 {
   gtranslator_show_preferences_dialog (window);
 }
 
 void
 gtranslator_actions_edit_header (GtkAction * action,
-				 GtranslatorWindow * window)
+				 GtrWindow * window)
 {
   gtranslator_show_header_dialog (window);
 }
 
 void
 gtranslator_edit_message_comment (GtkAction * action,
-				  GtranslatorWindow * window)
+				  GtrWindow * window)
 {
   gtranslator_show_comment_dialog (window);
 }
 
 void
 gtranslator_actions_edit_clear (GtkAction * action,
-				GtranslatorWindow * window)
+				GtrWindow * window)
 {
-  GtranslatorTab *tab;
+  GtrTab *tab;
 
   g_return_if_fail (GTR_IS_WINDOW (window));
 
diff --git a/src/gtr-actions-file.c b/src/gtr-actions-file.c
index 2e589fb..e9a4d11 100644
--- a/src/gtr-actions-file.c
+++ b/src/gtr-actions-file.c
@@ -46,7 +46,7 @@
 #define GTR_TAB_SAVE_AS "gtranslator-tab-save-as"
 #define GTR_IS_CLOSING_ALL            "gtranslator-is-closing-all"
 
-static void load_file_list (GtranslatorWindow * window, const GSList * uris);
+static void load_file_list (GtrWindow * window, const GSList * uris);
 
 
 /*
@@ -55,13 +55,13 @@ static void load_file_list (GtranslatorWindow * window, const GSList * uris);
  */
 gboolean
 gtranslator_open (GFile * location,
-		  GtranslatorWindow * window, GError ** error)
+		  GtrWindow * window, GError ** error)
 {
-  GtranslatorHeader *header;
-  GtranslatorPo *po;
-  GtranslatorTab *tab;
+  GtrHeader *header;
+  GtrPo *po;
+  GtrTab *tab;
   GList *current;
-  GtranslatorView *active_view;
+  GtrView *active_view;
   const gchar *project_id;
 
   /*
@@ -116,7 +116,7 @@ gtranslator_open (GFile * location,
 
 static void
 gtranslator_po_parse_files_from_dialog (GtkWidget * dialog,
-					GtranslatorWindow * window)
+					GtrWindow * window)
 {
   GSList *po_files, *l;
   GSList *locations = NULL;
@@ -165,7 +165,7 @@ gtranslator_po_parse_files_from_dialog (GtkWidget * dialog,
 static void
 gtranslator_file_chooser_analyse (gpointer dialog,
 				  FileselMode mode,
-				  GtranslatorWindow * window)
+				  GtrWindow * window)
 {
   gint reply;
 
@@ -195,7 +195,7 @@ gtranslator_file_chooser_analyse (gpointer dialog,
  * The "Open file" dialog.
  */
 void
-gtranslator_open_file_dialog (GtkAction * action, GtranslatorWindow * window)
+gtranslator_open_file_dialog (GtkAction * action, GtrWindow * window)
 {
   GtkWidget *dialog = NULL;
 
@@ -223,14 +223,14 @@ gtranslator_open_file_dialog (GtkAction * action, GtranslatorWindow * window)
 
 static void
 save_dialog_response_cb (GtkDialog * dialog,
-			 gint response_id, GtranslatorWindow * window)
+			 gint response_id, GtrWindow * window)
 {
   GError *error = NULL;
-  GtranslatorPo *po;
-  GtranslatorTab *tab;
+  GtrPo *po;
+  GtrTab *tab;
   gchar *filename;
   GFile *location;
-  GtranslatorStatusbar *status;
+  GtrStatusbar *status;
 
   tab = GTR_TAB (g_object_get_data (G_OBJECT (dialog), GTR_TAB_SAVE_AS));
 
@@ -309,11 +309,11 @@ confirm_overwrite_callback (GtkFileChooser * dialog, gpointer data)
  */
 void
 gtranslator_save_file_as_dialog (GtkAction * action,
-				 GtranslatorWindow * window)
+				 GtrWindow * window)
 {
   GtkWidget *dialog = NULL;
-  GtranslatorTab *current_page;
-  GtranslatorPo *po;
+  GtrTab *current_page;
+  GtrPo *po;
   GFile *location;
   gchar *uri = NULL;
   gboolean uri_set = FALSE;
@@ -370,12 +370,12 @@ gtranslator_save_file_as_dialog (GtkAction * action,
  */
 void
 gtranslator_save_current_file_dialog (GtkWidget * widget,
-				      GtranslatorWindow * window)
+				      GtrWindow * window)
 {
   GError *error = NULL;
-  GtranslatorTab *current;
-  GtranslatorPo *po;
-  GtranslatorStatusbar *status;
+  GtrTab *current;
+  GtrPo *po;
+  GtrStatusbar *status;
 
   current = gtranslator_window_get_active_tab (window);
   po = gtranslator_tab_get_po (current);
@@ -418,7 +418,7 @@ is_duplicated_location (const GSList * locations, GFile * u)
 }
 
 static void
-load_file_list (GtranslatorWindow * window, const GSList * locations)
+load_file_list (GtrWindow * window, const GSList * locations)
 {
   GSList *locations_to_load = NULL;
   const GSList *l;
@@ -500,7 +500,7 @@ load_file_list (GtranslatorWindow * window, const GSList * locations)
  * Ignore non-existing URIs 
  */
 void
-gtranslator_actions_load_locations (GtranslatorWindow * window,
+gtranslator_actions_load_locations (GtrWindow * window,
 				    const GSList * locations)
 {
   g_return_if_fail (GTR_IS_WINDOW (window));
@@ -510,9 +510,9 @@ gtranslator_actions_load_locations (GtranslatorWindow * window,
 }
 
 static void
-save_and_close_document (GtranslatorPo * po, GtranslatorWindow * window)
+save_and_close_document (GtrPo * po, GtrWindow * window)
 {
-  GtranslatorTab *tab;
+  GtrTab *tab;
 
   gtranslator_save_current_file_dialog (NULL, window);
 
@@ -522,9 +522,9 @@ save_and_close_document (GtranslatorPo * po, GtranslatorWindow * window)
 }
 
 static void
-close_all_tabs (GtranslatorWindow * window)
+close_all_tabs (GtrWindow * window)
 {
-  GtranslatorNotebook *nb;
+  GtrNotebook *nb;
   gint pages;
 
   nb = gtranslator_window_get_notebook (window);
@@ -543,9 +543,9 @@ close_all_tabs (GtranslatorWindow * window)
 
 static void
 save_and_close_all_documents (GList * unsaved_documents,
-			      GtranslatorWindow * window)
+			      GtrWindow * window)
 {
-  GtranslatorTab *tab;
+  GtrTab *tab;
   GList *l;
   GError *error = NULL;
 
@@ -577,9 +577,9 @@ save_and_close_all_documents (GList * unsaved_documents,
 }
 
 static void
-close_confirmation_dialog_response_handler (GtranslatorCloseConfirmationDialog
+close_confirmation_dialog_response_handler (GtrCloseConfirmationDialog
 					    * dlg, gint response_id,
-					    GtranslatorWindow * window)
+					    GtrWindow * window)
 {
   GList *selected_documents;
   gboolean is_closing_all;
@@ -654,7 +654,7 @@ close_confirmation_dialog_response_handler (GtranslatorCloseConfirmationDialog
 }
 
 void
-gtranslator_close_tab (GtranslatorTab * tab, GtranslatorWindow * window)
+gtranslator_close_tab (GtrTab * tab, GtrWindow * window)
 {
   g_object_set_data (G_OBJECT (window),
 		     GTR_IS_CLOSING_ALL, GINT_TO_POINTER (0));
@@ -680,9 +680,9 @@ gtranslator_close_tab (GtranslatorTab * tab, GtranslatorWindow * window)
 }
 
 void
-gtranslator_file_close (GtkAction * widget, GtranslatorWindow * window)
+gtranslator_file_close (GtkAction * widget, GtrWindow * window)
 {
-  GtranslatorTab *tab;
+  GtrTab *tab;
 
   tab = gtranslator_window_get_active_tab (window);
 
@@ -690,11 +690,11 @@ gtranslator_file_close (GtkAction * widget, GtranslatorWindow * window)
 }
 
 static GList *
-get_modified_documents (GtranslatorWindow * window)
+get_modified_documents (GtrWindow * window)
 {
-  GtranslatorNotebook *nb;
-  GtranslatorTab *tab;
-  GtranslatorPo *po;
+  GtrNotebook *nb;
+  GtrTab *tab;
+  GtrPo *po;
   gint pages;
   GList *list = NULL;
 
@@ -717,7 +717,7 @@ get_modified_documents (GtranslatorWindow * window)
 }
 
 static void
-close_all_documents (GtranslatorWindow * window, gboolean logout_mode)
+close_all_documents (GtrWindow * window, gboolean logout_mode)
 {
   GList *list;
 
@@ -751,11 +751,11 @@ close_all_documents (GtranslatorWindow * window, gboolean logout_mode)
 }
 
 void
-gtranslator_file_quit (GtkAction * action, GtranslatorWindow * window)
+gtranslator_file_quit (GtkAction * action, GtrWindow * window)
 {
-  GtranslatorNotebook *nb;
-  GtranslatorTab *tab;
-  GtranslatorPo *po;
+  GtrNotebook *nb;
+  GtrTab *tab;
+  GtrPo *po;
   gint pages;
   GList *list = NULL;
   GList *profiles_list = NULL;
@@ -809,14 +809,14 @@ gtranslator_file_quit (GtkAction * action, GtranslatorWindow * window)
 
 void
 _gtranslator_actions_file_close_all (GtkAction * action,
-				     GtranslatorWindow * window)
+				     GtrWindow * window)
 {
   close_all_documents (window, FALSE);
 }
 
 void
 _gtranslator_actions_file_save_all (GtkAction * action,
-				    GtranslatorWindow * window)
+				    GtrWindow * window)
 {
   GList *list, *l;
 
@@ -825,7 +825,7 @@ _gtranslator_actions_file_save_all (GtkAction * action,
   for (l = list; l != NULL; l = g_list_next (l))
     {
       GError *error = NULL;
-      GtranslatorStatusbar *status;
+      GtrStatusbar *status;
 
       gtranslator_po_save_file (GTR_PO (l->data), &error);
 
diff --git a/src/gtr-actions-go.c b/src/gtr-actions-go.c
index cda1297..cd38675 100644
--- a/src/gtr-actions-go.c
+++ b/src/gtr-actions-go.c
@@ -33,10 +33,10 @@
 
 void
 gtranslator_message_go_to_first (GtkAction * action,
-				 GtranslatorWindow * window)
+				 GtrWindow * window)
 {
-  GtranslatorTab *current;
-  GtranslatorPo *po;
+  GtrTab *current;
+  GtrPo *po;
 
   current = gtranslator_window_get_active_tab (window);
   po = gtranslator_tab_get_po (current);
@@ -46,10 +46,10 @@ gtranslator_message_go_to_first (GtkAction * action,
 
 void
 gtranslator_message_go_to_previous (GtkAction * action,
-				    GtranslatorWindow * window)
+				    GtrWindow * window)
 {
-  GtranslatorTab *current;
-  GtranslatorPo *po;
+  GtrTab *current;
+  GtrPo *po;
 
   current = gtranslator_window_get_active_tab (window);
   po = gtranslator_tab_get_po (current);
@@ -59,10 +59,10 @@ gtranslator_message_go_to_previous (GtkAction * action,
 
 void
 gtranslator_message_go_to_next (GtkAction * action,
-				GtranslatorWindow * window)
+				GtrWindow * window)
 {
-  GtranslatorTab *current;
-  GtranslatorPo *po;
+  GtrTab *current;
+  GtrPo *po;
 
   current = gtranslator_window_get_active_tab (window);
   po = gtranslator_tab_get_po (current);
@@ -72,10 +72,10 @@ gtranslator_message_go_to_next (GtkAction * action,
 
 void
 gtranslator_message_go_to_last (GtkAction * action,
-				GtranslatorWindow * window)
+				GtrWindow * window)
 {
-  GtranslatorTab *current;
-  GtranslatorPo *po;
+  GtrTab *current;
+  GtrPo *po;
 
   current = gtranslator_window_get_active_tab (window);
   po = gtranslator_tab_get_po (current);
@@ -85,10 +85,10 @@ gtranslator_message_go_to_last (GtkAction * action,
 
 void
 gtranslator_message_go_to_next_fuzzy (GtkAction * action,
-				      GtranslatorWindow * window)
+				      GtrWindow * window)
 {
-  GtranslatorTab *current;
-  GtranslatorPo *po;
+  GtrTab *current;
+  GtrPo *po;
 
   current = gtranslator_window_get_active_tab (window);
   po = gtranslator_tab_get_po (current);
@@ -98,10 +98,10 @@ gtranslator_message_go_to_next_fuzzy (GtkAction * action,
 
 void
 gtranslator_message_go_to_prev_fuzzy (GtkAction * action,
-				      GtranslatorWindow * window)
+				      GtrWindow * window)
 {
-  GtranslatorTab *current;
-  GtranslatorPo *po;
+  GtrTab *current;
+  GtrPo *po;
 
   current = gtranslator_window_get_active_tab (window);
   po = gtranslator_tab_get_po (current);
@@ -111,10 +111,10 @@ gtranslator_message_go_to_prev_fuzzy (GtkAction * action,
 
 void
 gtranslator_message_go_to_next_untranslated (GtkAction * action,
-					     GtranslatorWindow * window)
+					     GtrWindow * window)
 {
-  GtranslatorTab *current;
-  GtranslatorPo *po;
+  GtrTab *current;
+  GtrPo *po;
   GList *msg;
 
   current = gtranslator_window_get_active_tab (window);
@@ -125,10 +125,10 @@ gtranslator_message_go_to_next_untranslated (GtkAction * action,
 
 void
 gtranslator_message_go_to_prev_untranslated (GtkAction * action,
-					     GtranslatorWindow * window)
+					     GtrWindow * window)
 {
-  GtranslatorTab *current;
-  GtranslatorPo *po;
+  GtrTab *current;
+  GtrPo *po;
   GList *msg;
 
   current = gtranslator_window_get_active_tab (window);
@@ -139,11 +139,11 @@ gtranslator_message_go_to_prev_untranslated (GtkAction * action,
 
 void
 gtranslator_message_go_to_next_fuzzy_or_untranslated (GtkAction * action,
-						      GtranslatorWindow *
+						      GtrWindow *
 						      window)
 {
-  GtranslatorTab *current;
-  GtranslatorPo *po;
+  GtrTab *current;
+  GtrPo *po;
   GList *msg;
 
   current = gtranslator_window_get_active_tab (window);
@@ -154,11 +154,11 @@ gtranslator_message_go_to_next_fuzzy_or_untranslated (GtkAction * action,
 
 void
 gtranslator_message_go_to_prev_fuzzy_or_untranslated (GtkAction * action,
-						      GtranslatorWindow *
+						      GtrWindow *
 						      window)
 {
-  GtranslatorTab *current;
-  GtranslatorPo *po;
+  GtrTab *current;
+  GtrPo *po;
   GList *msg;
 
   current = gtranslator_window_get_active_tab (window);
@@ -168,7 +168,7 @@ gtranslator_message_go_to_prev_fuzzy_or_untranslated (GtkAction * action,
 }
 
 void
-gtranslator_message_jump (GtkAction * action, GtranslatorWindow * window)
+gtranslator_message_jump (GtkAction * action, GtrWindow * window)
 {
   gtranslator_show_jump_dialog (window);
 }
diff --git a/src/gtr-actions-help.c b/src/gtr-actions-help.c
index 9278a00..7855316 100644
--- a/src/gtr-actions-help.c
+++ b/src/gtr-actions-help.c
@@ -35,7 +35,7 @@
  * Show the user's guide for gtranslator
  */
 void
-gtranslator_cmd_help_contents (GtkAction * action, GtranslatorWindow * window)
+gtranslator_cmd_help_contents (GtkAction * action, GtrWindow * window)
 {
   gtranslator_utils_help_display (GTK_WINDOW (window),
 				  "gtranslator", "gtranslator.xml");
@@ -45,7 +45,7 @@ gtranslator_cmd_help_contents (GtkAction * action, GtranslatorWindow * window)
  * Creates and shows the about box for gtranslator.
  */
 void
-gtranslator_about_dialog (GtkAction * action, GtranslatorWindow * window)
+gtranslator_about_dialog (GtkAction * action, GtrWindow * window)
 {
   gchar *license_trans;
 
@@ -127,7 +127,7 @@ gtranslator_about_dialog (GtkAction * action, GtranslatorWindow * window)
 			 ("Copyright © 1999-2008 Free Software Foundation, Inc."),
 			 "documenters", documenters, "license", license_trans,
 			 "logo", logo,
-			 "title", _("About Gtranslator"),
+			 "title", _("About Gtr"),
 			 /*
 			  * Note to translators: put here your name and email so it will show
 			  * up in the "about" box
@@ -136,7 +136,7 @@ gtranslator_about_dialog (GtkAction * action, GtranslatorWindow * window)
 			 "version", VERSION,
 			 "website", "http://gtranslator.sourceforge.net/";,
 			 "wrap-license", TRUE,
-			 "website-label", _("Gtranslator Web Site"), NULL);
+			 "website-label", _("Gtr Web Site"), NULL);
 
   if (logo)
     g_object_unref (logo);
diff --git a/src/gtr-actions-search.c b/src/gtr-actions-search.c
index 41e2a80..b633112 100644
--- a/src/gtr-actions-search.c
+++ b/src/gtr-actions-search.c
@@ -72,7 +72,7 @@ last_search_data_free (LastSearchData * data)
 }
 
 static void
-last_search_data_set (LastSearchData * data, GtranslatorSearchDialog * dialog)
+last_search_data_set (LastSearchData * data, GtrSearchDialog * dialog)
 {
   const gchar *str;
 
@@ -101,7 +101,7 @@ last_search_data_set (LastSearchData * data, GtranslatorSearchDialog * dialog)
 }
 
 static void
-search_dialog_set_last_find_text (GtranslatorSearchDialog * dialog,
+search_dialog_set_last_find_text (GtrSearchDialog * dialog,
 				  LastSearchData * data)
 {
   if (data->find_text)
@@ -109,7 +109,7 @@ search_dialog_set_last_find_text (GtranslatorSearchDialog * dialog,
 }
 
 static void
-search_dialog_set_last_replace_text (GtranslatorSearchDialog * dialog,
+search_dialog_set_last_replace_text (GtrSearchDialog * dialog,
 				     LastSearchData * data)
 {
   if (data->replace_text)
@@ -117,7 +117,7 @@ search_dialog_set_last_replace_text (GtranslatorSearchDialog * dialog,
 }
 
 static void
-search_dialog_set_last_options (GtranslatorSearchDialog * dialog,
+search_dialog_set_last_options (GtrSearchDialog * dialog,
 				LastSearchData * data)
 {
   gtranslator_search_dialog_set_original_text (dialog, data->original_text);
@@ -134,8 +134,8 @@ search_dialog_set_last_options (GtranslatorSearchDialog * dialog,
  * Used to get the old search data and store the new values.
  */
 static void
-restore_last_searched_data (GtranslatorSearchDialog * dialog,
-			    GtranslatorTab * tab)
+restore_last_searched_data (GtrSearchDialog * dialog,
+			    GtrTab * tab)
 {
   LastSearchData *data;
 
@@ -159,9 +159,9 @@ restore_last_searched_data (GtranslatorSearchDialog * dialog,
 
 /* Use occurences only for Replace All */
 static void
-phrase_found (GtranslatorWindow * window, gint occurrences)
+phrase_found (GtrWindow * window, gint occurrences)
 {
-  GtranslatorStatusbar *statusbar;
+  GtrStatusbar *statusbar;
 
   statusbar = GTR_STATUSBAR (gtranslator_window_get_statusbar (window));
 
@@ -187,16 +187,16 @@ phrase_found (GtranslatorWindow * window, gint occurrences)
 }
 
 static void
-phrase_not_found (GtranslatorWindow * window)
+phrase_not_found (GtrWindow * window)
 {
-  GtranslatorStatusbar *status;
+  GtrStatusbar *status;
 
   status = GTR_STATUSBAR (gtranslator_window_get_statusbar (window));
   gtranslator_statusbar_flash_message (status, 0, _("Phrase not found"));
 }
 
 static gboolean
-run_search (GtranslatorView * view, gboolean follow)
+run_search (GtrView * view, gboolean follow)
 {
   GtkSourceBuffer *doc;
   GtkTextIter start_iter;
@@ -235,12 +235,12 @@ run_search (GtranslatorView * view, gboolean follow)
 }
 
 static gboolean
-find_in_list (GtranslatorWindow * window,
+find_in_list (GtrWindow * window,
 	      GList * views,
 	      gboolean fuzzy, gboolean wrap_around, gboolean search_backwards)
 {
-  GtranslatorTab *tab = gtranslator_window_get_active_tab (window);
-  GtranslatorPo *po = gtranslator_tab_get_po (tab);
+  GtrTab *tab = gtranslator_window_get_active_tab (window);
+  GtrPo *po = gtranslator_tab_get_po (tab);
   GList *l = gtranslator_po_get_current_message (po);
   GList *current;
   static GList *viewsaux = NULL;
@@ -331,9 +331,9 @@ find_in_list (GtranslatorWindow * window,
 }
 
 static void
-do_find (GtranslatorSearchDialog * dialog, GtranslatorWindow * window)
+do_find (GtrSearchDialog * dialog, GtrWindow * window)
 {
-  GtranslatorTab *tab;
+  GtrTab *tab;
   GList *views, *list;
   gchar *search_text;
   const gchar *entry_text;
@@ -425,9 +425,9 @@ replace_selected_text (GtkTextBuffer * buffer, const gchar * replace)
 }
 
 static void
-do_replace (GtranslatorSearchDialog * dialog, GtranslatorWindow * window)
+do_replace (GtrSearchDialog * dialog, GtrWindow * window)
 {
-  GtranslatorView *view;
+  GtrView *view;
   const gchar *search_entry_text;
   const gchar *replace_entry_text;
   gchar *unescaped_search_text;
@@ -484,9 +484,9 @@ do_replace (GtranslatorSearchDialog * dialog, GtranslatorWindow * window)
 }
 
 static void
-do_replace_all (GtranslatorSearchDialog * dialog, GtranslatorWindow * window)
+do_replace_all (GtrSearchDialog * dialog, GtrWindow * window)
 {
-  GtranslatorTab *tab;
+  GtrTab *tab;
   GList *views, *l;
   GList *current_msg, *aux;
   const gchar *search_entry_text;
@@ -564,8 +564,8 @@ do_replace_all (GtranslatorSearchDialog * dialog, GtranslatorWindow * window)
 }
 
 static void
-search_dialog_response_cb (GtranslatorSearchDialog * dialog,
-			   gint response_id, GtranslatorWindow * window)
+search_dialog_response_cb (GtrSearchDialog * dialog,
+			   gint response_id, GtrWindow * window)
 {
   switch (response_id)
     {
@@ -584,20 +584,20 @@ search_dialog_response_cb (GtranslatorSearchDialog * dialog,
 }
 
 static void
-search_dialog_destroyed (GtranslatorWindow * window,
-			 GtranslatorSearchDialog * dialog)
+search_dialog_destroyed (GtrWindow * window,
+			 GtrSearchDialog * dialog)
 {
   g_object_set_data (G_OBJECT (window), GTR_SEARCH_DIALOG_KEY, NULL);
 }
 
 void
 _gtranslator_actions_search_find (GtkAction * action,
-				  GtranslatorWindow * window)
+				  GtrWindow * window)
 {
   gpointer data;
   GtkWidget *search_dialog;
-  GtranslatorTab *tab;
-  GtranslatorView *view;
+  GtrTab *tab;
+  GtrView *view;
   gboolean selection_exists;
   gchar *find_text = NULL;
   gint sel_len;
@@ -670,12 +670,12 @@ _gtranslator_actions_search_find (GtkAction * action,
 
 void
 _gtranslator_actions_search_replace (GtkAction * action,
-				     GtranslatorWindow * window)
+				     GtrWindow * window)
 {
   gpointer data;
   GtkWidget *replace_dialog;
-  GtranslatorTab *tab;
-  GtranslatorView *view;
+  GtrTab *tab;
+  GtrView *view;
   gboolean selection_exists;
   gchar *find_text = NULL;
   gint sel_len;
@@ -750,9 +750,9 @@ _gtranslator_actions_search_replace (GtkAction * action,
 }
 
 static void
-do_find_again (GtranslatorWindow * window, gboolean backward)
+do_find_again (GtrWindow * window, gboolean backward)
 {
-  GtranslatorView *active_view;
+  GtrView *active_view;
   GtkTextBuffer *buffer;
   gboolean wrap_around = TRUE;
   LastSearchData *data;
@@ -772,14 +772,14 @@ do_find_again (GtranslatorWindow * window, gboolean backward)
 
 void
 _gtranslator_actions_search_find_next (GtkAction * action,
-				       GtranslatorWindow * window)
+				       GtrWindow * window)
 {
   do_find_again (window, FALSE);
 }
 
 void
 _gtranslator_actions_search_find_prev (GtkAction * action,
-				       GtranslatorWindow * window)
+				       GtrWindow * window)
 {
   do_find_again (window, TRUE);
 }
diff --git a/src/gtr-actions-view.c b/src/gtr-actions-view.c
index 265ba5e..785af0b 100644
--- a/src/gtr-actions-view.c
+++ b/src/gtr-actions-view.c
@@ -19,9 +19,9 @@
 
 void
 gtranslator_actions_view_context (GtkAction * action,
-				  GtranslatorWindow * window)
+				  GtrWindow * window)
 {
-  GtranslatorTab *tab;
+  GtrTab *tab;
   GtkWidget *context;
 
   tab = gtranslator_window_get_active_tab (window);
@@ -32,9 +32,9 @@ gtranslator_actions_view_context (GtkAction * action,
 
 void
 gtranslator_actions_view_translation_memory (GtkAction * action,
-					     GtranslatorWindow * window)
+					     GtrWindow * window)
 {
-  GtranslatorTab *tab;
+  GtrTab *tab;
   GtkWidget *tm_ui;
 
   tab = gtranslator_window_get_active_tab (window);
diff --git a/src/gtr-actions.h b/src/gtr-actions.h
index f361ffe..36410c2 100644
--- a/src/gtr-actions.h
+++ b/src/gtr-actions.h
@@ -27,129 +27,129 @@
 G_BEGIN_DECLS
 /*File*/
 void gtranslator_open_file_dialog (GtkAction * action,
-				   GtranslatorWindow * window);
+				   GtrWindow * window);
 
 void gtranslator_save_current_file_dialog (GtkWidget * widget,
-					   GtranslatorWindow * window);
+					   GtrWindow * window);
 
 void gtranslator_save_file_as_dialog (GtkAction * action,
-				      GtranslatorWindow * window);
+				      GtrWindow * window);
 
 gboolean gtranslator_open (GFile * location,
-			   GtranslatorWindow * window, GError ** error);
+			   GtrWindow * window, GError ** error);
 
-void gtranslator_close_tab (GtranslatorTab * tab, GtranslatorWindow * window);
+void gtranslator_close_tab (GtrTab * tab, GtrWindow * window);
 
-void gtranslator_file_close (GtkAction * widget, GtranslatorWindow * window);
+void gtranslator_file_close (GtkAction * widget, GtrWindow * window);
 
-void gtranslator_file_quit (GtkAction * action, GtranslatorWindow * window);
+void gtranslator_file_quit (GtkAction * action, GtrWindow * window);
 
-void gtranslator_actions_load_locations (GtranslatorWindow * window,
+void gtranslator_actions_load_locations (GtrWindow * window,
 					 const GSList * locations);
 
 void _gtranslator_actions_file_close_all (GtkAction * action,
-					  GtranslatorWindow * window);
+					  GtrWindow * window);
 
 void _gtranslator_actions_file_save_all (GtkAction * action,
-					 GtranslatorWindow * window);
+					 GtrWindow * window);
 
 /*Edit*/
 void gtranslator_actions_edit_undo (GtkAction * action,
-				    GtranslatorWindow * window);
+				    GtrWindow * window);
 
 void gtranslator_actions_edit_redo (GtkAction * action,
-				    GtranslatorWindow * window);
+				    GtrWindow * window);
 
 void gtranslator_actions_edit_cut (GtkAction * action,
-				   GtranslatorWindow * window);
+				   GtrWindow * window);
 
 void gtranslator_actions_edit_copy (GtkAction * action,
-				    GtranslatorWindow * window);
+				    GtrWindow * window);
 
 void gtranslator_actions_edit_paste (GtkAction * action,
-				     GtranslatorWindow * window);
+				     GtrWindow * window);
 
 void gtranslator_actions_edit_header (GtkAction * action,
-				      GtranslatorWindow * window);
+				      GtrWindow * window);
 
 void gtranslator_edit_message_comment (GtkAction * action,
-				       GtranslatorWindow * window);
+				       GtrWindow * window);
 
 void gtranslator_message_copy_to_translation
-  (GtkAction * action, GtranslatorWindow * window);
+  (GtkAction * action, GtrWindow * window);
 
 void gtranslator_message_status_toggle_fuzzy
-  (GtkAction * action, GtranslatorWindow * window);
+  (GtkAction * action, GtrWindow * window);
 
 void gtranslator_actions_edit_preferences (GtkAction * action,
-					   GtranslatorWindow * window);
+					   GtrWindow * window);
 
 void gtranslator_actions_edit_clear (GtkAction * action,
-				     GtranslatorWindow * window);
+				     GtrWindow * window);
 
 /* View */
 void gtranslator_actions_view_context (GtkAction * action,
-				       GtranslatorWindow * window);
+				       GtrWindow * window);
 
 void gtranslator_actions_view_translation_memory
-  (GtkAction * action, GtranslatorWindow * window);
+  (GtkAction * action, GtrWindow * window);
 
 /*Go*/
 void gtranslator_message_go_to_first (GtkAction * action,
-				      GtranslatorWindow * window);
+				      GtrWindow * window);
 
 void gtranslator_message_go_to_previous (GtkAction * action,
-					 GtranslatorWindow * window);
+					 GtrWindow * window);
 
 void gtranslator_message_go_to_next (GtkAction * action,
-				     GtranslatorWindow * window);
+				     GtrWindow * window);
 
 void gtranslator_message_go_to_last (GtkAction * action,
-				     GtranslatorWindow * window);
+				     GtrWindow * window);
 
 void gtranslator_message_go_to_next_fuzzy (GtkAction * action,
-					   GtranslatorWindow * window);
+					   GtrWindow * window);
 
 void gtranslator_message_go_to_prev_fuzzy (GtkAction * action,
-					   GtranslatorWindow * window);
+					   GtrWindow * window);
 
 void gtranslator_message_go_to_next_untranslated
-  (GtkAction * action, GtranslatorWindow * window);
+  (GtkAction * action, GtrWindow * window);
 
 void gtranslator_message_go_to_prev_untranslated
-  (GtkAction * action, GtranslatorWindow * window);
+  (GtkAction * action, GtrWindow * window);
 
 void gtranslator_message_go_to_next_fuzzy_or_untranslated
-  (GtkAction * action, GtranslatorWindow * window);
+  (GtkAction * action, GtrWindow * window);
 
 void gtranslator_message_go_to_prev_fuzzy_or_untranslated
-  (GtkAction * action, GtranslatorWindow * window);
+  (GtkAction * action, GtrWindow * window);
 
 void gtranslator_message_jump (GtkAction * action,
-			       GtranslatorWindow * window);
+			       GtrWindow * window);
 
 /*Search*/
 void _gtranslator_actions_search_find (GtkAction * action,
-				       GtranslatorWindow * window);
+				       GtrWindow * window);
 
 void _gtranslator_actions_search_replace (GtkAction * action,
-					  GtranslatorWindow * window);
+					  GtrWindow * window);
 
 /*Documents*/
 void gtranslator_actions_documents_next_document
-  (GtkAction * action, GtranslatorWindow * window);
+  (GtkAction * action, GtrWindow * window);
 
 void gtranslator_actions_documents_previous_document
-  (GtkAction * action, GtranslatorWindow * window);
+  (GtkAction * action, GtrWindow * window);
 
 /*Help*/
 void gtranslator_window_show_home_page (GtkAction * action, gpointer useless);
 
 void gtranslator_cmd_help_contents (GtkAction * action,
-				    GtranslatorWindow * window);
+				    GtrWindow * window);
 
 void gtranslator_about_dialog (GtkAction * action,
-			       GtranslatorWindow * window);
+			       GtrWindow * window);
 
 
 
diff --git a/src/gtr-application.c b/src/gtr-application.c
index aba21ef..fbc04e3 100644
--- a/src/gtr-application.c
+++ b/src/gtr-application.c
@@ -42,17 +42,17 @@
 #define GTR_APPLICATION_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 					 (object),	\
 					 GTR_TYPE_APPLICATION,     \
-					 GtranslatorApplicationPrivate))
+					 GtrApplicationPrivate))
 
-G_DEFINE_TYPE (GtranslatorApplication, gtranslator_application, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GtrApplication, gtranslator_application, G_TYPE_OBJECT)
 
-struct _GtranslatorApplicationPrivate
+struct _GtrApplicationPrivate
 {
   GList *windows;
-  GtranslatorWindow *active_window;
+  GtrWindow *active_window;
 
   GList *profiles;
-  GtranslatorProfile *active_profile;
+  GtrProfile *active_profile;
 
   gchar *toolbars_file;
   EggToolbarsModel *toolbars_model;
@@ -61,7 +61,7 @@ struct _GtranslatorApplicationPrivate
 
   gchar *last_dir;
 
-  GtranslatorTranslationMemory *tm;
+  GtrTranslationMemory *tm;
 
   gboolean first_run;
 };
@@ -109,16 +109,16 @@ save_accels (void)
 }
 
 static gboolean
-on_window_delete_event_cb (GtranslatorWindow * window,
-			   GdkEvent * event, GtranslatorApplication * app)
+on_window_delete_event_cb (GtrWindow * window,
+			   GdkEvent * event, GtrApplication * app)
 {
   gtranslator_file_quit (NULL, window);
   return TRUE;
 }
 
 static void
-on_window_destroy_cb (GtranslatorWindow * window,
-		      GtranslatorApplication * app)
+on_window_destroy_cb (GtrWindow * window,
+		      GtrApplication * app)
 {
   save_accels ();
   //if(app->priv->active_window == NULL)
@@ -126,14 +126,14 @@ on_window_destroy_cb (GtranslatorWindow * window,
 }
 
 static void
-gtranslator_application_init (GtranslatorApplication * application)
+gtranslator_application_init (GtrApplication * application)
 {
   gchar *gtranslator_folder;
   gchar *path_default_gtr_toolbar;
   gchar *profiles_file;
   gchar *dir;
 
-  GtranslatorApplicationPrivate *priv;
+  GtrApplicationPrivate *priv;
 
   application->priv = GTR_APPLICATION_GET_PRIVATE (application);
   priv = application->priv;
@@ -242,7 +242,7 @@ gtranslator_application_init (GtranslatorApplication * application)
 static void
 gtranslator_application_finalize (GObject * object)
 {
-  GtranslatorApplication *app = GTR_APPLICATION (object);
+  GtrApplication *app = GTR_APPLICATION (object);
 
   if (app->priv->icon_factory)
     g_object_unref (app->priv->icon_factory);
@@ -256,11 +256,11 @@ gtranslator_application_finalize (GObject * object)
 }
 
 static void
-gtranslator_application_class_init (GtranslatorApplicationClass * klass)
+gtranslator_application_class_init (GtrApplicationClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorApplicationPrivate));
+  g_type_class_add_private (klass, sizeof (GtrApplicationPrivate));
 
   object_class->finalize = gtranslator_application_finalize;
 }
@@ -278,10 +278,10 @@ app_weak_notify (gpointer data, GObject * where_the_app_was)
  * 
  * Returns: the default instance of the application.
  */
-GtranslatorApplication *
+GtrApplication *
 gtranslator_application_get_default (void)
 {
-  static GtranslatorApplication *instance = NULL;
+  static GtrApplication *instance = NULL;
 
   if (!instance)
     {
@@ -294,16 +294,16 @@ gtranslator_application_get_default (void)
 
 /**
  * gtranslator_application_open_window:
- * @app: a #GtranslatorApplication
+ * @app: a #GtrApplication
  *
- * Creates a new #GtranslatorWindow and shows it.
+ * Creates a new #GtrWindow and shows it.
  * 
- * Returns: the #GtranslatorWindow to be opened
+ * Returns: the #GtrWindow to be opened
  */
-GtranslatorWindow *
-gtranslator_application_open_window (GtranslatorApplication * app)
+GtrWindow *
+gtranslator_application_open_window (GtrApplication * app)
 {
-  GtranslatorWindow *window;
+  GtrWindow *window;
   GdkWindowState state;
   gint w, h;
 
@@ -345,14 +345,14 @@ gtranslator_application_open_window (GtranslatorApplication * app)
 
 /**
  * _gtranslator_application_get_toolbars_model:
- * @application: a #GtranslatorApplication
+ * @application: a #GtrApplication
  * 
  * Returns the toolbar model.
  * 
  * Retuns: the toolbar model.
  */
 GObject *
-_gtranslator_application_get_toolbars_model (GtranslatorApplication *
+_gtranslator_application_get_toolbars_model (GtrApplication *
 					     application)
 {
   return G_OBJECT (application->priv->toolbars_model);
@@ -360,12 +360,12 @@ _gtranslator_application_get_toolbars_model (GtranslatorApplication *
 
 /**
  * _gtranslator_application_save_toolbars_model:
- * @application: a #GtranslatorApplication
+ * @application: a #GtrApplication
  * 
  * Saves the toolbar model.
  */
 void
-_gtranslator_application_save_toolbars_model (GtranslatorApplication *
+_gtranslator_application_save_toolbars_model (GtrApplication *
 					      application)
 {
   egg_toolbars_model_save_toolbars (application->priv->toolbars_model,
@@ -374,12 +374,12 @@ _gtranslator_application_save_toolbars_model (GtranslatorApplication *
 
 /**
  * gtranslator_application_shutdown:
- * @app: a #GtranslatorApplication
+ * @app: a #GtrApplication
  * 
  * Shutdowns the application.
  */
 void
-gtranslator_application_shutdown (GtranslatorApplication * app)
+gtranslator_application_shutdown (GtrApplication * app)
 {
   if (app->priv->toolbars_model)
     {
@@ -403,7 +403,7 @@ gtranslator_application_shutdown (GtranslatorApplication * app)
  * Return value: a newly allocated list of #GtranslationApplication objects
  */
 GList *
-gtranslator_application_get_views (GtranslatorApplication * app,
+gtranslator_application_get_views (GtrApplication * app,
 				   gboolean original, gboolean translated)
 {
   GList *res = NULL;
@@ -422,24 +422,24 @@ gtranslator_application_get_views (GtranslatorApplication * app,
 
 /**
  * gtranslator_application_get_active_window:
- * @app: a #GtranslatorApplication
+ * @app: a #GtrApplication
  * 
- * Return value: the active #GtranslatorWindow
+ * Return value: the active #GtrWindow
  **/
-GtranslatorWindow *
-gtranslator_application_get_active_window (GtranslatorApplication * app)
+GtrWindow *
+gtranslator_application_get_active_window (GtrApplication * app)
 {
   return GTR_WINDOW (app->priv->active_window);
 }
 
 /**
  * gtranslator_application_get_windows:
- * @app: a #GtranslatorApplication
+ * @app: a #GtrApplication
  * 
  * Return value: a list of all opened windows.
  **/
 const GList *
-gtranslator_application_get_windows (GtranslatorApplication * app)
+gtranslator_application_get_windows (GtrApplication * app)
 {
   g_return_val_if_fail (GTR_IS_APPLICATION (app), NULL);
 
@@ -452,37 +452,37 @@ gtranslator_application_get_windows (GtranslatorApplication * app)
 
 /**
  * gtranslator_application_get_active_profile:
- * @app: a #GtranslatorApplication
+ * @app: a #GtrApplication
  * 
- * Return value: the active #GtranslatorProfile
+ * Return value: the active #GtrProfile
  **/
-GtranslatorProfile *
-gtranslator_application_get_active_profile (GtranslatorApplication * app)
+GtrProfile *
+gtranslator_application_get_active_profile (GtrApplication * app)
 {
   return app->priv->active_profile;
 }
 
 /**
  * gtranslator_application_set_profiles:
- * @app: a #GtranslatorApplication
+ * @app: a #GtrApplication
  * @profiles: a #GList
  *
  **/
 void
-gtranslator_application_set_active_profile (GtranslatorApplication * app,
-					    GtranslatorProfile * profile)
+gtranslator_application_set_active_profile (GtrApplication * app,
+					    GtrProfile * profile)
 {
   app->priv->active_profile = profile;
 }
 
 /**
  * gtranslator_application_get_profiles:
- * @app: a #GtranslatorApplication
+ * @app: a #GtrApplication
  * 
  * Return value: a list of all profiles.
  **/
 GList *
-gtranslator_application_get_profiles (GtranslatorApplication * app)
+gtranslator_application_get_profiles (GtrApplication * app)
 {
   g_return_val_if_fail (GTR_IS_APPLICATION (app), NULL);
 
@@ -491,12 +491,12 @@ gtranslator_application_get_profiles (GtranslatorApplication * app)
 
 /**
  * gtranslator_application_set_profiles:
- * @app: a #GtranslatorApplication
+ * @app: a #GtrApplication
  * @profiles: a #GList
  *
  **/
 void
-gtranslator_application_set_profiles (GtranslatorApplication * app,
+gtranslator_application_set_profiles (GtrApplication * app,
 				      GList * profiles)
 {
   app->priv->profiles = profiles;
@@ -504,14 +504,14 @@ gtranslator_application_set_profiles (GtranslatorApplication * app,
 
 /**
  * gtranslator_application_register_icon:
- * @app: a #GtranslatorApplication
+ * @app: a #GtrApplication
  * @icon: the name of the icon
  * @stock_id: the stock id for the new icon
  * 
  * Registers a new @icon with the @stock_id.
  */
 void
-gtranslator_application_register_icon (GtranslatorApplication * app,
+gtranslator_application_register_icon (GtrApplication * app,
 				       const gchar * icon,
 				       const gchar * stock_id)
 {
@@ -541,12 +541,12 @@ gtranslator_application_register_icon (GtranslatorApplication * app,
 
 /**
  * gtranslator_application_get_last_dir:
- * @app: a #GtranslatorApplication
+ * @app: a #GtrApplication
  *
  * Return value: the last dir where a file was opened in the GtkFileChooser
  */
 const gchar *
-_gtranslator_application_get_last_dir (GtranslatorApplication * app)
+_gtranslator_application_get_last_dir (GtrApplication * app)
 {
   g_return_val_if_fail (GTR_IS_APPLICATION (app), NULL);
 
@@ -555,12 +555,12 @@ _gtranslator_application_get_last_dir (GtranslatorApplication * app)
 
 /**
  * gtranslator_application_set_last_dir:
- * @app: a #GtranslatorApplication
+ * @app: a #GtrApplication
  * @last_dir: the path of the last directory where a file was opened in the
  * GtkFileChooser.
  */
 void
-_gtranslator_application_set_last_dir (GtranslatorApplication * app,
+_gtranslator_application_set_last_dir (GtrApplication * app,
 				       const gchar * last_dir)
 {
   g_return_if_fail (GTR_IS_APPLICATION (app));
@@ -569,7 +569,7 @@ _gtranslator_application_set_last_dir (GtranslatorApplication * app,
 }
 
 GObject *
-gtranslator_application_get_translation_memory (GtranslatorApplication * app)
+gtranslator_application_get_translation_memory (GtrApplication * app)
 {
   g_return_val_if_fail (GTR_IS_APPLICATION (app), NULL);
 
diff --git a/src/gtr-application.h b/src/gtr-application.h
index 814da95..b0db09f 100644
--- a/src/gtr-application.h
+++ b/src/gtr-application.h
@@ -35,34 +35,34 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_APPLICATION		(gtranslator_application_get_type ())
-#define GTR_APPLICATION(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_APPLICATION, GtranslatorApplication))
-#define GTR_APPLICATION_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_APPLICATION, GtranslatorApplicationClass))
+#define GTR_APPLICATION(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_APPLICATION, GtrApplication))
+#define GTR_APPLICATION_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_APPLICATION, GtrApplicationClass))
 #define GTR_IS_APPLICATION(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_APPLICATION))
 #define GTR_IS_APPLICATION_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_APPLICATION))
-#define GTR_APPLICATION_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_APPLIAPPLICATION, GtranslatorApplicationClass))
+#define GTR_APPLICATION_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_APPLIAPPLICATION, GtrApplicationClass))
 #define GTR_APP			        (gtranslator_application_get_default())
 /* Private structure type */
-typedef struct _GtranslatorApplicationPrivate GtranslatorApplicationPrivate;
+typedef struct _GtrApplicationPrivate GtrApplicationPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorApplication GtranslatorApplication;
+typedef struct _GtrApplication GtrApplication;
 
-struct _GtranslatorApplication
+struct _GtrApplication
 {
   GObject base_instance;
 
   /*< private > */
-  GtranslatorApplicationPrivate *priv;
+  GtrApplicationPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorApplicationClass GtranslatorApplicationClass;
+typedef struct _GtrApplicationClass GtrApplicationClass;
 
-struct _GtranslatorApplicationClass
+struct _GtrApplicationClass
 {
   GObjectClass parent_class;
 };
@@ -73,60 +73,60 @@ struct _GtranslatorApplicationClass
 GType
 gtranslator_application_get_type (void)
   G_GNUC_CONST;
-     GtranslatorApplication *gtranslator_application_get_default (void);
+     GtrApplication *gtranslator_application_get_default (void);
 
-     void gtranslator_application_shutdown (GtranslatorApplication * app);
+     void gtranslator_application_shutdown (GtrApplication * app);
 
-     GList *gtranslator_application_get_views (GtranslatorApplication * app,
+     GList *gtranslator_application_get_views (GtrApplication * app,
 					       gboolean original,
 					       gboolean translated);
 
-     GtranslatorWindow
-       *gtranslator_application_open_window (GtranslatorApplication * app);
+     GtrWindow
+       *gtranslator_application_open_window (GtrApplication * app);
 
-     GtranslatorWindow
-       *gtranslator_application_get_active_window (GtranslatorApplication *
+     GtrWindow
+       *gtranslator_application_get_active_window (GtrApplication *
 						   app);
 
-     const GList *gtranslator_application_get_windows (GtranslatorApplication
+     const GList *gtranslator_application_get_windows (GtrApplication
 						       * app);
 
-     GtranslatorProfile
-       *gtranslator_application_get_active_profile (GtranslatorApplication *
+     GtrProfile
+       *gtranslator_application_get_active_profile (GtrApplication *
 						    app);
 
-     void gtranslator_application_set_active_profile (GtranslatorApplication *
+     void gtranslator_application_set_active_profile (GtrApplication *
 						      app,
-						      GtranslatorProfile *
+						      GtrProfile *
 						      profile);
 
-     GList *gtranslator_application_get_profiles (GtranslatorApplication *
+     GList *gtranslator_application_get_profiles (GtrApplication *
 						  app);
 
-     void gtranslator_application_set_profiles (GtranslatorApplication * app,
+     void gtranslator_application_set_profiles (GtrApplication * app,
 						GList * profiles);
 
-     void gtranslator_application_register_icon (GtranslatorApplication * app,
+     void gtranslator_application_register_icon (GtrApplication * app,
 						 const gchar * icon,
 						 const gchar * stock_id);
 
      GObject
-       *gtranslator_application_get_translation_memory (GtranslatorApplication
+       *gtranslator_application_get_translation_memory (GtrApplication
 							* app);
 
 /* Non exported funcs */
 
      GObject
-       *_gtranslator_application_get_toolbars_model (GtranslatorApplication *
+       *_gtranslator_application_get_toolbars_model (GtrApplication *
 						     application);
 
-     void _gtranslator_application_save_toolbars_model (GtranslatorApplication
+     void _gtranslator_application_save_toolbars_model (GtrApplication
 							* application);
 
      const gchar
-       *_gtranslator_application_get_last_dir (GtranslatorApplication * app);
+       *_gtranslator_application_get_last_dir (GtrApplication * app);
 
-     void _gtranslator_application_set_last_dir (GtranslatorApplication * app,
+     void _gtranslator_application_set_last_dir (GtrApplication * app,
 						 const gchar * last_dir);
 
 G_END_DECLS
diff --git a/src/gtr-context.c b/src/gtr-context.c
index 0c0cbfb..228024b 100644
--- a/src/gtr-context.c
+++ b/src/gtr-context.c
@@ -30,21 +30,21 @@
 #define GTR_CONTEXT_PANEL_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 (object),		       \
 						 GTR_TYPE_CONTEXT_PANEL,     \
-						 GtranslatorContextPanelPrivate))
+						 GtrContextPanelPrivate))
 
-G_DEFINE_TYPE (GtranslatorContextPanel, gtranslator_context_panel,
+G_DEFINE_TYPE (GtrContextPanel, gtranslator_context_panel,
 	       GTK_TYPE_VBOX)
-     struct _GtranslatorContextPanelPrivate
+     struct _GtrContextPanelPrivate
      {
        GtkWidget *context;
 
-       GtranslatorTab *tab;
+       GtrTab *tab;
      };
 
      static void
-       showed_message_cb (GtranslatorTab * tab,
-			  GtranslatorMsg * msg,
-			  GtranslatorContextPanel * panel)
+       showed_message_cb (GtrTab * tab,
+			  GtrMsg * msg,
+			  GtrContextPanel * panel)
 {
   GtkTextBuffer *buffer;
   GtkTextIter iter;
@@ -76,9 +76,9 @@ G_DEFINE_TYPE (GtranslatorContextPanel, gtranslator_context_panel,
 }
 
 static void
-gtranslator_context_panel_draw (GtranslatorContextPanel * panel)
+gtranslator_context_panel_draw (GtrContextPanel * panel)
 {
-  GtranslatorContextPanelPrivate *priv = panel->priv;
+  GtrContextPanelPrivate *priv = panel->priv;
   GtkWidget *context_scrolled_window;
 
   /*
@@ -109,7 +109,7 @@ gtranslator_context_panel_draw (GtranslatorContextPanel * panel)
 
 
 static void
-gtranslator_context_panel_init (GtranslatorContextPanel * panel)
+gtranslator_context_panel_init (GtrContextPanel * panel)
 {
   panel->priv = GTR_CONTEXT_PANEL_GET_PRIVATE (panel);
 
@@ -123,27 +123,27 @@ gtranslator_context_panel_finalize (GObject * object)
 }
 
 static void
-gtranslator_context_panel_class_init (GtranslatorContextPanelClass * klass)
+gtranslator_context_panel_class_init (GtrContextPanelClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorContextPanelPrivate));
+  g_type_class_add_private (klass, sizeof (GtrContextPanelPrivate));
 
   object_class->finalize = gtranslator_context_panel_finalize;
 }
 
 /**
  * gtranslator_context_panel_new:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  * 
- * Creates a new #GtranslatorContextPanel object.
+ * Creates a new #GtrContextPanel object.
  * 
- * Returns: a new #GtranslatorContextPanel object
+ * Returns: a new #GtrContextPanel object
  */
 GtkWidget *
 gtranslator_context_panel_new (GtkWidget * tab)
 {
-  GtranslatorContextPanel *context;
+  GtrContextPanel *context;
   context = g_object_new (GTR_TYPE_CONTEXT_PANEL, NULL);
 
   context->priv->tab = GTR_TAB (tab);
@@ -156,12 +156,12 @@ gtranslator_context_panel_new (GtkWidget * tab)
 
 /**
  * gtranslator_context_panel_get_extracted_text_view:
- * @panel: a #GtranslatorContextPanel
+ * @panel: a #GtrContextPanel
  *
  * Returns: the context #GtkTextView
  */
 GtkTextView *
-gtranslator_context_panel_get_context_text_view (GtranslatorContextPanel *
+gtranslator_context_panel_get_context_text_view (GtrContextPanel *
 						 panel)
 {
   g_return_val_if_fail (GTR_IS_CONTEXT_PANEL (panel), NULL);
diff --git a/src/gtr-context.h b/src/gtr-context.h
index 155c436..c1d6e3a 100644
--- a/src/gtr-context.h
+++ b/src/gtr-context.h
@@ -27,33 +27,33 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_CONTEXT_PANEL		(gtranslator_context_panel_get_type ())
-#define GTR_CONTEXT_PANEL(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_CONTEXT_PANEL, GtranslatorContextPanel))
-#define GTR_CONTEXT_PANEL_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_CONTEXT_PANEL, GtranslatorContextPanelClass))
+#define GTR_CONTEXT_PANEL(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_CONTEXT_PANEL, GtrContextPanel))
+#define GTR_CONTEXT_PANEL_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_CONTEXT_PANEL, GtrContextPanelClass))
 #define GTR_IS_CONTEXT_PANEL(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_CONTEXT_PANEL))
 #define GTR_IS_CONTEXT_PANEL_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_CONTEXT_PANEL))
-#define GTR_CONTEXT_PANEL_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_CONTEXT_PANEL, GtranslatorContextPanelClass))
+#define GTR_CONTEXT_PANEL_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_CONTEXT_PANEL, GtrContextPanelClass))
 /* Private structure type */
-typedef struct _GtranslatorContextPanelPrivate GtranslatorContextPanelPrivate;
+typedef struct _GtrContextPanelPrivate GtrContextPanelPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorContextPanel GtranslatorContextPanel;
+typedef struct _GtrContextPanel GtrContextPanel;
 
-struct _GtranslatorContextPanel
+struct _GtrContextPanel
 {
   GtkVBox parent_instance;
 
   /*< private > */
-  GtranslatorContextPanelPrivate *priv;
+  GtrContextPanelPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorContextPanelClass GtranslatorContextPanelClass;
+typedef struct _GtrContextPanelClass GtrContextPanelClass;
 
-struct _GtranslatorContextPanelClass
+struct _GtrContextPanelClass
 {
   GtkVBoxClass parent_class;
 };
@@ -71,7 +71,7 @@ gtranslator_context_panel_get_type (void)
 
      GtkTextView
        *gtranslator_context_panel_get_context_text_view
-       (GtranslatorContextPanel * panel);
+       (GtrContextPanel * panel);
 
 G_END_DECLS
 #endif /* __CONTEXT_PANEL_H__ */
diff --git a/src/gtr-header.c b/src/gtr-header.c
index e238bb7..14535dc 100644
--- a/src/gtr-header.c
+++ b/src/gtr-header.c
@@ -35,17 +35,17 @@
 #define GTR_HEADER_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
                                          (object), \
                                          GTR_TYPE_HEADER, \
-                                         GtranslatorHeaderPrivate))
+                                         GtrHeaderPrivate))
 
-G_DEFINE_TYPE (GtranslatorHeader, gtranslator_header, GTR_TYPE_MSG)
+G_DEFINE_TYPE (GtrHeader, gtranslator_header, GTR_TYPE_MSG)
 
-struct _GtranslatorHeaderPrivate
+struct _GtrHeaderPrivate
 {
   gint   nplurals;
 };
 
 static void
-gtranslator_header_set_field (GtranslatorHeader *header,
+gtranslator_header_set_field (GtrHeader *header,
                               const gchar       *field,
                               const gchar       *data)
 {
@@ -63,7 +63,7 @@ gtranslator_header_set_field (GtranslatorHeader *header,
 
 /* Set nplurals variable */
 static void
-parse_nplurals (GtranslatorHeader * header)
+parse_nplurals (GtrHeader * header)
 {
   gchar *pointer, *plural_forms;
 
@@ -72,7 +72,7 @@ parse_nplurals (GtranslatorHeader * header)
   if (!plural_forms)
     {
       const gchar *plural_form;
-      GtranslatorProfile *profile;
+      GtrProfile *profile;
 
       header->priv->nplurals = -1;
 
@@ -106,7 +106,7 @@ parse_nplurals (GtranslatorHeader * header)
 }
 
 static void
-gtranslator_header_init (GtranslatorHeader * header)
+gtranslator_header_init (GtrHeader * header)
 {
   header->priv = GTR_HEADER_GET_PRIVATE (header);
 
@@ -120,22 +120,22 @@ gtranslator_header_finalize (GObject * object)
 }
 
 static void
-gtranslator_header_class_init (GtranslatorHeaderClass * klass)
+gtranslator_header_class_init (GtrHeaderClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorHeaderPrivate));
+  g_type_class_add_private (klass, sizeof (GtrHeaderPrivate));
 
   object_class->finalize = gtranslator_header_finalize;
 }
 
 /* Public methods */
 
-GtranslatorHeader *
+GtrHeader *
 gtranslator_header_new (po_message_iterator_t iter,
                         po_message_t          message)
 {
-  GtranslatorHeader *header;
+  GtrHeader *header;
 
   header = g_object_new (GTR_TYPE_HEADER, "gettext-iter", iter,
                          "gettext-msg", message, NULL);
@@ -148,14 +148,14 @@ gtranslator_header_new (po_message_iterator_t iter,
 
 /**
  * gtranslator_header_get_comments:
- * @header: a #GtranslatorHeader
+ * @header: a #GtrHeader
  *
  * Gets the comments of the header.
  *
  * Return value: the comments of the header.
  */
 const gchar *
-gtranslator_header_get_comments (GtranslatorHeader *header)
+gtranslator_header_get_comments (GtrHeader *header)
 {
   g_return_val_if_fail (GTR_IS_HEADER (header), NULL);
 
@@ -163,7 +163,7 @@ gtranslator_header_get_comments (GtranslatorHeader *header)
 }
 
 void
-gtranslator_header_set_comments (GtranslatorHeader *header,
+gtranslator_header_set_comments (GtrHeader *header,
                                  const gchar *comments)
 {
   g_return_if_fail (GTR_IS_HEADER (header));
@@ -174,7 +174,7 @@ gtranslator_header_set_comments (GtranslatorHeader *header,
 }
 
 gchar *
-gtranslator_header_get_prj_id_version (GtranslatorHeader *header)
+gtranslator_header_get_prj_id_version (GtrHeader *header)
 {
   g_return_val_if_fail (GTR_IS_HEADER (header), NULL);
 
@@ -183,7 +183,7 @@ gtranslator_header_get_prj_id_version (GtranslatorHeader *header)
 }
 
 void
-gtranslator_header_set_prj_id_version (GtranslatorHeader *header,
+gtranslator_header_set_prj_id_version (GtrHeader *header,
                                        const gchar *prj_id_version)
 {
   g_return_if_fail (GTR_IS_HEADER (header));
@@ -194,7 +194,7 @@ gtranslator_header_set_prj_id_version (GtranslatorHeader *header,
 }
 
 gchar *
-gtranslator_header_get_rmbt (GtranslatorHeader *header)
+gtranslator_header_get_rmbt (GtrHeader *header)
 {
   g_return_val_if_fail (GTR_IS_HEADER (header), NULL);
 
@@ -203,7 +203,7 @@ gtranslator_header_get_rmbt (GtranslatorHeader *header)
 }
 
 void
-gtranslator_header_set_rmbt (GtranslatorHeader *header,
+gtranslator_header_set_rmbt (GtrHeader *header,
                              const gchar *rmbt)
 {
   /* FIXME: rmbt is not a good name */
@@ -215,7 +215,7 @@ gtranslator_header_set_rmbt (GtranslatorHeader *header,
 }
 
 gchar *
-gtranslator_header_get_pot_date (GtranslatorHeader *header)
+gtranslator_header_get_pot_date (GtrHeader *header)
 {
   g_return_val_if_fail (GTR_IS_HEADER (header), NULL);
 
@@ -224,7 +224,7 @@ gtranslator_header_get_pot_date (GtranslatorHeader *header)
 }
 
 void
-gtranslator_header_set_pot_date (GtranslatorHeader *header,
+gtranslator_header_set_pot_date (GtrHeader *header,
                                  const gchar *pot_date)
 {
   g_return_if_fail (GTR_IS_HEADER (header));
@@ -235,7 +235,7 @@ gtranslator_header_set_pot_date (GtranslatorHeader *header,
 }
 
 gchar *
-gtranslator_header_get_po_date (GtranslatorHeader *header)
+gtranslator_header_get_po_date (GtrHeader *header)
 {
   g_return_val_if_fail (GTR_IS_HEADER (header), NULL);
 
@@ -244,7 +244,7 @@ gtranslator_header_get_po_date (GtranslatorHeader *header)
 }
 
 void
-gtranslator_header_set_po_date (GtranslatorHeader *header,
+gtranslator_header_set_po_date (GtrHeader *header,
                                 const gchar *po_date)
 {
   g_return_if_fail (GTR_IS_HEADER (header));
@@ -255,7 +255,7 @@ gtranslator_header_set_po_date (GtranslatorHeader *header,
 }
 
 gchar *
-gtranslator_header_get_translator (GtranslatorHeader *header)
+gtranslator_header_get_translator (GtrHeader *header)
 {
   gchar *space, *translator_temp, *translator;
 
@@ -276,7 +276,7 @@ gtranslator_header_get_translator (GtranslatorHeader *header)
 }
 
 gchar *
-gtranslator_header_get_tr_email (GtranslatorHeader *header)
+gtranslator_header_get_tr_email (GtrHeader *header)
 {
   gchar *space, *email_temp, *email;
 
@@ -297,7 +297,7 @@ gtranslator_header_get_tr_email (GtranslatorHeader *header)
 }
 
 void
-gtranslator_header_set_translator (GtranslatorHeader *header,
+gtranslator_header_set_translator (GtrHeader *header,
                                    const gchar *name,
                                    const gchar *email)
 {
@@ -314,7 +314,7 @@ gtranslator_header_set_translator (GtranslatorHeader *header,
 }
 
 gchar *
-gtranslator_header_get_language (GtranslatorHeader *header)
+gtranslator_header_get_language (GtrHeader *header)
 {
   gchar *space, *lang_temp, *language;
 
@@ -335,7 +335,7 @@ gtranslator_header_get_language (GtranslatorHeader *header)
 }
 
 gchar *
-gtranslator_header_get_lg_email (GtranslatorHeader *header)
+gtranslator_header_get_lg_email (GtrHeader *header)
 {
   gchar *space, *email_temp, *email;
 
@@ -356,7 +356,7 @@ gtranslator_header_get_lg_email (GtranslatorHeader *header)
 }
 
 void
-gtranslator_header_set_language (GtranslatorHeader *header,
+gtranslator_header_set_language (GtrHeader *header,
                                  const gchar *language,
                                  const gchar *email)
 {
@@ -373,7 +373,7 @@ gtranslator_header_set_language (GtranslatorHeader *header,
 }
 
 gchar *
-gtranslator_header_get_mime_version (GtranslatorHeader *header)
+gtranslator_header_get_mime_version (GtrHeader *header)
 {
   g_return_val_if_fail (GTR_IS_HEADER (header), NULL);
 
@@ -382,7 +382,7 @@ gtranslator_header_get_mime_version (GtranslatorHeader *header)
 }
 
 void
-gtranslator_header_set_mime_version (GtranslatorHeader *header,
+gtranslator_header_set_mime_version (GtrHeader *header,
                                      const gchar *mime_version)
 {
   g_return_if_fail (GTR_IS_HEADER (header));
@@ -392,7 +392,7 @@ gtranslator_header_set_mime_version (GtranslatorHeader *header,
 }
 
 gchar *
-gtranslator_header_get_charset (GtranslatorHeader *header)
+gtranslator_header_get_charset (GtrHeader *header)
 {
   gchar *space, *charset_temp, *charset;
 
@@ -414,7 +414,7 @@ gtranslator_header_get_charset (GtranslatorHeader *header)
 }
 
 void
-gtranslator_header_set_charset (GtranslatorHeader *header,
+gtranslator_header_set_charset (GtrHeader *header,
                                 const gchar *charset)
 {
   gchar *set;
@@ -431,7 +431,7 @@ gtranslator_header_set_charset (GtranslatorHeader *header,
 }
 
 gchar *
-gtranslator_header_get_encoding (GtranslatorHeader *header)
+gtranslator_header_get_encoding (GtrHeader *header)
 {
   g_return_val_if_fail (GTR_IS_HEADER (header), NULL);
 
@@ -440,7 +440,7 @@ gtranslator_header_get_encoding (GtranslatorHeader *header)
 }
 
 void
-gtranslator_header_set_encoding (GtranslatorHeader *header,
+gtranslator_header_set_encoding (GtrHeader *header,
                                  const gchar *encoding)
 {
   g_return_if_fail (GTR_IS_HEADER (header));
@@ -451,12 +451,12 @@ gtranslator_header_set_encoding (GtranslatorHeader *header,
 
 /**
  * gtranslator_header_get_plural_forms:
- * @header: a #GtranslatorHeader.
+ * @header: a #GtrHeader.
  *
  * Return value: a new allocated string with the plural form of the po file.
  */
 gchar *
-gtranslator_header_get_plural_forms (GtranslatorHeader *header)
+gtranslator_header_get_plural_forms (GtrHeader *header)
 {
   g_return_val_if_fail (GTR_IS_HEADER (header), NULL);
 
@@ -466,13 +466,13 @@ gtranslator_header_get_plural_forms (GtranslatorHeader *header)
 
 /**
  * gtranslator_header_set_plural_forms:
- * @header: a #GtranslatorHeader
+ * @header: a #GtrHeader
  * @plural_forms: the plural forms string.
  *
  * Sets the plural form string in the @header and it sets the number of plurals.
  */
 void
-gtranslator_header_set_plural_forms (GtranslatorHeader * header,
+gtranslator_header_set_plural_forms (GtrHeader * header,
                                      const gchar * plural_forms)
 {
   g_return_if_fail (GTR_IS_HEADER (header));
@@ -487,14 +487,14 @@ gtranslator_header_set_plural_forms (GtranslatorHeader * header,
 
 /**
  * gtranslator_header_get_plural:
- * @header: a #GtranslatorHeader
+ * @header: a #GtrHeader
  *
  * Return value: The number of plurals of the po file, if there is not a plural
  * form in the po file it returns the predefined by user number of plurals 
  * or 1 if there is not a plural form string stored.
  */
 gint
-gtranslator_header_get_nplurals (GtranslatorHeader * header)
+gtranslator_header_get_nplurals (GtrHeader * header)
 {
   const gchar *plural_form;
 
@@ -507,11 +507,11 @@ gtranslator_header_get_nplurals (GtranslatorHeader * header)
 }
 
 static void
-set_profile_values (GtranslatorHeader *header)
+set_profile_values (GtrHeader *header)
 {
   if (gtranslator_prefs_manager_get_use_profile_values ())
     {
-      GtranslatorProfile *active_profile;
+      GtrProfile *active_profile;
 
       active_profile = gtranslator_application_get_active_profile (GTR_APP);
 
@@ -526,7 +526,7 @@ set_profile_values (GtranslatorHeader *header)
 }
 
 static void
-update_po_date (GtranslatorHeader *header)
+update_po_date (GtrHeader *header)
 {
   gchar *current_date;
   gchar *current_time;
@@ -546,7 +546,7 @@ update_po_date (GtranslatorHeader *header)
 }
 
 static void
-update_comments (GtranslatorHeader *header,
+update_comments (GtrHeader *header,
                  const gchar       *comments)
 {
   GString *new_comments;
@@ -562,7 +562,7 @@ update_comments (GtranslatorHeader *header,
   /* Save the previous translator to update the header's comment */
   if (gtranslator_prefs_manager_get_use_profile_values ())
     {
-      GtranslatorProfile *active_profile;
+      GtrProfile *active_profile;
 
       active_profile = gtranslator_application_get_active_profile (GTR_APP);
 
@@ -641,12 +641,12 @@ update_comments (GtranslatorHeader *header,
 
 /* FIXME: complete this */
 static void
-add_default_comments (GtranslatorHeader *header)
+add_default_comments (GtrHeader *header)
 {
 }
 
 void
-gtranslator_header_update_header (GtranslatorHeader *header)
+gtranslator_header_update_header (GtrHeader *header)
 {
   const gchar *comments;
 
diff --git a/src/gtr-header.h b/src/gtr-header.h
index 1009168..f6fd3af 100644
--- a/src/gtr-header.h
+++ b/src/gtr-header.h
@@ -34,36 +34,36 @@
  */
 
 #define GTR_TYPE_HEADER			(gtranslator_header_get_type ())
-#define GTR_HEADER(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_HEADER, GtranslatorHeader))
-#define GTR_HEADER_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_HEADER, GtranslatorHeaderClass))
+#define GTR_HEADER(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_HEADER, GtrHeader))
+#define GTR_HEADER_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_HEADER, GtrHeaderClass))
 #define GTR_IS_HEADER(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_HEADER))
 #define GTR_IS_HEADER_CLASS(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_HEADER))
-#define GTR_HEADER_GET_CLASS(o)		(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_HEADER, GtranslatorHeaderClass))
+#define GTR_HEADER_GET_CLASS(o)		(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_HEADER, GtrHeaderClass))
 
 /* Private structure type */
-typedef struct _GtranslatorHeaderPrivate GtranslatorHeaderPrivate;
+typedef struct _GtrHeaderPrivate GtrHeaderPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorHeader GtranslatorHeader;
+typedef struct _GtrHeader GtrHeader;
 
-struct _GtranslatorHeader
+struct _GtrHeader
 {
-  GtranslatorMsg parent_instance;
+  GtrMsg parent_instance;
 
   /*< private > */
-  GtranslatorHeaderPrivate *priv;
+  GtrHeaderPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorHeaderClass GtranslatorHeaderClass;
+typedef struct _GtrHeaderClass GtrHeaderClass;
 
-struct _GtranslatorHeaderClass
+struct _GtrHeaderClass
 {
-  GtranslatorMsgClass parent_class;
+  GtrMsgClass parent_class;
 };
 
 /*
@@ -73,56 +73,56 @@ GType                 gtranslator_header_get_type            (void)G_GNUC_CONST;
 
 GType                 gtranslator_header_register_type       (GTypeModule * module);
 
-GtranslatorHeader    *gtranslator_header_new                 (po_message_iterator_t iter,
+GtrHeader    *gtranslator_header_new                 (po_message_iterator_t iter,
                                                               po_message_t          message);
 
-const gchar          *gtranslator_header_get_comments        (GtranslatorHeader *header);
-void                  gtranslator_header_set_comments        (GtranslatorHeader *header,
+const gchar          *gtranslator_header_get_comments        (GtrHeader *header);
+void                  gtranslator_header_set_comments        (GtrHeader *header,
                                                               const gchar *comments);
 
-gchar                *gtranslator_header_get_prj_id_version  (GtranslatorHeader *header);
-void                  gtranslator_header_set_prj_id_version  (GtranslatorHeader *header,
+gchar                *gtranslator_header_get_prj_id_version  (GtrHeader *header);
+void                  gtranslator_header_set_prj_id_version  (GtrHeader *header,
                                                               const gchar *prj_id_version);
 
-gchar                *gtranslator_header_get_rmbt            (GtranslatorHeader *header);
-void                  gtranslator_header_set_rmbt            (GtranslatorHeader *header,
+gchar                *gtranslator_header_get_rmbt            (GtrHeader *header);
+void                  gtranslator_header_set_rmbt            (GtrHeader *header,
                                                               const gchar *rmbt);
 
-gchar                *gtranslator_header_get_pot_date        (GtranslatorHeader *header);
-void                  gtranslator_header_set_pot_date        (GtranslatorHeader *header,
+gchar                *gtranslator_header_get_pot_date        (GtrHeader *header);
+void                  gtranslator_header_set_pot_date        (GtrHeader *header,
                                                               const gchar *pot_date);
 
-gchar                *gtranslator_header_get_po_date         (GtranslatorHeader *header);
-void                  gtranslator_header_set_po_date         (GtranslatorHeader *header,
+gchar                *gtranslator_header_get_po_date         (GtrHeader *header);
+void                  gtranslator_header_set_po_date         (GtrHeader *header,
                                                               const gchar *po_date);
 
-gchar                *gtranslator_header_get_translator      (GtranslatorHeader *header);
-gchar                *gtranslator_header_get_tr_email        (GtranslatorHeader *header);
-void                  gtranslator_header_set_translator      (GtranslatorHeader *header,
+gchar                *gtranslator_header_get_translator      (GtrHeader *header);
+gchar                *gtranslator_header_get_tr_email        (GtrHeader *header);
+void                  gtranslator_header_set_translator      (GtrHeader *header,
                                                               const gchar *name,
                                                               const gchar *email);
 
-gchar                *gtranslator_header_get_language        (GtranslatorHeader *header);
-gchar                *gtranslator_header_get_lg_email        (GtranslatorHeader *header);
-void                  gtranslator_header_set_language        (GtranslatorHeader *header,
+gchar                *gtranslator_header_get_language        (GtrHeader *header);
+gchar                *gtranslator_header_get_lg_email        (GtrHeader *header);
+void                  gtranslator_header_set_language        (GtrHeader *header,
                                                               const gchar *language,
                                                               const gchar *email);
 
-gchar                *gtranslator_header_get_mime_version    (GtranslatorHeader *header);
-void                  gtranslator_header_set_mime_version    (GtranslatorHeader *header,
+gchar                *gtranslator_header_get_mime_version    (GtrHeader *header);
+void                  gtranslator_header_set_mime_version    (GtrHeader *header,
                                                               const gchar *mime_version);
 
-gchar                *gtranslator_header_get_charset         (GtranslatorHeader *header);
-void                  gtranslator_header_set_charset         (GtranslatorHeader *header,
+gchar                *gtranslator_header_get_charset         (GtrHeader *header);
+void                  gtranslator_header_set_charset         (GtrHeader *header,
                                                               const gchar *charset);
 
-gchar                *gtranslator_header_get_encoding        (GtranslatorHeader *header);
-void                  gtranslator_header_set_encoding        (GtranslatorHeader *header,
+gchar                *gtranslator_header_get_encoding        (GtrHeader *header);
+void                  gtranslator_header_set_encoding        (GtrHeader *header,
                                                               const gchar *encoding);
 
-gchar                *gtranslator_header_get_plural_forms    (GtranslatorHeader *header);
-void                  gtranslator_header_set_plural_forms    (GtranslatorHeader * header,
+gchar                *gtranslator_header_get_plural_forms    (GtrHeader *header);
+void                  gtranslator_header_set_plural_forms    (GtrHeader * header,
                                                               const gchar * plural_forms);
-gint                  gtranslator_header_get_nplurals        (GtranslatorHeader * header);
+gint                  gtranslator_header_get_nplurals        (GtrHeader * header);
 
 #endif /* __HEADER_H__ */
diff --git a/src/gtr-history-entry.c b/src/gtr-history-entry.c
index de17994..29fc2c7 100644
--- a/src/gtr-history-entry.c
+++ b/src/gtr-history-entry.c
@@ -51,9 +51,9 @@ enum {
 
 #define GTR_HISTORY_ENTRY_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), \
 						GTR_TYPE_HISTORY_ENTRY, \
-						GtranslatorHistoryEntryPrivate))
+						GtrHistoryEntryPrivate))
 
-struct _GtranslatorHistoryEntryPrivate
+struct _GtrHistoryEntryPrivate
 {
 	gchar              *history_id;
 	guint               history_length;
@@ -63,7 +63,7 @@ struct _GtranslatorHistoryEntryPrivate
 	GConfClient        *gconf_client;
 };
 
-G_DEFINE_TYPE(GtranslatorHistoryEntry, gtranslator_history_entry, GTK_TYPE_COMBO_BOX_ENTRY)
+G_DEFINE_TYPE(GtrHistoryEntry, gtranslator_history_entry, GTK_TYPE_COMBO_BOX_ENTRY)
 
 static void
 gtranslator_history_entry_set_property (GObject      *object,
@@ -71,7 +71,7 @@ gtranslator_history_entry_set_property (GObject      *object,
 				  const GValue *value,
 				  GParamSpec   *spec)
 {
-	GtranslatorHistoryEntry *entry;
+	GtrHistoryEntry *entry;
 
 	g_return_if_fail (GTR_IS_HISTORY_ENTRY (object));
 
@@ -96,7 +96,7 @@ gtranslator_history_entry_get_property (GObject    *object,
 				  GValue     *value,
 				  GParamSpec *spec)
 {
-	GtranslatorHistoryEntryPrivate *priv;
+	GtrHistoryEntryPrivate *priv;
 
 	g_return_if_fail (GTR_IS_HISTORY_ENTRY (object));
 
@@ -126,7 +126,7 @@ gtranslator_history_entry_destroy (GtkObject *object)
 static void
 gtranslator_history_entry_finalize (GObject *object)
 {
-	GtranslatorHistoryEntryPrivate *priv;
+	GtrHistoryEntryPrivate *priv;
 
 	priv = GTR_HISTORY_ENTRY (object)->priv;
 	
@@ -142,7 +142,7 @@ gtranslator_history_entry_finalize (GObject *object)
 }
 
 static void 
-gtranslator_history_entry_class_init (GtranslatorHistoryEntryClass *klass)
+gtranslator_history_entry_class_init (GtrHistoryEntryClass *klass)
 {
 	GObjectClass   *object_class = G_OBJECT_CLASS (klass);
 	GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (klass);
@@ -174,11 +174,11 @@ gtranslator_history_entry_class_init (GtranslatorHistoryEntryClass *klass)
 
 	/* TODO: Add enable-completion property */
 
-	g_type_class_add_private (object_class, sizeof(GtranslatorHistoryEntryPrivate));
+	g_type_class_add_private (object_class, sizeof(GtrHistoryEntryPrivate));
 }
 
 static GtkListStore *
-get_history_store (GtranslatorHistoryEntry *entry)
+get_history_store (GtrHistoryEntry *entry)
 {
 	GtkTreeModel *store;
 
@@ -189,7 +189,7 @@ get_history_store (GtranslatorHistoryEntry *entry)
 }
 
 static char *
-get_history_key (GtranslatorHistoryEntry *entry)
+get_history_key (GtrHistoryEntry *entry)
 {
 	gchar *tmp;
 	gchar *key;
@@ -213,7 +213,7 @@ get_history_key (GtranslatorHistoryEntry *entry)
 }
 
 static GSList *
-get_history_list (GtranslatorHistoryEntry *entry)
+get_history_list (GtrHistoryEntry *entry)
 {
 	GtkListStore *store;
 	GtkTreeIter iter;
@@ -244,7 +244,7 @@ get_history_list (GtranslatorHistoryEntry *entry)
 }
 
 static void
-gtranslator_history_entry_save_history (GtranslatorHistoryEntry *entry)
+gtranslator_history_entry_save_history (GtrHistoryEntry *entry)
 {
 	GSList *gconf_items;
 	gchar *key;
@@ -324,7 +324,7 @@ clamp_list_store (GtkListStore *store,
 }
 
 static void
-insert_history_item (GtranslatorHistoryEntry *entry,
+insert_history_item (GtrHistoryEntry *entry,
 		     const gchar       *text,
 		     gboolean           prepend)
 {
@@ -360,7 +360,7 @@ insert_history_item (GtranslatorHistoryEntry *entry,
 }
 
 void
-gtranslator_history_entry_prepend_text (GtranslatorHistoryEntry *entry,
+gtranslator_history_entry_prepend_text (GtrHistoryEntry *entry,
 				  const gchar       *text)
 {
 	g_return_if_fail (GTR_IS_HISTORY_ENTRY (entry));
@@ -370,7 +370,7 @@ gtranslator_history_entry_prepend_text (GtranslatorHistoryEntry *entry,
 }
 
 void
-gtranslator_history_entry_append_text (GtranslatorHistoryEntry *entry,
+gtranslator_history_entry_append_text (GtrHistoryEntry *entry,
 				 const gchar       *text)
 {
 	g_return_if_fail (GTR_IS_HISTORY_ENTRY (entry));
@@ -380,7 +380,7 @@ gtranslator_history_entry_append_text (GtranslatorHistoryEntry *entry,
 }
 
 static void
-gtranslator_history_entry_load_history (GtranslatorHistoryEntry *entry)
+gtranslator_history_entry_load_history (GtrHistoryEntry *entry)
 {
 	GSList *gconf_items, *l;
 	GtkListStore *store;
@@ -418,7 +418,7 @@ gtranslator_history_entry_load_history (GtranslatorHistoryEntry *entry)
 }
 
 void
-gtranslator_history_entry_clear (GtranslatorHistoryEntry *entry)
+gtranslator_history_entry_clear (GtrHistoryEntry *entry)
 {
 	GtkListStore *store;
 
@@ -431,9 +431,9 @@ gtranslator_history_entry_clear (GtranslatorHistoryEntry *entry)
 }
 
 static void
-gtranslator_history_entry_init (GtranslatorHistoryEntry *entry)
+gtranslator_history_entry_init (GtrHistoryEntry *entry)
 {
-	GtranslatorHistoryEntryPrivate *priv;
+	GtrHistoryEntryPrivate *priv;
 
 	priv = GTR_HISTORY_ENTRY_GET_PRIVATE (entry);
 	entry->priv = priv;
@@ -447,7 +447,7 @@ gtranslator_history_entry_init (GtranslatorHistoryEntry *entry)
 }
 
 void
-gtranslator_history_entry_set_history_length (GtranslatorHistoryEntry *entry,
+gtranslator_history_entry_set_history_length (GtrHistoryEntry *entry,
 					guint              history_length)
 {
 	g_return_if_fail (GTR_IS_HISTORY_ENTRY (entry));
@@ -459,7 +459,7 @@ gtranslator_history_entry_set_history_length (GtranslatorHistoryEntry *entry,
 }
 
 guint
-gtranslator_history_entry_get_history_length (GtranslatorHistoryEntry *entry)
+gtranslator_history_entry_get_history_length (GtrHistoryEntry *entry)
 {
 	g_return_val_if_fail (GTR_IS_HISTORY_ENTRY (entry), 0);
 
@@ -467,7 +467,7 @@ gtranslator_history_entry_get_history_length (GtranslatorHistoryEntry *entry)
 }
 
 gchar *
-gtranslator_history_entry_get_history_id (GtranslatorHistoryEntry *entry)
+gtranslator_history_entry_get_history_id (GtrHistoryEntry *entry)
 {
 	g_return_val_if_fail (GTR_IS_HISTORY_ENTRY (entry), NULL);
 
@@ -475,7 +475,7 @@ gtranslator_history_entry_get_history_id (GtranslatorHistoryEntry *entry)
 }
 
 void
-gtranslator_history_entry_set_enable_completion (GtranslatorHistoryEntry *entry,
+gtranslator_history_entry_set_enable_completion (GtrHistoryEntry *entry,
 					   gboolean           enable)
 {
 	g_return_if_fail (GTR_IS_HISTORY_ENTRY (entry));
@@ -517,7 +517,7 @@ gtranslator_history_entry_set_enable_completion (GtranslatorHistoryEntry *entry,
 }
 							 
 gboolean
-gtranslator_history_entry_get_enable_completion (GtranslatorHistoryEntry *entry)
+gtranslator_history_entry_get_enable_completion (GtrHistoryEntry *entry)
 {
 	g_return_val_if_fail (GTR_IS_HISTORY_ENTRY (entry), FALSE);
 	
@@ -571,13 +571,13 @@ gtranslator_history_entry_new (const gchar *history_id,
 /*
  * Utility function to get the editable text entry internal widget.
  * I would prefer to not expose this implementation detail and 
- * simply make the GtranslatorHistoryEntry widget implement the 
+ * simply make the GtrHistoryEntry widget implement the 
  * GtkEditable interface. Unfortunately both GtkEditable and
  * GtkComboBox have a "changed" signal and I am not sure how to
  * handle the conflict.
  */
 GtkWidget *
-gtranslator_history_entry_get_entry (GtranslatorHistoryEntry *entry)
+gtranslator_history_entry_get_entry (GtrHistoryEntry *entry)
 {
 	g_return_val_if_fail (GTR_IS_HISTORY_ENTRY (entry), NULL);
 
@@ -589,7 +589,7 @@ escape_cell_data_func (GtkTreeViewColumn           *col,
 		       GtkCellRenderer             *renderer,
 		       GtkTreeModel                *model,
 		       GtkTreeIter                 *iter,
-		       GtranslatorHistoryEntryEscapeFunc  escape_func)
+		       GtrHistoryEntryEscapeFunc  escape_func)
 {
 	gchar *str;
 	gchar *escaped;
@@ -603,8 +603,8 @@ escape_cell_data_func (GtkTreeViewColumn           *col,
 }
 
 void
-gtranslator_history_entry_set_escape_func (GtranslatorHistoryEntry           *entry,
-				     GtranslatorHistoryEntryEscapeFunc  escape_func)
+gtranslator_history_entry_set_escape_func (GtrHistoryEntry           *entry,
+				     GtrHistoryEntryEscapeFunc  escape_func)
 {
 	GList *cells;
 
diff --git a/src/gtr-history-entry.h b/src/gtr-history-entry.h
index 4a9f598..8868ccd 100644
--- a/src/gtr-history-entry.h
+++ b/src/gtr-history-entry.h
@@ -35,27 +35,27 @@
 G_BEGIN_DECLS
 
 #define GTR_TYPE_HISTORY_ENTRY             (gtranslator_history_entry_get_type ())
-#define GTR_HISTORY_ENTRY(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTR_TYPE_HISTORY_ENTRY, GtranslatorHistoryEntry))
-#define GTR_HISTORY_ENTRY_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTR_TYPE_HISTORY_ENTRY, GtranslatorHistoryEntryClass))
+#define GTR_HISTORY_ENTRY(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTR_TYPE_HISTORY_ENTRY, GtrHistoryEntry))
+#define GTR_HISTORY_ENTRY_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTR_TYPE_HISTORY_ENTRY, GtrHistoryEntryClass))
 #define GTR_IS_HISTORY_ENTRY(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTR_TYPE_HISTORY_ENTRY))
 #define GTR_IS_HISTORY_ENTRY_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTR_TYPE_HISTORY_ENTRY))
-#define GTR_HISTORY_ENTRY_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTR_TYPE_HISTORY_ENTRY, GtranslatorHistoryEntryClass))
+#define GTR_HISTORY_ENTRY_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTR_TYPE_HISTORY_ENTRY, GtrHistoryEntryClass))
 
 
-typedef struct _GtranslatorHistoryEntry        GtranslatorHistoryEntry;
-typedef struct _GtranslatorHistoryEntryClass   GtranslatorHistoryEntryClass;
-typedef struct _GtranslatorHistoryEntryPrivate GtranslatorHistoryEntryPrivate;
+typedef struct _GtrHistoryEntry        GtrHistoryEntry;
+typedef struct _GtrHistoryEntryClass   GtrHistoryEntryClass;
+typedef struct _GtrHistoryEntryPrivate GtrHistoryEntryPrivate;
 
-struct _GtranslatorHistoryEntryClass
+struct _GtrHistoryEntryClass
 {
 	GtkComboBoxEntryClass parent_class;
 };
 
-struct _GtranslatorHistoryEntry
+struct _GtrHistoryEntry
 {
 	GtkComboBoxEntry parent_instance;
 
-	GtranslatorHistoryEntryPrivate *priv;
+	GtrHistoryEntryPrivate *priv;
 };
 
 GType		 gtranslator_history_entry_get_type	(void) G_GNUC_CONST;
@@ -63,33 +63,33 @@ GType		 gtranslator_history_entry_get_type	(void) G_GNUC_CONST;
 GtkWidget	*gtranslator_history_entry_new		(const gchar       *history_id,
 							 gboolean           enable_completion);
 
-void		 gtranslator_history_entry_prepend_text	(GtranslatorHistoryEntry *entry,
+void		 gtranslator_history_entry_prepend_text	(GtrHistoryEntry *entry,
 							 const gchar       *text);
 
-void		 gtranslator_history_entry_append_text	(GtranslatorHistoryEntry *entry,
+void		 gtranslator_history_entry_append_text	(GtrHistoryEntry *entry,
 							 const gchar       *text);
 
-void		 gtranslator_history_entry_clear		(GtranslatorHistoryEntry *entry);
+void		 gtranslator_history_entry_clear		(GtrHistoryEntry *entry);
 
-void		 gtranslator_history_entry_set_history_length	(GtranslatorHistoryEntry *entry,
+void		 gtranslator_history_entry_set_history_length	(GtrHistoryEntry *entry,
 							 guint              max_saved);
 
-guint		 gtranslator_history_entry_get_history_length	(GtranslatorHistoryEntry *gentry);
+guint		 gtranslator_history_entry_get_history_length	(GtrHistoryEntry *gentry);
 
-gchar		*gtranslator_history_entry_get_history_id	(GtranslatorHistoryEntry *entry);
+gchar		*gtranslator_history_entry_get_history_id	(GtrHistoryEntry *entry);
 
 void             gtranslator_history_entry_set_enable_completion 
-							(GtranslatorHistoryEntry *entry,
+							(GtrHistoryEntry *entry,
 							 gboolean           enable);
 							 
 gboolean         gtranslator_history_entry_get_enable_completion 
-							(GtranslatorHistoryEntry *entry);
+							(GtrHistoryEntry *entry);
 
-GtkWidget	*gtranslator_history_entry_get_entry		(GtranslatorHistoryEntry *entry);
+GtkWidget	*gtranslator_history_entry_get_entry		(GtrHistoryEntry *entry);
 
-typedef gchar * (* GtranslatorHistoryEntryEscapeFunc) (const gchar *str);
-void		gtranslator_history_entry_set_escape_func	(GtranslatorHistoryEntry *entry,
-							 GtranslatorHistoryEntryEscapeFunc escape_func);
+typedef gchar * (* GtrHistoryEntryEscapeFunc) (const gchar *str);
+void		gtranslator_history_entry_set_escape_func	(GtrHistoryEntry *entry,
+							 GtrHistoryEntryEscapeFunc escape_func);
 
 G_END_DECLS
 
diff --git a/src/gtr-message-table-model.c b/src/gtr-message-table-model.c
index 1e0ef05..a91b248 100644
--- a/src/gtr-message-table-model.c
+++ b/src/gtr-message-table-model.c
@@ -82,7 +82,7 @@ gtranslator_message_table_model_get_iter (GtkTreeModel * self,
 					  GtkTreeIter * iter,
 					  GtkTreePath * path)
 {
-  GtranslatorMessageTableModel *list_model = GTR_MESSAGE_TABLE_MODEL (self);
+  GtrMessageTableModel *list_model = GTR_MESSAGE_TABLE_MODEL (self);
   gint i;
   GList *list;
 
@@ -135,10 +135,10 @@ gtranslator_message_table_model_get_value (GtkTreeModel * self,
 					   GtkTreeIter * iter,
 					   gint column, GValue * value)
 {
-  GtranslatorMessageTableModel *model = GTR_MESSAGE_TABLE_MODEL (self);
-  GtranslatorMsg *msg;
+  GtrMessageTableModel *model = GTR_MESSAGE_TABLE_MODEL (self);
+  GtrMsg *msg;
   gchar *text;
-  GtranslatorMsgStatus status;
+  GtrMsgStatus status;
   gint i;
   GList *list;
 
@@ -263,7 +263,7 @@ gtranslator_message_table_model_iter_children (GtkTreeModel * tree_model,
 					       GtkTreeIter * iter,
 					       GtkTreeIter * parent)
 {
-  GtranslatorMessageTableModel *model = GTR_MESSAGE_TABLE_MODEL (tree_model);
+  GtrMessageTableModel *model = GTR_MESSAGE_TABLE_MODEL (tree_model);
 
   /* this is a list, nodes have no children */
   if (parent)
@@ -296,7 +296,7 @@ gtranslator_message_table_model_tree_model_init (GtkTreeModelIface * iface)
 }
 
 static void
-gtranslator_message_table_model_init (GtranslatorMessageTableModel * model)
+gtranslator_message_table_model_init (GtrMessageTableModel * model)
 {
   model->length = 0;
   model->stamp = g_random_int ();
@@ -309,7 +309,7 @@ gtranslator_message_table_model_finalize (GObject * object)
 }
 
 static void
-gtranslator_message_table_model_class_init (GtranslatorMessageTableModelClass
+gtranslator_message_table_model_class_init (GtrMessageTableModelClass
 					    * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -324,12 +324,12 @@ gtranslator_message_table_model_class_init (GtranslatorMessageTableModelClass
 /**
  * gtranslator_message_table_model_new:
  * 
- * Return value: a new #GtranslatorMessageTableModel object
+ * Return value: a new #GtrMessageTableModel object
  **/
-GtranslatorMessageTableModel *
+GtrMessageTableModel *
 gtranslator_message_table_model_new (void)
 {
-  GtranslatorMessageTableModel *model;
+  GtrMessageTableModel *model;
 
   model = g_object_new (GTR_TYPE_MESSAGE_TABLE_MODEL, NULL);
 
@@ -337,8 +337,8 @@ gtranslator_message_table_model_new (void)
 }
 
 void
-gtranslator_message_table_model_append (GtranslatorMessageTableModel * model,
-					GtranslatorMsg * msg,
+gtranslator_message_table_model_append (GtrMessageTableModel * model,
+					GtrMsg * msg,
 					GtkTreeIter * iter)
 {
   GList *list;
@@ -359,7 +359,7 @@ gtranslator_message_table_model_append (GtranslatorMessageTableModel * model,
 }
 
 void
-gtranslator_message_table_model_update_row (GtranslatorMessageTableModel *
+gtranslator_message_table_model_update_row (GtrMessageTableModel *
 					    model, GtkTreePath * path)
 {
   GtkTreeIter iter;
@@ -378,13 +378,13 @@ gtranslator_message_table_model_get_type (void)
   if (G_UNLIKELY (object_type == 0))
     {
       static const GTypeInfo object_info = {
-	sizeof (GtranslatorMessageTableModelClass),
+	sizeof (GtrMessageTableModelClass),
 	NULL,			/* base_init */
 	NULL,			/* base_finalize */
 	(GClassInitFunc) gtranslator_message_table_model_class_init,
 	NULL,			/* class_finalize */
 	NULL,			/* class_data */
-	sizeof (GtranslatorMessageTableModel),
+	sizeof (GtrMessageTableModel),
 	0,			/* n_preallocs */
 	(GInstanceInitFunc) gtranslator_message_table_model_init,
 	NULL
@@ -397,7 +397,7 @@ gtranslator_message_table_model_get_type (void)
       };
 
       object_type = g_type_register_static (G_TYPE_OBJECT,
-					    "GtranslatorMessageTableModel",
+					    "GtrMessageTableModel",
 					    &object_info, 0);
 
       g_type_add_interface_static (object_type, GTK_TYPE_TREE_MODEL,
diff --git a/src/gtr-message-table-model.h b/src/gtr-message-table-model.h
index bb181cd..9a6258d 100644
--- a/src/gtr-message-table-model.h
+++ b/src/gtr-message-table-model.h
@@ -31,21 +31,21 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_MESSAGE_TABLE_MODEL		(gtranslator_message_table_model_get_type ())
-#define GTR_MESSAGE_TABLE_MODEL(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_MESSAGE_TABLE_MODEL, GtranslatorMessageTableModel))
-#define GTR_MESSAGE_TABLE_MODEL_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_MESSAGE_TABLE_MODEL, GtranslatorMessageTableModelClass))
+#define GTR_MESSAGE_TABLE_MODEL(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_MESSAGE_TABLE_MODEL, GtrMessageTableModel))
+#define GTR_MESSAGE_TABLE_MODEL_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_MESSAGE_TABLE_MODEL, GtrMessageTableModelClass))
 #define GTR_IS_MESSAGE_TABLE_MODEL(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_MESSAGE_TABLE_MODEL))
 #define GTR_IS_MESSAGE_TABLE_MODEL_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_MESSAGE_TABLE_MODEL))
-#define GTR_MESSAGE_TABLE_MODEL_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_MESSAGE_TABLE_MODEL, GtranslatorMessageTableModelClass))
+#define GTR_MESSAGE_TABLE_MODEL_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_MESSAGE_TABLE_MODEL, GtrMessageTableModelClass))
 /* Private structure type */
-typedef struct _GtranslatorMessageTableModelPrivate
-  GtranslatorMessageTableModelPrivate;
+typedef struct _GtrMessageTableModelPrivate
+  GtrMessageTableModelPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorMessageTableModel GtranslatorMessageTableModel;
+typedef struct _GtrMessageTableModel GtrMessageTableModel;
 
-struct _GtranslatorMessageTableModel
+struct _GtrMessageTableModel
 {
   GObject parent_instance;
 
@@ -57,18 +57,18 @@ struct _GtranslatorMessageTableModel
 /*
  * Class definition
  */
-typedef struct _GtranslatorMessageTableModelClass
-  GtranslatorMessageTableModelClass;
+typedef struct _GtrMessageTableModelClass
+  GtrMessageTableModelClass;
 
-struct _GtranslatorMessageTableModelClass
+struct _GtrMessageTableModelClass
 {
   GObjectClass parent_class;
 };
 
-typedef enum _GtranslatorMessageTableModelColumn
-  GtranslatorMessageTableModelColumn;
+typedef enum _GtrMessageTableModelColumn
+  GtrMessageTableModelColumn;
 
-enum _GtranslatorMessageTableModelColumn
+enum _GtrMessageTableModelColumn
 {
   GTR_MESSAGE_TABLE_MODEL_ICON_COLUMN,
   GTR_MESSAGE_TABLE_MODEL_ID_COLUMN,
@@ -89,16 +89,16 @@ gtranslator_message_table_model_get_type (void)
      GType gtranslator_message_table_model_register_type (GTypeModule *
 							  module);
 
-     GtranslatorMessageTableModel *gtranslator_message_table_model_new (void);
+     GtrMessageTableModel *gtranslator_message_table_model_new (void);
 
-     void gtranslator_message_table_model_append (GtranslatorMessageTableModel
+     void gtranslator_message_table_model_append (GtrMessageTableModel
 						  * model,
-						  GtranslatorMsg * msg,
+						  GtrMsg * msg,
 						  GtkTreeIter * iter);
 
      void
        gtranslator_message_table_model_update_row
-       (GtranslatorMessageTableModel * model, GtkTreePath * path);
+       (GtrMessageTableModel * model, GtkTreePath * path);
 
 G_END_DECLS
 #endif /* __MESSAGE_TABLE_MODEL_H__ */
diff --git a/src/gtr-message-table.c b/src/gtr-message-table.c
index 121fa24..a9c5eb4 100644
--- a/src/gtr-message-table.c
+++ b/src/gtr-message-table.c
@@ -39,30 +39,30 @@
 #define GTR_MESSAGE_TABLE_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE (	\
 							(object),		\
 							GTR_TYPE_MESSAGE_TABLE,	\
-							GtranslatorMessageTablePrivate))
+							GtrMessageTablePrivate))
 
-G_DEFINE_TYPE (GtranslatorMessageTable, gtranslator_message_table,
+G_DEFINE_TYPE (GtrMessageTable, gtranslator_message_table,
 	       GTK_TYPE_VBOX)
-     struct _GtranslatorMessageTablePrivate
+     struct _GtrMessageTablePrivate
      {
        GtkWidget *treeview;
-       GtranslatorMessageTableModel *store;
+       GtrMessageTableModel *store;
        GtkTreeModel *sort_model;
 
-       GtranslatorTab *tab;
+       GtrTab *tab;
      };
 
      static void
        gtranslator_message_table_selection_changed (GtkTreeSelection *
 						    selection,
-						    GtranslatorMessageTable *
+						    GtrMessageTable *
 						    table)
 {
   GtkTreeIter iter;
   GtkTreeModel *model;
   GList *msg = NULL;
   GList *current_msg = NULL;
-  GtranslatorPo *po;
+  GtrPo *po;
 
   g_return_if_fail (selection != NULL);
 
@@ -85,8 +85,8 @@ G_DEFINE_TYPE (GtranslatorMessageTable, gtranslator_message_table,
 }
 
 static void
-showed_message_cb (GtranslatorTab * tab,
-		   GtranslatorMsg * msg, GtranslatorMessageTable * table)
+showed_message_cb (GtrTab * tab,
+		   GtrMsg * msg, GtrMessageTable * table)
 {
   GtkTreeModel *model, *sort_model;
   GtkTreePath *path, *sort_path;
@@ -111,8 +111,8 @@ showed_message_cb (GtranslatorTab * tab,
 }
 
 static void
-message_changed_cb (GtranslatorTab * tab,
-		    GtranslatorMsg * msg, GtranslatorMessageTable * table)
+message_changed_cb (GtrTab * tab,
+		    GtrMsg * msg, GtrMessageTable * table)
 {
   GtkTreePath *sort_path, *path;
   GtkTreeRowReference *row;
@@ -203,9 +203,9 @@ list_compare_by_translation (gconstpointer a, gconstpointer b)
 
 static void
 sort_message_list (GtkTreeViewColumn * column,
-		   GtranslatorMessageTable * table)
+		   GtrMessageTable * table)
 {
-  GtranslatorPo *po;
+  GtrPo *po;
   GList *messages;
   gint sort_column;
 
@@ -240,9 +240,9 @@ sort_message_list (GtkTreeViewColumn * column,
 }
 
 static void
-gtranslator_message_table_draw (GtranslatorMessageTable * table)
+gtranslator_message_table_draw (GtrMessageTable * table)
 {
-  GtranslatorMessageTablePrivate *priv = table->priv;
+  GtrMessageTablePrivate *priv = table->priv;
 
   GtkTreeViewColumn *column;
   GtkCellRenderer *renderer;
@@ -350,7 +350,7 @@ gtranslator_message_table_draw (GtranslatorMessageTable * table)
 
 
 static void
-gtranslator_message_table_init (GtranslatorMessageTable * table)
+gtranslator_message_table_init (GtrMessageTable * table)
 {
   GtkWidget *scrolledwindow;
 
@@ -375,27 +375,27 @@ gtranslator_message_table_finalize (GObject * object)
 }
 
 static void
-gtranslator_message_table_class_init (GtranslatorMessageTableClass * klass)
+gtranslator_message_table_class_init (GtrMessageTableClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorMessageTablePrivate));
+  g_type_class_add_private (klass, sizeof (GtrMessageTablePrivate));
 
   object_class->finalize = gtranslator_message_table_finalize;
 }
 
 /**
  * gtranslator_message_table_new:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  *
- * Creates a new #GtranslatorMessageTable object.
+ * Creates a new #GtrMessageTable object.
  *
- * Returns: the newly created #GtranslatorMessageTable
+ * Returns: the newly created #GtrMessageTable
  */
 GtkWidget *
 gtranslator_message_table_new (GtkWidget * tab)
 {
-  GtranslatorMessageTable *obj =
+  GtrMessageTable *obj =
     GTR_MESSAGE_TABLE (g_object_new (GTR_TYPE_MESSAGE_TABLE, NULL));
   obj->priv->tab = GTR_TAB (tab);
   g_signal_connect (obj->priv->tab,
@@ -408,14 +408,14 @@ gtranslator_message_table_new (GtkWidget * tab)
 
 /**
  * gtranslator_message_table_populate:
- * @table: a #GtranslatorMessageTable
- * @messages: a list of #GtranslatorMsg
+ * @table: a #GtrMessageTable
+ * @messages: a list of #GtrMsg
  *
- * Populates the #GtranslatorMessageTable with the list of #GtranslatorMsg and
+ * Populates the #GtrMessageTable with the list of #GtrMsg and
  * sort them.
  */
 void
-gtranslator_message_table_populate (GtranslatorMessageTable * table,
+gtranslator_message_table_populate (GtrMessageTable * table,
 				    GList * messages)
 {
   GtkTreeIter iter, sort_iter;
diff --git a/src/gtr-message-table.h b/src/gtr-message-table.h
index f8f3716..01d35b4 100644
--- a/src/gtr-message-table.h
+++ b/src/gtr-message-table.h
@@ -29,33 +29,33 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_MESSAGE_TABLE		(gtranslator_message_table_get_type ())
-#define GTR_MESSAGE_TABLE(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_MESSAGE_TABLE, GtranslatorMessageTable))
-#define GTR_MESSAGE_TABLE_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_MESSAGE_TABLE, GtranslatorMessageTableClass))
+#define GTR_MESSAGE_TABLE(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_MESSAGE_TABLE, GtrMessageTable))
+#define GTR_MESSAGE_TABLE_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_MESSAGE_TABLE, GtrMessageTableClass))
 #define GTR_IS_MESSAGE_TABLE(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_MESSAGE_TABLE))
 #define GTR_IS_MESSAGE_TABLE_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_MESSAGE_TABLE))
-#define GTR_MESSAGE_TABLE_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_MESSAGE_TABLE, GtranslatorMessageTableClass))
+#define GTR_MESSAGE_TABLE_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_MESSAGE_TABLE, GtrMessageTableClass))
 /* Private structure type */
-typedef struct _GtranslatorMessageTablePrivate GtranslatorMessageTablePrivate;
+typedef struct _GtrMessageTablePrivate GtrMessageTablePrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorMessageTable GtranslatorMessageTable;
+typedef struct _GtrMessageTable GtrMessageTable;
 
-struct _GtranslatorMessageTable
+struct _GtrMessageTable
 {
   GtkVBox parent_instance;
 
   /* < private > */
-  GtranslatorMessageTablePrivate *priv;
+  GtrMessageTablePrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorMessageTableClass GtranslatorMessageTableClass;
+typedef struct _GtrMessageTableClass GtrMessageTableClass;
 
-struct _GtranslatorMessageTableClass
+struct _GtrMessageTableClass
 {
   GtkVBoxClass parent_class;
 };
@@ -71,13 +71,13 @@ gtranslator_message_table_get_type (void)
 
      GtkWidget *gtranslator_message_table_new (GtkWidget * tab);
 
-     void gtranslator_message_table_populate (GtranslatorMessageTable * table,
+     void gtranslator_message_table_populate (GtrMessageTable * table,
 					      GList * messages);
 
      void
-       gtranslator_message_table_update_translation (GtranslatorMessageTable *
+       gtranslator_message_table_update_translation (GtrMessageTable *
 						     table,
-						     GtranslatorMsg * msg,
+						     GtrMsg * msg,
 						     gchar * translation);
 
 G_END_DECLS
diff --git a/src/gtr-msg.c b/src/gtr-msg.c
index 79d76ae..7f6f4cc 100644
--- a/src/gtr-msg.c
+++ b/src/gtr-msg.c
@@ -35,18 +35,18 @@
 #define GTR_MSG_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 					 (object),	\
 					 GTR_TYPE_MSG,     \
-					 GtranslatorMsgPrivate))
+					 GtrMsgPrivate))
 
 
-G_DEFINE_TYPE (GtranslatorMsg, gtranslator_msg, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GtrMsg, gtranslator_msg, G_TYPE_OBJECT)
 
-struct _GtranslatorMsgPrivate
+struct _GtrMsgPrivate
 {
   po_message_iterator_t iterator;
 
   po_message_t message;
 
-  GtranslatorMsgStatus status;
+  GtrMsgStatus status;
 
   GtkTreeRowReference *row_reference;
 
@@ -67,7 +67,7 @@ gtranslator_msg_set_property (GObject * object,
 			      guint prop_id,
 			      const GValue * value, GParamSpec * pspec)
 {
-  GtranslatorMsg *msg = GTR_MSG (object);
+  GtrMsg *msg = GTR_MSG (object);
 
   switch (prop_id)
     {
@@ -88,7 +88,7 @@ gtranslator_msg_get_property (GObject * object,
 			      guint prop_id,
 			      GValue * value, GParamSpec * pspec)
 {
-  GtranslatorMsg *msg = GTR_MSG (object);
+  GtrMsg *msg = GTR_MSG (object);
 
   switch (prop_id)
     {
@@ -105,7 +105,7 @@ gtranslator_msg_get_property (GObject * object,
 }
 
 static void
-gtranslator_msg_init (GtranslatorMsg * msg)
+gtranslator_msg_init (GtrMsg * msg)
 {
   msg->priv = GTR_MSG_GET_PRIVATE (msg);
 }
@@ -117,11 +117,11 @@ gtranslator_msg_finalize (GObject * object)
 }
 
 static void
-gtranslator_msg_class_init (GtranslatorMsgClass * klass)
+gtranslator_msg_class_init (GtrMsgClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorMsgPrivate));
+  g_type_class_add_private (klass, sizeof (GtrMsgPrivate));
 
   object_class->finalize = gtranslator_msg_finalize;
   object_class->set_property = gtranslator_msg_set_property;
@@ -147,14 +147,14 @@ gtranslator_msg_class_init (GtranslatorMsgClass * klass)
 /**
  * gtranslator_msg_new:
  * 
- * Creates a new #GtranslatorMsg.
+ * Creates a new #GtrMsg.
  * 
- * Return value: a new #GtranslatorMsg object
+ * Return value: a new #GtrMsg object
  **/
-GtranslatorMsg *
+GtrMsg *
 gtranslator_msg_new (po_message_iterator_t iter, po_message_t message)
 {
-  GtranslatorMsg *msg;
+  GtrMsg *msg;
 
   g_return_val_if_fail (iter != NULL || message != NULL, NULL);
 
@@ -176,12 +176,12 @@ gtranslator_msg_new (po_message_iterator_t iter, po_message_t message)
 
 /**
  * gtranslator_msg_get_iterator:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  *
  * Return value: the message iterator in gettext format
  **/
 po_message_iterator_t
-gtranslator_msg_get_iterator (GtranslatorMsg * msg)
+gtranslator_msg_get_iterator (GtrMsg * msg)
 {
   g_return_val_if_fail (GTR_IS_MSG (msg), NULL);
 
@@ -190,13 +190,13 @@ gtranslator_msg_get_iterator (GtranslatorMsg * msg)
 
 /**
  * gtranslator_msg_set_iterator:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  * @message: the po_message_iterator_t to set into the @msg
  *
- * Sets the iterator into the #GtranslatorMsg class.
+ * Sets the iterator into the #GtrMsg class.
  **/
 void
-gtranslator_msg_set_iterator (GtranslatorMsg * msg,
+gtranslator_msg_set_iterator (GtrMsg * msg,
 			      po_message_iterator_t iter)
 {
   g_return_if_fail (GTR_IS_MSG (msg));
@@ -208,12 +208,12 @@ gtranslator_msg_set_iterator (GtranslatorMsg * msg,
 
 /**
  * gtranslator_msg_get_message:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  *
  * Return value: the message in gettext format
  **/
 po_message_t
-gtranslator_msg_get_message (GtranslatorMsg * msg)
+gtranslator_msg_get_message (GtrMsg * msg)
 {
   g_return_val_if_fail (GTR_IS_MSG (msg), NULL);
 
@@ -222,13 +222,13 @@ gtranslator_msg_get_message (GtranslatorMsg * msg)
 
 /**
  * gtranslator_msg_set_message:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  * @message: the po_message_t to set into the @msg
  *
- * Sets the message into the #GtranslatorMsg class.
+ * Sets the message into the #GtrMsg class.
  **/
 void
-gtranslator_msg_set_message (GtranslatorMsg * msg, po_message_t message)
+gtranslator_msg_set_message (GtrMsg * msg, po_message_t message)
 {
   g_return_if_fail (GTR_IS_MSG (msg));
   g_return_if_fail (message != NULL);
@@ -240,13 +240,13 @@ gtranslator_msg_set_message (GtranslatorMsg * msg, po_message_t message)
 
 /**
  * gtranslator_msg_get_row_reference:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  *
  * Returns: the #GtkTreeRowReference corresponding to the message's place
  * in the message table
  */
 GtkTreeRowReference *
-gtranslator_msg_get_row_reference (GtranslatorMsg * msg)
+gtranslator_msg_get_row_reference (GtrMsg * msg)
 {
   g_return_val_if_fail (GTR_IS_MSG (msg), NULL);
 
@@ -255,13 +255,13 @@ gtranslator_msg_get_row_reference (GtranslatorMsg * msg)
 
 /**
  * gtranslator_msg_set_row_reference:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  * @tree_iter: the GtkTreeRowReference corresponding to position in the message table
  *
  * Sets the GtkTreeRowReference from the messages table for the given message
  **/
 void
-gtranslator_msg_set_row_reference (GtranslatorMsg * msg,
+gtranslator_msg_set_row_reference (GtrMsg * msg,
 				   GtkTreeRowReference * row_reference)
 {
   g_return_if_fail (GTR_IS_MSG (msg));
@@ -271,12 +271,12 @@ gtranslator_msg_set_row_reference (GtranslatorMsg * msg,
 
 /**
  * po_message_is_translated:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  * 
  * Return value: TRUE if the message is translated
  **/
 gboolean
-gtranslator_msg_is_translated (GtranslatorMsg * msg)
+gtranslator_msg_is_translated (GtrMsg * msg)
 {
   g_return_val_if_fail (GTR_IS_MSG (msg), FALSE);
 
@@ -302,12 +302,12 @@ gtranslator_msg_is_translated (GtranslatorMsg * msg)
 
 /**
  * gtranslator_msg_is_fuzzy:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  * 
  * Return value: TRUE if the message is fuzzy
  **/
 gboolean
-gtranslator_msg_is_fuzzy (GtranslatorMsg * msg)
+gtranslator_msg_is_fuzzy (GtrMsg * msg)
 {
   g_return_val_if_fail (GTR_IS_MSG (msg), FALSE);
 
@@ -317,13 +317,13 @@ gtranslator_msg_is_fuzzy (GtranslatorMsg * msg)
 
 /**
  * gtranslator_msg_set_fuzzy:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  * @fuzzy: the fuzzy value to set to the message
  * 
  * Change the fuzzy mark of a message.
  **/
 void
-gtranslator_msg_set_fuzzy (GtranslatorMsg * msg, gboolean fuzzy)
+gtranslator_msg_set_fuzzy (GtrMsg * msg, gboolean fuzzy)
 {
   g_return_if_fail (GTR_IS_MSG (msg));
 
@@ -332,13 +332,13 @@ gtranslator_msg_set_fuzzy (GtranslatorMsg * msg, gboolean fuzzy)
 
 /**
  * gtranslator_msg_set_status:
- * @msg: a #GtranslatorMsg
- * @status: a #GtranslatorMsgStatus
+ * @msg: a #GtrMsg
+ * @status: a #GtrMsgStatus
  * 
  * Sets the status for a message.
  */
 void
-gtranslator_msg_set_status (GtranslatorMsg * msg, GtranslatorMsgStatus status)
+gtranslator_msg_set_status (GtrMsg * msg, GtrMsgStatus status)
 {
   g_return_if_fail (GTR_IS_MSG (msg));
 
@@ -347,12 +347,12 @@ gtranslator_msg_set_status (GtranslatorMsg * msg, GtranslatorMsgStatus status)
 
 /**
  * gtranslator_msg_get_status:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  * 
  * Return value: the message's status.
  */
-GtranslatorMsgStatus
-gtranslator_msg_get_status (GtranslatorMsg * msg)
+GtrMsgStatus
+gtranslator_msg_get_status (GtrMsg * msg)
 {
   g_return_val_if_fail (GTR_IS_MSG (msg), 0);
 
@@ -361,12 +361,12 @@ gtranslator_msg_get_status (GtranslatorMsg * msg)
 
 /**
  * gtranslator_msg_get_msgid:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  *
  * Return value: the msgid (untranslated English string) of a message.
  **/
 const gchar *
-gtranslator_msg_get_msgid (GtranslatorMsg * msg)
+gtranslator_msg_get_msgid (GtrMsg * msg)
 {
   g_return_val_if_fail (GTR_IS_MSG (msg), NULL);
 
@@ -376,13 +376,13 @@ gtranslator_msg_get_msgid (GtranslatorMsg * msg)
 
 /**
  * gtranslator_msg_get_msgid_plural:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  * 
  * Return value: the msgid_plural (untranslated English plural string) of a
  * message, or NULL for a message without plural.
  **/
 const gchar *
-gtranslator_msg_get_msgid_plural (GtranslatorMsg * msg)
+gtranslator_msg_get_msgid_plural (GtrMsg * msg)
 {
   return po_message_msgid_plural (msg->priv->message);
 }
@@ -390,13 +390,13 @@ gtranslator_msg_get_msgid_plural (GtranslatorMsg * msg)
 
 /**
  * gtranslator_msg_get_msgstr:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  * 
  * Return value: the msgstr (translation) of a message.
  * Return the empty string for an untranslated message.
  **/
 const gchar *
-gtranslator_msg_get_msgstr (GtranslatorMsg * msg)
+gtranslator_msg_get_msgstr (GtrMsg * msg)
 {
   g_return_val_if_fail (GTR_IS_MSG (msg), NULL);
 
@@ -406,14 +406,14 @@ gtranslator_msg_get_msgstr (GtranslatorMsg * msg)
 
 /**
  * gtranslator_msg_set_msgstr:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  * @msgstr: the string to set in the @msg
  * 
  * Change the msgstr (translation) of a message.
  * Use an empty string to denote an untranslated message.
  **/
 void
-gtranslator_msg_set_msgstr (GtranslatorMsg * msg, const gchar * msgstr)
+gtranslator_msg_set_msgstr (GtrMsg * msg, const gchar * msgstr)
 {
   g_return_if_fail (GTR_IS_MSG (msg));
   g_return_if_fail (msgstr != NULL);
@@ -424,14 +424,14 @@ gtranslator_msg_set_msgstr (GtranslatorMsg * msg, const gchar * msgstr)
 
 /**
  * gtranslator_msg_get_msgstr_plural:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  * @index: the index of the plural array
  *
  * Return value: the msgstr[index] for a message with plural handling, or
  * NULL when the index is out of range or for a message without plural.
  **/
 const gchar *
-gtranslator_msg_get_msgstr_plural (GtranslatorMsg * msg, gint index)
+gtranslator_msg_get_msgstr_plural (GtrMsg * msg, gint index)
 {
   g_return_val_if_fail (GTR_IS_MSG (msg), NULL);
 
@@ -440,7 +440,7 @@ gtranslator_msg_get_msgstr_plural (GtranslatorMsg * msg, gint index)
 
 /**
  * gtranslator_msg_set_msgstr_plural:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  * @index: the index where to set the msgstr
  * @msgstr: the message to set in the msg
  *
@@ -448,7 +448,7 @@ gtranslator_msg_get_msgstr_plural (GtranslatorMsg * msg, gint index)
  * Use a NULL value at the end to reduce the number of plural forms.
  **/
 void
-gtranslator_msg_set_msgstr_plural (GtranslatorMsg * msg,
+gtranslator_msg_set_msgstr_plural (GtrMsg * msg,
 				   gint index, const gchar * msgstr)
 {
   g_return_if_fail (GTR_IS_MSG (msg));
@@ -460,12 +460,12 @@ gtranslator_msg_set_msgstr_plural (GtranslatorMsg * msg,
 
 /**
  * gtranslator_msg_get_comment:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  *
  * Return value: the comments for a message.
  **/
 const gchar *
-gtranslator_msg_get_comment (GtranslatorMsg * msg)
+gtranslator_msg_get_comment (GtrMsg * msg)
 {
   g_return_val_if_fail (GTR_IS_MSG (msg), NULL);
 
@@ -474,7 +474,7 @@ gtranslator_msg_get_comment (GtranslatorMsg * msg)
 
 /**
  * gtranslator_msg_set_comment:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  * @comment: the comment to set for a message
  * 
  * Change the comments for a message.
@@ -482,7 +482,7 @@ gtranslator_msg_get_comment (GtranslatorMsg * msg)
  * ending in a newline, or empty.
  **/
 void
-gtranslator_msg_set_comment (GtranslatorMsg * msg, const gchar * comment)
+gtranslator_msg_set_comment (GtrMsg * msg, const gchar * comment)
 {
   g_return_if_fail (GTR_IS_MSG (msg));
   g_return_if_fail (comment != NULL);
@@ -492,7 +492,7 @@ gtranslator_msg_set_comment (GtranslatorMsg * msg, const gchar * comment)
 
 /**
  * gtranslator_msg_get_po_position:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  *
  * Return value: the position of the message.
  *
@@ -500,7 +500,7 @@ gtranslator_msg_set_comment (GtranslatorMsg * msg, const gchar * comment)
  * messages.
  **/
 gint
-gtranslator_msg_get_po_position (GtranslatorMsg * msg)
+gtranslator_msg_get_po_position (GtrMsg * msg)
 {
   g_return_val_if_fail (GTR_IS_MSG (msg), 0);
 
@@ -509,13 +509,13 @@ gtranslator_msg_get_po_position (GtranslatorMsg * msg)
 
 /**
  * gtranslator_msg_set_po_position:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  * @po_position: the numerical position of the message.
  *
  * Sets the numerical position of this message in relation to other messages.
  **/
 void
-gtranslator_msg_set_po_position (GtranslatorMsg * msg, gint po_position)
+gtranslator_msg_set_po_position (GtrMsg * msg, gint po_position)
 {
   g_return_if_fail (GTR_IS_MSG (msg));
 
@@ -524,12 +524,12 @@ gtranslator_msg_set_po_position (GtranslatorMsg * msg, gint po_position)
 
 /**
  * gtranslator_msg_get_extracted_comments:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  *
  * Return value: the extracted comments for a message.
  **/
 const gchar *
-gtranslator_msg_get_extracted_comments (GtranslatorMsg * msg)
+gtranslator_msg_get_extracted_comments (GtrMsg * msg)
 {
   g_return_val_if_fail (GTR_IS_MSG (msg), NULL);
 
@@ -538,14 +538,14 @@ gtranslator_msg_get_extracted_comments (GtranslatorMsg * msg)
 
 /**
  * gtranslator_msg_get_filename:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  * @i: the i-th file for a message.
  *
  * Return value: the i-th filename for a message, or NULL if @i is out
  * of range.
  */
 const gchar *
-gtranslator_msg_get_filename (GtranslatorMsg * msg, gint i)
+gtranslator_msg_get_filename (GtrMsg * msg, gint i)
 {
   g_return_val_if_fail (GTR_IS_MSG (msg), NULL);
 
@@ -561,14 +561,14 @@ gtranslator_msg_get_filename (GtranslatorMsg * msg, gint i)
 
 /**
  * gtranslator_msg_get_file_line:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  * @i: the i-th file for a message.
  *
  * Return value: the i-th file line for a message, or NULL if @i is out
  * of range.
  */
 gint *
-gtranslator_msg_get_file_line (GtranslatorMsg * msg, gint i)
+gtranslator_msg_get_file_line (GtrMsg * msg, gint i)
 {
   g_return_val_if_fail (GTR_IS_MSG (msg), (gint *)0);
 
@@ -584,13 +584,13 @@ gtranslator_msg_get_file_line (GtranslatorMsg * msg, gint i)
 
 /**
  * gtranslator_msg_get_msgctxt:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  *
  * Return value: the context of a message, or NULL for a 
  * message not restricted to a context.
  */
 const gchar *
-gtranslator_msg_get_msgctxt (GtranslatorMsg * msg)
+gtranslator_msg_get_msgctxt (GtrMsg * msg)
 {
   g_return_val_if_fail (GTR_IS_MSG (msg), NULL);
 
@@ -599,7 +599,7 @@ gtranslator_msg_get_msgctxt (GtranslatorMsg * msg)
 
 /**
  * gtranslator_msg_get_format:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  *
  * Return the pretty name associated with a format type.
  * For example, for "csharp-format", return "C#".
@@ -609,7 +609,7 @@ gtranslator_msg_get_msgctxt (GtranslatorMsg * msg)
  * if the message hasn't any format type.
  */
 const gchar *
-gtranslator_msg_get_format (GtranslatorMsg * msg)
+gtranslator_msg_get_format (GtrMsg * msg)
 {
   const gchar *const *format_list;
   gint i;
@@ -658,7 +658,7 @@ on_gettext_po_xerror2 (gint severity,
 
 /**
  * gtranslator_msg_check:
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  * 
  * Return value: the message error or NULL if there is not any error. Must be
  * freed with g_free.
@@ -667,7 +667,7 @@ on_gettext_po_xerror2 (gint severity,
  * is marked as being a format string.  
  **/
 gchar *
-gtranslator_msg_check (GtranslatorMsg * msg)
+gtranslator_msg_check (GtrMsg * msg)
 {
   struct po_xerror_handler handler;
 
diff --git a/src/gtr-msg.h b/src/gtr-msg.h
index 6a0f270..826ae58 100644
--- a/src/gtr-msg.h
+++ b/src/gtr-msg.h
@@ -33,33 +33,33 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_MSG		(gtranslator_msg_get_type ())
-#define GTR_MSG(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_MSG, GtranslatorMsg))
-#define GTR_MSG_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_MSG, GtranslatorMsgClass))
+#define GTR_MSG(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_MSG, GtrMsg))
+#define GTR_MSG_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_MSG, GtrMsgClass))
 #define GTR_IS_MSG(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_MSG))
 #define GTR_IS_MSG_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_MSG))
-#define GTR_MSG_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_MSG, GtranslatorMsgClass))
+#define GTR_MSG_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_MSG, GtrMsgClass))
 /* Private structure type */
-typedef struct _GtranslatorMsgPrivate GtranslatorMsgPrivate;
+typedef struct _GtrMsgPrivate GtrMsgPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorMsg GtranslatorMsg;
+typedef struct _GtrMsg GtrMsg;
 
-struct _GtranslatorMsg
+struct _GtrMsg
 {
   GObject parent_instance;
 
   /*< private > */
-  GtranslatorMsgPrivate *priv;
+  GtrMsgPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorMsgClass GtranslatorMsgClass;
+typedef struct _GtrMsgClass GtrMsgClass;
 
-struct _GtranslatorMsgClass
+struct _GtrMsgClass
 {
   GObjectClass parent_class;
 };
@@ -69,7 +69,7 @@ typedef enum
   GTR_MSG_STATUS_UNTRANSLATED,
   GTR_MSG_STATUS_FUZZY,
   GTR_MSG_STATUS_TRANSLATED
-} GtranslatorMsgStatus;
+} GtrMsgStatus;
 
 /*
  * Public methods
@@ -80,76 +80,76 @@ gtranslator_msg_get_type (void)
 
      GType gtranslator_msg_register_type (GTypeModule * module);
 
-     GtranslatorMsg *gtranslator_msg_new (po_message_iterator_t iter,
+     GtrMsg *gtranslator_msg_new (po_message_iterator_t iter,
 					  po_message_t message);
 
 po_message_iterator_t
-gtranslator_msg_get_iterator (GtranslatorMsg * msg);
+gtranslator_msg_get_iterator (GtrMsg * msg);
 
-     void gtranslator_msg_set_iterator (GtranslatorMsg * msg,
+     void gtranslator_msg_set_iterator (GtrMsg * msg,
 					po_message_iterator_t iter);
 
-     po_message_t gtranslator_msg_get_message (GtranslatorMsg * msg);
+     po_message_t gtranslator_msg_get_message (GtrMsg * msg);
 
-     void gtranslator_msg_set_message (GtranslatorMsg * msg,
+     void gtranslator_msg_set_message (GtrMsg * msg,
 				       po_message_t message);
 
-     GtkTreeRowReference *gtranslator_msg_get_row_reference (GtranslatorMsg *
+     GtkTreeRowReference *gtranslator_msg_get_row_reference (GtrMsg *
 							     msg);
 
-     void gtranslator_msg_set_row_reference (GtranslatorMsg * msg,
+     void gtranslator_msg_set_row_reference (GtrMsg * msg,
 					     GtkTreeRowReference *
 					     row_reference);
 
-     gboolean gtranslator_msg_is_translated (GtranslatorMsg * msg);
+     gboolean gtranslator_msg_is_translated (GtrMsg * msg);
 
-     gboolean gtranslator_msg_is_fuzzy (GtranslatorMsg * msg);
+     gboolean gtranslator_msg_is_fuzzy (GtrMsg * msg);
 
-     void gtranslator_msg_set_fuzzy (GtranslatorMsg * msg, gboolean fuzzy);
+     void gtranslator_msg_set_fuzzy (GtrMsg * msg, gboolean fuzzy);
 
-     void gtranslator_msg_set_status (GtranslatorMsg * msg,
-				      GtranslatorMsgStatus status);
+     void gtranslator_msg_set_status (GtrMsg * msg,
+				      GtrMsgStatus status);
 
-     GtranslatorMsgStatus gtranslator_msg_get_status (GtranslatorMsg * msg);
+     GtrMsgStatus gtranslator_msg_get_status (GtrMsg * msg);
 
-     const gchar *gtranslator_msg_get_msgid (GtranslatorMsg * msg);
+     const gchar *gtranslator_msg_get_msgid (GtrMsg * msg);
 
-     const gchar *gtranslator_msg_get_msgid_plural (GtranslatorMsg * msg);
+     const gchar *gtranslator_msg_get_msgid_plural (GtrMsg * msg);
 
-     const gchar *gtranslator_msg_get_msgstr (GtranslatorMsg * msg);
+     const gchar *gtranslator_msg_get_msgstr (GtrMsg * msg);
 
-     void gtranslator_msg_set_msgstr (GtranslatorMsg * msg,
+     void gtranslator_msg_set_msgstr (GtrMsg * msg,
 				      const gchar * msgstr);
 
-     const gchar *gtranslator_msg_get_msgstr_plural (GtranslatorMsg * msg,
+     const gchar *gtranslator_msg_get_msgstr_plural (GtrMsg * msg,
 						     gint index);
 
-     void gtranslator_msg_set_msgstr_plural (GtranslatorMsg * msg,
+     void gtranslator_msg_set_msgstr_plural (GtrMsg * msg,
 					     gint index,
 					     const gchar * msgstr);
 
-     const gchar *gtranslator_msg_get_comment (GtranslatorMsg * msg);
+     const gchar *gtranslator_msg_get_comment (GtrMsg * msg);
 
-     void gtranslator_msg_set_comment (GtranslatorMsg * msg,
+     void gtranslator_msg_set_comment (GtrMsg * msg,
 				       const gchar * comment);
 
-     gint gtranslator_msg_get_po_position (GtranslatorMsg * msg);
+     gint gtranslator_msg_get_po_position (GtrMsg * msg);
 
-     void gtranslator_msg_set_po_position (GtranslatorMsg * msg,
+     void gtranslator_msg_set_po_position (GtrMsg * msg,
 					   gint po_position);
 
      const gchar *gtranslator_msg_get_extracted_comments
-       (GtranslatorMsg * msg);
+       (GtrMsg * msg);
 
-     const gchar *gtranslator_msg_get_filename (GtranslatorMsg * msg, gint i);
+     const gchar *gtranslator_msg_get_filename (GtrMsg * msg, gint i);
 
-     gint *gtranslator_msg_get_file_line (GtranslatorMsg * msg, gint i);
+     gint *gtranslator_msg_get_file_line (GtrMsg * msg, gint i);
 
-     const gchar *gtranslator_msg_get_msgctxt (GtranslatorMsg * msg);
+     const gchar *gtranslator_msg_get_msgctxt (GtrMsg * msg);
 
-     const gchar *gtranslator_msg_get_format (GtranslatorMsg * msg);
+     const gchar *gtranslator_msg_get_format (GtrMsg * msg);
 
-     gchar *gtranslator_msg_check (GtranslatorMsg * msg);
+     gchar *gtranslator_msg_check (GtrMsg * msg);
 
 G_END_DECLS
 #endif /* __MSG_H__ */
diff --git a/src/gtr-notebook.c b/src/gtr-notebook.c
index 073965e..17661ff 100644
--- a/src/gtr-notebook.c
+++ b/src/gtr-notebook.c
@@ -31,10 +31,10 @@
 #define GTR_NOTEBOOK_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 					 (object),	\
 					 GTR_TYPE_NOTEBOOK,     \
-					 GtranslatorNotebookPrivate))
+					 GtrNotebookPrivate))
 
-G_DEFINE_TYPE (GtranslatorNotebook, gtranslator_notebook, GTK_TYPE_NOTEBOOK)
-     struct _GtranslatorNotebookPrivate
+G_DEFINE_TYPE (GtrNotebook, gtranslator_notebook, GTK_TYPE_NOTEBOOK)
+     struct _GtrNotebookPrivate
      {
        GList *pages;
 
@@ -64,13 +64,13 @@ tab_label_style_set_cb (GtkWidget * hbox,
 }
 
 static void
-sync_name (GtranslatorPo * po, GParamSpec * pspec, GtkWidget * hbox)
+sync_name (GtrPo * po, GParamSpec * pspec, GtkWidget * hbox)
 {
   gchar *str;
   GtkWidget *label;
   GtkWidget *ebox;
   gchar *tooltip;
-  GtranslatorTab *tab;
+  GtrTab *tab;
   GFile *location;
   gchar *path;
 
@@ -99,14 +99,14 @@ sync_name (GtranslatorPo * po, GParamSpec * pspec, GtkWidget * hbox)
 static void
 close_button_clicked_cb (GtkWidget * widget, GtkWidget * tab)
 {
-  GtranslatorNotebook *notebook;
+  GtrNotebook *notebook;
 
   notebook = GTR_NOTEBOOK (gtk_widget_get_parent (tab));
   g_signal_emit (notebook, signals[TAB_CLOSE_REQUEST], 0, tab);
 }
 
 static GtkWidget *
-build_tab_label (GtranslatorNotebook * nb, GtranslatorTab * tab)
+build_tab_label (GtrNotebook * nb, GtrTab * tab)
 {
   GtkWidget *hbox, *label_hbox, *label_ebox;
   GtkWidget *label, *dummy_label;
@@ -180,10 +180,10 @@ build_tab_label (GtranslatorNotebook * nb, GtranslatorTab * tab)
 }
 
 static void
-gtranslator_notebook_init (GtranslatorNotebook * notebook)
+gtranslator_notebook_init (GtrNotebook * notebook)
 {
   notebook->priv = GTR_NOTEBOOK_GET_PRIVATE (notebook);
-  GtranslatorNotebookPrivate *priv = notebook->priv;
+  GtrNotebookPrivate *priv = notebook->priv;
 
   priv->pages = NULL;
 }
@@ -191,7 +191,7 @@ gtranslator_notebook_init (GtranslatorNotebook * notebook)
 static void
 gtranslator_notebook_finalize (GObject * object)
 {
-  GtranslatorNotebook *notebook = GTR_NOTEBOOK (object);
+  GtrNotebook *notebook = GTR_NOTEBOOK (object);
 
   if (notebook->priv->pages)
     g_list_free (notebook->priv->pages);
@@ -200,11 +200,11 @@ gtranslator_notebook_finalize (GObject * object)
 }
 
 static void
-gtranslator_notebook_class_init (GtranslatorNotebookClass * klass)
+gtranslator_notebook_class_init (GtrNotebookClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorNotebookPrivate));
+  g_type_class_add_private (klass, sizeof (GtrNotebookPrivate));
 
   object_class->finalize = gtranslator_notebook_finalize;
 
@@ -212,7 +212,7 @@ gtranslator_notebook_class_init (GtranslatorNotebookClass * klass)
     g_signal_new ("tab-close-request",
 		  G_OBJECT_CLASS_TYPE (object_class),
 		  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (GtranslatorNotebookClass,
+		  G_STRUCT_OFFSET (GtrNotebookClass,
 				   tab_close_request), NULL, NULL,
 		  g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1,
 		  GTR_TYPE_TAB);
@@ -223,9 +223,9 @@ gtranslator_notebook_class_init (GtranslatorNotebookClass * klass)
 /**
  * gtranslator_notebook_new:
  * 
- * Creates a new #GtranslatorNotebook.
+ * Creates a new #GtrNotebook.
  * 
- * Returns: a new #GtranslatorNotebook object
+ * Returns: a new #GtrNotebook object
  */
 GtkWidget *
 gtranslator_notebook_new ()
@@ -235,17 +235,17 @@ gtranslator_notebook_new ()
 
 /**
  * gtranslator_notebook_add_page:
- * @notebook: a #GtranslatorNotebook
- * @tab: a #GtranslatorTab
+ * @notebook: a #GtrNotebook
+ * @tab: a #GtrTab
  * 
- * Adds a new #GtranslatorTab to @notebook.
+ * Adds a new #GtrTab to @notebook.
  */
 void
-gtranslator_notebook_add_page (GtranslatorNotebook * notebook,
-			       GtranslatorTab * tab)
+gtranslator_notebook_add_page (GtrNotebook * notebook,
+			       GtrTab * tab)
 {
-  GtranslatorNotebookPrivate *priv = notebook->priv;
-  GtranslatorPo *po;
+  GtrNotebookPrivate *priv = notebook->priv;
+  GtrPo *po;
   GtkWidget *label;
 
   g_return_if_fail (GTR_IS_NOTEBOOK (notebook));
@@ -271,13 +271,13 @@ gtranslator_notebook_add_page (GtranslatorNotebook * notebook,
 
 /**
  * gtranslator_notebook_remove_page:
- * @notebook: a #GtranslatorNotebook
+ * @notebook: a #GtrNotebook
  * @page_num: the index of a notebook page, starting from 0.
  *
  * Removes a page from the notebook given its index in the notebook.
  */
 void
-gtranslator_notebook_remove_page (GtranslatorNotebook * notebook,
+gtranslator_notebook_remove_page (GtrNotebook * notebook,
 				  gint page_num)
 {
   GtkWidget *tab;
@@ -297,14 +297,14 @@ gtranslator_notebook_remove_page (GtranslatorNotebook * notebook,
 
 /**
  * gtranslator_notebook_get_page:
- * @notebook: a #GtranslatorNotebook
+ * @notebook: a #GtrNotebook
  * 
- * Gets the selected page in the #GtranslatorNotebook.
+ * Gets the selected page in the #GtrNotebook.
  * 
  * Returns: the selected page in the @notebook
  */
-GtranslatorTab *
-gtranslator_notebook_get_page (GtranslatorNotebook * notebook)
+GtrTab *
+gtranslator_notebook_get_page (GtrNotebook * notebook)
 {
   gint num;
 
diff --git a/src/gtr-notebook.h b/src/gtr-notebook.h
index 3719b54..182dc30 100644
--- a/src/gtr-notebook.h
+++ b/src/gtr-notebook.h
@@ -30,38 +30,38 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_NOTEBOOK		(gtranslator_notebook_get_type ())
-#define GTR_NOTEBOOK(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_NOTEBOOK, GtranslatorNotebook))
-#define GTR_NOTEBOOK_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_NOTEBOOK, GtranslatorNotebookClass))
+#define GTR_NOTEBOOK(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_NOTEBOOK, GtrNotebook))
+#define GTR_NOTEBOOK_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_NOTEBOOK, GtrNotebookClass))
 #define GTR_IS_NOTEBOOK(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_NOTEBOOK))
 #define GTR_IS_NOTEBOOK_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_NOTEBOOK))
-#define GTR_NOTEBOOK_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_NOTEBOOK, GtranslatorNotebookClass))
+#define GTR_NOTEBOOK_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_NOTEBOOK, GtrNotebookClass))
 /* Private structure type */
-typedef struct _GtranslatorNotebookPrivate GtranslatorNotebookPrivate;
+typedef struct _GtrNotebookPrivate GtrNotebookPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorNotebook GtranslatorNotebook;
+typedef struct _GtrNotebook GtrNotebook;
 
-struct _GtranslatorNotebook
+struct _GtrNotebook
 {
   GtkNotebook parent_instance;
 
   /*< private > */
-  GtranslatorNotebookPrivate *priv;
+  GtrNotebookPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorNotebookClass GtranslatorNotebookClass;
+typedef struct _GtrNotebookClass GtrNotebookClass;
 
-struct _GtranslatorNotebookClass
+struct _GtrNotebookClass
 {
   GtkNotebookClass parent_class;
 
   void (*tab_close_request)
-    (GtranslatorNotebook * notebook, GtranslatorTab * tab);
+    (GtrNotebook * notebook, GtrTab * tab);
 };
 
 /*
@@ -75,13 +75,13 @@ gtranslator_notebook_get_type (void)
 
      GtkWidget *gtranslator_notebook_new (void);
 
-     void gtranslator_notebook_add_page (GtranslatorNotebook * notebook,
-					 GtranslatorTab * pax);
+     void gtranslator_notebook_add_page (GtrNotebook * notebook,
+					 GtrTab * pax);
 
-     void gtranslator_notebook_remove_page (GtranslatorNotebook * notebook,
+     void gtranslator_notebook_remove_page (GtrNotebook * notebook,
 					    gint i);
 
-     GtranslatorTab *gtranslator_notebook_get_page (GtranslatorNotebook *
+     GtrTab *gtranslator_notebook_get_page (GtrNotebook *
 						    notebook);
 
 G_END_DECLS
diff --git a/src/gtr-po.c b/src/gtr-po.c
index 039d4b2..173f9a0 100644
--- a/src/gtr-po.c
+++ b/src/gtr-po.c
@@ -54,12 +54,12 @@
 #define GTR_PO_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 					 (object),	\
 					 GTR_TYPE_PO,     \
-					 GtranslatorPoPrivate))
+					 GtrPoPrivate))
 
 
-G_DEFINE_TYPE (GtranslatorPo, gtranslator_po, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GtrPo, gtranslator_po, G_TYPE_OBJECT)
 
-struct _GtranslatorPoPrivate
+struct _GtrPoPrivate
 {
   GFile *location;
 
@@ -94,9 +94,9 @@ struct _GtranslatorPoPrivate
   guint autosave_timeout;
 
   /* Header object */
-  GtranslatorHeader *header;
+  GtrHeader *header;
 
-  GtranslatorPoState state;
+  GtrPoState state;
 
   /* Marks if the file was changed;  */
   guint file_changed : 1;
@@ -116,7 +116,7 @@ gtranslator_po_get_property (GObject * object,
 			     GValue * value,
 			     GParamSpec * pspec)
 {
-  GtranslatorPo *po = GTR_PO (object);
+  GtrPo *po = GTR_PO (object);
 
   switch (prop_id)
     {
@@ -134,7 +134,7 @@ gtranslator_po_get_property (GObject * object,
  *  po-file.
  */
 static void
-determine_translation_status (GtranslatorMsg * msg, GtranslatorPo * po)
+determine_translation_status (GtrMsg * msg, GtrPo * po)
 {
   if (gtranslator_msg_is_fuzzy (msg))
     po->priv->fuzzy++;
@@ -146,7 +146,7 @@ determine_translation_status (GtranslatorMsg * msg, GtranslatorPo * po)
  * Update the count of the completed translated entries.
  */
 static void
-gtranslator_po_update_translated_count (GtranslatorPo * po)
+gtranslator_po_update_translated_count (GtrPo * po)
 {
   po->priv->translated = 0;
   po->priv->fuzzy = 0;
@@ -155,7 +155,7 @@ gtranslator_po_update_translated_count (GtranslatorPo * po)
 }
 
 static void
-gtranslator_po_init (GtranslatorPo * po)
+gtranslator_po_init (GtrPo * po)
 {
   po->priv = GTR_PO_GET_PRIVATE (po);
 
@@ -166,7 +166,7 @@ gtranslator_po_init (GtranslatorPo * po)
 static void
 gtranslator_po_finalize (GObject * object)
 {
-  GtranslatorPo *po = GTR_PO (object);
+  GtrPo *po = GTR_PO (object);
 
   if (po->priv->messages)
     {
@@ -190,7 +190,7 @@ gtranslator_po_finalize (GObject * object)
 static void
 gtranslator_po_dispose (GObject * object)
 {
-  GtranslatorPo *po = GTR_PO (object);
+  GtrPo *po = GTR_PO (object);
 
   if (po->priv->location != NULL)
     {
@@ -202,11 +202,11 @@ gtranslator_po_dispose (GObject * object)
 }
 
 static void
-gtranslator_po_class_init (GtranslatorPoClass * klass)
+gtranslator_po_class_init (GtrPoClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorPoPrivate));
+  g_type_class_add_private (klass, sizeof (GtrPoPrivate));
 
   object_class->finalize = gtranslator_po_finalize;
   object_class->dispose = gtranslator_po_dispose;
@@ -323,14 +323,14 @@ is_read_only (const gchar *filename)
 /**
  * gtranslator_po_new:
  *
- * Creates a new #GtranslatorPo.
+ * Creates a new #GtrPo.
  *
- * Returns: a new #GtranslatorPo object
+ * Returns: a new #GtrPo object
  **/
-GtranslatorPo *
+GtrPo *
 gtranslator_po_new (void)
 {
-  GtranslatorPo *po;
+  GtrPo *po;
 
   po = g_object_new (GTR_TYPE_PO, NULL);
 
@@ -339,19 +339,19 @@ gtranslator_po_new (void)
 
 /**
  * gtranslator_po_parse:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  * @location: the file to open
  * @error: a variable to store the errors
  *
- * Parses all things related to the #GtranslatorPo and initilizes all neccessary
+ * Parses all things related to the #GtrPo and initilizes all neccessary
  * variables.
  **/
 void
-gtranslator_po_parse (GtranslatorPo * po, GFile * location, GError ** error)
+gtranslator_po_parse (GtrPo * po, GFile * location, GError ** error)
 {
-  GtranslatorPoPrivate *priv = po->priv;
+  GtrPoPrivate *priv = po->priv;
   gchar *filename;
-  GtranslatorMsg *msg;
+  GtrMsg *msg;
   struct po_xerror_handler handler;
   po_message_t message;
   po_message_iterator_t iter;
@@ -502,19 +502,19 @@ gtranslator_po_parse (GtranslatorPo * po, GFile * location, GError ** error)
 
 /**
  * gtranslator_po_save_file:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  * @error: a GError to manage the exceptions
  *
  * It saves the po file and if there are any problem it stores the error
  * in @error.
  **/
 void
-gtranslator_po_save_file (GtranslatorPo * po, GError ** error)
+gtranslator_po_save_file (GtrPo * po, GError ** error)
 {
   struct po_xerror_handler handler;
   gchar *msg_error;
   gchar *filename;
-  GtranslatorHeader *header;
+  GtrHeader *header;
 
   /*
    * Initialice the handler error.
@@ -603,7 +603,7 @@ gtranslator_po_save_file (GtranslatorPo * po, GError ** error)
 
 /**
  * gtranslator_po_get_filename:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  *
  * Gets the GFile of the po file.
  *
@@ -611,7 +611,7 @@ gtranslator_po_save_file (GtranslatorPo * po, GError ** error)
  * with g_object_unref.
  **/
 GFile *
-gtranslator_po_get_location (GtranslatorPo * po)
+gtranslator_po_get_location (GtrPo * po)
 {
   g_return_val_if_fail (GTR_IS_PO (po), NULL);
 
@@ -620,13 +620,13 @@ gtranslator_po_get_location (GtranslatorPo * po)
 
 /**
  * gtranslator_po_set_location:
- * @po: a #GtranslatorPo
- * @location: The GFile to set to the #GtranslatorPo
+ * @po: a #GtrPo
+ * @location: The GFile to set to the #GtrPo
  *
- * Sets the GFile location within the #GtranslatorPo object.
+ * Sets the GFile location within the #GtrPo object.
  **/
 void
-gtranslator_po_set_location (GtranslatorPo * po, GFile * location)
+gtranslator_po_set_location (GtrPo * po, GFile * location)
 {
   g_return_if_fail (GTR_IS_PO (po));
 
@@ -638,25 +638,25 @@ gtranslator_po_set_location (GtranslatorPo * po, GFile * location)
 
 /**
  * gtranslator_po_get_state:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  *
- * Return value: the #GtranslatorPoState value of the @po.
+ * Return value: the #GtrPoState value of the @po.
  */
-GtranslatorPoState
-gtranslator_po_get_state (GtranslatorPo * po)
+GtrPoState
+gtranslator_po_get_state (GtrPo * po)
 {
   return po->priv->state;
 }
 
 /**
  * gtranslator_po_set_state:
- * @po: a #GtranslatorPo
- * @state: a #GtranslatorPoState
+ * @po: a #GtrPo
+ * @state: a #GtrPoState
  *
- * Sets the state for a #GtranslatorPo
+ * Sets the state for a #GtrPo
  */
 void
-gtranslator_po_set_state (GtranslatorPo * po, GtranslatorPoState state)
+gtranslator_po_set_state (GtrPo * po, GtrPoState state)
 {
   po->priv->state = state;
 
@@ -667,44 +667,44 @@ gtranslator_po_set_state (GtranslatorPo * po, GtranslatorPoState state)
  * FIXME: We are not using this func.
  */
 gboolean
-gtranslator_po_get_write_perms (GtranslatorPo * po)
+gtranslator_po_get_write_perms (GtrPo * po)
 {
   return po->priv->no_write_perms;
 }
 
 /**
  * gtranslator_po_get_messages:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  *
  * Return value: a pointer to the messages list
  **/
 GList *
-gtranslator_po_get_messages (GtranslatorPo * po)
+gtranslator_po_get_messages (GtrPo * po)
 {
   return po->priv->messages;
 }
 
 /**
  * gtranslator_po_set_messages:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  * @messages: a pointer to a new messages list.
  *
  * Sets an updated list of messages.
  **/
 void
-gtranslator_po_set_messages (GtranslatorPo * po, GList * messages)
+gtranslator_po_set_messages (GtrPo * po, GList * messages)
 {
   po->priv->messages = messages;
 }
 
 /**
  * gtranslator_po_get_current_message:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  *
  * Return value: a pointer to the current message
  **/
 GList *
-gtranslator_po_get_current_message (GtranslatorPo * po)
+gtranslator_po_get_current_message (GtrPo * po)
 {
   return po->priv->current;
 }
@@ -712,15 +712,15 @@ gtranslator_po_get_current_message (GtranslatorPo * po)
 
 /**
  * gtranslator_po_update_current_message:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  * @msg: the message where should point the current message.
  *
  * Sets the new current message to the message that is passed in
  * the argument.
  **/
 void
-gtranslator_po_update_current_message (GtranslatorPo * po,
-				       GtranslatorMsg * msg)
+gtranslator_po_update_current_message (GtrPo * po,
+				       GtrMsg * msg)
 {
   gint i;
   i = g_list_index (po->priv->messages, msg);
@@ -729,36 +729,36 @@ gtranslator_po_update_current_message (GtranslatorPo * po,
 
 /**
  * gtranslator_po_get_domains:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  *
  * Return value: a pointer to the domains list
  **/
 GList *
-gtranslator_po_get_domains (GtranslatorPo * po)
+gtranslator_po_get_domains (GtrPo * po)
 {
   return po->priv->domains;
 }
 
 /**
  * gtranslator_po_get_po_file:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  *
  * Return value: the gettext file
  **/
 po_file_t
-gtranslator_po_get_po_file (GtranslatorPo * po)
+gtranslator_po_get_po_file (GtrPo * po)
 {
   return po->priv->gettext_po_file;
 }
 
 /**
  * gtranslator_po_get_next_fuzzy:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  *
  * Return value: a pointer to the next fuzzy message
  **/
 GList *
-gtranslator_po_get_next_fuzzy (GtranslatorPo * po)
+gtranslator_po_get_next_fuzzy (GtrPo * po)
 {
   GList *msg;
 
@@ -775,12 +775,12 @@ gtranslator_po_get_next_fuzzy (GtranslatorPo * po)
 
 /**
  * gtranslator_po_get_prev_fuzzy:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  *
  * Return value: a pointer to the previously fuzzy message
  **/
 GList *
-gtranslator_po_get_prev_fuzzy (GtranslatorPo * po)
+gtranslator_po_get_prev_fuzzy (GtrPo * po)
 {
   GList *msg;
 
@@ -797,12 +797,12 @@ gtranslator_po_get_prev_fuzzy (GtranslatorPo * po)
 
 /**
  * gtranslator_po_get_next_untrans:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  *
  * Return value: a pointer to the next untranslated message
  **/
 GList *
-gtranslator_po_get_next_untrans (GtranslatorPo * po)
+gtranslator_po_get_next_untrans (GtrPo * po)
 {
   GList *msg;
 
@@ -819,13 +819,13 @@ gtranslator_po_get_next_untrans (GtranslatorPo * po)
 
 /**
  * gtranslator_po_get_prev_untrans:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  *
  * Return value: a pointer to the previously untranslated message
  * or NULL if there are not previously untranslated message.
  **/
 GList *
-gtranslator_po_get_prev_untrans (GtranslatorPo * po)
+gtranslator_po_get_prev_untrans (GtrPo * po)
 {
   GList *msg;
 
@@ -841,13 +841,13 @@ gtranslator_po_get_prev_untrans (GtranslatorPo * po)
 
 /**
  * gtranslator_po_get_next_fuzzy_or_untrans:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  *
  * Return value: a pointer to the next fuzzy or untranslated message
  * or NULL if there is not next fuzzy or untranslated message.
  **/
 GList *
-gtranslator_po_get_next_fuzzy_or_untrans (GtranslatorPo * po)
+gtranslator_po_get_next_fuzzy_or_untrans (GtrPo * po)
 {
   GList *msg;
 
@@ -864,13 +864,13 @@ gtranslator_po_get_next_fuzzy_or_untrans (GtranslatorPo * po)
 
 /**
  * gtranslator_po_get_prev_fuzzy_or_untrans:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  *
  * Return value: a pointer to the previously fuzzy or untranslated message
  * or NULL if there is not previously fuzzy or untranslated message.
  **/
 GList *
-gtranslator_po_get_prev_fuzzy_or_untrans (GtranslatorPo * po)
+gtranslator_po_get_prev_fuzzy_or_untrans (GtrPo * po)
 {
   GList *msg;
 
@@ -887,13 +887,13 @@ gtranslator_po_get_prev_fuzzy_or_untrans (GtranslatorPo * po)
 
 /**
  * gtranslator_po_get_msg_from_number:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  * @number: the message to jump
  *
  * Gets the message at the given position.
  */
 GList *
-gtranslator_po_get_msg_from_number (GtranslatorPo * po, gint number)
+gtranslator_po_get_msg_from_number (GtrPo * po, gint number)
 {
   g_return_val_if_fail (GTR_IS_PO (po), NULL);
 
@@ -902,12 +902,12 @@ gtranslator_po_get_msg_from_number (GtranslatorPo * po, gint number)
 
 /**
  * gtranslator_po_get_header:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  *
- * Return value: The #GtranslatorHeader of the @po.
+ * Return value: The #GtrHeader of the @po.
  **/
-GtranslatorHeader *
-gtranslator_po_get_header (GtranslatorPo * po)
+GtrHeader *
+gtranslator_po_get_header (GtrPo * po)
 {
   g_return_val_if_fail (GTR_IS_PO (po), NULL);
 
@@ -915,19 +915,19 @@ gtranslator_po_get_header (GtranslatorPo * po)
 }
 
 void
-gtranslator_po_set_header (GtranslatorPo * po, GtranslatorHeader * header)
+gtranslator_po_set_header (GtrPo * po, GtrHeader * header)
 {
   po->priv->header = header;
 }
 
 /**
  * gtranslator_po_get_translated_count:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  *
  * Return value: the count of the translated messages.
  **/
 gint
-gtranslator_po_get_translated_count (GtranslatorPo * po)
+gtranslator_po_get_translated_count (GtrPo * po)
 {
   g_return_val_if_fail (GTR_IS_PO (po), -1);
 
@@ -940,7 +940,7 @@ gtranslator_po_get_translated_count (GtranslatorPo * po)
  * This funcs must not be exported.
  */
 void
-_gtranslator_po_increase_decrease_translated (GtranslatorPo * po,
+_gtranslator_po_increase_decrease_translated (GtrPo * po,
 					      gboolean increase)
 {
   g_return_if_fail (GTR_IS_PO (po));
@@ -953,12 +953,12 @@ _gtranslator_po_increase_decrease_translated (GtranslatorPo * po,
 
 /**
  * gtranslator_po_get_fuzzy_count:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  *
  * Return value: the count of the fuzzy messages.
  **/
 gint
-gtranslator_po_get_fuzzy_count (GtranslatorPo * po)
+gtranslator_po_get_fuzzy_count (GtrPo * po)
 {
   g_return_val_if_fail (GTR_IS_PO (po), -1);
 
@@ -971,7 +971,7 @@ gtranslator_po_get_fuzzy_count (GtranslatorPo * po)
  * This funcs must not be exported.
  */
 void
-_gtranslator_po_increase_decrease_fuzzy (GtranslatorPo * po,
+_gtranslator_po_increase_decrease_fuzzy (GtrPo * po,
 					 gboolean increase)
 {
   g_return_if_fail (GTR_IS_PO (po));
@@ -984,12 +984,12 @@ _gtranslator_po_increase_decrease_fuzzy (GtranslatorPo * po,
 
 /**
  * gtranslator_po_get_untranslated_count:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  *
  * Return value: the count of the untranslated messages.
  **/
 gint
-gtranslator_po_get_untranslated_count (GtranslatorPo * po)
+gtranslator_po_get_untranslated_count (GtrPo * po)
 {
   g_return_val_if_fail (GTR_IS_PO (po), -1);
 
@@ -1002,12 +1002,12 @@ gtranslator_po_get_untranslated_count (GtranslatorPo * po)
 
 /**
  * gtranslator_po_get_messages_count:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  *
  * Return value: the number of messages messages.
  **/
 gint
-gtranslator_po_get_messages_count (GtranslatorPo * po)
+gtranslator_po_get_messages_count (GtrPo * po)
 {
   g_return_val_if_fail (GTR_IS_PO (po), -1);
 
@@ -1016,12 +1016,12 @@ gtranslator_po_get_messages_count (GtranslatorPo * po)
 
 /**
  * gtranslator_po_get_message_position:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  *
  * Return value: the number of the current message.
  **/
 gint
-gtranslator_po_get_message_position (GtranslatorPo * po)
+gtranslator_po_get_message_position (GtrPo * po)
 {
   g_return_val_if_fail (GTR_IS_PO (po), -1);
 
@@ -1030,14 +1030,14 @@ gtranslator_po_get_message_position (GtranslatorPo * po)
 
 /**
  * gtranslator_po_check_po_file:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  *
  * Test whether an entire PO file is valid, like msgfmt does it.
  * Returns: If it is invalid, returns the error. The return value must be freed
  * with g_free.
  **/
 gchar *
-gtranslator_po_check_po_file (GtranslatorPo * po)
+gtranslator_po_check_po_file (GtrPo * po)
 {
   struct po_xerror_handler handler;
 
diff --git a/src/gtr-po.h b/src/gtr-po.h
index 120f200..a7b6563 100644
--- a/src/gtr-po.h
+++ b/src/gtr-po.h
@@ -37,33 +37,33 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_PO		(gtranslator_po_get_type ())
-#define GTR_PO(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_PO, GtranslatorPo))
-#define GTR_PO_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_PO, GtranslatorPoClass))
+#define GTR_PO(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_PO, GtrPo))
+#define GTR_PO_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_PO, GtrPoClass))
 #define GTR_IS_PO(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_PO))
 #define GTR_IS_PO_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_PO))
-#define GTR_PO_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_PO, GtranslatorPoClass))
+#define GTR_PO_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_PO, GtrPoClass))
 /* Private structure type */
-typedef struct _GtranslatorPoPrivate GtranslatorPoPrivate;
+typedef struct _GtrPoPrivate GtrPoPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorPo GtranslatorPo;
+typedef struct _GtrPo GtrPo;
 
-struct _GtranslatorPo
+struct _GtrPo
 {
   GObject parent_instance;
 
   /*< private > */
-  GtranslatorPoPrivate *priv;
+  GtrPoPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorPoClass GtranslatorPoClass;
+typedef struct _GtrPoClass GtrPoClass;
 
-struct _GtranslatorPoClass
+struct _GtrPoClass
 {
   GObjectClass parent_class;
 };
@@ -84,7 +84,7 @@ typedef enum
 {
   GTR_PO_STATE_SAVED,
   GTR_PO_STATE_MODIFIED
-} GtranslatorPoState;
+} GtrPoState;
 
 /*
  * Public methods
@@ -97,75 +97,75 @@ gtranslator_po_get_type (void)
 
      GType gtranslator_po_register_type (GTypeModule * module);
 
-     GtranslatorPo *gtranslator_po_new (void);
+     GtrPo *gtranslator_po_new (void);
 
-     void gtranslator_po_parse (GtranslatorPo * po,
+     void gtranslator_po_parse (GtrPo * po,
 				GFile * filename, GError ** error);
 
-     void gtranslator_po_save_header_in_msg (GtranslatorPo * po,
-					     GtranslatorHeader * header);
+     void gtranslator_po_save_header_in_msg (GtrPo * po,
+					     GtrHeader * header);
 
-     void gtranslator_po_save_file (GtranslatorPo * po, GError ** error);
+     void gtranslator_po_save_file (GtrPo * po, GError ** error);
 
-     GtranslatorPoState gtranslator_po_get_state (GtranslatorPo * po);
+     GtrPoState gtranslator_po_get_state (GtrPo * po);
 
-     void gtranslator_po_set_state (GtranslatorPo * po,
-				    GtranslatorPoState state);
+     void gtranslator_po_set_state (GtrPo * po,
+				    GtrPoState state);
 
-     GFile *gtranslator_po_get_location (GtranslatorPo * po);
+     GFile *gtranslator_po_get_location (GtrPo * po);
 
-     void gtranslator_po_set_location (GtranslatorPo * po, GFile * location);
+     void gtranslator_po_set_location (GtrPo * po, GFile * location);
 
-     gboolean gtranslator_po_get_write_perms (GtranslatorPo * po);
+     gboolean gtranslator_po_get_write_perms (GtrPo * po);
 
-     GList *gtranslator_po_get_messages (GtranslatorPo * po);
+     GList *gtranslator_po_get_messages (GtrPo * po);
 
-     void gtranslator_po_set_messages (GtranslatorPo * po, GList * messages);
+     void gtranslator_po_set_messages (GtrPo * po, GList * messages);
 
-     GList *gtranslator_po_get_current_message (GtranslatorPo * po);
+     GList *gtranslator_po_get_current_message (GtrPo * po);
 
-     GList *gtranslator_po_get_domains (GtranslatorPo * po);
+     GList *gtranslator_po_get_domains (GtrPo * po);
 
-     po_file_t gtranslator_po_get_po_file (GtranslatorPo * po);
+     po_file_t gtranslator_po_get_po_file (GtrPo * po);
 
-     GList *gtranslator_po_get_next_fuzzy (GtranslatorPo * po);
+     GList *gtranslator_po_get_next_fuzzy (GtrPo * po);
 
-     GList *gtranslator_po_get_prev_fuzzy (GtranslatorPo * po);
+     GList *gtranslator_po_get_prev_fuzzy (GtrPo * po);
 
-     GList *gtranslator_po_get_next_untrans (GtranslatorPo * po);
+     GList *gtranslator_po_get_next_untrans (GtrPo * po);
 
-     GList *gtranslator_po_get_prev_untrans (GtranslatorPo * po);
+     GList *gtranslator_po_get_prev_untrans (GtrPo * po);
 
-     GList *gtranslator_po_get_next_fuzzy_or_untrans (GtranslatorPo * po);
+     GList *gtranslator_po_get_next_fuzzy_or_untrans (GtrPo * po);
 
-     GList *gtranslator_po_get_prev_fuzzy_or_untrans (GtranslatorPo * po);
+     GList *gtranslator_po_get_prev_fuzzy_or_untrans (GtrPo * po);
 
-     GList *gtranslator_po_get_msg_from_number (GtranslatorPo * po,
+     GList *gtranslator_po_get_msg_from_number (GtrPo * po,
 						gint number);
 
-GtranslatorHeader * gtranslator_po_get_header (GtranslatorPo * po);
+GtrHeader * gtranslator_po_get_header (GtrPo * po);
 
      void
-     gtranslator_po_set_header (GtranslatorPo * po,
-				GtranslatorHeader * header);
+     gtranslator_po_set_header (GtrPo * po,
+				GtrHeader * header);
 
      gint
-     gtranslator_po_get_translated_count (GtranslatorPo * po);
+     gtranslator_po_get_translated_count (GtrPo * po);
 
      gint
-     gtranslator_po_get_fuzzy_count (GtranslatorPo * po);
+     gtranslator_po_get_fuzzy_count (GtrPo * po);
 
      gint
-     gtranslator_po_get_untranslated_count (GtranslatorPo * po);
+     gtranslator_po_get_untranslated_count (GtrPo * po);
 
      gint
-     gtranslator_po_get_messages_count (GtranslatorPo * po);
+     gtranslator_po_get_messages_count (GtrPo * po);
 
      gint
-     gtranslator_po_get_message_position (GtranslatorPo * po);
+     gtranslator_po_get_message_position (GtrPo * po);
 
      gchar *
-     gtranslator_po_check_po_file (GtranslatorPo * po);
+     gtranslator_po_check_po_file (GtrPo * po);
 
      extern char * 
      gtranslator_po_header_set_field (const char *header, const char *field, const char *value);
@@ -174,10 +174,10 @@ GtranslatorHeader * gtranslator_po_get_header (GtranslatorPo * po);
 /* Unexported funcs */
      void
      _gtranslator_po_increase_decrease_translated
-       (GtranslatorPo * po, gboolean increase);
+       (GtrPo * po, gboolean increase);
 
      void
-     _gtranslator_po_increase_decrease_fuzzy (GtranslatorPo * po,
+     _gtranslator_po_increase_decrease_fuzzy (GtrPo * po,
 					      gboolean increase);
 
 G_END_DECLS
diff --git a/src/gtr-prefs-manager-app.c b/src/gtr-prefs-manager-app.c
index 65ead30..2729a52 100644
--- a/src/gtr-prefs-manager-app.c
+++ b/src/gtr-prefs-manager-app.c
@@ -493,7 +493,7 @@ gtranslator_prefs_manager_editor_font_changed (GConfClient * client,
 
   while (l != NULL)
     {
-      /* Note: we use def=FALSE to avoid GtranslatorView to query gconf */
+      /* Note: we use def=FALSE to avoid GtrView to query gconf */
       gtranslator_view_set_font (GTR_VIEW (l->data), FALSE, font);
       l = l->next;
     }
@@ -603,7 +603,7 @@ gtranslator_prefs_manager_gdl_style_changed (GConfClient * client,
 					     GConfEntry * entry,
 					     gpointer user_data)
 {
-  GtranslatorWindow *window;
+  GtrWindow *window;
   GdlSwitcherStyle style;
   GdlDockLayout *layout_manager;
 
@@ -626,7 +626,7 @@ gtranslator_prefs_manager_autosave_changed (GConfClient * client,
 {
   GList *tabs;
   GList *l;
-  GtranslatorWindow *window;
+  GtrWindow *window;
 
   g_return_if_fail (entry->key != NULL);
   g_return_if_fail (entry->value != NULL);
@@ -643,7 +643,7 @@ gtranslator_prefs_manager_autosave_changed (GConfClient * client,
 
       for (l = tabs; l != NULL; l = g_list_next (l))
 	{
-	  GtranslatorTab *tab = GTR_TAB (l->data);
+	  GtrTab *tab = GTR_TAB (l->data);
 
 	  gtranslator_tab_set_autosave_enabled (tab, autosave);
 	}
@@ -663,7 +663,7 @@ gtranslator_prefs_manager_autosave_changed (GConfClient * client,
 
       for (l = tabs; l != NULL; l = g_list_next (l))
 	{
-	  GtranslatorTab *tab = GTR_TAB (l->data);
+	  GtrTab *tab = GTR_TAB (l->data);
 
 	  gtranslator_tab_set_autosave_interval (tab, autosave_interval);
 	}
diff --git a/src/gtr-prefs-manager-private.h b/src/gtr-prefs-manager-private.h
index e4f53b9..5a5fcc4 100644
--- a/src/gtr-prefs-manager-private.h
+++ b/src/gtr-prefs-manager-private.h
@@ -28,13 +28,13 @@
 
 #include <gconf/gconf-client.h>
 
-typedef struct _GtranslatorPrefsManager GtranslatorPrefsManager;
+typedef struct _GtrPrefsManager GtrPrefsManager;
 
-struct _GtranslatorPrefsManager
+struct _GtrPrefsManager
 {
   GConfClient *gconf_client;
 };
 
-extern GtranslatorPrefsManager *gtranslator_prefs_manager;
+extern GtrPrefsManager *gtranslator_prefs_manager;
 
 #endif /* __GTR_PREFS_MANAGER_PRIVATE_H__ */
diff --git a/src/gtr-prefs-manager.c b/src/gtr-prefs-manager.c
index 1623d5b..7ac5071 100644
--- a/src/gtr-prefs-manager.c
+++ b/src/gtr-prefs-manager.c
@@ -90,7 +90,7 @@ gtranslator_prefs_manager_set_ ## name (const gchar* v)			\
 }
 
 
-GtranslatorPrefsManager *gtranslator_prefs_manager = NULL;
+GtrPrefsManager *gtranslator_prefs_manager = NULL;
 
 static gboolean gtranslator_prefs_manager_get_bool (const gchar * key);
 
@@ -112,7 +112,7 @@ gtranslator_prefs_manager_init (void)
       if (gconf_client == NULL)
 	g_error ("Failed to initialize preferences manager");
 
-      gtranslator_prefs_manager = g_new0 (GtranslatorPrefsManager, 1);
+      gtranslator_prefs_manager = g_new0 (GtrPrefsManager, 1);
 
       gtranslator_prefs_manager->gconf_client = gconf_client;
     }
@@ -295,10 +295,10 @@ gtranslator_prefs_manager_set_pane_switcher_style (GdlSwitcherStyle
 DEFINE_STRING_PREF (color_scheme, GPM_COLOR_SCHEME)
 /* sort_order requires custom functions to deal with conversion from a string to
    an enum */
-  GtranslatorSortOrder
+  GtrSortOrder
 gtranslator_prefs_manager_get_sort_order (void)
 {
-  GtranslatorSortOrder sort_order;
+  GtrSortOrder sort_order;
   const gchar *v;
 
   v = gtranslator_prefs_manager_get_string (GPM_SORT_ORDER);
@@ -317,7 +317,7 @@ gtranslator_prefs_manager_get_sort_order (void)
 }
 
 void
-gtranslator_prefs_manager_set_sort_order (GtranslatorSortOrder sort_order)
+gtranslator_prefs_manager_set_sort_order (GtrSortOrder sort_order)
 {
   const gchar *v;
 
diff --git a/src/gtr-prefs-manager.h b/src/gtr-prefs-manager.h
index 237a33b..31c8427 100644
--- a/src/gtr-prefs-manager.h
+++ b/src/gtr-prefs-manager.h
@@ -46,7 +46,7 @@ typedef enum
   GTR_SORT_ORDER_ID,
   GTR_SORT_ORDER_ORIGINAL_TEXT,
   GTR_SORT_ORDER_TRANSLATED_TEXT
-} GtranslatorSortOrder;
+} GtrSortOrder;
 
 #define GTR_BASE_KEY			"/apps/gtranslator"
 #define GPM_PREFS_DIR			GTR_BASE_KEY "/preferences"
@@ -166,8 +166,8 @@ GdlSwitcherStyle gtranslator_prefs_manager_get_pane_switcher_style (void);
 void gtranslator_prefs_manager_set_color_scheme (const gchar * color_scheme);
 const gchar *gtranslator_prefs_manager_get_color_scheme (void);
 
-void gtranslator_prefs_manager_set_sort_order (GtranslatorSortOrder
+void gtranslator_prefs_manager_set_sort_order (GtrSortOrder
 					       sort_order);
-GtranslatorSortOrder gtranslator_prefs_manager_get_sort_order (void);
+GtrSortOrder gtranslator_prefs_manager_get_sort_order (void);
 
 #endif /* __GTR_PREFS_MANAGER_H__ */
diff --git a/src/gtr-profile.c b/src/gtr-profile.c
index a93454f..30b56ef 100644
--- a/src/gtr-profile.c
+++ b/src/gtr-profile.c
@@ -44,10 +44,10 @@
 #define GTR_PROFILE_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 					 	(object),	\
 					 	GTR_TYPE_PROFILE,     \
-					 	GtranslatorProfilePrivate))
+					 	GtrProfilePrivate))
 
-G_DEFINE_TYPE (GtranslatorProfile, gtranslator_profile, G_TYPE_OBJECT)
-     struct _GtranslatorProfilePrivate
+G_DEFINE_TYPE (GtrProfile, gtranslator_profile, G_TYPE_OBJECT)
+     struct _GtrProfilePrivate
      {
        /* 
         * Identify the profile
@@ -91,7 +91,7 @@ G_DEFINE_TYPE (GtranslatorProfile, gtranslator_profile, G_TYPE_OBJECT)
        gchar *plurals;
      };
 
-     static void gtranslator_profile_init (GtranslatorProfile * profile)
+     static void gtranslator_profile_init (GtrProfile * profile)
 {
   profile->priv = GTR_PROFILE_GET_PRIVATE (profile);
 }
@@ -99,7 +99,7 @@ G_DEFINE_TYPE (GtranslatorProfile, gtranslator_profile, G_TYPE_OBJECT)
 static void
 gtranslator_profile_finalize (GObject * object)
 {
-  GtranslatorProfile *profile = GTR_PROFILE (object);
+  GtrProfile *profile = GTR_PROFILE (object);
 
   g_free (profile->priv->name);
   g_free (profile->priv->author_name);
@@ -115,11 +115,11 @@ gtranslator_profile_finalize (GObject * object)
 }
 
 static void
-gtranslator_profile_class_init (GtranslatorProfileClass * klass)
+gtranslator_profile_class_init (GtrProfileClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorProfilePrivate));
+  g_type_class_add_private (klass, sizeof (GtrProfilePrivate));
 
   object_class->finalize = gtranslator_profile_finalize;
 }
@@ -128,10 +128,10 @@ gtranslator_profile_class_init (GtranslatorProfileClass * klass)
  * Public methods
  */
 
-GtranslatorProfile *
+GtrProfile *
 gtranslator_profile_new (void)
 {
-  GtranslatorProfile *profile;
+  GtrProfile *profile;
 
   profile = g_object_new (GTR_TYPE_PROFILE, NULL);
 
@@ -139,13 +139,13 @@ gtranslator_profile_new (void)
 }
 
 const gchar *
-gtranslator_profile_get_name (GtranslatorProfile * profile)
+gtranslator_profile_get_name (GtrProfile * profile)
 {
   return profile->priv->name;
 }
 
 void
-gtranslator_profile_set_name (GtranslatorProfile * profile,
+gtranslator_profile_set_name (GtrProfile * profile,
 			      const gchar * data)
 {
   if (profile->priv->name)
@@ -154,13 +154,13 @@ gtranslator_profile_set_name (GtranslatorProfile * profile,
 }
 
 const gchar *
-gtranslator_profile_get_author_name (GtranslatorProfile * profile)
+gtranslator_profile_get_author_name (GtrProfile * profile)
 {
   return profile->priv->author_name;
 }
 
 void
-gtranslator_profile_set_author_name (GtranslatorProfile * profile,
+gtranslator_profile_set_author_name (GtrProfile * profile,
 				     const gchar * data)
 {
   if (profile->priv->author_name)
@@ -169,13 +169,13 @@ gtranslator_profile_set_author_name (GtranslatorProfile * profile,
 }
 
 const gchar *
-gtranslator_profile_get_author_email (GtranslatorProfile * profile)
+gtranslator_profile_get_author_email (GtrProfile * profile)
 {
   return profile->priv->author_email;
 }
 
 void
-gtranslator_profile_set_author_email (GtranslatorProfile * profile,
+gtranslator_profile_set_author_email (GtrProfile * profile,
 				      const gchar * data)
 {
   if (profile->priv->author_email)
@@ -184,13 +184,13 @@ gtranslator_profile_set_author_email (GtranslatorProfile * profile,
 }
 
 const gchar *
-gtranslator_profile_get_language_name (GtranslatorProfile * profile)
+gtranslator_profile_get_language_name (GtrProfile * profile)
 {
   return profile->priv->language_name;
 }
 
 void
-gtranslator_profile_set_language_name (GtranslatorProfile * profile,
+gtranslator_profile_set_language_name (GtrProfile * profile,
 				       const gchar * data)
 {
   if (profile->priv->language_name)
@@ -199,13 +199,13 @@ gtranslator_profile_set_language_name (GtranslatorProfile * profile,
 }
 
 const gchar *
-gtranslator_profile_get_language_code (GtranslatorProfile * profile)
+gtranslator_profile_get_language_code (GtrProfile * profile)
 {
   return profile->priv->language_code;
 }
 
 void
-gtranslator_profile_set_language_code (GtranslatorProfile * profile,
+gtranslator_profile_set_language_code (GtrProfile * profile,
 				       const gchar * data)
 {
   if (profile->priv->language_code)
@@ -214,13 +214,13 @@ gtranslator_profile_set_language_code (GtranslatorProfile * profile,
 }
 
 const gchar *
-gtranslator_profile_get_charset (GtranslatorProfile * profile)
+gtranslator_profile_get_charset (GtrProfile * profile)
 {
   return profile->priv->charset;
 }
 
 void
-gtranslator_profile_set_charset (GtranslatorProfile * profile,
+gtranslator_profile_set_charset (GtrProfile * profile,
 				 const gchar * data)
 {
   if (profile->priv->charset)
@@ -229,13 +229,13 @@ gtranslator_profile_set_charset (GtranslatorProfile * profile,
 }
 
 const gchar *
-gtranslator_profile_get_encoding (GtranslatorProfile * profile)
+gtranslator_profile_get_encoding (GtrProfile * profile)
 {
   return profile->priv->encoding;
 }
 
 void
-gtranslator_profile_set_encoding (GtranslatorProfile * profile,
+gtranslator_profile_set_encoding (GtrProfile * profile,
 				  const gchar * data)
 {
   if (profile->priv->encoding)
@@ -244,13 +244,13 @@ gtranslator_profile_set_encoding (GtranslatorProfile * profile,
 }
 
 const gchar *
-gtranslator_profile_get_group_email (GtranslatorProfile * profile)
+gtranslator_profile_get_group_email (GtrProfile * profile)
 {
   return profile->priv->group_email;
 }
 
 void
-gtranslator_profile_set_group_email (GtranslatorProfile * profile,
+gtranslator_profile_set_group_email (GtrProfile * profile,
 				     const gchar * data)
 {
   if (profile->priv->group_email)
@@ -259,13 +259,13 @@ gtranslator_profile_set_group_email (GtranslatorProfile * profile,
 }
 
 const gchar *
-gtranslator_profile_get_plurals (GtranslatorProfile * profile)
+gtranslator_profile_get_plurals (GtrProfile * profile)
 {
   return profile->priv->plurals;
 }
 
 void
-gtranslator_profile_set_plurals (GtranslatorProfile * profile,
+gtranslator_profile_set_plurals (GtrProfile * profile,
 				 const gchar * data)
 {
   if (profile->priv->plurals)
@@ -276,14 +276,14 @@ gtranslator_profile_set_plurals (GtranslatorProfile * profile,
 /**
  * gtranslator_profile_xml_new_entry:
  * @doc: a #xmlDocPtr.
- * @profile: a #GtranslatorProfile object.
+ * @profile: a #GtrProfile object.
  *
  * This function create a new #xmlNodePtr entry into #xmlDocPtr.
  *
  */
 void
 gtranslator_profile_xml_new_entry (xmlDocPtr doc,
-				   GtranslatorProfile * profile)
+				   GtrProfile * profile)
 {
   xmlNodePtr root;
   xmlNodePtr profile_node;
@@ -311,15 +311,15 @@ gtranslator_profile_xml_new_entry (xmlDocPtr doc,
  * @child: a #xmlNodePtr.
  *
  * This function get the values of the #xmlNodePtr and save them into
- * a #GtranslatorProfile object.
+ * a #GtrProfile object.
  *
- * Returns: a #GtranslatorProfile object.
+ * Returns: a #GtrProfile object.
  */
-GtranslatorProfile *
+GtrProfile *
 gtranslator_profile_xml_get_entry (xmlNodePtr child)
 {
   xmlNodePtr node;
-  GtranslatorProfile *profile;
+  GtrProfile *profile;
 
   profile = gtranslator_profile_new ();
 
@@ -351,7 +351,7 @@ gtranslator_profile_xml_get_entry (xmlNodePtr child)
  * @filename: a filename path.
  *
  * This function get the profiles saved in a xml file
- * and return a #GList of #GtranslatorProfile objects.
+ * and return a #GList of #GtrProfile objects.
  *
  * returns: a #GList
  */
@@ -359,7 +359,7 @@ GList *
 gtranslator_profile_get_profiles_from_xml_file (gchar * filename)
 {
   GList *profiles_list = NULL;
-  GtranslatorProfile *profile;
+  GtrProfile *profile;
   xmlNodePtr root, child, active;
   xmlDocPtr doc;
   gchar *active_profile;
@@ -383,8 +383,8 @@ gtranslator_profile_get_profiles_from_xml_file (gchar * filename)
 
   for (l = profiles_list; l; l = l->next)
     {
-      GtranslatorProfile *profile;
-      profile = (GtranslatorProfile *) l->data;
+      GtrProfile *profile;
+      profile = (GtrProfile *) l->data;
       if (!strcmp (gtranslator_profile_get_name (profile), active_profile))
 	gtranslator_application_set_active_profile (GTR_APP, profile);
     }
@@ -399,7 +399,7 @@ gtranslator_profile_save_profiles_in_xml (gchar * filename)
   xmlNodePtr root;
   xmlDocPtr doc;
   GList *profiles_list, *l;
-  GtranslatorProfile *active_profile;
+  GtrProfile *active_profile;
 
   doc = gtranslator_xml_new_doc ("list_of_profiles");
 
@@ -413,8 +413,8 @@ gtranslator_profile_save_profiles_in_xml (gchar * filename)
 
   for (l = profiles_list; l; l = l->next)
     {
-      GtranslatorProfile *profile;
-      profile = (GtranslatorProfile *) l->data;
+      GtrProfile *profile;
+      profile = (GtrProfile *) l->data;
       gtranslator_profile_xml_new_entry (doc, profile);
     }
 
diff --git a/src/gtr-profile.h b/src/gtr-profile.h
index b95666f..1b71dab 100644
--- a/src/gtr-profile.h
+++ b/src/gtr-profile.h
@@ -32,33 +32,33 @@
  */
 
 #define GTR_TYPE_PROFILE		(gtranslator_profile_get_type ())
-#define GTR_PROFILE(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_PROFILE, GtranslatorProfile))
-#define GTR_PROFILE_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_PROFILE, GtranslatorProfileClass))
+#define GTR_PROFILE(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_PROFILE, GtrProfile))
+#define GTR_PROFILE_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_PROFILE, GtrProfileClass))
 #define GTR_IS_PROFILE(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_PROFILE))
 #define GTR_IS_PROFILE_CLASS(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_PROFILE))
-#define GTR_PROFILE_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_PROFILE, GtranslatorProfileClass))
+#define GTR_PROFILE_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_PROFILE, GtrProfileClass))
 
 /* Private structure type */
-typedef struct _GtranslatorProfilePrivate GtranslatorProfilePrivate;
+typedef struct _GtrProfilePrivate GtrProfilePrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorProfile GtranslatorProfile;
+typedef struct _GtrProfile GtrProfile;
 
-struct _GtranslatorProfile
+struct _GtrProfile
 {
   GObject parent_instance;
   /*< private > */
-  GtranslatorProfilePrivate *priv;
+  GtrProfilePrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorProfileClass GtranslatorProfileClass;
+typedef struct _GtrProfileClass GtrProfileClass;
 
-struct _GtranslatorProfileClass
+struct _GtrProfileClass
 {
   GObjectClass parent_class;
 };
@@ -72,66 +72,66 @@ gtranslator_profile_get_type (void)
 
      GType gtranslator_profile_register_type (GTypeModule * module);
 
-GtranslatorProfile * gtranslator_profile_new (void);
+GtrProfile * gtranslator_profile_new (void);
 
      const gchar *
-     gtranslator_profile_get_name (GtranslatorProfile * profile);
+     gtranslator_profile_get_name (GtrProfile * profile);
      void
-     gtranslator_profile_set_name (GtranslatorProfile * profile,
+     gtranslator_profile_set_name (GtrProfile * profile,
 				   const gchar * data);
 
      const gchar *
-     gtranslator_profile_get_author_name (GtranslatorProfile * profile);
+     gtranslator_profile_get_author_name (GtrProfile * profile);
      void
-     gtranslator_profile_set_author_name (GtranslatorProfile * profile,
+     gtranslator_profile_set_author_name (GtrProfile * profile,
 					  const gchar * data);
 
      const gchar *
-     gtranslator_profile_get_author_email (GtranslatorProfile * profile);
+     gtranslator_profile_get_author_email (GtrProfile * profile);
      void
-     gtranslator_profile_set_author_email (GtranslatorProfile * profile,
+     gtranslator_profile_set_author_email (GtrProfile * profile,
 					   const gchar * data);
 
      const gchar *
-     gtranslator_profile_get_language_name (GtranslatorProfile * profile);
+     gtranslator_profile_get_language_name (GtrProfile * profile);
      void
-     gtranslator_profile_set_language_name (GtranslatorProfile * profile,
+     gtranslator_profile_set_language_name (GtrProfile * profile,
 					    const gchar * data);
 
      const gchar *
-     gtranslator_profile_get_language_code (GtranslatorProfile * profile);
+     gtranslator_profile_get_language_code (GtrProfile * profile);
      void
-     gtranslator_profile_set_language_code (GtranslatorProfile * profile,
+     gtranslator_profile_set_language_code (GtrProfile * profile,
 					    const gchar * data);
 
      const gchar *
-     gtranslator_profile_get_charset (GtranslatorProfile * profile);
+     gtranslator_profile_get_charset (GtrProfile * profile);
      void
-     gtranslator_profile_set_charset (GtranslatorProfile * profile,
+     gtranslator_profile_set_charset (GtrProfile * profile,
 				      const gchar * data);
 
      const gchar *
-     gtranslator_profile_get_encoding (GtranslatorProfile * profile);
+     gtranslator_profile_get_encoding (GtrProfile * profile);
      void
-     gtranslator_profile_set_encoding (GtranslatorProfile * profile,
+     gtranslator_profile_set_encoding (GtrProfile * profile,
 				       const gchar * data);
 
      const gchar *
-     gtranslator_profile_get_group_email (GtranslatorProfile * profile);
+     gtranslator_profile_get_group_email (GtrProfile * profile);
      void
-     gtranslator_profile_set_group_email (GtranslatorProfile * profile,
+     gtranslator_profile_set_group_email (GtrProfile * profile,
 					  const gchar * data);
 
      const gchar *
-     gtranslator_profile_get_plurals (GtranslatorProfile * profile);
+     gtranslator_profile_get_plurals (GtrProfile * profile);
      void
-     gtranslator_profile_set_plurals (GtranslatorProfile * profile,
+     gtranslator_profile_set_plurals (GtrProfile * profile,
 				      const gchar * data);
 
      void
      gtranslator_profile_xml_new_entry (xmlDocPtr doc,
-					GtranslatorProfile * profile);
-GtranslatorProfile * gtranslator_profile_xml_get_entry (xmlNodePtr child);
+					GtrProfile * profile);
+GtrProfile * gtranslator_profile_xml_get_entry (xmlNodePtr child);
 
      GList *
      gtranslator_profile_get_profiles_from_xml_file (gchar * filename);
diff --git a/src/gtr-statusbar.c b/src/gtr-statusbar.c
index 770d261..a003817 100644
--- a/src/gtr-statusbar.c
+++ b/src/gtr-statusbar.c
@@ -30,9 +30,9 @@
 #include "gtr-statusbar.h"
 
 #define GTR_STATUSBAR_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object),\
-					  GTR_TYPE_STATUSBAR, GtranslatorStatusbarPrivate))
+					  GTR_TYPE_STATUSBAR, GtrStatusbarPrivate))
 
-struct _GtranslatorStatusbarPrivate
+struct _GtrStatusbarPrivate
 {
   GtkWidget *statusbar;
   GtkWidget *progress_bar;
@@ -48,10 +48,10 @@ struct _GtranslatorStatusbarPrivate
   guint flash_message_id;
 };
 
-G_DEFINE_TYPE (GtranslatorStatusbar, gtranslator_statusbar, GTK_TYPE_HBOX)
+G_DEFINE_TYPE (GtrStatusbar, gtranslator_statusbar, GTK_TYPE_HBOX)
      static void gtranslator_statusbar_finalize (GObject * object)
 {
-  GtranslatorStatusbar *statusbar = GTR_STATUSBAR (object);
+  GtrStatusbar *statusbar = GTR_STATUSBAR (object);
 
   if (statusbar->priv->flash_timeout > 0)
     g_source_remove (statusbar->priv->flash_timeout);
@@ -60,18 +60,18 @@ G_DEFINE_TYPE (GtranslatorStatusbar, gtranslator_statusbar, GTK_TYPE_HBOX)
 }
 
 static void
-gtranslator_statusbar_class_init (GtranslatorStatusbarClass * klass)
+gtranslator_statusbar_class_init (GtrStatusbarClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   object_class->finalize = gtranslator_statusbar_finalize;
 
   g_type_class_add_private (object_class,
-			    sizeof (GtranslatorStatusbarPrivate));
+			    sizeof (GtrStatusbarPrivate));
 }
 
 static void
-gtranslator_statusbar_init (GtranslatorStatusbar * statusbar)
+gtranslator_statusbar_init (GtrStatusbar * statusbar)
 {
   GtkWidget *frame;
   GtkShadowType shadow_type;
@@ -130,9 +130,9 @@ gtranslator_statusbar_init (GtranslatorStatusbar * statusbar)
 /**
  * gtranslator_statusbar_new:
  *
- * Creates a new #GtranslatorStatusbar.
+ * Creates a new #GtrStatusbar.
  *
- * Return value: the new #GtranslatorStatusbar object
+ * Return value: the new #GtrStatusbar object
  **/
 GtkWidget *
 gtranslator_statusbar_new (void)
@@ -142,13 +142,13 @@ gtranslator_statusbar_new (void)
 
 /**
  * gtranslator_statusbar_push_default:
- * @statusbar: a #GtranslatorStatusbar
+ * @statusbar: a #GtrStatusbar
  * @text: the text to push in the statusbar
  *
  * Pushes a text onto the statusbar in the default context id.
  */
 void
-gtranslator_statusbar_push_default (GtranslatorStatusbar * statusbar,
+gtranslator_statusbar_push_default (GtrStatusbar * statusbar,
 				    const gchar * text)
 {
   g_return_if_fail (GTR_IS_STATUSBAR (statusbar));
@@ -159,12 +159,12 @@ gtranslator_statusbar_push_default (GtranslatorStatusbar * statusbar,
 
 /**
  * gtranslator_statusbar_pop_default:
- * @statusbar: a #GtranslatorStatusbar
+ * @statusbar: a #GtrStatusbar
  *
  * Pops the text in the statusbar of the default context id.
  */
 void
-gtranslator_statusbar_pop_default (GtranslatorStatusbar * statusbar)
+gtranslator_statusbar_pop_default (GtrStatusbar * statusbar)
 {
   g_return_if_fail (GTR_IS_STATUSBAR (statusbar));
 
@@ -174,7 +174,7 @@ gtranslator_statusbar_pop_default (GtranslatorStatusbar * statusbar)
 
 /**
  * gtranslator_statusbar_push:
- * @statusbar: a #GtranslatorStatusbar
+ * @statusbar: a #GtrStatusbar
  * @context_id: the message's context id, as returned by gtk_statusbar_get_context_id()
  * @text: the text to push in the statusbar
  *
@@ -183,7 +183,7 @@ gtranslator_statusbar_pop_default (GtranslatorStatusbar * statusbar)
  * Returns: a message id that can be used with gtk_statusbar_remove()
  */
 guint
-gtranslator_statusbar_push (GtranslatorStatusbar * statusbar,
+gtranslator_statusbar_push (GtrStatusbar * statusbar,
 			    guint context_id, const gchar * text)
 {
   g_return_val_if_fail (GTR_IS_STATUSBAR (statusbar), 0);
@@ -194,13 +194,13 @@ gtranslator_statusbar_push (GtranslatorStatusbar * statusbar,
 
 /**
  * gtranslator_statusbar_pop:
- * @statusbar: a #GtranslatorStatusbar
+ * @statusbar: a #GtrStatusbar
  * @context_id: a context identifier
  * 
  * Removes the first message in the GtkStatusBar's stack with the given context id. 
  */
 void
-gtranslator_statusbar_pop (GtranslatorStatusbar * statusbar, guint context_id)
+gtranslator_statusbar_pop (GtrStatusbar * statusbar, guint context_id)
 {
   g_return_if_fail (GTR_IS_STATUSBAR (statusbar));
 
@@ -209,7 +209,7 @@ gtranslator_statusbar_pop (GtranslatorStatusbar * statusbar, guint context_id)
 
 /**
  * gtranslator_statusbar_get_context_id:
- * @statusbar: a #GtranslatorStatusbar
+ * @statusbar: a #GtrStatusbar
  * @context_description: textual description of what context the new message is being used in
  *
  * Returns a new context identifier, given a description of the actual context.
@@ -218,7 +218,7 @@ gtranslator_statusbar_pop (GtranslatorStatusbar * statusbar, guint context_id)
  * Returns: an integer id
  */
 guint
-gtranslator_statusbar_get_context_id (GtranslatorStatusbar * statusbar,
+gtranslator_statusbar_get_context_id (GtrStatusbar * statusbar,
 				      const gchar * context_description)
 {
   return
@@ -228,13 +228,13 @@ gtranslator_statusbar_get_context_id (GtranslatorStatusbar * statusbar,
 
 /**
  * gtranslator_statusbar_set_overwrite:
- * @statusbar: a #GtranslatorStatusbar
+ * @statusbar: a #GtrStatusbar
  * @overwrite: if the overwrite mode is set
  *
  * Sets the overwrite mode on the statusbar.
  **/
 void
-gtranslator_statusbar_set_overwrite (GtranslatorStatusbar * statusbar,
+gtranslator_statusbar_set_overwrite (GtrStatusbar * statusbar,
 				     gboolean overwrite)
 {
   g_return_if_fail (GTR_IS_STATUSBAR (statusbar));
@@ -251,12 +251,12 @@ gtranslator_statusbar_set_overwrite (GtranslatorStatusbar * statusbar,
 
 /**
  * gtranslator_statusbar_clear_overwrite:
- * @statusbar: a #GtranslatorStatusbar
+ * @statusbar: a #GtrStatusbar
  *
  * Clears the statusbar overwrite label.
  */
 void
-gtranslator_statusbar_clear_overwrite (GtranslatorStatusbar * statusbar)
+gtranslator_statusbar_clear_overwrite (GtrStatusbar * statusbar)
 {
   g_return_if_fail (GTR_IS_STATUSBAR (statusbar));
 
@@ -264,7 +264,7 @@ gtranslator_statusbar_clear_overwrite (GtranslatorStatusbar * statusbar)
 }
 
 static gboolean
-remove_message_timeout (GtranslatorStatusbar * statusbar)
+remove_message_timeout (GtrStatusbar * statusbar)
 {
   gtk_statusbar_remove (GTK_STATUSBAR (statusbar->priv->statusbar),
 			statusbar->priv->flash_context_id,
@@ -277,14 +277,14 @@ remove_message_timeout (GtranslatorStatusbar * statusbar)
 
 /**
  * gtranslator_statusbar_flash_message:
- * @statusbar: a #GtranslatorStatusbar
+ * @statusbar: a #GtrStatusbar
  * @context_id: message context_id
  * @format: message to flash on the statusbar
  *
  * Flash a temporary message on the statusbar.
  */
 void
-gtranslator_statusbar_flash_message (GtranslatorStatusbar * statusbar,
+gtranslator_statusbar_flash_message (GtrStatusbar * statusbar,
 				     guint context_id,
 				     const gchar * format, ...)
 {
@@ -325,14 +325,14 @@ gtranslator_statusbar_flash_message (GtranslatorStatusbar * statusbar,
 
 /**
  * gtranslator_statusbar_update_progress_bar:
- * @statusbar: a #GtranslatorStatusbar
+ * @statusbar: a #GtrStatusbar
  * @translated_count: the number of translated messages
  * @messages_count: the number of messages
  * 
  * Updates the state of the progress bar with the given values.
  */
 void
-gtranslator_statusbar_update_progress_bar (GtranslatorStatusbar * statusbar,
+gtranslator_statusbar_update_progress_bar (GtrStatusbar * statusbar,
 					   gdouble translated_count,
 					   gdouble messages_count)
 {
@@ -366,12 +366,12 @@ gtranslator_statusbar_update_progress_bar (GtranslatorStatusbar * statusbar,
 
 /**
  * gtranslator_statusbar_clear_progress_bar:
- * @statusbar: a #GtranslatorStatusbar
+ * @statusbar: a #GtrStatusbar
  *
  * Clear the progress bar
  */
 void
-gtranslator_statusbar_clear_progress_bar (GtranslatorStatusbar * statusbar)
+gtranslator_statusbar_clear_progress_bar (GtrStatusbar * statusbar)
 {
   gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR
 				 (statusbar->priv->progress_bar), 0.0);
diff --git a/src/gtr-statusbar.h b/src/gtr-statusbar.h
index d88fcda..24d7d8d 100644
--- a/src/gtr-statusbar.h
+++ b/src/gtr-statusbar.h
@@ -25,24 +25,24 @@
 
 G_BEGIN_DECLS
 #define GTR_TYPE_STATUSBAR		(gtranslator_statusbar_get_type ())
-#define GTR_STATUSBAR(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_STATUSBAR, GtranslatorStatusbar))
-#define GTR_STATUSBAR_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_STATUSBAR, GtranslatorStatusbarClass))
+#define GTR_STATUSBAR(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_STATUSBAR, GtrStatusbar))
+#define GTR_STATUSBAR_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_STATUSBAR, GtrStatusbarClass))
 #define GTR_IS_STATUSBAR(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_STATUSBAR))
 #define GTR_IS_STATUSBAR_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_STATUSBAR))
-#define GTR_STATUSBAR_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_STATUSBAR, GtranslatorStatusbarClass))
-typedef struct _GtranslatorStatusbar GtranslatorStatusbar;
-typedef struct _GtranslatorStatusbarPrivate GtranslatorStatusbarPrivate;
-typedef struct _GtranslatorStatusbarClass GtranslatorStatusbarClass;
+#define GTR_STATUSBAR_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_STATUSBAR, GtrStatusbarClass))
+typedef struct _GtrStatusbar GtrStatusbar;
+typedef struct _GtrStatusbarPrivate GtrStatusbarPrivate;
+typedef struct _GtrStatusbarClass GtrStatusbarClass;
 
-struct _GtranslatorStatusbar
+struct _GtrStatusbar
 {
   GtkHBox parent;
 
   /* <private/> */
-  GtranslatorStatusbarPrivate *priv;
+  GtrStatusbarPrivate *priv;
 };
 
-struct _GtranslatorStatusbarClass
+struct _GtrStatusbarClass
 {
   GtkHBoxClass parent_class;
 };
@@ -53,40 +53,40 @@ gtranslator_statusbar_get_type (void)
 
      GtkWidget *gtranslator_statusbar_new (void);
 
-     void gtranslator_statusbar_push_default (GtranslatorStatusbar *
+     void gtranslator_statusbar_push_default (GtrStatusbar *
 					      statusbar, const gchar * text);
 
-     void gtranslator_statusbar_pop_default (GtranslatorStatusbar *
+     void gtranslator_statusbar_pop_default (GtrStatusbar *
 					     statusbar);
 
-     guint gtranslator_statusbar_push (GtranslatorStatusbar * statusbar,
+     guint gtranslator_statusbar_push (GtrStatusbar * statusbar,
 				       guint context_id, const gchar * text);
 
-     void gtranslator_statusbar_pop (GtranslatorStatusbar * statusbar,
+     void gtranslator_statusbar_pop (GtrStatusbar * statusbar,
 				     guint context_id);
 
-     guint gtranslator_statusbar_get_context_id (GtranslatorStatusbar *
+     guint gtranslator_statusbar_get_context_id (GtrStatusbar *
 						 statusbar,
 						 const gchar *
 						 context_description);
 
-     void gtranslator_statusbar_set_overwrite (GtranslatorStatusbar *
+     void gtranslator_statusbar_set_overwrite (GtrStatusbar *
 					       statusbar, gboolean overwrite);
 
-     void gtranslator_statusbar_clear_overwrite (GtranslatorStatusbar *
+     void gtranslator_statusbar_clear_overwrite (GtrStatusbar *
 						 statusbar);
 
-     void gtranslator_statusbar_flash_message (GtranslatorStatusbar *
+     void gtranslator_statusbar_flash_message (GtrStatusbar *
 					       statusbar, guint context_id,
 					       const gchar * format,
 					       ...) G_GNUC_PRINTF (3, 4);
 
-     void gtranslator_statusbar_update_progress_bar (GtranslatorStatusbar *
+     void gtranslator_statusbar_update_progress_bar (GtrStatusbar *
 						     statusbar,
 						     gdouble translated_count,
 						     gdouble messages_count);
 
-     void gtranslator_statusbar_clear_progress_bar (GtranslatorStatusbar *
+     void gtranslator_statusbar_clear_progress_bar (GtrStatusbar *
 						    statusbar);
 
 G_END_DECLS
diff --git a/src/gtr-tab.c b/src/gtr-tab.c
index 004847f..6c85bde 100644
--- a/src/gtr-tab.c
+++ b/src/gtr-tab.c
@@ -53,17 +53,17 @@
 #define GTR_TAB_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 					 (object),	\
 					 GTR_TYPE_TAB,     \
-					 GtranslatorTabPrivate))
+					 GtrTabPrivate))
 
 #define MAX_PLURALS 6
 
-#define GTR_TAB_KEY "GtranslatorTabFromDocument"
+#define GTR_TAB_KEY "GtrTabFromDocument"
 
-G_DEFINE_TYPE (GtranslatorTab, gtranslator_tab, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (GtrTab, gtranslator_tab, GTK_TYPE_VBOX)
 
-struct _GtranslatorTabPrivate
+struct _GtrTabPrivate
 {
-  GtranslatorPo *po;
+  GtrPo *po;
 
   GtkWidget *table_pane;
   GtkWidget *content_pane;
@@ -126,10 +126,10 @@ enum
 
 static guint signals[LAST_SIGNAL];
 
-static gboolean gtranslator_tab_autosave (GtranslatorTab * tab);
+static gboolean gtranslator_tab_autosave (GtrTab * tab);
 
 static void
-install_autosave_timeout (GtranslatorTab * tab)
+install_autosave_timeout (GtrTab * tab)
 {
   gint timeout;
 
@@ -145,7 +145,7 @@ install_autosave_timeout (GtranslatorTab * tab)
 }
 
 static gboolean
-install_autosave_timeout_if_needed (GtranslatorTab * tab)
+install_autosave_timeout_if_needed (GtrTab * tab)
 {
   g_return_val_if_fail (tab->priv->autosave_timeout <= 0, FALSE);
 
@@ -160,7 +160,7 @@ install_autosave_timeout_if_needed (GtranslatorTab * tab)
 }
 
 static gboolean
-gtranslator_tab_autosave (GtranslatorTab * tab)
+gtranslator_tab_autosave (GtrTab * tab)
 {
   GError *error = NULL;
 
@@ -178,7 +178,7 @@ gtranslator_tab_autosave (GtranslatorTab * tab)
 }
 
 static void
-remove_autosave_timeout (GtranslatorTab * tab)
+remove_autosave_timeout (GtrTab * tab)
 {
   g_return_if_fail (tab->priv->autosave_timeout > 0);
 
@@ -187,7 +187,7 @@ remove_autosave_timeout (GtranslatorTab * tab)
 }
 
 static void
-gtranslator_tab_showed_message (GtranslatorTab * tab, GtranslatorMsg * msg)
+gtranslator_tab_showed_message (GtrTab * tab, GtrMsg * msg)
 {
   if (strcmp (gtranslator_msg_get_comment (msg), "") != 0)
     gtk_widget_show (tab->priv->comment_button);
@@ -196,9 +196,9 @@ gtranslator_tab_showed_message (GtranslatorTab * tab, GtranslatorMsg * msg)
 }
 
 static void
-gtranslator_tab_edition_finished (GtranslatorTab * tab, GtranslatorMsg * msg)
+gtranslator_tab_edition_finished (GtrTab * tab, GtrMsg * msg)
 {
-  GtranslatorTranslationMemory *tm;
+  GtrTranslationMemory *tm;
   gchar *message_error;
   GtkWidget *infobar;
 
@@ -238,13 +238,13 @@ gtranslator_tab_edition_finished (GtranslatorTab * tab, GtranslatorMsg * msg)
  */
 static void
 gtranslator_message_translation_update (GtkTextBuffer * textbuffer,
-					GtranslatorTab * tab)
+					GtrTab * tab)
 {
-  GtranslatorHeader *header;
+  GtrHeader *header;
   GtkTextIter start, end;
   GtkTextBuffer *buf;
   GList *msg_aux;
-  GtranslatorMsg *msg;
+  GtrMsg *msg;
   const gchar *check;
   gchar *translation;
   gint i;
@@ -351,9 +351,9 @@ gtranslator_tab_append_msgstr_page (const gchar * tab_label,
 }
 
 static void
-gtranslator_message_plural_forms (GtranslatorTab * tab, GtranslatorMsg * msg)
+gtranslator_message_plural_forms (GtrTab * tab, GtrMsg * msg)
 {
-  GtranslatorHeader *header;
+  GtrHeader *header;
   GtkTextBuffer *buf;
   const gchar *msgstr_plural;
   gint i;
@@ -403,7 +403,7 @@ gtranslator_tab_create_comment_button ()
 static void
 on_comment_button_clicked (GtkButton * button, gpointer useless)
 {
-  GtranslatorWindow *window =
+  GtrWindow *window =
     gtranslator_application_get_active_window (GTR_APP);
 
   gtranslator_show_comment_dialog (window);
@@ -412,16 +412,16 @@ on_comment_button_clicked (GtkButton * button, gpointer useless)
 /*
  * gtranslator_tab_show_message:
  * @tab: a #GtranslationTab
- * @msg: a #GtranslatorMsg
+ * @msg: a #GtrMsg
  * 
  * Shows the @msg in the @tab TextViews
  *
  */
 static void
-gtranslator_tab_show_message (GtranslatorTab * tab, GtranslatorMsg * msg)
+gtranslator_tab_show_message (GtrTab * tab, GtrMsg * msg)
 {
-  GtranslatorTabPrivate *priv = tab->priv;
-  GtranslatorPo *po;
+  GtrTabPrivate *priv = tab->priv;
+  GtrPo *po;
   GtkTextBuffer *buf;
   const gchar *msgid, *msgid_plural;
   const gchar *msgstr, *msgstr_plural;
@@ -474,7 +474,7 @@ gtranslator_tab_show_message (GtranslatorTab * tab, GtranslatorMsg * msg)
 }
 
 static void
-emit_message_changed_signal (GtkTextBuffer * buf, GtranslatorTab * tab)
+emit_message_changed_signal (GtkTextBuffer * buf, GtrTab * tab)
 {
   GList *msg;
 
@@ -484,10 +484,10 @@ emit_message_changed_signal (GtkTextBuffer * buf, GtranslatorTab * tab)
 }
 
 static void
-update_status (GtranslatorTab * tab, GtranslatorMsg * msg, gpointer useless)
+update_status (GtrTab * tab, GtrMsg * msg, gpointer useless)
 {
-  GtranslatorMsgStatus status;
-  GtranslatorPoState po_state;
+  GtrMsgStatus status;
+  GtrPoState po_state;
   gboolean fuzzy, translated;
 
   status = gtranslator_msg_get_status (msg);
@@ -543,7 +543,7 @@ update_status (GtranslatorTab * tab, GtranslatorMsg * msg, gpointer useless)
 
 static void
 comment_pane_position_changed (GObject * tab_gobject,
-			       GParamSpec * arg1, GtranslatorTab * tab)
+			       GParamSpec * arg1, GtrTab * tab)
 {
   gtranslator_prefs_manager_set_comment_pane_pos (gtk_paned_get_position
 						  (GTK_PANED (tab_gobject)));
@@ -551,17 +551,17 @@ comment_pane_position_changed (GObject * tab_gobject,
 
 static void
 content_pane_position_changed (GObject * tab_gobject,
-			       GParamSpec * arg1, GtranslatorTab * tab)
+			       GParamSpec * arg1, GtrTab * tab)
 {
   gtranslator_prefs_manager_set_content_pane_pos (gtk_paned_get_position
 						  (GTK_PANED (tab_gobject)));
 }
 
 static void
-gtranslator_tab_add_msgstr_tabs (GtranslatorTab * tab)
+gtranslator_tab_add_msgstr_tabs (GtrTab * tab)
 {
-  GtranslatorHeader *header;
-  GtranslatorTabPrivate *priv = tab->priv;
+  GtrHeader *header;
+  GtrTabPrivate *priv = tab->priv;
   gchar *label;
   GtkTextBuffer *buf;
   gint i = 0;
@@ -592,7 +592,7 @@ gtranslator_tab_add_msgstr_tabs (GtranslatorTab * tab)
 }
 
 static void
-gtranslator_tab_draw (GtranslatorTab * tab)
+gtranslator_tab_draw (GtrTab * tab)
 {
   gint current_page_num;
   GtkWidget *image;
@@ -603,7 +603,7 @@ gtranslator_tab_draw (GtranslatorTab * tab)
   GtkWidget *notebook, *tm_layout, *tm, *comments_label, *tm_label, *scroll;
   GtkWidget *hbox;
   GtkWidget *label;
-  GtranslatorTabPrivate *priv = tab->priv;
+  GtrTabPrivate *priv = tab->priv;
 
   /*
    * Panel
@@ -780,7 +780,7 @@ gtranslator_tab_draw (GtranslatorTab * tab)
 }
 
 static void
-gtranslator_tab_init (GtranslatorTab * tab)
+gtranslator_tab_init (GtrTab * tab)
 {
   tab->priv = GTR_TAB_GET_PRIVATE (tab);
 
@@ -801,7 +801,7 @@ gtranslator_tab_init (GtranslatorTab * tab)
 static void
 gtranslator_tab_finalize (GObject * object)
 {
-  GtranslatorTab *tab = GTR_TAB (object);
+  GtrTab *tab = GTR_TAB (object);
 
   if (tab->priv->po)
     g_object_unref (tab->priv->po);
@@ -820,7 +820,7 @@ gtranslator_tab_get_property (GObject * object,
 			      guint prop_id,
 			      GValue * value, GParamSpec * pspec)
 {
-  GtranslatorTab *tab = GTR_TAB (object);
+  GtrTab *tab = GTR_TAB (object);
 
   switch (prop_id)
     {
@@ -841,7 +841,7 @@ gtranslator_tab_set_property (GObject * object,
 			      guint prop_id,
 			      const GValue * value, GParamSpec * pspec)
 {
-  GtranslatorTab *tab = GTR_TAB (object);
+  GtrTab *tab = GTR_TAB (object);
 
   switch (prop_id)
     {
@@ -858,11 +858,11 @@ gtranslator_tab_set_property (GObject * object,
 }
 
 static void
-gtranslator_tab_class_init (GtranslatorTabClass * klass)
+gtranslator_tab_class_init (GtrTabClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorTabPrivate));
+  g_type_class_add_private (klass, sizeof (GtrTabPrivate));
 
   object_class->finalize = gtranslator_tab_finalize;
   object_class->set_property = gtranslator_tab_set_property;
@@ -875,7 +875,7 @@ gtranslator_tab_class_init (GtranslatorTabClass * klass)
     g_signal_new ("showed-message",
 		  G_OBJECT_CLASS_TYPE (klass),
 		  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (GtranslatorTabClass, showed_message),
+		  G_STRUCT_OFFSET (GtrTabClass, showed_message),
 		  NULL, NULL,
 		  g_cclosure_marshal_VOID__POINTER,
 		  G_TYPE_NONE, 1, G_TYPE_POINTER);
@@ -884,7 +884,7 @@ gtranslator_tab_class_init (GtranslatorTabClass * klass)
     g_signal_new ("message-changed",
 		  G_OBJECT_CLASS_TYPE (klass),
 		  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (GtranslatorTabClass, message_changed),
+		  G_STRUCT_OFFSET (GtrTabClass, message_changed),
 		  NULL, NULL,
 		  g_cclosure_marshal_VOID__POINTER,
 		  G_TYPE_NONE, 1, G_TYPE_POINTER);
@@ -893,7 +893,7 @@ gtranslator_tab_class_init (GtranslatorTabClass * klass)
     g_signal_new ("message-edition-finished",
 		  G_OBJECT_CLASS_TYPE (klass),
 		  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (GtranslatorTabClass,
+		  G_STRUCT_OFFSET (GtrTabClass,
 				   message_edition_finished), NULL, NULL,
 		  g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1,
 		  G_TYPE_POINTER);
@@ -924,16 +924,16 @@ gtranslator_tab_class_init (GtranslatorTabClass * klass)
 
 /**
  * gtranslator_tab_new:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  * 
- * Creates a new #GtranslatorTab.
+ * Creates a new #GtrTab.
  * 
- * Return value: a new #GtranslatorTab object
+ * Return value: a new #GtrTab object
  **/
-GtranslatorTab *
-gtranslator_tab_new (GtranslatorPo * po)
+GtrTab *
+gtranslator_tab_new (GtrPo * po)
 {
-  GtranslatorTab *tab;
+  GtrTab *tab;
 
   g_return_val_if_fail (po != NULL, NULL);
 
@@ -959,12 +959,12 @@ gtranslator_tab_new (GtranslatorPo * po)
 
 /**
  * gtranslator_tab_get_po:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  *
- * Return value: the #GtranslatorPo stored in the #GtranslatorTab
+ * Return value: the #GtrPo stored in the #GtrTab
 **/
-GtranslatorPo *
-gtranslator_tab_get_po (GtranslatorTab * tab)
+GtrPo *
+gtranslator_tab_get_po (GtrTab * tab)
 {
   return tab->priv->po;
 }
@@ -976,7 +976,7 @@ gtranslator_tab_get_po (GtranslatorTab * tab)
  * Return value: the horizontal notebook of the #GtranslationTab
 **/
 GtkWidget *
-gtranslator_tab_get_panel (GtranslatorTab * tab)
+gtranslator_tab_get_panel (GtrTab * tab)
 {
   g_return_val_if_fail (tab != NULL, NULL);
 
@@ -990,7 +990,7 @@ gtranslator_tab_get_panel (GtranslatorTab * tab)
  * Return value: the number of the active translation notebook.
  **/
 gint
-gtranslator_tab_get_active_trans_tab (GtranslatorTab * tab)
+gtranslator_tab_get_active_trans_tab (GtrTab * tab)
 {
   return
     gtk_notebook_get_current_page (GTK_NOTEBOOK (tab->priv->trans_notebook));
@@ -998,24 +998,24 @@ gtranslator_tab_get_active_trans_tab (GtranslatorTab * tab)
 
 /**
  * gtranslator_tab_get_context_panel:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  *
  * Return value: the #GtranslaorContextPanel
  */
-GtranslatorContextPanel *
-gtranslator_tab_get_context_panel (GtranslatorTab * tab)
+GtrContextPanel *
+gtranslator_tab_get_context_panel (GtrTab * tab)
 {
   return GTR_CONTEXT_PANEL (tab->priv->context);
 }
 
 /**
  * gtranslator_tab_get_translation_memory_ui:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  *
- * Returns: the #GtranslatorTranslationMemoryUi panel.
+ * Returns: the #GtrTranslationMemoryUi panel.
  */
 GtkWidget *
-gtranslator_tab_get_translation_memory_ui (GtranslatorTab * tab)
+gtranslator_tab_get_translation_memory_ui (GtrTab * tab)
 {
   g_return_val_if_fail (GTR_IS_TAB (tab), NULL);
 
@@ -1028,8 +1028,8 @@ gtranslator_tab_get_translation_memory_ui (GtranslatorTab * tab)
  *
  * Return value: the active page of the translation notebook.
 **/
-GtranslatorView *
-gtranslator_tab_get_active_view (GtranslatorTab * tab)
+GtrView *
+gtranslator_tab_get_active_view (GtrTab * tab)
 {
   gint num;
 
@@ -1049,7 +1049,7 @@ gtranslator_tab_get_active_view (GtranslatorTab * tab)
  * Return value: a newly allocated list of #GtranslationTab objects
  */
 GList *
-gtranslator_tab_get_all_views (GtranslatorTab * tab,
+gtranslator_tab_get_all_views (GtrTab * tab,
 			       gboolean original, gboolean translated)
 {
   GList *ret = NULL;
@@ -1080,15 +1080,15 @@ gtranslator_tab_get_all_views (GtranslatorTab * tab,
 
 /**
  * gtranslator_tab_get_name:
- * @tab: a #GtranslatorTab 
+ * @tab: a #GtrTab 
  * 
  * Return value: a new allocated string with the name of the @tab.
  */
 gchar *
-gtranslator_tab_get_name (GtranslatorTab * tab)
+gtranslator_tab_get_name (GtrTab * tab)
 {
-  GtranslatorHeader *header;
-  GtranslatorPoState state;
+  GtrHeader *header;
+  GtrPoState state;
   const gchar *str;
   gchar *tab_name;
 
@@ -1108,19 +1108,19 @@ gtranslator_tab_get_name (GtranslatorTab * tab)
 
 /**
  * gtranslator_tab_message_go_to:
- * @tab: a #GtranslatorTab
- * @to_go: the #GtranslatorMsg you want to jump
+ * @tab: a #GtrTab
+ * @to_go: the #GtrMsg you want to jump
  * @searching: TRUE if we are searching in the message list
  *
  * Jumps to the specific @to_go pointer message and show the message
- * in the #GtranslatorView.
+ * in the #GtrView.
 **/
 void
-gtranslator_tab_message_go_to (GtranslatorTab * tab,
+gtranslator_tab_message_go_to (GtrTab * tab,
 			       GList * to_go,
-			       gboolean searching, GtranslatorTabMove move)
+			       gboolean searching, GtrTabMove move)
 {
-  GtranslatorPo *po;
+  GtrPo *po;
   GList *current_msg;
   static gboolean first_msg = TRUE;
 
@@ -1207,28 +1207,28 @@ gtranslator_tab_message_go_to (GtranslatorTab * tab,
 
 /**
  * _gtranslator_tab_can_close:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  *
- * Whether a #GtranslatorTab can be closed.
+ * Whether a #GtrTab can be closed.
  *
- * Returns: TRUE if the #GtranslatorPo of the @tab is already saved
+ * Returns: TRUE if the #GtrPo of the @tab is already saved
  */
 gboolean
-_gtranslator_tab_can_close (GtranslatorTab * tab)
+_gtranslator_tab_can_close (GtrTab * tab)
 {
   return gtranslator_po_get_state (tab->priv->po) == GTR_PO_STATE_SAVED;
 }
 
 /**
  * gtranslator_tab_get_from_document:
- * @po: a #GtranslatorPo
+ * @po: a #GtrPo
  *
- * Returns the #GtranslatorTab for a specific #GtranslatorPo.
+ * Returns the #GtrTab for a specific #GtrPo.
  *
- * Returns: the #GtranslatorTab for a specific #GtranslatorPo
+ * Returns: the #GtrTab for a specific #GtrPo
  */
-GtranslatorTab *
-gtranslator_tab_get_from_document (GtranslatorPo * po)
+GtrTab *
+gtranslator_tab_get_from_document (GtrPo * po)
 {
   gpointer res;
 
@@ -1241,14 +1241,14 @@ gtranslator_tab_get_from_document (GtranslatorPo * po)
 
 /**
  * gtranslator_tab_get_autosave_enabled:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  * 
  * Gets the current state for the autosave feature
  * 
  * Return value: TRUE if the autosave is enabled, else FALSE
  **/
 gboolean
-gtranslator_tab_get_autosave_enabled (GtranslatorTab * tab)
+gtranslator_tab_get_autosave_enabled (GtrTab * tab)
 {
   g_return_val_if_fail (GTR_IS_TAB (tab), FALSE);
 
@@ -1257,14 +1257,14 @@ gtranslator_tab_get_autosave_enabled (GtranslatorTab * tab)
 
 /**
  * gtranslator_tab_set_autosave_enabled:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  * @enable: enable (TRUE) or disable (FALSE) auto save
  * 
  * Enables or disables the autosave feature. It does not install an
  * autosave timeout if the document is new or is read-only
  **/
 void
-gtranslator_tab_set_autosave_enabled (GtranslatorTab * tab, gboolean enable)
+gtranslator_tab_set_autosave_enabled (GtrTab * tab, gboolean enable)
 {
   g_return_if_fail (GTR_IS_TAB (tab));
 
@@ -1292,14 +1292,14 @@ gtranslator_tab_set_autosave_enabled (GtranslatorTab * tab, gboolean enable)
 
 /**
  * gtranslator_tab_get_autosave_interval:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  * 
  * Gets the current interval for the autosaves
  * 
  * Return value: the value of the autosave
  **/
 gint
-gtranslator_tab_get_autosave_interval (GtranslatorTab * tab)
+gtranslator_tab_get_autosave_interval (GtrTab * tab)
 {
   g_return_val_if_fail (GTR_IS_TAB (tab), 0);
 
@@ -1308,7 +1308,7 @@ gtranslator_tab_get_autosave_interval (GtranslatorTab * tab)
 
 /**
  * gtranslator_tab_set_autosave_interval:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  * @interval: the new interval
  * 
  * Sets the interval for the autosave feature. It does nothing if the
@@ -1317,7 +1317,7 @@ gtranslator_tab_get_autosave_interval (GtranslatorTab * tab)
  * argument.
  **/
 void
-gtranslator_tab_set_autosave_interval (GtranslatorTab * tab, gint interval)
+gtranslator_tab_set_autosave_interval (GtrTab * tab, gint interval)
 {
   g_return_if_fail (GTR_IS_TAB (tab));
   g_return_if_fail (interval > 0);
@@ -1340,14 +1340,14 @@ gtranslator_tab_set_autosave_interval (GtranslatorTab * tab, gint interval)
 
 /**
  * gtranslator_tab_add_widget_to_lateral_panel:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  * @widget: a #GtkWidget
  * @tab_name: the tab name in the notebook
  *
  * Adds a new widget to the laberal panel notebook.
  */
 void
-gtranslator_tab_add_widget_to_lateral_panel (GtranslatorTab * tab,
+gtranslator_tab_add_widget_to_lateral_panel (GtrTab * tab,
 					     GtkWidget * widget,
 					     const gchar * tab_name)
 {
@@ -1364,13 +1364,13 @@ gtranslator_tab_add_widget_to_lateral_panel (GtranslatorTab * tab,
 
 /**
  * gtranslator_tab_remove_widget_from_lateral_panel:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  * @widget: a #GtkWidget
  *
  * Removes the @widget from the lateral panel notebook of @tab.
  */
 void
-gtranslator_tab_remove_widget_from_lateral_panel (GtranslatorTab * tab,
+gtranslator_tab_remove_widget_from_lateral_panel (GtrTab * tab,
 						  GtkWidget * widget)
 {
   gint page;
@@ -1386,13 +1386,13 @@ gtranslator_tab_remove_widget_from_lateral_panel (GtranslatorTab * tab,
 
 /**
  * gtranslator_tab_show_lateral_panel_widget:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  * @widget: the widget to be shown.
  *
  * Shows the notebook page of the @widget.
  */
 void
-gtranslator_tab_show_lateral_panel_widget (GtranslatorTab * tab,
+gtranslator_tab_show_lateral_panel_widget (GtrTab * tab,
 					   GtkWidget * widget)
 {
   gint page;
@@ -1405,15 +1405,15 @@ gtranslator_tab_show_lateral_panel_widget (GtranslatorTab * tab,
 
 /**
  * gtranslator_tab_clear_msgstr_views:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  * 
  * Clears all text from msgstr text views.
  */
 void
-gtranslator_tab_clear_msgstr_views (GtranslatorTab * tab)
+gtranslator_tab_clear_msgstr_views (GtrTab * tab)
 {
   gint i = 0;
-  GtranslatorHeader *header;
+  GtrHeader *header;
   GtkTextBuffer *buf;
 
   g_return_if_fail (GTR_IS_TAB (tab));
@@ -1434,12 +1434,12 @@ gtranslator_tab_clear_msgstr_views (GtranslatorTab * tab)
 
 /**
  * gtranslator_tab_copy_to_translation:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  *
  * Copies the text from the original text box to the translation text box.
  */
 void
-gtranslator_tab_copy_to_translation (GtranslatorTab * tab)
+gtranslator_tab_copy_to_translation (GtrTab * tab)
 {
   GtkTextBuffer *msgstr, *msgid;
   gint page_index;
@@ -1464,12 +1464,12 @@ gtranslator_tab_copy_to_translation (GtranslatorTab * tab)
 
 /**
  * gtranslator_tab_block_movement:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  *
  * Blocks the movement to the next/prev message.
  */
 void
-gtranslator_tab_block_movement (GtranslatorTab * tab)
+gtranslator_tab_block_movement (GtrTab * tab)
 {
   g_return_if_fail (GTR_IS_TAB (tab));
 
@@ -1478,12 +1478,12 @@ gtranslator_tab_block_movement (GtranslatorTab * tab)
 
 /**
  * gtranslator_tab_unblock_movement:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  * 
  * Unblocks the movement to the next/prev message.
  */
 void
-gtranslator_tab_unblock_movement (GtranslatorTab * tab)
+gtranslator_tab_unblock_movement (GtrTab * tab)
 {
   g_return_if_fail (GTR_IS_TAB (tab));
 
@@ -1492,14 +1492,14 @@ gtranslator_tab_unblock_movement (GtranslatorTab * tab)
 
 /**
  * gtranslator_tab_go_to_next:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  *
  * Moves to the next message or plural tab in case the message has plurals.
  */
 void
-gtranslator_tab_go_to_next (GtranslatorTab * tab)
+gtranslator_tab_go_to_next (GtrTab * tab)
 {
-  GtranslatorPo *po;
+  GtrPo *po;
 
   po = gtranslator_tab_get_po (tab);
 
@@ -1511,14 +1511,14 @@ gtranslator_tab_go_to_next (GtranslatorTab * tab)
 
 /**
  * gtranslator_tab_go_to_prev:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  *
  * Moves to the previous message or plural tab in case the message has plurals.
  */
 void
-gtranslator_tab_go_to_prev (GtranslatorTab * tab)
+gtranslator_tab_go_to_prev (GtrTab * tab)
 {
-  GtranslatorPo *po;
+  GtrPo *po;
 
   po = gtranslator_tab_get_po (tab);
 
@@ -1530,14 +1530,14 @@ gtranslator_tab_go_to_prev (GtranslatorTab * tab)
 
 /**
  * gtranslator_tab_go_to_first:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  *
  * Jumps to the first message.
  */
 void
-gtranslator_tab_go_to_first (GtranslatorTab * tab)
+gtranslator_tab_go_to_first (GtrTab * tab)
 {
-  GtranslatorPo *po;
+  GtrPo *po;
 
   po = gtranslator_tab_get_po (tab);
 
@@ -1549,14 +1549,14 @@ gtranslator_tab_go_to_first (GtranslatorTab * tab)
 
 /**
  * gtranslator_tab_go_to_last:
- * @tab: a #GtranslatorTab 
+ * @tab: a #GtrTab 
  *
  * Jumps to the last message.
  */
 void
-gtranslator_tab_go_to_last (GtranslatorTab * tab)
+gtranslator_tab_go_to_last (GtrTab * tab)
 {
-  GtranslatorPo *po;
+  GtrPo *po;
 
   po = gtranslator_tab_get_po (tab);
 
@@ -1568,16 +1568,16 @@ gtranslator_tab_go_to_last (GtranslatorTab * tab)
 
 /**
  * gtranslator_tab_go_to_next_fuzzy:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  *
  * If there is a next fuzzy message it jumps to it.
  *
  * Returns: TRUE if there is a next fuzzy message.
  */
 gboolean
-gtranslator_tab_go_to_next_fuzzy (GtranslatorTab * tab)
+gtranslator_tab_go_to_next_fuzzy (GtrTab * tab)
 {
-  GtranslatorPo *po;
+  GtrPo *po;
   GList *msg;
 
   po = gtranslator_tab_get_po (tab);
@@ -1594,16 +1594,16 @@ gtranslator_tab_go_to_next_fuzzy (GtranslatorTab * tab)
 
 /**
  * gtranslator_tab_go_to_prev_fuzzy:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  *
  * If there is a prev fuzzy message it jumps to it.
  *
  * Returns: TRUE if there is a prev fuzzy message.
  */
 gboolean
-gtranslator_tab_go_to_prev_fuzzy (GtranslatorTab * tab)
+gtranslator_tab_go_to_prev_fuzzy (GtrTab * tab)
 {
-  GtranslatorPo *po;
+  GtrPo *po;
   GList *msg;
 
   po = gtranslator_tab_get_po (tab);
@@ -1620,16 +1620,16 @@ gtranslator_tab_go_to_prev_fuzzy (GtranslatorTab * tab)
 
 /**
  * gtranslator_tab_go_to_next_untrans:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  *
  * If there is a next untranslated message it jumps to it.
  *
  * Returns: TRUE if there is a next untranslated message.
  */
 gboolean
-gtranslator_tab_go_to_next_untrans (GtranslatorTab * tab)
+gtranslator_tab_go_to_next_untrans (GtrTab * tab)
 {
-  GtranslatorPo *po;
+  GtrPo *po;
   GList *msg;
 
   po = gtranslator_tab_get_po (tab);
@@ -1646,16 +1646,16 @@ gtranslator_tab_go_to_next_untrans (GtranslatorTab * tab)
 
 /**
  * gtranslator_tab_go_to_prev_untrans:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  *
  * If there is a prev untranslated message it jumps to it.
  *
  * Returns: TRUE if there is a prev untranslated message.
  */
 gboolean
-gtranslator_tab_go_to_prev_untrans (GtranslatorTab * tab)
+gtranslator_tab_go_to_prev_untrans (GtrTab * tab)
 {
-  GtranslatorPo *po;
+  GtrPo *po;
   GList *msg;
 
   po = gtranslator_tab_get_po (tab);
@@ -1672,16 +1672,16 @@ gtranslator_tab_go_to_prev_untrans (GtranslatorTab * tab)
 
 /**
  * gtranslator_tab_go_to_next_fuzzy_or_untrans:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  *
  * If there is a next fuzzy or untranslated message it jumps to it.
  *
  * Returns: TRUE if there is a next fuzzy or untranslated message.
  */
 gboolean
-gtranslator_tab_go_to_next_fuzzy_or_untrans (GtranslatorTab * tab)
+gtranslator_tab_go_to_next_fuzzy_or_untrans (GtrTab * tab)
 {
-  GtranslatorPo *po;
+  GtrPo *po;
   GList *msg;
 
   po = gtranslator_tab_get_po (tab);
@@ -1698,16 +1698,16 @@ gtranslator_tab_go_to_next_fuzzy_or_untrans (GtranslatorTab * tab)
 
 /**
  * gtranslator_tab_go_to_prev_fuzzy_or_untrans:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  *
  * If there is a prev fuzzy or untranslated message it jumps to it.
  *
  * Returns: TRUE if there is a prev fuzzy or untranslated message.
  */
 gboolean
-gtranslator_tab_go_to_prev_fuzzy_or_untrans (GtranslatorTab * tab)
+gtranslator_tab_go_to_prev_fuzzy_or_untrans (GtrTab * tab)
 {
-  GtranslatorPo *po;
+  GtrPo *po;
   GList *msg;
 
   po = gtranslator_tab_get_po (tab);
@@ -1724,16 +1724,16 @@ gtranslator_tab_go_to_prev_fuzzy_or_untrans (GtranslatorTab * tab)
 
 /**
  * gtranslator_tab_go_to_number:
- * @tab: a #GtranslatorTab
+ * @tab: a #GtrTab
  * @number: the message number you want to jump
  *
  * Jumps to the message with the @number in the list, if the message does not
  * exists it does not jump.
  */
 void
-gtranslator_tab_go_to_number (GtranslatorTab * tab, gint number)
+gtranslator_tab_go_to_number (GtrTab * tab, gint number)
 {
-  GtranslatorPo *po;
+  GtrPo *po;
   GList *msg;
 
   po = gtranslator_tab_get_po (tab);
@@ -1747,13 +1747,13 @@ gtranslator_tab_go_to_number (GtranslatorTab * tab, gint number)
 
 /**
  * gtranslator_tab_set_info_bar:
- * @tab: a #GtranslatorTab
- * @infobar: a #GtranslatorMessageArea
+ * @tab: a #GtrTab
+ * @infobar: a #GtrMessageArea
  *
  * Sets the @infobar to be shown in the @tab.
  */
 void
-gtranslator_tab_set_info_bar (GtranslatorTab *tab,
+gtranslator_tab_set_info_bar (GtrTab *tab,
 			      GtkWidget      *infobar)
 {
   g_return_if_fail (GTR_IS_TAB (tab));
diff --git a/src/gtr-tab.h b/src/gtr-tab.h
index ff996e7..126f622 100644
--- a/src/gtr-tab.h
+++ b/src/gtr-tab.h
@@ -37,40 +37,40 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_TAB		(gtranslator_tab_get_type ())
-#define GTR_TAB(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_TAB, GtranslatorTab))
-#define GTR_TAB_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_TAB, GtranslatorTabClass))
+#define GTR_TAB(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_TAB, GtrTab))
+#define GTR_TAB_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_TAB, GtrTabClass))
 #define GTR_IS_TAB(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_TAB))
 #define GTR_IS_TAB_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_TAB))
-#define GTR_TAB_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_TAB, GtranslatorTabClass))
+#define GTR_TAB_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_TAB, GtrTabClass))
 /* Private structure type */
-typedef struct _GtranslatorTabPrivate GtranslatorTabPrivate;
+typedef struct _GtrTabPrivate GtrTabPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorTab GtranslatorTab;
+typedef struct _GtrTab GtrTab;
 
-struct _GtranslatorTab
+struct _GtrTab
 {
   GtkVBox parent_instance;
 
   /*< private > */
-  GtranslatorTabPrivate *priv;
+  GtrTabPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorTabClass GtranslatorTabClass;
+typedef struct _GtrTabClass GtrTabClass;
 
-struct _GtranslatorTabClass
+struct _GtrTabClass
 {
   GtkVBoxClass parent_class;
 
-  void (*showed_message) (GtranslatorTab * tab, GtranslatorMsg * msg);
-  void (*message_changed) (GtranslatorTab * tab, GtranslatorMsg * msg);
-  void (*message_edition_finished) (GtranslatorTab * tab,
-				    GtranslatorMsg * msg);
+  void (*showed_message) (GtrTab * tab, GtrMsg * msg);
+  void (*message_changed) (GtrTab * tab, GtrMsg * msg);
+  void (*message_edition_finished) (GtrTab * tab,
+				    GtrMsg * msg);
 };
 
 typedef enum
@@ -78,7 +78,7 @@ typedef enum
   GTR_TAB_MOVE_NONE,
   GTR_TAB_MOVE_NEXT,
   GTR_TAB_MOVE_PREV
-} GtranslatorTabMove;
+} GtrTabMove;
 
 /*
  * Public methods
@@ -89,92 +89,92 @@ gtranslator_tab_get_type (void)
 
      GType gtranslator_tab_register_type (GTypeModule * module);
 
-     GtranslatorTab *gtranslator_tab_new (GtranslatorPo * po);
+     GtrTab *gtranslator_tab_new (GtrPo * po);
 
-     GtranslatorPo *gtranslator_tab_get_po (GtranslatorTab * tab);
+     GtrPo *gtranslator_tab_get_po (GtrTab * tab);
 
-     GtkWidget *gtranslator_tab_get_panel (GtranslatorTab * tab);
+     GtkWidget *gtranslator_tab_get_panel (GtrTab * tab);
 
-     gint gtranslator_tab_get_active_trans_tab (GtranslatorTab * tab);
+     gint gtranslator_tab_get_active_trans_tab (GtrTab * tab);
 
-     GtranslatorContextPanel
-       *gtranslator_tab_get_context_panel (GtranslatorTab * tab);
+     GtrContextPanel
+       *gtranslator_tab_get_context_panel (GtrTab * tab);
 
-     GtkWidget *gtranslator_tab_get_translation_memory_ui (GtranslatorTab *
+     GtkWidget *gtranslator_tab_get_translation_memory_ui (GtrTab *
 							   tab);
 
-     GtranslatorView *gtranslator_tab_get_active_view (GtranslatorTab * tab);
+     GtrView *gtranslator_tab_get_active_view (GtrTab * tab);
 
-     GList *gtranslator_tab_get_all_views (GtranslatorTab * tab,
+     GList *gtranslator_tab_get_all_views (GtrTab * tab,
 					   gboolean original,
 					   gboolean translated);
 
-     gchar *gtranslator_tab_get_name (GtranslatorTab * tab);
+     gchar *gtranslator_tab_get_name (GtrTab * tab);
 
-     void gtranslator_tab_message_go_to (GtranslatorTab * tab,
+     void gtranslator_tab_message_go_to (GtrTab * tab,
 					 GList * to_go,
 					 gboolean searching,
-					 GtranslatorTabMove move);
+					 GtrTabMove move);
 
-     GtranslatorTab *gtranslator_tab_get_from_document (GtranslatorPo * po);
+     GtrTab *gtranslator_tab_get_from_document (GtrPo * po);
 
-     gboolean gtranslator_tab_get_autosave_enabled (GtranslatorTab * tab);
+     gboolean gtranslator_tab_get_autosave_enabled (GtrTab * tab);
 
-     void gtranslator_tab_set_autosave_enabled (GtranslatorTab * tab,
+     void gtranslator_tab_set_autosave_enabled (GtrTab * tab,
 						gboolean enable);
 
-     gint gtranslator_tab_get_autosave_interval (GtranslatorTab * tab);
+     gint gtranslator_tab_get_autosave_interval (GtrTab * tab);
 
-     void gtranslator_tab_set_autosave_interval (GtranslatorTab * tab,
+     void gtranslator_tab_set_autosave_interval (GtrTab * tab,
 						 gint interval);
 
-     void gtranslator_tab_add_widget_to_lateral_panel (GtranslatorTab * tab,
+     void gtranslator_tab_add_widget_to_lateral_panel (GtrTab * tab,
 						       GtkWidget * widget,
 						       const gchar *
 						       tab_name);
 
-     void gtranslator_tab_remove_widget_from_lateral_panel (GtranslatorTab *
+     void gtranslator_tab_remove_widget_from_lateral_panel (GtrTab *
 							    tab,
 							    GtkWidget *
 							    widget);
 
-     void gtranslator_tab_show_lateral_panel_widget (GtranslatorTab * tab,
+     void gtranslator_tab_show_lateral_panel_widget (GtrTab * tab,
 						     GtkWidget * widget);
 
-     void gtranslator_tab_clear_msgstr_views (GtranslatorTab * tab);
+     void gtranslator_tab_clear_msgstr_views (GtrTab * tab);
 
-     void gtranslator_tab_block_movement (GtranslatorTab * tab);
+     void gtranslator_tab_block_movement (GtrTab * tab);
 
-     void gtranslator_tab_unblock_movement (GtranslatorTab * tab);
+     void gtranslator_tab_unblock_movement (GtrTab * tab);
 
-     void gtranslator_tab_go_to_next (GtranslatorTab * tab);
+     void gtranslator_tab_go_to_next (GtrTab * tab);
 
-     void gtranslator_tab_go_to_prev (GtranslatorTab * tab);
+     void gtranslator_tab_go_to_prev (GtrTab * tab);
 
-     void gtranslator_tab_go_to_first (GtranslatorTab * tab);
+     void gtranslator_tab_go_to_first (GtrTab * tab);
 
-     void gtranslator_tab_go_to_last (GtranslatorTab * tab);
+     void gtranslator_tab_go_to_last (GtrTab * tab);
 
-     gboolean gtranslator_tab_go_to_next_fuzzy (GtranslatorTab * tab);
+     gboolean gtranslator_tab_go_to_next_fuzzy (GtrTab * tab);
 
-     gboolean gtranslator_tab_go_to_prev_fuzzy (GtranslatorTab * tab);
+     gboolean gtranslator_tab_go_to_prev_fuzzy (GtrTab * tab);
 
-     gboolean gtranslator_tab_go_to_next_untrans (GtranslatorTab * tab);
+     gboolean gtranslator_tab_go_to_next_untrans (GtrTab * tab);
 
-     gboolean gtranslator_tab_go_to_prev_untrans (GtranslatorTab * tab);
+     gboolean gtranslator_tab_go_to_prev_untrans (GtrTab * tab);
 
-     gboolean gtranslator_tab_go_to_next_fuzzy_or_untrans (GtranslatorTab *
+     gboolean gtranslator_tab_go_to_next_fuzzy_or_untrans (GtrTab *
 							   tab);
 
-     gboolean gtranslator_tab_go_to_prev_fuzzy_or_untrans (GtranslatorTab *
+     gboolean gtranslator_tab_go_to_prev_fuzzy_or_untrans (GtrTab *
 							   tab);
 
-     void gtranslator_tab_go_to_number (GtranslatorTab * tab, gint number);
+     void gtranslator_tab_go_to_number (GtrTab * tab, gint number);
 
-     void gtranslator_tab_set_info_bar (GtranslatorTab *tab,
+     void gtranslator_tab_set_info_bar (GtrTab *tab,
 					GtkWidget      *infobar);
 
-     gboolean _gtranslator_tab_can_close (GtranslatorTab * tab);
+     gboolean _gtranslator_tab_can_close (GtrTab * tab);
 
 G_END_DECLS
 #endif /* __TAB_H__ */
diff --git a/src/gtr-utils.c b/src/gtr-utils.c
index 95ded94..e9c470d 100644
--- a/src/gtr-utils.c
+++ b/src/gtr-utils.c
@@ -772,7 +772,7 @@ gtranslator_utils_help_display (GtkWindow * parent,
      GTK_DIALOG_DESTROY_WITH_PARENT,
      GTK_MESSAGE_ERROR,
      GTK_BUTTONS_CLOSE,
-     _("Sorry, Gtranslator for windows is unable to display help yet."));
+     _("Sorry, Gtr for windows is unable to display help yet."));
      gtk_dialog_run (GTK_DIALOG (dialog));
      gtk_widget_destroy (dialog);
 
@@ -811,7 +811,7 @@ gtranslator_utils_help_display (GtkWindow * parent,
 				       GTK_MESSAGE_ERROR,
 				       GTK_BUTTONS_CLOSE,
 				       _("Unable to display help. "
-					 "Please make sure the Gtranslator "
+					 "Please make sure the Gtr "
 					 "documentation package is installed."));
       gtk_dialog_run (GTK_DIALOG (dialog));
       gtk_widget_destroy (dialog);
diff --git a/src/gtr-view.c b/src/gtr-view.c
index f5101ab..3f39a0b 100644
--- a/src/gtr-view.c
+++ b/src/gtr-view.c
@@ -49,11 +49,11 @@
 #define GTR_VIEW_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 	(object),	\
 						 	GTR_TYPE_VIEW,     \
-						 	GtranslatorViewPrivate))
+						 	GtrViewPrivate))
 
-G_DEFINE_TYPE (GtranslatorView, gtranslator_view, GTK_TYPE_SOURCE_VIEW)
+G_DEFINE_TYPE (GtrView, gtranslator_view, GTK_TYPE_SOURCE_VIEW)
 
-struct _GtranslatorViewPrivate
+struct _GtrViewPrivate
 {
   GtkSourceBuffer *buffer;
 
@@ -66,7 +66,7 @@ struct _GtranslatorViewPrivate
 };
 
 #ifdef HAVE_GTKSPELL
-     static void gtranslator_attach_gtkspell (GtranslatorView * view)
+     static void gtranslator_attach_gtkspell (GtrView * view)
 {
   gint i;
   GError *error = NULL;
@@ -90,7 +90,7 @@ struct _GtranslatorViewPrivate
 #endif
 
 static void
-gtranslator_view_init (GtranslatorView * view)
+gtranslator_view_init (GtrView * view)
 {
   GtkSourceLanguageManager *lm;
   GtkSourceLanguage *lang;
@@ -102,7 +102,7 @@ gtranslator_view_init (GtranslatorView * view)
 
   view->priv = GTR_VIEW_GET_PRIVATE (view);
 
-  GtranslatorViewPrivate *priv = view->priv;
+  GtrViewPrivate *priv = view->priv;
 
   lm = gtk_source_language_manager_new ();
   dirs = g_ptr_array_new ();
@@ -168,11 +168,11 @@ gtranslator_view_finalize (GObject * object)
 }
 
 static void
-gtranslator_view_class_init (GtranslatorViewClass * klass)
+gtranslator_view_class_init (GtrViewClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorViewPrivate));
+  g_type_class_add_private (klass, sizeof (GtrViewPrivate));
 
   object_class->finalize = gtranslator_view_finalize;
 }
@@ -180,9 +180,9 @@ gtranslator_view_class_init (GtranslatorViewClass * klass)
 /**
  * gtranslator_view_new:
  *
- * Creates a new #GtranslatorView. An empty default buffer will be created for you.
+ * Creates a new #GtrView. An empty default buffer will be created for you.
  * 
- * Returns: a new #GtranslatorView
+ * Returns: a new #GtrView
  */
 GtkWidget *
 gtranslator_view_new (void)
@@ -195,16 +195,16 @@ gtranslator_view_new (void)
 
 /**
  * gtranslator_view_get_selected_text:
- * @view: a #GtranslatorView
- * @selected_text: it stores the text selected in the #GtranslatorView
+ * @view: a #GtrView
+ * @selected_text: it stores the text selected in the #GtrView
  * @len: it stores the length of the @selected_text
  *
- * Gets the selected text region of the #GtranslatorView
+ * Gets the selected text region of the #GtrView
  *
  * Returns: TRUE if the @selected_text was got correctly.
  */
 gboolean
-gtranslator_view_get_selected_text (GtranslatorView * view,
+gtranslator_view_get_selected_text (GtrView * view,
 				    gchar ** selected_text, gint * len)
 {
   GtkTextIter start, end;
@@ -234,13 +234,13 @@ gtranslator_view_get_selected_text (GtranslatorView * view,
 
 /**
  * gtranslator_view_enable_spellcheck:
- * @view: a #GtranslatorView
+ * @view: a #GtrView
  * @enable: TRUE if you want enable the spellcheck
  * 
  * Enables the spellcheck
  **/
 void
-gtranslator_view_enable_spellcheck (GtranslatorView * view, gboolean enable)
+gtranslator_view_enable_spellcheck (GtrView * view, gboolean enable)
 {
   if (enable)
     {
@@ -260,13 +260,13 @@ gtranslator_view_enable_spellcheck (GtranslatorView * view, gboolean enable)
 
 /**
  * gtranslator_view_enable_visible_whitespace:
- * @view: a #GtranslatorView
+ * @view: a #GtrView
  * @enable: TRUE if you want to enable special chars for white spaces
  *
  * Enables special chars for white spaces including \n and \t
 **/
 void
-gtranslator_view_enable_visible_whitespace (GtranslatorView * view,
+gtranslator_view_enable_visible_whitespace (GtrView * view,
 					    gboolean enable)
 {
   g_return_if_fail (GTR_IS_VIEW (view));
@@ -280,13 +280,13 @@ gtranslator_view_enable_visible_whitespace (GtranslatorView * view,
 
 /**
  * gtranslator_view_cut_clipboard:
- * @view: a #GtranslatorView
+ * @view: a #GtrView
  *
  * Copies the currently-selected text to a clipboard,
  * then deletes said text if it's editable.
  */
 void
-gtranslator_view_cut_clipboard (GtranslatorView * view)
+gtranslator_view_cut_clipboard (GtrView * view)
 {
   GtkTextBuffer *buffer;
   GtkClipboard *clipboard;
@@ -312,12 +312,12 @@ gtranslator_view_cut_clipboard (GtranslatorView * view)
 
 /**
  * gtranslator_view_copy_clipboard:
- * @view: a #GtranslatorView
+ * @view: a #GtrView
  *
  * Copies the currently-selected text to a clipboard.
  */
 void
-gtranslator_view_copy_clipboard (GtranslatorView * view)
+gtranslator_view_copy_clipboard (GtrView * view)
 {
   GtkTextBuffer *buffer;
   GtkClipboard *clipboard;
@@ -337,13 +337,13 @@ gtranslator_view_copy_clipboard (GtranslatorView * view)
 
 /**
  * gtranslator_view_cut_clipboard:
- * @view: a #GtranslatorView
+ * @view: a #GtrView
  *
  * Pastes the contents of a clipboard at the insertion point,
  * or at override_location.
  */
 void
-gtranslator_view_paste_clipboard (GtranslatorView * view)
+gtranslator_view_paste_clipboard (GtrView * view)
 {
   GtkTextBuffer *buffer;
   GtkClipboard *clipboard;
@@ -370,14 +370,14 @@ gtranslator_view_paste_clipboard (GtranslatorView * view)
 
 /**
  * gtranslator_view_set_font:
- * @view: a #GtranslatorView
+ * @view: a #GtrView
  * @def: TRUE if you want to use the default font
- * @font_name: The name of the font you want to use in the #GtranslatorView
+ * @font_name: The name of the font you want to use in the #GtrView
  * 
- * Sets the #GtranslatorView font.
+ * Sets the #GtrView font.
  **/
 void
-gtranslator_view_set_font (GtranslatorView * view,
+gtranslator_view_set_font (GtrView * view,
 			   gboolean def, const gchar * font_name)
 {
   PangoFontDescription *font_desc = NULL;
@@ -400,14 +400,14 @@ gtranslator_view_set_font (GtranslatorView * view,
 
 /**
  * gtranslator_view_set_search_text:
- * @view: a #GtranslatorView
+ * @view: a #GtrView
  * @text: the text to set for searching
- * @flags: a #GtranslatorSearchFlags
+ * @flags: a #GtrSearchFlags
  *
  * Stores the text to search for in the @view with some specific @flags.
  */
 void
-gtranslator_view_set_search_text (GtranslatorView * view,
+gtranslator_view_set_search_text (GtrView * view,
 				  const gchar * text, guint flags)
 {
   GtkSourceBuffer *doc;
@@ -468,16 +468,16 @@ gtranslator_view_set_search_text (GtranslatorView * view,
 
 /**
  * gtranslator_view_get_search_text:
- * @view: a #GtranslatorView
- * @flags: the #GtranslatorSearchFlags of the stored text.
+ * @view: a #GtrView
+ * @flags: the #GtrSearchFlags of the stored text.
  * 
- * Returns the text to search for it and the #GtranslatorSearchFlags of that
+ * Returns the text to search for it and the #GtrSearchFlags of that
  * text.
  * 
  * Returns: the text to search for it.
  */
 gchar *
-gtranslator_view_get_search_text (GtranslatorView * view, guint * flags)
+gtranslator_view_get_search_text (GtrView * view, guint * flags)
 {
   g_return_val_if_fail (GTR_IS_VIEW (view), NULL);
 
@@ -489,12 +489,12 @@ gtranslator_view_get_search_text (GtranslatorView * view, guint * flags)
 
 /**
  * gtranslator_view_get_can_search_again:
- * @view: a #GtranslatorView
+ * @view: a #GtrView
  * 
  * Returns: TRUE if it can search again
  */
 gboolean
-gtranslator_view_get_can_search_again (GtranslatorView * view)
+gtranslator_view_get_can_search_again (GtrView * view)
 {
   g_return_val_if_fail (GTR_IS_VIEW (view), FALSE);
 
@@ -504,7 +504,7 @@ gtranslator_view_get_can_search_again (GtranslatorView * view)
 
 /**
  * gtranslator_view_search_forward:
- * @view: a #GtranslatorView
+ * @view: a #GtrView
  * @start: start of search 
  * @end: bound for the search, or %NULL for the end of the buffer
  * @match_start: return location for start of match, or %NULL
@@ -519,7 +519,7 @@ gtranslator_view_get_can_search_again (GtranslatorView * view)
  * Returns: whether a match was found
  */
 gboolean
-gtranslator_view_search_forward (GtranslatorView * view,
+gtranslator_view_search_forward (GtrView * view,
 				 const GtkTextIter * start,
 				 const GtkTextIter * end,
 				 GtkTextIter * match_start,
@@ -593,7 +593,7 @@ gtranslator_view_search_forward (GtranslatorView * view,
 
 /**
  * gtranslator_view_search_backward:
- * @view: a #GtranslatorView
+ * @view: a #GtrView
  * @start: start of search 
  * @end: bound for the search, or %NULL for the end of the buffer
  * @match_start: return location for start of match, or %NULL
@@ -608,7 +608,7 @@ gtranslator_view_search_forward (GtranslatorView * view,
  * Returns: whether a match was found
  */
 gboolean
-gtranslator_view_search_backward (GtranslatorView * view,
+gtranslator_view_search_backward (GtrView * view,
 				  const GtkTextIter * start,
 				  const GtkTextIter * end,
 				  GtkTextIter * match_start,
@@ -682,10 +682,10 @@ gtranslator_view_search_backward (GtranslatorView * view,
 
 /**
  * gtranslator_view_replace_all:
- * @view: a #GtranslatorView
+ * @view: a #GtrView
  * @find: the text to find
  * @replace: the text to replace @find
- * @flags: a #GtranslatorSearchFlags
+ * @flags: a #GtrSearchFlags
  * 
  * Replaces all matches of @find with @replace and returns the number of 
  * replacements.
@@ -693,7 +693,7 @@ gtranslator_view_search_backward (GtranslatorView * view,
  * Returns: the number of replacements made it.
  */
 gint
-gtranslator_view_replace_all (GtranslatorView * view,
+gtranslator_view_replace_all (GtrView * view,
 			      const gchar * find,
 			      const gchar * replace, guint flags)
 {
@@ -793,13 +793,13 @@ gtranslator_view_replace_all (GtranslatorView * view,
 
 /**
  * gtranslator_view_reload_scheme_color:
- * @view: a #GtranslatorView
+ * @view: a #GtrView
  *
  * Reloads the gtksourceview scheme color. Neccessary when the scheme color 
  * changes.
  */
 void
-gtranslator_view_reload_scheme_color (GtranslatorView * view)
+gtranslator_view_reload_scheme_color (GtrView * view)
 {
   GtkSourceBuffer *buf;
   GtkSourceStyleScheme *scheme;
diff --git a/src/gtr-view.h b/src/gtr-view.h
index bdbd267..4ed8106 100644
--- a/src/gtr-view.h
+++ b/src/gtr-view.h
@@ -29,40 +29,40 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_VIEW		(gtranslator_view_get_type ())
-#define GTR_VIEW(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_VIEW, GtranslatorView))
-#define GTR_VIEW_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_VIEW, GtranslatorViewClass))
+#define GTR_VIEW(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_VIEW, GtrView))
+#define GTR_VIEW_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_VIEW, GtrViewClass))
 #define GTR_IS_VIEW(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_VIEW))
 #define GTR_IS_VIEW_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_VIEW))
-#define GTR_VIEW_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_VIEW, GtranslatorViewClass))
+#define GTR_VIEW_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_VIEW, GtrViewClass))
   typedef enum
 {
   GTR_SEARCH_DONT_SET_FLAGS = 1 << 0,
   GTR_SEARCH_ENTIRE_WORD = 1 << 1,
   GTR_SEARCH_CASE_SENSITIVE = 1 << 2
-} GtranslatorSearchFlags;
+} GtrSearchFlags;
 
 /* Private structure type */
-typedef struct _GtranslatorViewPrivate GtranslatorViewPrivate;
+typedef struct _GtrViewPrivate GtrViewPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorView GtranslatorView;
+typedef struct _GtrView GtrView;
 
-struct _GtranslatorView
+struct _GtrView
 {
   GtkSourceView parent_instance;
 
   /*< private > */
-  GtranslatorViewPrivate *priv;
+  GtrViewPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorViewClass GtranslatorViewClass;
+typedef struct _GtrViewClass GtrViewClass;
 
-struct _GtranslatorViewClass
+struct _GtrViewClass
 {
   GtkSourceViewClass parent_class;
 };
@@ -79,32 +79,32 @@ gtranslator_view_get_type (void)
 
      GtkWidget *gtranslator_view_new (void);
 
-     gboolean gtranslator_view_get_selected_text (GtranslatorView * view,
+     gboolean gtranslator_view_get_selected_text (GtrView * view,
 						  gchar ** selected_text,
 						  gint * len);
 
-     void gtranslator_view_enable_spellcheck (GtranslatorView * view,
+     void gtranslator_view_enable_spellcheck (GtrView * view,
 					      gboolean enable);
 
      void gtranslator_view_enable_visible_whitespace
-       (GtranslatorView * view, gboolean enable);
+       (GtrView * view, gboolean enable);
 
-     void gtranslator_view_cut_clipboard (GtranslatorView * view);
+     void gtranslator_view_cut_clipboard (GtrView * view);
 
-     void gtranslator_view_copy_clipboard (GtranslatorView * view);
+     void gtranslator_view_copy_clipboard (GtrView * view);
 
-     void gtranslator_view_paste_clipboard (GtranslatorView * view);
+     void gtranslator_view_paste_clipboard (GtrView * view);
 
-     void gtranslator_view_set_font (GtranslatorView * view,
+     void gtranslator_view_set_font (GtrView * view,
 				     gboolean def, const gchar * font_name);
 
-     void gtranslator_view_set_search_text (GtranslatorView * view,
+     void gtranslator_view_set_search_text (GtrView * view,
 					    const gchar * text, guint flags);
 
-     gchar *gtranslator_view_get_search_text (GtranslatorView * view,
+     gchar *gtranslator_view_get_search_text (GtrView * view,
 					      guint * flags);
 
-     void gtranslator_view_reload_scheme_color (GtranslatorView * view);
+     void gtranslator_view_reload_scheme_color (GtrView * view);
 
 
 /* Search macros */
diff --git a/src/gtr-window.c b/src/gtr-window.c
index 9345172..35ab16a 100644
--- a/src/gtr-window.c
+++ b/src/gtr-window.c
@@ -63,15 +63,15 @@
 #define GTR_WINDOW_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 					 (object),	\
 					 GTR_TYPE_WINDOW,     \
-					 GtranslatorWindowPrivate))
+					 GtrWindowPrivate))
 
 static void gtranslator_window_cmd_edit_toolbar (GtkAction * action,
-						 GtranslatorWindow * window);
+						 GtrWindow * window);
 
 
-G_DEFINE_TYPE (GtranslatorWindow, gtranslator_window, GTK_TYPE_WINDOW)
+G_DEFINE_TYPE (GtrWindow, gtranslator_window, GTK_TYPE_WINDOW)
 
-struct _GtranslatorWindowPrivate
+struct _GtrWindowPrivate
 {
   GtkWidget *main_box;
 
@@ -84,7 +84,7 @@ struct _GtranslatorWindowPrivate
   guint documents_list_menu_ui_id;
 
   GtkWidget *notebook;
-  GtranslatorTab *active_tab;
+  GtrTab *active_tab;
 
   GtkWidget *dock;
   GdlDockLayout *layout_manager;
@@ -310,7 +310,7 @@ on_update_widget_view_menuitem (gpointer key, gpointer wid, gpointer data)
 
 static void
 on_layout_dirty_notify (GObject * object,
-			GParamSpec * pspec, GtranslatorWindow * window)
+			GParamSpec * pspec, GtrWindow * window)
 {
   if (!strcmp (pspec->name, "dirty"))
     {
@@ -326,7 +326,7 @@ on_layout_dirty_notify (GObject * object,
 }
 
 static void
-gtranslator_window_layout_save (GtranslatorWindow * window,
+gtranslator_window_layout_save (GtrWindow * window,
 				const gchar * filename, const gchar * name)
 {
   g_return_if_fail (GTR_IS_WINDOW (window));
@@ -338,7 +338,7 @@ gtranslator_window_layout_save (GtranslatorWindow * window,
 }
 
 static void
-gtranslator_window_layout_load (GtranslatorWindow * window,
+gtranslator_window_layout_load (GtrWindow * window,
 				const gchar * layout_filename,
 				const gchar * name)
 {
@@ -377,7 +377,7 @@ remove_from_widgets_hash (gpointer name,
 }
 
 static void
-on_widget_destroy (GtkWidget * widget, GtranslatorWindow * window)
+on_widget_destroy (GtkWidget * widget, GtrWindow * window)
 {
   //DEBUG_PRINT ("Widget about to be destroyed");
   g_hash_table_foreach_remove (window->priv->widgets,
@@ -386,7 +386,7 @@ on_widget_destroy (GtkWidget * widget, GtranslatorWindow * window)
 
 static void
 on_widget_remove (GtkWidget * container,
-		  GtkWidget * widget, GtranslatorWindow * window)
+		  GtkWidget * widget, GtrWindow * window)
 {
   GtkWidget *dock_item;
 
@@ -411,7 +411,7 @@ on_widget_remove (GtkWidget * container,
 static void
 on_widget_removed_from_hash (gpointer widget)
 {
-  GtranslatorWindow *window;
+  GtrWindow *window;
   GtkWidget *menuitem;
   GdlDockItem *dockitem;
 
@@ -437,12 +437,12 @@ on_widget_removed_from_hash (gpointer widget)
 }
 
 static void
-add_widget_full (GtranslatorWindow * window,
+add_widget_full (GtrWindow * window,
 		 GtkWidget * widget,
 		 const char *name,
 		 const char *title,
 		 const char *stock_id,
-		 GtranslatorWindowPlacement placement,
+		 GtrWindowPlacement placement,
 		 gboolean locked, GError ** error)
 {
   GtkWidget *item;
@@ -514,7 +514,7 @@ add_widget_full (GtranslatorWindow * window,
 }
 
 static void
-remove_widget (GtranslatorWindow * window,
+remove_widget (GtrWindow * window,
 	       GtkWidget * widget, GError ** error)
 {
   GtkWidget *dock_item;
@@ -535,7 +535,7 @@ remove_widget (GtranslatorWindow * window,
 }
 
 static void
-gtranslator_app_present_widget (GtranslatorWindow * window,
+gtranslator_app_present_widget (GtrWindow * window,
 				GtkWidget * widget, GError ** error)
 {
   GdlDockItem *dock_item;
@@ -570,8 +570,8 @@ gtranslator_app_present_widget (GtranslatorWindow * window,
 }
 
 void
-set_sensitive_according_to_message (GtranslatorWindow * window,
-				    GtranslatorPo * po)
+set_sensitive_according_to_message (GtrWindow * window,
+				    GtrPo * po)
 {
   GList *current;
   GtkAction *action;
@@ -627,16 +627,16 @@ set_sensitive_according_to_message (GtranslatorWindow * window,
 }
 
 static void
-set_sensitive_according_to_tab (GtranslatorWindow * window,
-				GtranslatorTab * tab)
+set_sensitive_according_to_tab (GtrWindow * window,
+				GtrTab * tab)
 {
-  GtranslatorNotebook *notebook;
-  GtranslatorView *view;
-  GtranslatorPo *po;
+  GtrNotebook *notebook;
+  GtrView *view;
+  GtrPo *po;
   GtkSourceBuffer *buf;
   GtkAction *action;
   GList *current;
-  GtranslatorPoState state;
+  GtrPoState state;
   gint pages;
   gint current_page;
 
@@ -694,7 +694,7 @@ set_sensitive_according_to_tab (GtranslatorWindow * window,
 }
 
 void
-set_sensitive_according_to_window (GtranslatorWindow * window)
+set_sensitive_according_to_window (GtrWindow * window)
 {
   gint pages;
 
@@ -710,11 +710,11 @@ set_sensitive_according_to_window (GtranslatorWindow * window)
  * in the statusbar widget.
  */
 static void
-gtranslator_window_update_statusbar_message_count (GtranslatorTab * tab,
-						   GtranslatorMsg * message,
-						   GtranslatorWindow * window)
+gtranslator_window_update_statusbar_message_count (GtrTab * tab,
+						   GtrMsg * message,
+						   GtrWindow * window)
 {
-  GtranslatorPo *po;
+  GtrPo *po;
   const gchar *status;
   gchar *msg;
   gchar *status_msg;
@@ -792,7 +792,7 @@ gtranslator_window_update_statusbar_message_count (GtranslatorTab * tab,
 
 static void
 documents_list_menu_activate (GtkToggleAction * action,
-			      GtranslatorWindow * window)
+			      GtrWindow * window)
 {
   gint n;
 
@@ -804,9 +804,9 @@ documents_list_menu_activate (GtkToggleAction * action,
 }
 
 static gchar *
-get_menu_tip_for_tab (GtranslatorTab * tab)
+get_menu_tip_for_tab (GtrTab * tab)
 {
-  GtranslatorPo *doc;
+  GtrPo *doc;
   gchar *uri;
   gchar *ruri;
   gchar *tip;
@@ -826,9 +826,9 @@ get_menu_tip_for_tab (GtranslatorTab * tab)
 }
 
 static void
-update_documents_list_menu (GtranslatorWindow * window)
+update_documents_list_menu (GtrWindow * window)
 {
-  GtranslatorWindowPrivate *p = window->priv;
+  GtrWindowPrivate *p = window->priv;
   GList *actions, *l;
   gint n, i;
   guint id;
@@ -918,7 +918,7 @@ update_documents_list_menu (GtranslatorWindow * window)
   p->documents_list_menu_ui_id = id;
 }
 
-static GtranslatorWindow *
+static GtrWindow *
 get_drop_window (GtkWidget * widget)
 {
   GtkWidget *target_window;
@@ -929,7 +929,7 @@ get_drop_window (GtkWidget * widget)
   return GTR_WINDOW (target_window);
 }
 
-/* Handle drops on the GtranslatorWindow */
+/* Handle drops on the GtrWindow */
 static void
 drag_data_received_cb (GtkWidget * widget,
 		       GdkDragContext * context,
@@ -938,7 +938,7 @@ drag_data_received_cb (GtkWidget * widget,
 		       GtkSelectionData * selection_data,
 		       guint info, guint time, gpointer data)
 {
-  GtranslatorWindow *window;
+  GtrWindow *window;
   GSList *locations;
 
   window = get_drop_window (widget);
@@ -958,7 +958,7 @@ drag_data_received_cb (GtkWidget * widget,
 
 static void
 update_overwrite_mode_statusbar (GtkTextView * view,
-				 GtranslatorWindow * window)
+				 GtrWindow * window)
 {
   if (view != GTK_TEXT_VIEW (gtranslator_window_get_active_view (window)))
     return;
@@ -973,11 +973,11 @@ update_overwrite_mode_statusbar (GtkTextView * view,
 }
 
 static void
-set_window_title (GtranslatorWindow * window, gboolean with_path)
+set_window_title (GtrWindow * window, gboolean with_path)
 {
-  GtranslatorPo *po;
-  GtranslatorPoState state;
-  GtranslatorTab *active_tab;
+  GtrPo *po;
+  GtrPoState state;
+  GtrTab *active_tab;
   GFile *file;
   gchar *title;
 
@@ -1010,12 +1010,12 @@ set_window_title (GtranslatorWindow * window, gboolean with_path)
 static void
 notebook_switch_page (GtkNotebook * nb,
 		      GtkNotebookPage * page,
-		      gint page_num, GtranslatorWindow * window)
+		      gint page_num, GtrWindow * window)
 {
-  GtranslatorTab *tab;
+  GtrTab *tab;
   GList *msg;
-  GtranslatorView *view;
-  GtranslatorPo *po;
+  GtrView *view;
+  GtrPo *po;
   gint n_pages;
   GtkAction *action;
   gchar *action_name;
@@ -1070,7 +1070,7 @@ notebook_switch_page (GtkNotebook * nb,
 static void
 notebook_page_removed (GtkNotebook * notebook,
 		       GtkWidget * child,
-		       guint page_num, GtranslatorWindow * window)
+		       guint page_num, GtrWindow * window)
 {
   gint n_pages;
 
@@ -1087,8 +1087,8 @@ notebook_page_removed (GtkNotebook * notebook,
 }
 
 static void
-notebook_tab_close_request (GtranslatorNotebook * notebook,
-			    GtranslatorTab * tab, GtranslatorWindow * window)
+notebook_tab_close_request (GtrNotebook * notebook,
+			    GtrTab * tab, GtrWindow * window)
 {
   /* Note: we are destroying the tab before the default handler
    * seems to be ok, but we need to keep an eye on this. */
@@ -1100,11 +1100,11 @@ notebook_tab_close_request (GtranslatorNotebook * notebook,
 
 static void
 can_undo (GtkSourceBuffer * doc,
-	  GParamSpec * pspec, GtranslatorWindow * window)
+	  GParamSpec * pspec, GtrWindow * window)
 {
   GtkAction *action;
   gboolean sensitive;
-  GtranslatorView *view;
+  GtrView *view;
   GtkSourceBuffer *buf;
 
   view = gtranslator_window_get_active_view (window);
@@ -1122,11 +1122,11 @@ can_undo (GtkSourceBuffer * doc,
 
 static void
 can_redo (GtkSourceBuffer * doc,
-	  GParamSpec * spec, GtranslatorWindow * window)
+	  GParamSpec * spec, GtrWindow * window)
 {
   GtkAction *action;
   gboolean sensitive;
-  GtranslatorView *view;
+  GtrView *view;
   GtkSourceBuffer *buf;
 
   view = gtranslator_window_get_active_view (window);
@@ -1143,8 +1143,8 @@ can_redo (GtkSourceBuffer * doc,
 }
 
 static void
-sync_state (GtranslatorPo * po,
-	    GParamSpec * pspec, GtranslatorWindow * window)
+sync_state (GtrPo * po,
+	    GParamSpec * pspec, GtrWindow * window)
 {
   int n_pages = 0;
 
@@ -1157,8 +1157,8 @@ sync_state (GtranslatorPo * po,
 }
 
 static void
-showed_message_cb (GtranslatorTab * tab,
-		   GtranslatorMsg * msg, GtranslatorWindow * window)
+showed_message_cb (GtrTab * tab,
+		   GtrMsg * msg, GtrWindow * window)
 {
   g_return_if_fail (GTR_IS_TAB (tab));
 
@@ -1170,10 +1170,10 @@ showed_message_cb (GtranslatorTab * tab,
 static void
 notebook_tab_added (GtkNotebook * notebook,
 		    GtkWidget * child,
-		    guint page_num, GtranslatorWindow * window)
+		    guint page_num, GtrWindow * window)
 {
   GList *views;
-  GtranslatorTab *tab = GTR_TAB (child);
+  GtrTab *tab = GTR_TAB (child);
   GtkTextBuffer *buffer;
   gint n_pages;
 
@@ -1226,7 +1226,7 @@ notebook_tab_added (GtkNotebook * notebook,
 }
 
 void
-gtranslator_recent_add (GtranslatorWindow * window,
+gtranslator_recent_add (GtrWindow * window,
 			GFile * location, gchar * project_id)
 {
   GtkRecentData *recent_data;
@@ -1264,7 +1264,7 @@ gtranslator_recent_add (GtranslatorWindow * window,
 }
 
 void
-gtranslator_recent_remove (GtranslatorWindow * window, const gchar * path)
+gtranslator_recent_remove (GtrWindow * window, const gchar * path)
 {
   gchar *uri;
   GError *error = NULL;
@@ -1291,7 +1291,7 @@ gtranslator_recent_remove (GtranslatorWindow * window, const gchar * path)
 
 static void
 gtranslator_recent_chooser_item_activated_cb (GtkRecentChooser * chooser,
-					      GtranslatorWindow * window)
+					      GtrWindow * window)
 {
   gchar *uri;
   GError *error = NULL;
@@ -1311,7 +1311,7 @@ gtranslator_recent_chooser_item_activated_cb (GtkRecentChooser * chooser,
 }
 
 static GtkWidget *
-create_recent_chooser_menu (GtranslatorWindow * window,
+create_recent_chooser_menu (GtrWindow * window,
 			    GtkRecentManager * manager)
 {
   GtkWidget *recent_menu;
@@ -1335,7 +1335,7 @@ create_recent_chooser_menu (GtranslatorWindow * window,
 }
 
 static void
-gtranslator_window_set_action_sensitive (GtranslatorWindow * window,
+gtranslator_window_set_action_sensitive (GtrWindow * window,
 					 const gchar * name,
 					 gboolean sensitive)
 {
@@ -1348,7 +1348,7 @@ static void
 gtranslator_window_cmd_edit_toolbar_cb (GtkDialog * dialog,
 					gint response, gpointer data)
 {
-  GtranslatorWindow *window = GTR_WINDOW (data);
+  GtrWindow *window = GTR_WINDOW (data);
   egg_editable_toolbar_set_edit_mode
     (EGG_EDITABLE_TOOLBAR (window->priv->toolbar), FALSE);
   _gtranslator_application_save_toolbars_model (GTR_APP);
@@ -1357,7 +1357,7 @@ gtranslator_window_cmd_edit_toolbar_cb (GtkDialog * dialog,
 
 static void
 gtranslator_window_cmd_edit_toolbar (GtkAction * action,
-				     GtranslatorWindow * window)
+				     GtrWindow * window)
 {
   GtkWidget *dialog;
   GtkWidget *editor;
@@ -1392,7 +1392,7 @@ gtranslator_window_cmd_edit_toolbar (GtkAction * action,
 }
 
 static void
-menu_item_select_cb (GtkMenuItem * proxy, GtranslatorWindow * window)
+menu_item_select_cb (GtkMenuItem * proxy, GtrWindow * window)
 {
   GtkAction *action;
   char *message;
@@ -1410,7 +1410,7 @@ menu_item_select_cb (GtkMenuItem * proxy, GtranslatorWindow * window)
 }
 
 static void
-menu_item_deselect_cb (GtkMenuItem * proxy, GtranslatorWindow * window)
+menu_item_deselect_cb (GtkMenuItem * proxy, GtrWindow * window)
 {
   gtranslator_statusbar_pop_default (GTR_STATUSBAR (window->priv->statusbar));
 }
@@ -1418,7 +1418,7 @@ menu_item_deselect_cb (GtkMenuItem * proxy, GtranslatorWindow * window)
 static void
 connect_proxy_cb (GtkUIManager * manager,
 		  GtkAction * action,
-		  GtkWidget * proxy, GtranslatorWindow * window)
+		  GtkWidget * proxy, GtrWindow * window)
 {
   if (GTK_IS_MENU_ITEM (proxy))
     {
@@ -1432,7 +1432,7 @@ connect_proxy_cb (GtkUIManager * manager,
 static void
 disconnect_proxy_cb (GtkUIManager * manager,
 		     GtkAction * action,
-		     GtkWidget * proxy, GtranslatorWindow * window)
+		     GtkWidget * proxy, GtrWindow * window)
 {
   if (GTK_IS_MENU_ITEM (proxy))
     {
@@ -1444,7 +1444,7 @@ disconnect_proxy_cb (GtkUIManager * manager,
 }
 
 static void
-gtranslator_window_draw (GtranslatorWindow * window)
+gtranslator_window_draw (GtrWindow * window)
 {
   GtkWidget *hbox;		//Statusbar and progressbar
   GtkWidget *widget;
@@ -1456,7 +1456,7 @@ gtranslator_window_draw (GtranslatorWindow * window)
   gchar *datadir;
   gchar *path;
 
-  GtranslatorWindowPrivate *priv = window->priv;
+  GtrWindowPrivate *priv = window->priv;
 
   /* Main box */
   priv->main_box = gtk_vbox_new (FALSE, 0);
@@ -1599,7 +1599,7 @@ gtranslator_window_draw (GtranslatorWindow * window)
 }
 
 static void
-gtranslator_window_init (GtranslatorWindow * window)
+gtranslator_window_init (GtrWindow * window)
 {
   GtkTargetList *tl;
   gint active_page;
@@ -1653,7 +1653,7 @@ gtranslator_window_init (GtranslatorWindow * window)
   /* Adding notebook to dock */
   add_widget_full (window,
 		   window->priv->notebook,
-		   "GtranslatorNotebook",
+		   "GtrNotebook",
 		   _("Documents"),
 		   NULL, GTR_WINDOW_PLACEMENT_CENTER, TRUE, NULL);
 
@@ -1669,8 +1669,8 @@ gtranslator_window_init (GtranslatorWindow * window)
 static void
 gtranslator_window_dispose (GObject * object)
 {
-  GtranslatorWindow *window = GTR_WINDOW (object);
-  GtranslatorWindowPrivate *priv = window->priv;
+  GtrWindow *window = GTR_WINDOW (object);
+  GtrWindowPrivate *priv = window->priv;
 
   if (priv->ui_manager)
     {
@@ -1693,7 +1693,7 @@ gtranslator_window_finalize (GObject * object)
 }
 
 static void
-save_panes_state (GtranslatorWindow * window)
+save_panes_state (GtrWindow * window)
 {
   gchar *filename;
   gchar *config_folder;
@@ -1716,7 +1716,7 @@ save_panes_state (GtranslatorWindow * window)
 static void
 gtranslator_window_destroy (GtkObject * object)
 {
-  GtranslatorWindow *window;
+  GtrWindow *window;
 
   window = GTR_WINDOW (object);
 
@@ -1734,7 +1734,7 @@ static gboolean
 gtranslator_window_configure_event (GtkWidget * widget,
 				    GdkEventConfigure * event)
 {
-  GtranslatorWindow *window = GTR_WINDOW (widget);
+  GtrWindow *window = GTR_WINDOW (widget);
 
   window->priv->width = event->width;
   window->priv->height = event->height;
@@ -1744,13 +1744,13 @@ gtranslator_window_configure_event (GtkWidget * widget,
 }
 
 static void
-gtranslator_window_class_init (GtranslatorWindowClass * klass)
+gtranslator_window_class_init (GtrWindowClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkObjectClass *gobject_class = GTK_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorWindowPrivate));
+  g_type_class_add_private (klass, sizeof (GtrWindowPrivate));
 
   object_class->finalize = gtranslator_window_finalize;
   object_class->dispose = gtranslator_window_dispose;
@@ -1764,18 +1764,18 @@ gtranslator_window_class_init (GtranslatorWindowClass * klass)
 
 /**
  * gtranslator_window_create_tab:
- * @window: a #GtranslatorWindow
- * @po: a #GtranslatorPo
+ * @window: a #GtrWindow
+ * @po: a #GtrPo
  * 
- * Adds a new #GtranslatorTab to the #GtranslatorNotebook and returns the
- * #GtranslatorTab.
+ * Adds a new #GtrTab to the #GtrNotebook and returns the
+ * #GtrTab.
  * 
- * Returns: a new #GtranslatorTab object
+ * Returns: a new #GtrTab object
  */
-GtranslatorTab *
-gtranslator_window_create_tab (GtranslatorWindow * window, GtranslatorPo * po)
+GtrTab *
+gtranslator_window_create_tab (GtrWindow * window, GtrPo * po)
 {
-  GtranslatorTab *tab;
+  GtrTab *tab;
 
   tab = gtranslator_tab_new (po);
   gtk_widget_show (GTK_WIDGET (tab));
@@ -1787,14 +1787,14 @@ gtranslator_window_create_tab (GtranslatorWindow * window, GtranslatorPo * po)
 
 /**
  * gtranslator_window_get_active_tab:
- * @window: a #GtranslatorWindow
+ * @window: a #GtrWindow
  * 
- * Gets the active #GtranslatorTab of the @window.
+ * Gets the active #GtrTab of the @window.
  *
- * Returns: the active #GtranslatorTab of the @window.
+ * Returns: the active #GtrTab of the @window.
  */
-GtranslatorTab *
-gtranslator_window_get_active_tab (GtranslatorWindow * window)
+GtrTab *
+gtranslator_window_get_active_tab (GtrWindow * window)
 {
   return
     gtranslator_notebook_get_page (GTR_NOTEBOOK (window->priv->notebook));
@@ -1802,14 +1802,14 @@ gtranslator_window_get_active_tab (GtranslatorWindow * window)
 
 /**
  * gtranslator_window_get_all_tabs:
- * @window: a #GtranslatorWindow
+ * @window: a #GtrWindow
  *
  * Gets a list of all tabs in the @window or NULL if there is no tab opened.
  *
  * Returns: a list of all tabs in the @window or NULL if there is no tab opened.
  */
 GList *
-gtranslator_window_get_all_tabs (GtranslatorWindow * window)
+gtranslator_window_get_all_tabs (GtrWindow * window)
 {
   gint num_pages;
   gint i = 0;
@@ -1832,20 +1832,20 @@ gtranslator_window_get_all_tabs (GtranslatorWindow * window)
 
 /**
  * gtranslator_window_get_header_from_active_tab:
- * @window: a #GtranslatorWindow
+ * @window: a #GtrWindow
  *
- * Gets the #GtranslatorHeader of the #GtranslatorPo of in the active
- * #GtranslatorTab.
+ * Gets the #GtrHeader of the #GtrPo of in the active
+ * #GtrTab.
  *
- * Returns: the #GtranslatorHeader of the #GtranslatorPo of in the active
- * #GtranslatorTab
+ * Returns: the #GtrHeader of the #GtrPo of in the active
+ * #GtrTab
  */
-GtranslatorHeader *
-gtranslator_window_get_header_from_active_tab (GtranslatorWindow * window)
+GtrHeader *
+gtranslator_window_get_header_from_active_tab (GtrWindow * window)
 {
-  GtranslatorTab *current_page;
-  GtranslatorPo *po;
-  GtranslatorHeader *header;
+  GtrTab *current_page;
+  GtrPo *po;
+  GtrHeader *header;
 
   g_return_val_if_fail (GTR_IS_WINDOW (window), NULL);
 
@@ -1861,42 +1861,42 @@ gtranslator_window_get_header_from_active_tab (GtranslatorWindow * window)
 
 /**
  * gtranslator_window_get_notebook:
- * @window: a #GtranslatorWindow
+ * @window: a #GtrWindow
  * 
- * Gets the main #GtranslatorNotebook of the @window.
+ * Gets the main #GtrNotebook of the @window.
  *
- * Returns: the #GtranslatorNotebook of the @window
+ * Returns: the #GtrNotebook of the @window
  */
-GtranslatorNotebook *
-gtranslator_window_get_notebook (GtranslatorWindow * window)
+GtrNotebook *
+gtranslator_window_get_notebook (GtrWindow * window)
 {
   return GTR_NOTEBOOK (window->priv->notebook);
 }
 
 /**
  * gtranslator_window_get_statusbar:
- * @window: a #GtranslatorWindow
+ * @window: a #GtrWindow
  *
  * Gets the statusbar widget of the window.
  *
  * Returns: the statusbar widget of the window
  */
 GtkWidget *
-gtranslator_window_get_statusbar (GtranslatorWindow * window)
+gtranslator_window_get_statusbar (GtrWindow * window)
 {
   return window->priv->statusbar;
 }
 
 /**
  * gtranslator_window_get_ui_manager:
- * @window: a #GtranslatorWindow
+ * @window: a #GtrWindow
  *
  * Gets the #GtkUIManager of the window.
  *
  * Returns: the #GtkUIManager of the @window
  */
 GtkUIManager *
-gtranslator_window_get_ui_manager (GtranslatorWindow * window)
+gtranslator_window_get_ui_manager (GtrWindow * window)
 {
   return window->priv->ui_manager;
 }
@@ -1911,10 +1911,10 @@ gtranslator_window_get_ui_manager (GtranslatorWindow * window)
  * Returns: the active translation view in the #GtranslationWindow or
  * NULL if there is not tab opened.
  **/
-GtranslatorView *
-gtranslator_window_get_active_view (GtranslatorWindow * window)
+GtrView *
+gtranslator_window_get_active_view (GtrWindow * window)
 {
-  GtranslatorTab *current_tab;
+  GtrTab *current_tab;
   current_tab = gtranslator_window_get_active_tab (window);
 
   if (!current_tab)
@@ -1934,7 +1934,7 @@ gtranslator_window_get_active_view (GtranslatorWindow * window)
  * Return value: a newly allocated list of #GtranslationWindow objects
  **/
 GList *
-gtranslator_window_get_all_views (GtranslatorWindow * window,
+gtranslator_window_get_all_views (GtrWindow * window,
 				  gboolean original, gboolean translated)
 {
   gint numtabs;
@@ -1963,23 +1963,23 @@ gtranslator_window_get_all_views (GtranslatorWindow * window,
 
 /**
  * gtranslator_window_add_widget:
- * @window: a #GtranslatorWindow
+ * @window: a #GtrWindow
  * @widget: the widget to add in the window
  * @name: the name of the widged
  * @title: the title
  * @stock_id: the stock id for the icon
- * @placement: a #GtranslatorWindowPlacement
+ * @placement: a #GtrWindowPlacement
  *
  * Adds a new widget to the @window in the placement you prefer with and 
  * specific name, title and icon you want.
  */
 void
-gtranslator_window_add_widget (GtranslatorWindow * window,
+gtranslator_window_add_widget (GtrWindow * window,
 			       GtkWidget * widget,
 			       const gchar * name,
 			       const gchar * title,
 			       const gchar * stock_id,
-			       GtranslatorWindowPlacement placement)
+			       GtrWindowPlacement placement)
 {
   /*FIXME: We have to manage the error */
   add_widget_full (window, widget,
@@ -1988,13 +1988,13 @@ gtranslator_window_add_widget (GtranslatorWindow * window,
 
 /**
  * gtranslator_window_remove_widget:
- * @window: a #GtranslatorWindow
+ * @window: a #GtrWindow
  * @widget: the widget to remove
  *
  * Removes from the @window the @widget if it exists.
  */
 void
-gtranslator_window_remove_widget (GtranslatorWindow * window,
+gtranslator_window_remove_widget (GtrWindow * window,
 				  GtkWidget * widget)
 {
   /*FIXME: We have to manage the error */
@@ -2003,14 +2003,14 @@ gtranslator_window_remove_widget (GtranslatorWindow * window,
 
 /**
  * _gtranslator_window_get_layout_manager:
- * @window: a #GtranslatorWindow
+ * @window: a #GtrWindow
  * 
  * Gets the GDL layout manager of the window.
  * 
  * Returns: the GDL layout manager of the window.
  */
 GObject *
-_gtranslator_window_get_layout_manager (GtranslatorWindow * window)
+_gtranslator_window_get_layout_manager (GtrWindow * window)
 {
   g_return_val_if_fail (GTR_IS_WINDOW (window), NULL);
 
@@ -2019,20 +2019,20 @@ _gtranslator_window_get_layout_manager (GtranslatorWindow * window)
 
 /**
  * gtranslator_window_get_tab_from_uri:
- * @window: a #GtranslatorWindow
- * @location: the GFile of the po file of the #GtranslatorTab
+ * @window: a #GtrWindow
+ * @location: the GFile of the po file of the #GtrTab
  *
- * Gets the #GtranslatorTab of the #GtranslatorWindows that matches with the
+ * Gets the #GtrTab of the #GtrWindows that matches with the
  * @location.
  *
- * Returns: the #GtranslatorTab which @location matches with its po file.
+ * Returns: the #GtrTab which @location matches with its po file.
  */
 GtkWidget *
-gtranslator_window_get_tab_from_location (GtranslatorWindow * window,
+gtranslator_window_get_tab_from_location (GtrWindow * window,
 					  GFile * location)
 {
   GList *tabs, *l;
-  GtranslatorPo *po;
+  GtrPo *po;
   GFile *po_location;
 
   g_return_val_if_fail (GTR_IS_WINDOW (window), NULL);
@@ -2059,13 +2059,13 @@ gtranslator_window_get_tab_from_location (GtranslatorWindow * window,
 
 /**
  * gtranslator_window_set_active_tab:
- * @window: a #GtranslatorWindow
- * @tab: a #GtranslatorTab
+ * @window: a #GtrWindow
+ * @tab: a #GtrTab
  *
  * Sets the active tab for the @window.
  */
 void
-gtranslator_window_set_active_tab (GtranslatorWindow * window,
+gtranslator_window_set_active_tab (GtrWindow * window,
 				   GtkWidget * tab)
 {
   gint page;
@@ -2077,15 +2077,15 @@ gtranslator_window_set_active_tab (GtranslatorWindow * window,
 
 /**
  * _gtranslator_window_close_tab:
- * @window: a #GtranslatorWindow
- * @tab: a #GtranslatorTab
+ * @window: a #GtrWindow
+ * @tab: a #GtrTab
  *
  * Closes the opened @tab of the @window and sets the right sensitivity of the
  * widgets.
  */
 void
-_gtranslator_window_close_tab (GtranslatorWindow * window,
-			       GtranslatorTab * tab)
+_gtranslator_window_close_tab (GtrWindow * window,
+			       GtrTab * tab)
 {
   gint i;
 
@@ -2110,7 +2110,7 @@ _gtranslator_window_close_tab (GtranslatorWindow * window,
   set_sensitive_according_to_window (window);
 }
 
-GtkWidget * gtranslator_window_get_tm_menu (GtranslatorWindow * window)
+GtkWidget * gtranslator_window_get_tm_menu (GtrWindow * window)
 {
   return window->priv->tm_menu;
 }
diff --git a/src/gtr-window.h b/src/gtr-window.h
index cef1032..a6dd3c3 100644
--- a/src/gtr-window.h
+++ b/src/gtr-window.h
@@ -37,33 +37,33 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_WINDOW		(gtranslator_window_get_type ())
-#define GTR_WINDOW(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_WINDOW, GtranslatorWindow))
-#define GTR_WINDOW_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_WINDOW, GtranslatorWindowClass))
+#define GTR_WINDOW(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_WINDOW, GtrWindow))
+#define GTR_WINDOW_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_WINDOW, GtrWindowClass))
 #define GTR_IS_WINDOW(o)	(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_WINDOW))
 #define GTR_IS_WINDOW_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_WINDOW))
-#define GTR_WINDOW_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_WINDOW, GtranslatorWindowClass))
+#define GTR_WINDOW_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_WINDOW, GtrWindowClass))
 /* Private structure type */
-typedef struct _GtranslatorWindowPrivate GtranslatorWindowPrivate;
+typedef struct _GtrWindowPrivate GtrWindowPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorWindow GtranslatorWindow;
+typedef struct _GtrWindow GtrWindow;
 
-struct _GtranslatorWindow
+struct _GtrWindow
 {
   GtkWindow parent_instance;
 
   /*< private > */
-  GtranslatorWindowPrivate *priv;
+  GtrWindowPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorWindowClass GtranslatorWindowClass;
+typedef struct _GtrWindowClass GtrWindowClass;
 
-struct _GtranslatorWindowClass
+struct _GtrWindowClass
 {
   GtkWindowClass parent_class;
 };
@@ -77,7 +77,7 @@ typedef enum
   GTR_WINDOW_PLACEMENT_LEFT,
   GTR_WINDOW_PLACEMENT_CENTER,
   GTR_WINDOW_PLACEMENT_FLOATING
-} GtranslatorWindowPlacement;
+} GtrWindowPlacement;
 
 /*
  * Public methods
@@ -88,62 +88,62 @@ gtranslator_window_get_type (void)
 
      GType gtranslator_window_register_type (GTypeModule * module);
 
-     GtranslatorTab *gtranslator_window_create_tab (GtranslatorWindow *
+     GtrTab *gtranslator_window_create_tab (GtrWindow *
 						    window,
-						    GtranslatorPo * po);
+						    GtrPo * po);
 
-     GtranslatorTab *gtranslator_window_get_active_tab (GtranslatorWindow *
+     GtrTab *gtranslator_window_get_active_tab (GtrWindow *
 							window);
 
-     GList *gtranslator_window_get_all_tabs (GtranslatorWindow * window);
+     GList *gtranslator_window_get_all_tabs (GtrWindow * window);
 
-     GtranslatorNotebook *gtranslator_window_get_notebook (GtranslatorWindow *
+     GtrNotebook *gtranslator_window_get_notebook (GtrWindow *
 							   window);
-     GtranslatorHeader
-       *gtranslator_window_get_header_from_active_tab (GtranslatorWindow *
+     GtrHeader
+       *gtranslator_window_get_header_from_active_tab (GtrWindow *
 						       window);
 
-     GtkWidget *gtranslator_window_get_statusbar (GtranslatorWindow * window);
+     GtkWidget *gtranslator_window_get_statusbar (GtrWindow * window);
 
-     GtkUIManager *gtranslator_window_get_ui_manager (GtranslatorWindow *
+     GtkUIManager *gtranslator_window_get_ui_manager (GtrWindow *
 						      window);
 
-     GtranslatorView *gtranslator_window_get_active_view (GtranslatorWindow *
+     GtrView *gtranslator_window_get_active_view (GtrWindow *
 							  window);
 
-     GList *gtranslator_window_get_all_views (GtranslatorWindow * window,
+     GList *gtranslator_window_get_all_views (GtrWindow * window,
 					      gboolean original,
 					      gboolean translated);
 
-     void set_sensitive_according_to_message (GtranslatorWindow * window,
-					      GtranslatorPo * po);
+     void set_sensitive_according_to_message (GtrWindow * window,
+					      GtrPo * po);
 
-     void set_sensitive_according_to_window (GtranslatorWindow * window);
+     void set_sensitive_according_to_window (GtrWindow * window);
 
-     void gtranslator_window_add_widget (GtranslatorWindow * window,
+     void gtranslator_window_add_widget (GtrWindow * window,
 					 GtkWidget * widget,
 					 const gchar * name,
 					 const gchar * title,
 					 const gchar * stock_id,
-					 GtranslatorWindowPlacement
+					 GtrWindowPlacement
 					 placement);
 
-     void gtranslator_window_remove_widget (GtranslatorWindow * window,
+     void gtranslator_window_remove_widget (GtrWindow * window,
 					    GtkWidget * widget);
 
      GObject *_gtranslator_window_get_layout_manager
-       (GtranslatorWindow * window);
+       (GtrWindow * window);
 
      GtkWidget *gtranslator_window_get_tab_from_location
-       (GtranslatorWindow * window, GFile * location);
+       (GtrWindow * window, GFile * location);
 
-     void gtranslator_window_set_active_tab (GtranslatorWindow * window,
+     void gtranslator_window_set_active_tab (GtrWindow * window,
 					     GtkWidget * tab);
 
-     void _gtranslator_window_close_tab (GtranslatorWindow * window,
-					 GtranslatorTab * tab);
+     void _gtranslator_window_close_tab (GtrWindow * window,
+					 GtrTab * tab);
 
-     GtkWidget *gtranslator_window_get_tm_menu (GtranslatorWindow * window);
+     GtkWidget *gtranslator_window_get_tm_menu (GtrWindow * window);
 
 G_END_DECLS
 #endif /* __WINDOW_H__ */
diff --git a/src/main.c b/src/main.c
index 5db9c47..f234bb6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -124,8 +124,8 @@ gint
 main (gint argc, gchar * argv[])
 {
   GError *error = NULL;
-  GtranslatorPluginsEngine *engine;
-  GtranslatorWindow *window;
+  GtrPluginsEngine *engine;
+  GtrWindow *window;
   GSList *file_list = NULL;
   GOptionContext *context;
   gchar *filename;
@@ -144,7 +144,7 @@ main (gint argc, gchar * argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  g_set_application_name (_("Gtranslator"));
+  g_set_application_name (_("Gtr"));
   gtk_window_set_default_icon_name ("gtranslator");
 
   /* Setup command line options */
diff --git a/src/plugin-system/gtr-module.c b/src/plugin-system/gtr-module.c
index 9f1b51c..f454e1f 100644
--- a/src/plugin-system/gtr-module.c
+++ b/src/plugin-system/gtr-module.c
@@ -41,7 +41,7 @@
 #include "gtr-module.h"
 #include "gtr-debug.h"
 
-typedef GType (*GtranslatorModuleRegisterFunc) (GTypeModule *);
+typedef GType (*GtrModuleRegisterFunc) (GTypeModule *);
 
 enum
 {
@@ -50,13 +50,13 @@ enum
   PROP_PATH
 };
 
-G_DEFINE_TYPE (GtranslatorModule, gtranslator_module, G_TYPE_TYPE_MODULE);
+G_DEFINE_TYPE (GtrModule, gtranslator_module, G_TYPE_TYPE_MODULE);
 
 static gboolean
 gtranslator_module_load (GTypeModule * gmodule)
 {
-  GtranslatorModule *module = GTR_MODULE (gmodule);
-  GtranslatorModuleRegisterFunc register_func;
+  GtrModule *module = GTR_MODULE (gmodule);
+  GtrModuleRegisterFunc register_func;
   gchar *path;
 
   DEBUG_PRINT ("Loading %s module from %s",
@@ -111,7 +111,7 @@ gtranslator_module_load (GTypeModule * gmodule)
 static void
 gtranslator_module_unload (GTypeModule * gmodule)
 {
-  GtranslatorModule *module = GTR_MODULE (gmodule);
+  GtrModule *module = GTR_MODULE (gmodule);
 
   DEBUG_PRINT ("Unloading %s", module->path);
 
@@ -128,17 +128,17 @@ gtranslator_module_class_real_garbage_collect (void)
 }
 
 static void
-gtranslator_module_init (GtranslatorModule * module)
+gtranslator_module_init (GtrModule * module)
 {
-  DEBUG_PRINT ("GtranslatorModule %p initialising", module);
+  DEBUG_PRINT ("GtrModule %p initialising", module);
 }
 
 static void
 gtranslator_module_finalize (GObject * object)
 {
-  GtranslatorModule *module = GTR_MODULE (object);
+  GtrModule *module = GTR_MODULE (object);
 
-  DEBUG_PRINT ("GtranslatorModule %p finalising", module);
+  DEBUG_PRINT ("GtrModule %p finalising", module);
 
   g_free (module->path);
   g_free (module->module_name);
@@ -151,7 +151,7 @@ gtranslator_module_get_property (GObject * object,
 				 guint prop_id,
 				 GValue * value, GParamSpec * pspec)
 {
-  GtranslatorModule *module = GTR_MODULE (object);
+  GtrModule *module = GTR_MODULE (object);
 
   switch (prop_id)
     {
@@ -171,7 +171,7 @@ gtranslator_module_set_property (GObject * object,
 				 guint prop_id,
 				 const GValue * value, GParamSpec * pspec)
 {
-  GtranslatorModule *module = GTR_MODULE (object);
+  GtrModule *module = GTR_MODULE (object);
 
   switch (prop_id)
     {
@@ -188,7 +188,7 @@ gtranslator_module_set_property (GObject * object,
 }
 
 static void
-gtranslator_module_class_init (GtranslatorModuleClass * klass)
+gtranslator_module_class_init (GtrModuleClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GTypeModuleClass *module_class = G_TYPE_MODULE_CLASS (klass);
@@ -222,7 +222,7 @@ gtranslator_module_class_init (GtranslatorModuleClass * klass)
 }
 
 void
-gtranslator_module_class_garbage_collect (GtranslatorModuleClass * klass)
+gtranslator_module_class_garbage_collect (GtrModuleClass * klass)
 {
   g_return_if_fail (GTR_IS_MODULE_CLASS (klass));
 
@@ -230,7 +230,7 @@ gtranslator_module_class_garbage_collect (GtranslatorModuleClass * klass)
 }
 
 GObject *
-gtranslator_module_new_object (GtranslatorModule * module)
+gtranslator_module_new_object (GtrModule * module)
 {
   g_return_val_if_fail (module->type != 0, NULL);
 
@@ -240,7 +240,7 @@ gtranslator_module_new_object (GtranslatorModule * module)
 }
 
 const gchar *
-gtranslator_module_get_path (GtranslatorModule * module)
+gtranslator_module_get_path (GtrModule * module)
 {
   g_return_val_if_fail (GTR_IS_MODULE (module), NULL);
 
@@ -248,7 +248,7 @@ gtranslator_module_get_path (GtranslatorModule * module)
 }
 
 const gchar *
-gtranslator_module_get_module_name (GtranslatorModule * module)
+gtranslator_module_get_module_name (GtrModule * module)
 {
   g_return_val_if_fail (GTR_IS_MODULE (module), NULL);
 
diff --git a/src/plugin-system/gtr-module.h b/src/plugin-system/gtr-module.h
index 543686f..7217458 100644
--- a/src/plugin-system/gtr-module.h
+++ b/src/plugin-system/gtr-module.h
@@ -44,14 +44,14 @@
 
 G_BEGIN_DECLS
 #define GTR_TYPE_MODULE		(gtranslator_module_get_type ())
-#define GTR_MODULE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTR_TYPE_MODULE, GtranslatorModule))
-#define GTR_MODULE_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTR_TYPE_MODULE, GtranslatorModuleClass))
+#define GTR_MODULE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTR_TYPE_MODULE, GtrModule))
+#define GTR_MODULE_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTR_TYPE_MODULE, GtrModuleClass))
 #define GTR_IS_MODULE(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTR_TYPE_MODULE))
 #define GTR_IS_MODULE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTR_TYPE_MODULE))
-#define GTR_MODULE_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), GTR_TYPE_MODULE, GtranslatorModuleClass))
-typedef struct _GtranslatorModule GtranslatorModule;
+#define GTR_MODULE_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), GTR_TYPE_MODULE, GtrModuleClass))
+typedef struct _GtrModule GtrModule;
 
-struct _GtranslatorModule
+struct _GtrModule
 {
   GTypeModule parent;
 
@@ -62,9 +62,9 @@ struct _GtranslatorModule
   GType type;
 };
 
-typedef struct _GtranslatorModuleClass GtranslatorModuleClass;
+typedef struct _GtrModuleClass GtrModuleClass;
 
-struct _GtranslatorModuleClass
+struct _GtrModuleClass
 {
   GTypeModuleClass parent_class;
 
@@ -76,15 +76,15 @@ GType
 gtranslator_module_get_type (void)
   G_GNUC_CONST;
 
-     const gchar *gtranslator_module_get_path (GtranslatorModule * module);
+     const gchar *gtranslator_module_get_path (GtrModule * module);
 
-     const gchar *gtranslator_module_get_module_name (GtranslatorModule *
+     const gchar *gtranslator_module_get_module_name (GtrModule *
 						      module);
 
-     GObject *gtranslator_module_new_object (GtranslatorModule * module);
+     GObject *gtranslator_module_new_object (GtrModule * module);
 
      void gtranslator_module_class_garbage_collect
-       (GtranslatorModuleClass * klass);
+       (GtrModuleClass * klass);
 
 G_END_DECLS
 #endif
diff --git a/src/plugin-system/gtr-plugin-info-priv.h b/src/plugin-system/gtr-plugin-info-priv.h
index 482fe59..ad36db3 100644
--- a/src/plugin-system/gtr-plugin-info-priv.h
+++ b/src/plugin-system/gtr-plugin-info-priv.h
@@ -35,7 +35,7 @@
 #include "gtr-plugin-info.h"
 #include "gtr-plugin.h"
 
-struct _GtranslatorPluginInfo
+struct _GtrPluginInfo
 {
   gint refcount;
 
@@ -43,7 +43,7 @@ struct _GtranslatorPluginInfo
 
   gchar *module_name;
   GType module_type;
-  GtranslatorModule *module;
+  GtrModule *module;
   gchar **dependencies;
 
   gchar *name;
@@ -54,7 +54,7 @@ struct _GtranslatorPluginInfo
   gchar *website;
   gchar *license;
 
-  GtranslatorPlugin *plugin;
+  GtrPlugin *plugin;
 
   gint active:1;
 
@@ -64,9 +64,9 @@ struct _GtranslatorPluginInfo
   gint available:1;
 };
 
-GtranslatorPluginInfo *_gtranslator_plugin_info_new (const gchar * file);
-void _gtranslator_plugin_info_ref (GtranslatorPluginInfo * info);
-void _gtranslator_plugin_info_unref (GtranslatorPluginInfo * info);
+GtrPluginInfo *_gtranslator_plugin_info_new (const gchar * file);
+void _gtranslator_plugin_info_ref (GtrPluginInfo * info);
+void _gtranslator_plugin_info_unref (GtrPluginInfo * info);
 
 
 #endif /* __GTR_PLUGIN_INFO_PRIV_H__ */
diff --git a/src/plugin-system/gtr-plugin-info.c b/src/plugin-system/gtr-plugin-info.c
index 37d71b6..0fc931d 100644
--- a/src/plugin-system/gtr-plugin-info.c
+++ b/src/plugin-system/gtr-plugin-info.c
@@ -47,20 +47,20 @@
 #endif
 
 void
-_gtranslator_plugin_info_ref (GtranslatorPluginInfo * info)
+_gtranslator_plugin_info_ref (GtrPluginInfo * info)
 {
   g_atomic_int_inc (&info->refcount);
 }
 
-static GtranslatorPluginInfo *
-gtranslator_plugin_info_copy (GtranslatorPluginInfo * info)
+static GtrPluginInfo *
+gtranslator_plugin_info_copy (GtrPluginInfo * info)
 {
   _gtranslator_plugin_info_ref (info);
   return info;
 }
 
 void
-_gtranslator_plugin_info_unref (GtranslatorPluginInfo * info)
+_gtranslator_plugin_info_unref (GtrPluginInfo * info)
 {
   if (!g_atomic_int_dec_and_test (&info->refcount))
     return;
@@ -91,10 +91,10 @@ _gtranslator_plugin_info_unref (GtranslatorPluginInfo * info)
 /**
  * gtranslator_plugin_info_get_type:
  *
- * Retrieves the #GType object which is associated with the #GtranslatorPluginInfo
+ * Retrieves the #GType object which is associated with the #GtrPluginInfo
  * class.
  *
- * Return value: the GType associated with #GtranslatorPluginInfo.
+ * Return value: the GType associated with #GtrPluginInfo.
  **/
 GType
 gtranslator_plugin_info_get_type (void)
@@ -102,7 +102,7 @@ gtranslator_plugin_info_get_type (void)
   static GType the_type = 0;
 
   if (G_UNLIKELY (!the_type))
-    the_type = g_boxed_type_register_static ("GtranslatorPluginInfo",
+    the_type = g_boxed_type_register_static ("GtrPluginInfo",
 					     (GBoxedCopyFunc)
 					     gtranslator_plugin_info_copy,
 					     (GBoxedFreeFunc)
@@ -115,14 +115,14 @@ gtranslator_plugin_info_get_type (void)
  * gtranslator_plugin_info_new:
  * @filename: the filename where to read the plugin information
  *
- * Creates a new #GtranslatorPluginInfo from a file on the disk.
+ * Creates a new #GtrPluginInfo from a file on the disk.
  *
- * Return value: a newly created #GtranslatorPluginInfo.
+ * Return value: a newly created #GtrPluginInfo.
  */
-GtranslatorPluginInfo *
+GtrPluginInfo *
 _gtranslator_plugin_info_new (const gchar * file)
 {
-  GtranslatorPluginInfo *info;
+  GtrPluginInfo *info;
   GKeyFile *plugin_file = NULL;
   gchar *str;
 
@@ -130,7 +130,7 @@ _gtranslator_plugin_info_new (const gchar * file)
 
   DEBUG_PRINT ("Loading plugin: %s", file);
 
-  info = g_new0 (GtranslatorPluginInfo, 1);
+  info = g_new0 (GtrPluginInfo, 1);
   info->refcount = 1;
   info->file = g_strdup (file);
 
@@ -141,7 +141,7 @@ _gtranslator_plugin_info_new (const gchar * file)
       goto error;
     }
 
-  if (!g_key_file_has_key (plugin_file, "Gtranslator Plugin", "IAge", NULL))
+  if (!g_key_file_has_key (plugin_file, "Gtr Plugin", "IAge", NULL))
     {
       DEBUG_PRINT ("IAge key does not exist in file: %s", file);
       goto error;
@@ -149,7 +149,7 @@ _gtranslator_plugin_info_new (const gchar * file)
 
   /* Check IAge=2 */
   if (g_key_file_get_integer (plugin_file,
-			      "Gtranslator Plugin", "IAge", NULL) != 2)
+			      "Gtr Plugin", "IAge", NULL) != 2)
     {
       DEBUG_PRINT ("Wrong IAge in file: %s", file);
       goto error;
@@ -157,7 +157,7 @@ _gtranslator_plugin_info_new (const gchar * file)
 
   /* Get module name */
   str = g_key_file_get_string (plugin_file,
-			       "Gtranslator Plugin", "Module", NULL);
+			       "Gtr Plugin", "Module", NULL);
 
   if ((str != NULL) && (*str != '\0'))
     {
@@ -171,7 +171,7 @@ _gtranslator_plugin_info_new (const gchar * file)
 
   /* Get the dependency list */
   info->dependencies = g_key_file_get_string_list (plugin_file,
-						   "Gtranslator Plugin",
+						   "Gtr Plugin",
 						   "Depends", NULL, NULL);
   if (info->dependencies == NULL)
     {
@@ -181,7 +181,7 @@ _gtranslator_plugin_info_new (const gchar * file)
 
   /* Get the loader for this plugin */
   str = g_key_file_get_string (plugin_file,
-			       "Gtranslator Plugin", "Loader", NULL);
+			       "Gtr Plugin", "Loader", NULL);
   if (str && strcmp (str, "python") == 0)
     {
 #ifndef ENABLE_PYTHON
@@ -200,7 +200,7 @@ _gtranslator_plugin_info_new (const gchar * file)
 
   /* Get Name */
   str = g_key_file_get_locale_string (plugin_file,
-				      "Gtranslator Plugin",
+				      "Gtr Plugin",
 				      "Name", NULL, NULL);
   if (str)
     info->name = str;
@@ -212,7 +212,7 @@ _gtranslator_plugin_info_new (const gchar * file)
 
   /* Get Description */
   str = g_key_file_get_locale_string (plugin_file,
-				      "Gtranslator Plugin",
+				      "Gtr Plugin",
 				      "Description", NULL, NULL);
   if (str)
     info->desc = str;
@@ -221,7 +221,7 @@ _gtranslator_plugin_info_new (const gchar * file)
 
   /* Get Icon */
   str = g_key_file_get_locale_string (plugin_file,
-				      "Gtranslator Plugin",
+				      "Gtr Plugin",
 				      "Icon", NULL, NULL);
   if (str)
     info->icon_name = str;
@@ -231,7 +231,7 @@ _gtranslator_plugin_info_new (const gchar * file)
 
   /* Get Authors */
   info->authors = g_key_file_get_string_list (plugin_file,
-					      "Gtranslator Plugin",
+					      "Gtr Plugin",
 					      "Authors", NULL, NULL);
   if (info->authors == NULL)
     DEBUG_PRINT ("Could not find 'Authors' in %s", file);
@@ -239,7 +239,7 @@ _gtranslator_plugin_info_new (const gchar * file)
 
   /* Get Copyright */
   str = g_key_file_get_string (plugin_file,
-			       "Gtranslator Plugin", "Copyright", NULL);
+			       "Gtr Plugin", "Copyright", NULL);
   if (str)
     info->copyright = str;
   else
@@ -247,7 +247,7 @@ _gtranslator_plugin_info_new (const gchar * file)
 
   /* Get License */
   str = g_key_file_get_string (plugin_file,
-			       "Gtranslator Plugin", "License", NULL);
+			       "Gtr Plugin", "License", NULL);
   if (str)
     info->license = str;
   else
@@ -255,7 +255,7 @@ _gtranslator_plugin_info_new (const gchar * file)
 
   /* Get Website */
   str = g_key_file_get_string (plugin_file,
-			       "Gtranslator Plugin", "Website", NULL);
+			       "Gtr Plugin", "Website", NULL);
   if (str)
     info->website = str;
   else
@@ -280,7 +280,7 @@ error:
 }
 
 gboolean
-gtranslator_plugin_info_is_active (GtranslatorPluginInfo * info)
+gtranslator_plugin_info_is_active (GtrPluginInfo * info)
 {
   g_return_val_if_fail (info != NULL, FALSE);
 
@@ -288,7 +288,7 @@ gtranslator_plugin_info_is_active (GtranslatorPluginInfo * info)
 }
 
 gboolean
-gtranslator_plugin_info_is_available (GtranslatorPluginInfo * info)
+gtranslator_plugin_info_is_available (GtrPluginInfo * info)
 {
   g_return_val_if_fail (info != NULL, FALSE);
 
@@ -296,7 +296,7 @@ gtranslator_plugin_info_is_available (GtranslatorPluginInfo * info)
 }
 
 gboolean
-gtranslator_plugin_info_is_configurable (GtranslatorPluginInfo * info)
+gtranslator_plugin_info_is_configurable (GtrPluginInfo * info)
 {
   DEBUG_PRINT ("Is '%s' configurable?", info->name);
 
@@ -309,7 +309,7 @@ gtranslator_plugin_info_is_configurable (GtranslatorPluginInfo * info)
 }
 
 const gchar *
-gtranslator_plugin_info_get_name (GtranslatorPluginInfo * info)
+gtranslator_plugin_info_get_name (GtrPluginInfo * info)
 {
   g_return_val_if_fail (info != NULL, NULL);
 
@@ -317,7 +317,7 @@ gtranslator_plugin_info_get_name (GtranslatorPluginInfo * info)
 }
 
 const gchar *
-gtranslator_plugin_info_get_description (GtranslatorPluginInfo * info)
+gtranslator_plugin_info_get_description (GtrPluginInfo * info)
 {
   g_return_val_if_fail (info != NULL, NULL);
 
@@ -325,7 +325,7 @@ gtranslator_plugin_info_get_description (GtranslatorPluginInfo * info)
 }
 
 const gchar *
-gtranslator_plugin_info_get_icon_name (GtranslatorPluginInfo * info)
+gtranslator_plugin_info_get_icon_name (GtrPluginInfo * info)
 {
   g_return_val_if_fail (info != NULL, NULL);
 
@@ -340,7 +340,7 @@ gtranslator_plugin_info_get_icon_name (GtranslatorPluginInfo * info)
 }
 
 const gchar **
-gtranslator_plugin_info_get_authors (GtranslatorPluginInfo * info)
+gtranslator_plugin_info_get_authors (GtrPluginInfo * info)
 {
   g_return_val_if_fail (info != NULL, (const gchar **) NULL);
 
@@ -348,7 +348,7 @@ gtranslator_plugin_info_get_authors (GtranslatorPluginInfo * info)
 }
 
 const gchar *
-gtranslator_plugin_info_get_website (GtranslatorPluginInfo * info)
+gtranslator_plugin_info_get_website (GtrPluginInfo * info)
 {
   g_return_val_if_fail (info != NULL, NULL);
 
@@ -356,7 +356,7 @@ gtranslator_plugin_info_get_website (GtranslatorPluginInfo * info)
 }
 
 const gchar *
-gtranslator_plugin_info_get_copyright (GtranslatorPluginInfo * info)
+gtranslator_plugin_info_get_copyright (GtrPluginInfo * info)
 {
   g_return_val_if_fail (info != NULL, NULL);
 
@@ -364,7 +364,7 @@ gtranslator_plugin_info_get_copyright (GtranslatorPluginInfo * info)
 }
 
 const gchar *
-gtranslator_plugin_info_get_license (GtranslatorPluginInfo * info)
+gtranslator_plugin_info_get_license (GtrPluginInfo * info)
 {
   g_return_val_if_fail (info != NULL, NULL);
 
diff --git a/src/plugin-system/gtr-plugin-info.h b/src/plugin-system/gtr-plugin-info.h
index 85f983d..0acc85f 100644
--- a/src/plugin-system/gtr-plugin-info.h
+++ b/src/plugin-system/gtr-plugin-info.h
@@ -38,34 +38,34 @@
 
 G_BEGIN_DECLS
 #define GTR_TYPE_PLUGIN_INFO			(gtranslator_plugin_info_get_type ())
-#define GTR_PLUGIN_INFO(obj)			((GtranslatorPluginInfo *) (obj))
-typedef struct _GtranslatorPluginInfo GtranslatorPluginInfo;
+#define GTR_PLUGIN_INFO(obj)			((GtrPluginInfo *) (obj))
+typedef struct _GtrPluginInfo GtrPluginInfo;
 
 GType
 gtranslator_plugin_info_get_type (void)
   G_GNUC_CONST;
 
-     gboolean gtranslator_plugin_info_is_active (GtranslatorPluginInfo *
+     gboolean gtranslator_plugin_info_is_active (GtrPluginInfo *
 						 info);
-     gboolean gtranslator_plugin_info_is_available (GtranslatorPluginInfo *
+     gboolean gtranslator_plugin_info_is_available (GtrPluginInfo *
 						    info);
-     gboolean gtranslator_plugin_info_is_configurable (GtranslatorPluginInfo *
+     gboolean gtranslator_plugin_info_is_configurable (GtrPluginInfo *
 						       info);
 
-     const gchar *gtranslator_plugin_info_get_name (GtranslatorPluginInfo *
+     const gchar *gtranslator_plugin_info_get_name (GtrPluginInfo *
 						    info);
      const gchar
-       *gtranslator_plugin_info_get_description (GtranslatorPluginInfo *
+       *gtranslator_plugin_info_get_description (GtrPluginInfo *
 						 info);
-     const gchar *gtranslator_plugin_info_get_icon_name (GtranslatorPluginInfo
+     const gchar *gtranslator_plugin_info_get_icon_name (GtrPluginInfo
 							 * info);
-     const gchar **gtranslator_plugin_info_get_authors (GtranslatorPluginInfo
+     const gchar **gtranslator_plugin_info_get_authors (GtrPluginInfo
 							* info);
-     const gchar *gtranslator_plugin_info_get_website (GtranslatorPluginInfo *
+     const gchar *gtranslator_plugin_info_get_website (GtrPluginInfo *
 						       info);
-     const gchar *gtranslator_plugin_info_get_copyright (GtranslatorPluginInfo
+     const gchar *gtranslator_plugin_info_get_copyright (GtrPluginInfo
 							 * info);
-     const gchar *gtranslator_plugin_info_get_license (GtranslatorPluginInfo *
+     const gchar *gtranslator_plugin_info_get_license (GtrPluginInfo *
 						       info);
 
 G_END_DECLS
diff --git a/src/plugin-system/gtr-plugin-manager.c b/src/plugin-system/gtr-plugin-manager.c
index ff2bc9f..096c238 100644
--- a/src/plugin-system/gtr-plugin-manager.c
+++ b/src/plugin-system/gtr-plugin-manager.c
@@ -54,33 +54,33 @@ enum
 #define PLUGIN_MANAGER_NAME_TITLE _("Plugin")
 #define PLUGIN_MANAGER_ACTIVE_TITLE _("Enabled")
 
-#define GTR_PLUGIN_MANAGER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), GTR_TYPE_PLUGIN_MANAGER, GtranslatorPluginManagerPrivate))
+#define GTR_PLUGIN_MANAGER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), GTR_TYPE_PLUGIN_MANAGER, GtrPluginManagerPrivate))
 
-struct _GtranslatorPluginManagerPrivate
+struct _GtrPluginManagerPrivate
 {
   GtkWidget *tree;
 
   GtkWidget *about_button;
   GtkWidget *configure_button;
 
-  GtranslatorPluginsEngine *engine;
+  GtrPluginsEngine *engine;
 
   GtkWidget *about;
 
   GtkWidget *popup_menu;
 };
 
-G_DEFINE_TYPE (GtranslatorPluginManager, gtranslator_plugin_manager,
+G_DEFINE_TYPE (GtrPluginManager, gtranslator_plugin_manager,
 	       GTK_TYPE_VBOX)
-     static GtranslatorPluginInfo
-       *plugin_manager_get_selected_plugin (GtranslatorPluginManager * pm);
-     static void plugin_manager_toggle_active (GtranslatorPluginManager * pm,
+     static GtrPluginInfo
+       *plugin_manager_get_selected_plugin (GtrPluginManager * pm);
+     static void plugin_manager_toggle_active (GtrPluginManager * pm,
 					       GtkTreeIter * iter,
 					       GtkTreeModel * model);
      static void gtranslator_plugin_manager_finalize (GObject * object);
 
      static void
-       gtranslator_plugin_manager_class_init (GtranslatorPluginManagerClass *
+       gtranslator_plugin_manager_class_init (GtrPluginManagerClass *
 					      klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -88,13 +88,13 @@ G_DEFINE_TYPE (GtranslatorPluginManager, gtranslator_plugin_manager,
   object_class->finalize = gtranslator_plugin_manager_finalize;
 
   g_type_class_add_private (object_class,
-			    sizeof (GtranslatorPluginManagerPrivate));
+			    sizeof (GtrPluginManagerPrivate));
 }
 
 static void
-about_button_cb (GtkWidget * button, GtranslatorPluginManager * pm)
+about_button_cb (GtkWidget * button, GtrPluginManager * pm)
 {
-  GtranslatorPluginInfo *info;
+  GtrPluginInfo *info;
 
   //gtranslator_debug (DEBUG_PLUGINS);
 
@@ -138,9 +138,9 @@ about_button_cb (GtkWidget * button, GtranslatorPluginManager * pm)
 }
 
 static void
-configure_button_cb (GtkWidget * button, GtranslatorPluginManager * pm)
+configure_button_cb (GtkWidget * button, GtrPluginManager * pm)
 {
-  GtranslatorPluginInfo *info;
+  GtrPluginInfo *info;
   GtkWindow *toplevel;
 
   //gtranslator_debug (DEBUG_PLUGINS);
@@ -165,7 +165,7 @@ plugin_manager_view_info_cell_cb (GtkTreeViewColumn * tree_column,
 				  GtkTreeModel * tree_model,
 				  GtkTreeIter * iter, gpointer data)
 {
-  GtranslatorPluginInfo *info;
+  GtrPluginInfo *info;
   gchar *text;
 
   g_return_if_fail (tree_model != NULL);
@@ -192,7 +192,7 @@ plugin_manager_view_icon_cell_cb (GtkTreeViewColumn * tree_column,
 				  GtkTreeModel * tree_model,
 				  GtkTreeIter * iter, gpointer data)
 {
-  GtranslatorPluginInfo *info;
+  GtrPluginInfo *info;
 
   g_return_if_fail (tree_model != NULL);
   g_return_if_fail (tree_column != NULL);
@@ -211,7 +211,7 @@ plugin_manager_view_icon_cell_cb (GtkTreeViewColumn * tree_column,
 
 static void
 active_toggled_cb (GtkCellRendererToggle * cell,
-		   gchar * path_str, GtranslatorPluginManager * pm)
+		   gchar * path_str, GtrPluginManager * pm)
 {
   GtkTreeIter iter;
   GtkTreePath *path;
@@ -235,8 +235,8 @@ active_toggled_cb (GtkCellRendererToggle * cell,
 static void
 cursor_changed_cb (GtkTreeView * view, gpointer data)
 {
-  GtranslatorPluginManager *pm = data;
-  GtranslatorPluginInfo *info;
+  GtrPluginManager *pm = data;
+  GtrPluginInfo *info;
 
   //gtranslator_debug (DEBUG_PLUGINS);
 
@@ -254,7 +254,7 @@ row_activated_cb (GtkTreeView * tree_view,
 		  GtkTreePath * path,
 		  GtkTreeViewColumn * column, gpointer data)
 {
-  GtranslatorPluginManager *pm = data;
+  GtrPluginManager *pm = data;
   GtkTreeIter iter;
   GtkTreeModel *model;
 
@@ -272,7 +272,7 @@ row_activated_cb (GtkTreeView * tree_view,
 }
 
 static void
-plugin_manager_populate_lists (GtranslatorPluginManager * pm)
+plugin_manager_populate_lists (GtrPluginManager * pm)
 {
   const GList *plugins;
   GtkListStore *model;
@@ -287,8 +287,8 @@ plugin_manager_populate_lists (GtranslatorPluginManager * pm)
 
   while (plugins)
     {
-      GtranslatorPluginInfo *info;
-      info = (GtranslatorPluginInfo *) plugins->data;
+      GtrPluginInfo *info;
+      info = (GtrPluginInfo *) plugins->data;
 
       gtk_list_store_append (model, &iter);
       gtk_list_store_set (model, &iter,
@@ -304,7 +304,7 @@ plugin_manager_populate_lists (GtranslatorPluginManager * pm)
   if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter))
     {
       GtkTreeSelection *selection;
-      GtranslatorPluginInfo *info;
+      GtrPluginInfo *info;
 
       selection =
 	gtk_tree_view_get_selection (GTK_TREE_VIEW (pm->priv->tree));
@@ -322,11 +322,11 @@ plugin_manager_populate_lists (GtranslatorPluginManager * pm)
 }
 
 static gboolean
-plugin_manager_set_active (GtranslatorPluginManager * pm,
+plugin_manager_set_active (GtrPluginManager * pm,
 			   GtkTreeIter * iter,
 			   GtkTreeModel * model, gboolean active)
 {
-  GtranslatorPluginInfo *info;
+  GtrPluginInfo *info;
   gboolean res = TRUE;
 
   //gtranslator_debug (DEBUG_PLUGINS);
@@ -364,7 +364,7 @@ plugin_manager_set_active (GtranslatorPluginManager * pm,
 }
 
 static void
-plugin_manager_toggle_active (GtranslatorPluginManager * pm,
+plugin_manager_toggle_active (GtrPluginManager * pm,
 			      GtkTreeIter * iter, GtkTreeModel * model)
 {
   gboolean active;
@@ -378,10 +378,10 @@ plugin_manager_toggle_active (GtranslatorPluginManager * pm,
   plugin_manager_set_active (pm, iter, model, active);
 }
 
-static GtranslatorPluginInfo *
-plugin_manager_get_selected_plugin (GtranslatorPluginManager * pm)
+static GtrPluginInfo *
+plugin_manager_get_selected_plugin (GtrPluginManager * pm)
 {
-  GtranslatorPluginInfo *info = NULL;
+  GtrPluginInfo *info = NULL;
   GtkTreeModel *model;
   GtkTreeIter iter;
   GtkTreeSelection *selection;
@@ -403,7 +403,7 @@ plugin_manager_get_selected_plugin (GtranslatorPluginManager * pm)
 }
 
 static void
-plugin_manager_set_active_all (GtranslatorPluginManager * pm, gboolean active)
+plugin_manager_set_active_all (GtrPluginManager * pm, gboolean active)
 {
   GtkTreeModel *model;
   GtkTreeIter iter;
@@ -429,7 +429,7 @@ name_search_cb (GtkTreeModel * model,
 		gint column,
 		const gchar * key, GtkTreeIter * iter, gpointer data)
 {
-  GtranslatorPluginInfo *info;
+  GtrPluginInfo *info;
   gchar *normalized_string;
   gchar *normalized_key;
   gchar *case_normalized_string;
@@ -465,7 +465,7 @@ name_search_cb (GtkTreeModel * model,
 }
 
 static void
-enable_plugin_menu_cb (GtkMenu * menu, GtranslatorPluginManager * pm)
+enable_plugin_menu_cb (GtkMenu * menu, GtrPluginManager * pm)
 {
   GtkTreeModel *model;
   GtkTreeIter iter;
@@ -482,24 +482,24 @@ enable_plugin_menu_cb (GtkMenu * menu, GtranslatorPluginManager * pm)
 }
 
 static void
-enable_all_menu_cb (GtkMenu * menu, GtranslatorPluginManager * pm)
+enable_all_menu_cb (GtkMenu * menu, GtrPluginManager * pm)
 {
   plugin_manager_set_active_all (pm, TRUE);
 }
 
 static void
-disable_all_menu_cb (GtkMenu * menu, GtranslatorPluginManager * pm)
+disable_all_menu_cb (GtkMenu * menu, GtrPluginManager * pm)
 {
   plugin_manager_set_active_all (pm, FALSE);
 }
 
 static GtkWidget *
-create_tree_popup_menu (GtranslatorPluginManager * pm)
+create_tree_popup_menu (GtrPluginManager * pm)
 {
   GtkWidget *menu;
   GtkWidget *item;
   GtkWidget *image;
-  GtranslatorPluginInfo *info;
+  GtrPluginInfo *info;
 
   info = plugin_manager_get_selected_plugin (pm);
 
@@ -545,14 +545,14 @@ create_tree_popup_menu (GtranslatorPluginManager * pm)
 }
 
 static void
-tree_popup_menu_detach (GtranslatorPluginManager * pm, GtkMenu * menu)
+tree_popup_menu_detach (GtrPluginManager * pm, GtkMenu * menu)
 {
   pm->priv->popup_menu = NULL;
 }
 
 static void
 show_tree_popup_menu (GtkTreeView * tree,
-		      GtranslatorPluginManager * pm, GdkEventButton * event)
+		      GtrPluginManager * pm, GdkEventButton * event)
 {
   if (pm->priv->popup_menu)
     gtk_widget_destroy (pm->priv->popup_menu);
@@ -581,7 +581,7 @@ show_tree_popup_menu (GtkTreeView * tree,
 
 static gboolean
 button_press_event_cb (GtkWidget * tree,
-		       GdkEventButton * event, GtranslatorPluginManager * pm)
+		       GdkEventButton * event, GtrPluginManager * pm)
 {
   /* We want the treeview selection to be updated before showing the menu.
    * This code is evil, thanks to Federico Mena Quintero's black magic.
@@ -611,7 +611,7 @@ button_press_event_cb (GtkWidget * tree,
 }
 
 static gboolean
-popup_menu_cb (GtkTreeView * tree, GtranslatorPluginManager * pm)
+popup_menu_cb (GtkTreeView * tree, GtrPluginManager * pm)
 {
   show_tree_popup_menu (tree, pm, NULL);
   return TRUE;
@@ -622,7 +622,7 @@ model_name_sort_func (GtkTreeModel * model,
 		      GtkTreeIter * iter1,
 		      GtkTreeIter * iter2, gpointer user_data)
 {
-  GtranslatorPluginInfo *info1, *info2;
+  GtrPluginInfo *info1, *info2;
 
   gtk_tree_model_get (model, iter1, INFO_COLUMN, &info1, -1);
   gtk_tree_model_get (model, iter2, INFO_COLUMN, &info2, -1);
@@ -632,7 +632,7 @@ model_name_sort_func (GtkTreeModel * model,
 }
 
 static void
-plugin_manager_construct_tree (GtranslatorPluginManager * pm)
+plugin_manager_construct_tree (GtrPluginManager * pm)
 {
   GtkTreeViewColumn *column;
   GtkCellRenderer *cell;
@@ -713,9 +713,9 @@ plugin_manager_construct_tree (GtranslatorPluginManager * pm)
 }
 
 static void
-plugin_toggled_cb (GtranslatorPluginsEngine * engine,
-		   GtranslatorPluginInfo * info,
-		   GtranslatorPluginManager * pm)
+plugin_toggled_cb (GtrPluginsEngine * engine,
+		   GtrPluginInfo * info,
+		   GtrPluginManager * pm)
 {
   GtkTreeSelection *selection;
   GtkTreeModel *model;
@@ -727,7 +727,7 @@ plugin_toggled_cb (GtranslatorPluginsEngine * engine,
   if (gtk_tree_selection_get_selected (selection, &model, &iter))
     {
       /* There is an item selected: it's probably the one we want! */
-      GtranslatorPluginInfo *tinfo;
+      GtrPluginInfo *tinfo;
       gtk_tree_model_get (model, &iter, INFO_COLUMN, &tinfo, -1);
       info_found = info == tinfo;
     }
@@ -738,7 +738,7 @@ plugin_toggled_cb (GtranslatorPluginsEngine * engine,
 
       do
 	{
-	  GtranslatorPluginInfo *tinfo;
+	  GtrPluginInfo *tinfo;
 	  gtk_tree_model_get (model, &iter, INFO_COLUMN, &tinfo, -1);
 	  info_found = info == tinfo;
 	}
@@ -748,7 +748,7 @@ plugin_toggled_cb (GtranslatorPluginsEngine * engine,
   if (!info_found)
     {
       g_warning
-	("GtranslatorPluginManager: plugin '%s' not found in the tree model",
+	("GtrPluginManager: plugin '%s' not found in the tree model",
 	 gtranslator_plugin_info_get_name (info));
       return;
     }
@@ -758,7 +758,7 @@ plugin_toggled_cb (GtranslatorPluginsEngine * engine,
 }
 
 static void
-gtranslator_plugin_manager_init (GtranslatorPluginManager * pm)
+gtranslator_plugin_manager_init (GtrPluginManager * pm)
 {
   GtkWidget *label;
   GtkWidget *alignment;
@@ -846,7 +846,7 @@ gtranslator_plugin_manager_init (GtranslatorPluginManager * pm)
 static void
 gtranslator_plugin_manager_finalize (GObject * object)
 {
-  GtranslatorPluginManager *pm = GTR_PLUGIN_MANAGER (object);
+  GtrPluginManager *pm = GTR_PLUGIN_MANAGER (object);
 
   g_signal_handlers_disconnect_by_func (pm->priv->engine,
 					plugin_toggled_cb, pm);
diff --git a/src/plugin-system/gtr-plugin-manager.h b/src/plugin-system/gtr-plugin-manager.h
index 1b005ae..764f9c5 100644
--- a/src/plugin-system/gtr-plugin-manager.h
+++ b/src/plugin-system/gtr-plugin-manager.h
@@ -38,34 +38,34 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_PLUGIN_MANAGER              (gtranslator_plugin_manager_get_type())
-#define GTR_PLUGIN_MANAGER(obj)              (G_TYPE_CHECK_INSTANCE_CAST((obj), GTR_TYPE_PLUGIN_MANAGER, GtranslatorPluginManager))
-#define GTR_PLUGIN_MANAGER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), GTR_TYPE_PLUGIN_MANAGER, GtranslatorPluginManagerClass))
+#define GTR_PLUGIN_MANAGER(obj)              (G_TYPE_CHECK_INSTANCE_CAST((obj), GTR_TYPE_PLUGIN_MANAGER, GtrPluginManager))
+#define GTR_PLUGIN_MANAGER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), GTR_TYPE_PLUGIN_MANAGER, GtrPluginManagerClass))
 #define GTR_IS_PLUGIN_MANAGER(obj)           (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTR_TYPE_PLUGIN_MANAGER))
 #define GTR_IS_PLUGIN_MANAGER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTR_TYPE_PLUGIN_MANAGER))
-#define GTR_PLUGIN_MANAGER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS((obj), GTR_TYPE_PLUGIN_MANAGER, GtranslatorPluginManagerClass))
+#define GTR_PLUGIN_MANAGER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS((obj), GTR_TYPE_PLUGIN_MANAGER, GtrPluginManagerClass))
 /* Private structure type */
-typedef struct _GtranslatorPluginManagerPrivate
-  GtranslatorPluginManagerPrivate;
+typedef struct _GtrPluginManagerPrivate
+  GtrPluginManagerPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorPluginManager GtranslatorPluginManager;
+typedef struct _GtrPluginManager GtrPluginManager;
 
-struct _GtranslatorPluginManager
+struct _GtrPluginManager
 {
   GtkVBox vbox;
 
   /*< private > */
-  GtranslatorPluginManagerPrivate *priv;
+  GtrPluginManagerPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorPluginManagerClass GtranslatorPluginManagerClass;
+typedef struct _GtrPluginManagerClass GtrPluginManagerClass;
 
-struct _GtranslatorPluginManagerClass
+struct _GtrPluginManagerClass
 {
   GtkVBoxClass parent_class;
 };
diff --git a/src/plugin-system/gtr-plugin.c b/src/plugin-system/gtr-plugin.c
index 60c47ef..b0d9463 100644
--- a/src/plugin-system/gtr-plugin.c
+++ b/src/plugin-system/gtr-plugin.c
@@ -34,28 +34,28 @@
 
 #include "gtr-plugin.h"
 
-G_DEFINE_TYPE (GtranslatorPlugin, gtranslator_plugin, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GtrPlugin, gtranslator_plugin, G_TYPE_OBJECT)
      static void
-       dummy (GtranslatorPlugin * plugin, GtranslatorWindow * window)
+       dummy (GtrPlugin * plugin, GtrWindow * window)
 {
   /* Empty */
 }
 
 static GtkWidget *
-create_configure_dialog (GtranslatorPlugin * plugin)
+create_configure_dialog (GtrPlugin * plugin)
 {
   return NULL;
 }
 
 static gboolean
-is_configurable (GtranslatorPlugin * plugin)
+is_configurable (GtrPlugin * plugin)
 {
   return (GTR_PLUGIN_GET_CLASS (plugin)->create_configure_dialog !=
 	  create_configure_dialog);
 }
 
 static void
-gtranslator_plugin_class_init (GtranslatorPluginClass * klass)
+gtranslator_plugin_class_init (GtrPluginClass * klass)
 {
   klass->activate = dummy;
   klass->deactivate = dummy;
@@ -66,21 +66,21 @@ gtranslator_plugin_class_init (GtranslatorPluginClass * klass)
 }
 
 static void
-gtranslator_plugin_init (GtranslatorPlugin * plugin)
+gtranslator_plugin_init (GtrPlugin * plugin)
 {
   /* Empty */
 }
 
 /**
  * gtranslator_plugin_activate:
- * @plugin: a #GtranslatorPlugin
- * @window: a #GtranslatorWindow
+ * @plugin: a #GtrPlugin
+ * @window: a #GtrWindow
  * 
  * Activates the plugin.
  */
 void
-gtranslator_plugin_activate (GtranslatorPlugin * plugin,
-			     GtranslatorWindow * window)
+gtranslator_plugin_activate (GtrPlugin * plugin,
+			     GtrWindow * window)
 {
   g_return_if_fail (GTR_IS_PLUGIN (plugin));
   g_return_if_fail (GTR_IS_WINDOW (window));
@@ -90,14 +90,14 @@ gtranslator_plugin_activate (GtranslatorPlugin * plugin,
 
 /**
  * gtranslator_plugin_deactivate:
- * @plugin: a #GtranslatorPlugin
- * @window: a #GtranslatorWindow
+ * @plugin: a #GtrPlugin
+ * @window: a #GtrWindow
  * 
  * Deactivates the plugin.
  */
 void
-gtranslator_plugin_deactivate (GtranslatorPlugin * plugin,
-			       GtranslatorWindow * window)
+gtranslator_plugin_deactivate (GtrPlugin * plugin,
+			       GtrWindow * window)
 {
   g_return_if_fail (GTR_IS_PLUGIN (plugin));
   g_return_if_fail (GTR_IS_WINDOW (window));
@@ -107,15 +107,15 @@ gtranslator_plugin_deactivate (GtranslatorPlugin * plugin,
 
 /**
  * gtranslator_plugin_update_ui:
- * @plugin: a #GtranslatorPlugin
- * @window: a #GtranslatorWindow
+ * @plugin: a #GtrPlugin
+ * @window: a #GtrWindow
  *
  * Triggers an update of the user interface to take into account state changes
  * caused by the plugin.
  */
 void
-gtranslator_plugin_update_ui (GtranslatorPlugin * plugin,
-			      GtranslatorWindow * window)
+gtranslator_plugin_update_ui (GtrPlugin * plugin,
+			      GtrWindow * window)
 {
   g_return_if_fail (GTR_IS_PLUGIN (plugin));
   g_return_if_fail (GTR_IS_WINDOW (window));
@@ -125,14 +125,14 @@ gtranslator_plugin_update_ui (GtranslatorPlugin * plugin,
 
 /**
  * gtranslator_plugin_is_configurable:
- * @plugin: a #GtranslatorPlugin
+ * @plugin: a #GtrPlugin
  *
  * Whether the plugin is configurable.
  *
  * Returns: TRUE if the plugin is configurable:
  */
 gboolean
-gtranslator_plugin_is_configurable (GtranslatorPlugin * plugin)
+gtranslator_plugin_is_configurable (GtrPlugin * plugin)
 {
   g_return_val_if_fail (GTR_IS_PLUGIN (plugin), FALSE);
 
@@ -141,14 +141,14 @@ gtranslator_plugin_is_configurable (GtranslatorPlugin * plugin)
 
 /**
  * gtranslator_plugin_create_configure_dialog:
- * @plugin: a #GtranslatorPlugin
+ * @plugin: a #GtrPlugin
  *
  * Creates the configure dialog widget for the plugin.
  *
  * Returns: the configure dialog widget for the plugin.
  */
 GtkWidget *
-gtranslator_plugin_create_configure_dialog (GtranslatorPlugin * plugin)
+gtranslator_plugin_create_configure_dialog (GtrPlugin * plugin)
 {
   g_return_val_if_fail (GTR_IS_PLUGIN (plugin), NULL);
 
diff --git a/src/plugin-system/gtr-plugin.h b/src/plugin-system/gtr-plugin.h
index e4a344c..242c00e 100644
--- a/src/plugin-system/gtr-plugin.h
+++ b/src/plugin-system/gtr-plugin.h
@@ -44,17 +44,17 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_PLUGIN              (gtranslator_plugin_get_type())
-#define GTR_PLUGIN(obj)              (G_TYPE_CHECK_INSTANCE_CAST((obj), GTR_TYPE_PLUGIN, GtranslatorPlugin))
-#define GTR_PLUGIN_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), GTR_TYPE_PLUGIN, GtranslatorPluginClass))
+#define GTR_PLUGIN(obj)              (G_TYPE_CHECK_INSTANCE_CAST((obj), GTR_TYPE_PLUGIN, GtrPlugin))
+#define GTR_PLUGIN_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), GTR_TYPE_PLUGIN, GtrPluginClass))
 #define GTR_IS_PLUGIN(obj)           (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTR_TYPE_PLUGIN))
 #define GTR_IS_PLUGIN_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTR_TYPE_PLUGIN))
-#define GTR_PLUGIN_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS((obj), GTR_TYPE_PLUGIN, GtranslatorPluginClass))
+#define GTR_PLUGIN_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS((obj), GTR_TYPE_PLUGIN, GtrPluginClass))
 /*
  * Main object structure
  */
-typedef struct _GtranslatorPlugin GtranslatorPlugin;
+typedef struct _GtrPlugin GtrPlugin;
 
-struct _GtranslatorPlugin
+struct _GtrPlugin
 {
   GObject parent;
 };
@@ -62,24 +62,24 @@ struct _GtranslatorPlugin
 /*
  * Class definition
  */
-typedef struct _GtranslatorPluginClass GtranslatorPluginClass;
+typedef struct _GtrPluginClass GtrPluginClass;
 
-struct _GtranslatorPluginClass
+struct _GtrPluginClass
 {
   GObjectClass parent_class;
 
   /* Virtual public methods */
 
-  void (*activate) (GtranslatorPlugin * plugin, GtranslatorWindow * window);
-  void (*deactivate) (GtranslatorPlugin * plugin, GtranslatorWindow * window);
+  void (*activate) (GtrPlugin * plugin, GtrWindow * window);
+  void (*deactivate) (GtrPlugin * plugin, GtrWindow * window);
 
-  void (*update_ui) (GtranslatorPlugin * plugin, GtranslatorWindow * window);
+  void (*update_ui) (GtrPlugin * plugin, GtrWindow * window);
 
-  GtkWidget *(*create_configure_dialog) (GtranslatorPlugin * plugin);
+  GtkWidget *(*create_configure_dialog) (GtrPlugin * plugin);
 
   /* Plugins should not override this, it's handled automatically by
-     the GtranslatorPluginClass */
-    gboolean (*is_configurable) (GtranslatorPlugin * plugin);
+     the GtrPluginClass */
+    gboolean (*is_configurable) (GtrPlugin * plugin);
 
   /* Padding for future expansion */
   void (*_gtranslator_reserved1) (void);
@@ -95,17 +95,17 @@ GType
 gtranslator_plugin_get_type (void)
   G_GNUC_CONST;
 
-     void gtranslator_plugin_activate (GtranslatorPlugin * plugin,
-				       GtranslatorWindow * window);
-     void gtranslator_plugin_deactivate (GtranslatorPlugin * plugin,
-					 GtranslatorWindow * window);
+     void gtranslator_plugin_activate (GtrPlugin * plugin,
+				       GtrWindow * window);
+     void gtranslator_plugin_deactivate (GtrPlugin * plugin,
+					 GtrWindow * window);
 
-     void gtranslator_plugin_update_ui (GtranslatorPlugin * plugin,
-					GtranslatorWindow * window);
+     void gtranslator_plugin_update_ui (GtrPlugin * plugin,
+					GtrWindow * window);
 
-     gboolean gtranslator_plugin_is_configurable (GtranslatorPlugin * plugin);
+     gboolean gtranslator_plugin_is_configurable (GtrPlugin * plugin);
      GtkWidget *gtranslator_plugin_create_configure_dialog
-       (GtranslatorPlugin * plugin);
+       (GtrPlugin * plugin);
 
 /**
  * GTR_PLUGIN_REGISTER_TYPE_WITH_CODE(PluginName, plugin_name, CODE):
diff --git a/src/plugin-system/gtr-plugins-engine.c b/src/plugin-system/gtr-plugins-engine.c
index 1a2ada3..95ceb4c 100644
--- a/src/plugin-system/gtr-plugins-engine.c
+++ b/src/plugin-system/gtr-plugins-engine.c
@@ -66,15 +66,15 @@ enum
 
 static guint signals[LAST_SIGNAL];
 
-G_DEFINE_TYPE (GtranslatorPluginsEngine, gtranslator_plugins_engine,
+G_DEFINE_TYPE (GtrPluginsEngine, gtranslator_plugins_engine,
 	       G_TYPE_OBJECT)
-     struct _GtranslatorPluginsEnginePrivate
+     struct _GtrPluginsEnginePrivate
      {
        GList *plugin_list;
        GConfClient *gconf_client;
      };
 
-     GtranslatorPluginsEngine *default_engine = NULL;
+     GtrPluginsEngine *default_engine = NULL;
 
      static void
        gtranslator_plugins_engine_active_plugins_changed (GConfClient *
@@ -84,13 +84,13 @@ G_DEFINE_TYPE (GtranslatorPluginsEngine, gtranslator_plugins_engine,
 							  gpointer user_data);
      static void
        gtranslator_plugins_engine_activate_plugin_real
-       (GtranslatorPluginsEngine * engine, GtranslatorPluginInfo * info);
+       (GtrPluginsEngine * engine, GtrPluginInfo * info);
      static void
        gtranslator_plugins_engine_deactivate_plugin_real
-       (GtranslatorPluginsEngine * engine, GtranslatorPluginInfo * info);
+       (GtrPluginsEngine * engine, GtrPluginInfo * info);
 
      static void
-       gtranslator_plugins_engine_load_dir (GtranslatorPluginsEngine * engine,
+       gtranslator_plugins_engine_load_dir (GtrPluginsEngine * engine,
 					    const gchar * dir,
 					    GSList * active_plugins)
 {
@@ -116,7 +116,7 @@ G_DEFINE_TYPE (GtranslatorPluginsEngine, gtranslator_plugins_engine,
       if (g_str_has_suffix (dirent, PLUGIN_EXT))
 	{
 	  gchar *plugin_file;
-	  GtranslatorPluginInfo *info;
+	  GtrPluginInfo *info;
 
 	  plugin_file = g_build_filename (dir, dirent, NULL);
 	  info = _gtranslator_plugin_info_new (plugin_file);
@@ -156,7 +156,7 @@ G_DEFINE_TYPE (GtranslatorPluginsEngine, gtranslator_plugins_engine,
 }
 
 static void
-gtranslator_plugins_engine_load_all (GtranslatorPluginsEngine * engine)
+gtranslator_plugins_engine_load_all (GtrPluginsEngine * engine)
 {
   GSList *active_plugins = NULL;
   const gchar *home;
@@ -208,7 +208,7 @@ gtranslator_plugins_engine_load_all (GtranslatorPluginsEngine * engine)
 }
 
 static void
-gtranslator_plugins_engine_init (GtranslatorPluginsEngine * engine)
+gtranslator_plugins_engine_init (GtrPluginsEngine * engine)
 {
   //gtranslator_debug (DEBUG_PLUGINS);
 
@@ -220,7 +220,7 @@ gtranslator_plugins_engine_init (GtranslatorPluginsEngine * engine)
 
   engine->priv = G_TYPE_INSTANCE_GET_PRIVATE (engine,
 					      GTR_TYPE_PLUGINS_ENGINE,
-					      GtranslatorPluginsEnginePrivate);
+					      GtrPluginsEnginePrivate);
 
   engine->priv->gconf_client = gconf_client_get_default ();
   g_return_if_fail (engine->priv->gconf_client != NULL);
@@ -238,7 +238,7 @@ gtranslator_plugins_engine_init (GtranslatorPluginsEngine * engine)
 }
 
 void
-gtranslator_plugins_engine_garbage_collect (GtranslatorPluginsEngine * engine)
+gtranslator_plugins_engine_garbage_collect (GtrPluginsEngine * engine)
 {
   GType *module_types = g_type_children (GTR_TYPE_MODULE, NULL);
   unsigned i;
@@ -254,13 +254,13 @@ gtranslator_plugins_engine_garbage_collect (GtranslatorPluginsEngine * engine)
 static void
 gtranslator_plugins_engine_finalize (GObject * object)
 {
-  GtranslatorPluginsEngine *engine = GTR_PLUGINS_ENGINE (object);
+  GtrPluginsEngine *engine = GTR_PLUGINS_ENGINE (object);
 
   //gtranslator_debug (DEBUG_PLUGINS);
 
 #ifdef ENABLE_PYTHON
   /* Note: that this may cause finalization of objects (typically
-   * the GtranslatorWindow) by running the garbage collector. Since some
+   * the GtrWindow) by running the garbage collector. Since some
    * of the plugin may have installed callbacks upon object
    * finalization (typically they need to free the WindowData)
    * it must run before we get rid of the plugins.
@@ -278,7 +278,7 @@ gtranslator_plugins_engine_finalize (GObject * object)
 }
 
 static void
-gtranslator_plugins_engine_class_init (GtranslatorPluginsEngineClass * klass)
+gtranslator_plugins_engine_class_init (GtrPluginsEngineClass * klass)
 {
   GType the_type = G_TYPE_FROM_CLASS (klass);
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -292,7 +292,7 @@ gtranslator_plugins_engine_class_init (GtranslatorPluginsEngineClass * klass)
     g_signal_new ("activate-plugin",
 		  the_type,
 		  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (GtranslatorPluginsEngineClass,
+		  G_STRUCT_OFFSET (GtrPluginsEngineClass,
 				   activate_plugin), NULL, NULL,
 		  g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1,
 		  GTR_TYPE_PLUGIN_INFO | G_SIGNAL_TYPE_STATIC_SCOPE);
@@ -301,15 +301,15 @@ gtranslator_plugins_engine_class_init (GtranslatorPluginsEngineClass * klass)
     g_signal_new ("deactivate-plugin",
 		  the_type,
 		  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (GtranslatorPluginsEngineClass,
+		  G_STRUCT_OFFSET (GtrPluginsEngineClass,
 				   deactivate_plugin), NULL, NULL,
 		  g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1,
 		  GTR_TYPE_PLUGIN_INFO | G_SIGNAL_TYPE_STATIC_SCOPE);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorPluginsEnginePrivate));
+  g_type_class_add_private (klass, sizeof (GtrPluginsEnginePrivate));
 }
 
-GtranslatorPluginsEngine *
+GtrPluginsEngine *
 gtranslator_plugins_engine_get_default (void)
 {
   if (default_engine != NULL)
@@ -323,7 +323,7 @@ gtranslator_plugins_engine_get_default (void)
 }
 
 const GList *
-gtranslator_plugins_engine_get_plugin_list (GtranslatorPluginsEngine * engine)
+gtranslator_plugins_engine_get_plugin_list (GtrPluginsEngine * engine)
 {
   //gtranslator_debug (DEBUG_PLUGINS);
 
@@ -331,24 +331,24 @@ gtranslator_plugins_engine_get_plugin_list (GtranslatorPluginsEngine * engine)
 }
 
 static gint
-compare_plugin_info_and_name (GtranslatorPluginInfo * info,
+compare_plugin_info_and_name (GtrPluginInfo * info,
 			      const gchar * module_name)
 {
   return strcmp (info->module_name, module_name);
 }
 
-GtranslatorPluginInfo *
-gtranslator_plugins_engine_get_plugin_info (GtranslatorPluginsEngine * engine,
+GtrPluginInfo *
+gtranslator_plugins_engine_get_plugin_info (GtrPluginsEngine * engine,
 					    const gchar * name)
 {
   GList *l = g_list_find_custom (engine->priv->plugin_list,
 				 name,
 				 (GCompareFunc) compare_plugin_info_and_name);
-  return l == NULL ? NULL : (GtranslatorPluginInfo *) l->data;
+  return l == NULL ? NULL : (GtrPluginInfo *) l->data;
 }
 
 static gboolean
-load_plugin_module (GtranslatorPluginInfo * info)
+load_plugin_module (GtrPluginInfo * info)
 {
   gchar *dirname;
 
@@ -409,7 +409,7 @@ load_plugin_module (GtranslatorPluginInfo * info)
 }
 
 static void
-save_active_plugin_list (GtranslatorPluginsEngine * engine)
+save_active_plugin_list (GtrPluginsEngine * engine)
 {
   GSList *active_plugins = NULL;
   GList *l;
@@ -417,8 +417,8 @@ save_active_plugin_list (GtranslatorPluginsEngine * engine)
 
   for (l = engine->priv->plugin_list; l != NULL; l = l->next)
     {
-      const GtranslatorPluginInfo *info =
-	(const GtranslatorPluginInfo *) l->data;
+      const GtrPluginInfo *info =
+	(const GtrPluginInfo *) l->data;
       if (info->active)
 	{
 	  active_plugins = g_slist_prepend (active_plugins,
@@ -437,9 +437,9 @@ save_active_plugin_list (GtranslatorPluginsEngine * engine)
 }
 
 static void
-gtranslator_plugins_engine_activate_plugin_real (GtranslatorPluginsEngine *
+gtranslator_plugins_engine_activate_plugin_real (GtrPluginsEngine *
 						 engine,
-						 GtranslatorPluginInfo * info)
+						 GtrPluginInfo * info)
 {
   gboolean res = TRUE;
 
@@ -464,8 +464,8 @@ gtranslator_plugins_engine_activate_plugin_real (GtranslatorPluginsEngine *
 }
 
 gboolean
-gtranslator_plugins_engine_activate_plugin (GtranslatorPluginsEngine * engine,
-					    GtranslatorPluginInfo * info)
+gtranslator_plugins_engine_activate_plugin (GtrPluginsEngine * engine,
+					    GtrPluginInfo * info)
 {
   //gtranslator_debug (DEBUG_PLUGINS);
 
@@ -485,9 +485,9 @@ gtranslator_plugins_engine_activate_plugin (GtranslatorPluginsEngine * engine,
 }
 
 static void
-gtranslator_plugins_engine_deactivate_plugin_real (GtranslatorPluginsEngine *
+gtranslator_plugins_engine_deactivate_plugin_real (GtrPluginsEngine *
 						   engine,
-						   GtranslatorPluginInfo *
+						   GtrPluginInfo *
 						   info)
 {
   const GList *wins;
@@ -505,9 +505,9 @@ gtranslator_plugins_engine_deactivate_plugin_real (GtranslatorPluginsEngine *
 }
 
 gboolean
-gtranslator_plugins_engine_deactivate_plugin (GtranslatorPluginsEngine *
+gtranslator_plugins_engine_deactivate_plugin (GtrPluginsEngine *
 					      engine,
-					      GtranslatorPluginInfo * info)
+					      GtrPluginInfo * info)
 {
   //gtranslator_debug (DEBUG_PLUGINS);
 
@@ -524,7 +524,7 @@ gtranslator_plugins_engine_deactivate_plugin (GtranslatorPluginsEngine *
 }
 
 static void
-reactivate_all (GtranslatorPluginsEngine * engine, GtranslatorWindow * window)
+reactivate_all (GtrPluginsEngine * engine, GtrWindow * window)
 {
   GList *pl;
 
@@ -534,7 +534,7 @@ reactivate_all (GtranslatorPluginsEngine * engine, GtranslatorWindow * window)
     {
       gboolean res = TRUE;
 
-      GtranslatorPluginInfo *info = (GtranslatorPluginInfo *) pl->data;
+      GtrPluginInfo *info = (GtrPluginInfo *) pl->data;
 
       /* If plugin is not available, don't try to activate/load it */
       if (info->available && info->active)
@@ -551,9 +551,9 @@ reactivate_all (GtranslatorPluginsEngine * engine, GtranslatorWindow * window)
 }
 
 void
-gtranslator_plugins_engine_update_plugins_ui (GtranslatorPluginsEngine *
+gtranslator_plugins_engine_update_plugins_ui (GtrPluginsEngine *
 					      engine,
-					      GtranslatorWindow * window,
+					      GtrWindow * window,
 					      gboolean new_window)
 {
   GList *pl;
@@ -568,7 +568,7 @@ gtranslator_plugins_engine_update_plugins_ui (GtranslatorPluginsEngine *
   /* updated ui of all the plugins that implement update_ui */
   for (pl = engine->priv->plugin_list; pl; pl = pl->next)
     {
-      GtranslatorPluginInfo *info = (GtranslatorPluginInfo *) pl->data;
+      GtrPluginInfo *info = (GtrPluginInfo *) pl->data;
 
       if (!info->available || !info->active)
 	continue;
@@ -580,9 +580,9 @@ gtranslator_plugins_engine_update_plugins_ui (GtranslatorPluginsEngine *
 }
 
 void
-gtranslator_plugins_engine_configure_plugin (GtranslatorPluginsEngine *
+gtranslator_plugins_engine_configure_plugin (GtrPluginsEngine *
 					     engine,
-					     GtranslatorPluginInfo * info,
+					     GtrPluginInfo * info,
 					     GtkWindow * parent)
 {
   GtkWidget *conf_dlg;
@@ -616,7 +616,7 @@ gtranslator_plugins_engine_active_plugins_changed (GConfClient * client,
 						   GConfEntry * entry,
 						   gpointer user_data)
 {
-  GtranslatorPluginsEngine *engine;
+  GtrPluginsEngine *engine;
   GList *pl;
   gboolean to_activate;
   GSList *active_plugins;
@@ -642,7 +642,7 @@ gtranslator_plugins_engine_active_plugins_changed (GConfClient * client,
 
   for (pl = engine->priv->plugin_list; pl; pl = pl->next)
     {
-      GtranslatorPluginInfo *info = (GtranslatorPluginInfo *) pl->data;
+      GtrPluginInfo *info = (GtrPluginInfo *) pl->data;
 
       if (!info->available)
 	continue;
diff --git a/src/plugin-system/gtr-plugins-engine.h b/src/plugin-system/gtr-plugins-engine.h
index 8abb972..8697574 100644
--- a/src/plugin-system/gtr-plugins-engine.h
+++ b/src/plugin-system/gtr-plugins-engine.h
@@ -38,67 +38,67 @@
 
 G_BEGIN_DECLS
 #define GTR_TYPE_PLUGINS_ENGINE              (gtranslator_plugins_engine_get_type ())
-#define GTR_PLUGINS_ENGINE(obj)              (G_TYPE_CHECK_INSTANCE_CAST((obj), GTR_TYPE_PLUGINS_ENGINE, GtranslatorPluginsEngine))
-#define GTR_PLUGINS_ENGINE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), GTR_TYPE_PLUGINS_ENGINE, GtranslatorPluginsEngineClass))
+#define GTR_PLUGINS_ENGINE(obj)              (G_TYPE_CHECK_INSTANCE_CAST((obj), GTR_TYPE_PLUGINS_ENGINE, GtrPluginsEngine))
+#define GTR_PLUGINS_ENGINE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), GTR_TYPE_PLUGINS_ENGINE, GtrPluginsEngineClass))
 #define GTR_IS_PLUGINS_ENGINE(obj)           (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTR_TYPE_PLUGINS_ENGINE))
 #define GTR_IS_PLUGINS_ENGINE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTR_TYPE_PLUGINS_ENGINE))
-#define GTR_PLUGINS_ENGINE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS((obj), GTR_TYPE_PLUGINS_ENGINE, GtranslatorPluginsEngineClass))
-typedef struct _GtranslatorPluginsEngine GtranslatorPluginsEngine;
-typedef struct _GtranslatorPluginsEnginePrivate
-  GtranslatorPluginsEnginePrivate;
+#define GTR_PLUGINS_ENGINE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS((obj), GTR_TYPE_PLUGINS_ENGINE, GtrPluginsEngineClass))
+typedef struct _GtrPluginsEngine GtrPluginsEngine;
+typedef struct _GtrPluginsEnginePrivate
+  GtrPluginsEnginePrivate;
 
-struct _GtranslatorPluginsEngine
+struct _GtrPluginsEngine
 {
   GObject parent;
-  GtranslatorPluginsEnginePrivate *priv;
+  GtrPluginsEnginePrivate *priv;
 };
 
-typedef struct _GtranslatorPluginsEngineClass GtranslatorPluginsEngineClass;
+typedef struct _GtrPluginsEngineClass GtrPluginsEngineClass;
 
-struct _GtranslatorPluginsEngineClass
+struct _GtrPluginsEngineClass
 {
   GObjectClass parent_class;
 
-  void (*activate_plugin) (GtranslatorPluginsEngine * engine,
-			   GtranslatorPluginInfo * info);
+  void (*activate_plugin) (GtrPluginsEngine * engine,
+			   GtrPluginInfo * info);
 
-  void (*deactivate_plugin) (GtranslatorPluginsEngine * engine,
-			     GtranslatorPluginInfo * info);
+  void (*deactivate_plugin) (GtrPluginsEngine * engine,
+			     GtrPluginInfo * info);
 };
 
 GType
 gtranslator_plugins_engine_get_type (void)
   G_GNUC_CONST;
 
-     GtranslatorPluginsEngine *gtranslator_plugins_engine_get_default (void);
+     GtrPluginsEngine *gtranslator_plugins_engine_get_default (void);
 
-     void gtranslator_plugins_engine_garbage_collect (GtranslatorPluginsEngine
+     void gtranslator_plugins_engine_garbage_collect (GtrPluginsEngine
 						      * engine);
 
      const GList
-       *gtranslator_plugins_engine_get_plugin_list (GtranslatorPluginsEngine *
+       *gtranslator_plugins_engine_get_plugin_list (GtrPluginsEngine *
 						    engine);
 
-     GtranslatorPluginInfo
-       *gtranslator_plugins_engine_get_plugin_info (GtranslatorPluginsEngine *
+     GtrPluginInfo
+       *gtranslator_plugins_engine_get_plugin_info (GtrPluginsEngine *
 						    engine,
 						    const gchar * name);
 
      gboolean
-       gtranslator_plugins_engine_activate_plugin (GtranslatorPluginsEngine *
+       gtranslator_plugins_engine_activate_plugin (GtrPluginsEngine *
 						   engine,
-						   GtranslatorPluginInfo *
+						   GtrPluginInfo *
 						   info);
      gboolean
-       gtranslator_plugins_engine_deactivate_plugin (GtranslatorPluginsEngine
+       gtranslator_plugins_engine_deactivate_plugin (GtrPluginsEngine
 						     * engine,
-						     GtranslatorPluginInfo *
+						     GtrPluginInfo *
 						     info);
 
      void
-       gtranslator_plugins_engine_configure_plugin (GtranslatorPluginsEngine *
+       gtranslator_plugins_engine_configure_plugin (GtrPluginsEngine *
 						    engine,
-						    GtranslatorPluginInfo *
+						    GtrPluginInfo *
 						    info, GtkWindow * parent);
 
 /* 
@@ -106,9 +106,9 @@ gtranslator_plugins_engine_get_type (void)
  * has been created
  */
      void
-       gtranslator_plugins_engine_update_plugins_ui (GtranslatorPluginsEngine
+       gtranslator_plugins_engine_update_plugins_ui (GtrPluginsEngine
 						     * engine,
-						     GtranslatorWindow *
+						     GtrWindow *
 						     window,
 						     gboolean new_window);
 
diff --git a/src/translation-memory/berkeley/gtr-berkeley.c b/src/translation-memory/berkeley/gtr-berkeley.c
index d37073c..5665ee4 100644
--- a/src/translation-memory/berkeley/gtr-berkeley.c
+++ b/src/translation-memory/berkeley/gtr-berkeley.c
@@ -39,22 +39,22 @@
 #define GTR_BERKELEY_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 (object),		       \
 						 GTR_TYPE_BERKELEY,            \
-						 GtranslatorBerkeleyPrivate))
+						 GtrBerkeleyPrivate))
 
 static void
-gtranslator_translation_memory_iface_init (GtranslatorTranslationMemoryIface *
+gtranslator_translation_memory_iface_init (GtrTranslationMemoryIface *
 					   iface);
 
-G_DEFINE_TYPE_WITH_CODE (GtranslatorBerkeley,
+G_DEFINE_TYPE_WITH_CODE (GtrBerkeley,
 			 gtranslator_berkeley,
 			 G_TYPE_OBJECT,
 			 G_IMPLEMENT_INTERFACE (GTR_TYPE_TRANSLATION_MEMORY,
 						gtranslator_translation_memory_iface_init))
-     struct _GtranslatorBerkeleyPrivate
+     struct _GtrBerkeleyPrivate
      {
-       GtranslatorDbOrig *orig;
-       GtranslatorDbTrans *trans;
-       GtranslatorDbWords *words;
+       GtrDbOrig *orig;
+       GtrDbTrans *trans;
+       GtrDbWords *words;
 
        gsize max_omits;
        gsize max_delta;
@@ -62,11 +62,11 @@ G_DEFINE_TYPE_WITH_CODE (GtranslatorBerkeley,
      };
 
      static gboolean
-       gtranslator_berkeley_store (GtranslatorTranslationMemory * tm,
+       gtranslator_berkeley_store (GtrTranslationMemory * tm,
 				   const gchar * original,
 				   const gchar * translation)
 {
-  GtranslatorBerkeley *ber = GTR_BERKELEY (tm);
+  GtrBerkeley *ber = GTR_BERKELEY (tm);
   gboolean ok;
   db_recno_t key;
 
@@ -152,14 +152,14 @@ G_DEFINE_TYPE_WITH_CODE (GtranslatorBerkeley,
     }
 }
 
-static GtranslatorDbKeys *
-union_of_db_keys (GtranslatorBerkeley * ber,
-		  gsize cnt, GtranslatorDbKeys ** keys, gboolean * mask)
+static GtrDbKeys *
+union_of_db_keys (GtrBerkeley * ber,
+		  gsize cnt, GtrDbKeys ** keys, gboolean * mask)
 {
   gsize i, minSize;
   db_recno_t **heads = g_new (db_recno_t *, cnt);
   gsize *counters = g_new (gsize, cnt);
-  GtranslatorDbKeys *result;
+  GtrDbKeys *result;
   db_recno_t *res_list;
 
   // initialize heads and counters _and_ find size of smallest keys list
@@ -293,7 +293,7 @@ advance_cycle (gsize omitted[], gsize depth, gsize cnt)
 }
 
 static gboolean
-look_fuzzy (GtranslatorBerkeley * ber,
+look_fuzzy (GtrBerkeley * ber,
 	    gchar ** words, GHashTable ** hash, gsize omits, gsize delta)
 {
 #define RETURN_WITH_CLEANUP(val) \
@@ -307,19 +307,19 @@ look_fuzzy (GtranslatorBerkeley * ber,
 
   gsize i, slot;
   gsize missing;
-  GtranslatorDbKeys **keys;
+  GtrDbKeys **keys;
   gboolean *mask;
   gsize *omitted;
   gsize cnt = g_strv_length (words);
   gsize cnt_orig = cnt;
-  GtranslatorDbKeys *result;
+  GtrDbKeys *result;
 
   if (omits >= cnt)
     return FALSE;
   if (cnt + delta <= 0)
     return FALSE;
 
-  keys = g_new (GtranslatorDbKeys *, cnt);
+  keys = g_new (GtrDbKeys *, cnt);
   mask = g_new (gboolean, cnt);
   omitted = g_new (gsize, omits);
 
@@ -450,10 +450,10 @@ RETURN_WITH_CLEANUP (FALSE)}
 static gint
 insert_match_sorted (gconstpointer a, gconstpointer b)
 {
-  GtranslatorTranslationMemoryMatch *match1 =
-    (GtranslatorTranslationMemoryMatch *) a;
-  GtranslatorTranslationMemoryMatch *match2 =
-    (GtranslatorTranslationMemoryMatch *) b;
+  GtrTranslationMemoryMatch *match1 =
+    (GtrTranslationMemoryMatch *) a;
+  GtrTranslationMemoryMatch *match2 =
+    (GtrTranslationMemoryMatch *) b;
 
   if (match1->level < match2->level)
     return 1;
@@ -464,14 +464,14 @@ insert_match_sorted (gconstpointer a, gconstpointer b)
 }
 
 static GList *
-gtranslator_berkeley_lookup (GtranslatorTranslationMemory * tm,
+gtranslator_berkeley_lookup (GtrTranslationMemory * tm,
 			     const gchar * phrase)
 {
   GPtrArray *array = NULL;
   gchar **words;
   gsize omits;
   gsize delta;
-  GtranslatorBerkeley *ber = GTR_BERKELEY (tm);
+  GtrBerkeley *ber = GTR_BERKELEY (tm);
   GHashTable *hash;
   GHashTableIter iter;
   gpointer hkey, value;
@@ -525,8 +525,8 @@ gtranslator_berkeley_lookup (GtranslatorTranslationMemory * tm,
 list:g_hash_table_iter_init (&iter, hash);
   while (g_hash_table_iter_next (&iter, &hkey, &value))
     {
-      GtranslatorTranslationMemoryMatch *match =
-	g_new (GtranslatorTranslationMemoryMatch, 1);
+      GtrTranslationMemoryMatch *match =
+	g_new (GtrTranslationMemoryMatch, 1);
       match->match = g_strdup (hkey);
       match->level = GPOINTER_TO_INT (value);
 
@@ -540,34 +540,34 @@ list:g_hash_table_iter_init (&iter, hash);
 }
 
 static void
-gtranslator_berkeley_set_max_omits (GtranslatorTranslationMemory * tm,
+gtranslator_berkeley_set_max_omits (GtrTranslationMemory * tm,
 				    gsize omits)
 {
-  GtranslatorBerkeley *ber = GTR_BERKELEY (tm);
+  GtrBerkeley *ber = GTR_BERKELEY (tm);
 
   ber->priv->max_omits = omits;
 }
 
 static void
-gtranslator_berkeley_set_max_delta (GtranslatorTranslationMemory * tm,
+gtranslator_berkeley_set_max_delta (GtrTranslationMemory * tm,
 				    gsize delta)
 {
-  GtranslatorBerkeley *ber = GTR_BERKELEY (tm);
+  GtrBerkeley *ber = GTR_BERKELEY (tm);
 
   ber->priv->max_delta = delta;
 }
 
 static void
-gtranslator_berkeley_set_max_items (GtranslatorTranslationMemory * tm,
+gtranslator_berkeley_set_max_items (GtrTranslationMemory * tm,
 				    gint items)
 {
-  GtranslatorBerkeley *ber = GTR_BERKELEY (tm);
+  GtrBerkeley *ber = GTR_BERKELEY (tm);
 
   ber->priv->max_items = items;
 }
 
 static void
-gtranslator_translation_memory_iface_init (GtranslatorTranslationMemoryIface *
+gtranslator_translation_memory_iface_init (GtrTranslationMemoryIface *
 					   iface)
 {
   iface->store = gtranslator_berkeley_store;
@@ -578,7 +578,7 @@ gtranslator_translation_memory_iface_init (GtranslatorTranslationMemoryIface *
 }
 
 static void
-gtranslator_berkeley_init (GtranslatorBerkeley * pf)
+gtranslator_berkeley_init (GtrBerkeley * pf)
 {
   pf->priv = GTR_BERKELEY_GET_PRIVATE (pf);
 
@@ -593,7 +593,7 @@ gtranslator_berkeley_init (GtranslatorBerkeley * pf)
 static void
 gtranslator_berkeley_finalize (GObject * object)
 {
-  GtranslatorBerkeley *ber = GTR_BERKELEY (object);
+  GtrBerkeley *ber = GTR_BERKELEY (object);
 
   g_object_unref (ber->priv->orig);
   g_object_unref (ber->priv->trans);
@@ -603,11 +603,11 @@ gtranslator_berkeley_finalize (GObject * object)
 }
 
 static void
-gtranslator_berkeley_class_init (GtranslatorBerkeleyClass * klass)
+gtranslator_berkeley_class_init (GtrBerkeleyClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorBerkeleyPrivate));
+  g_type_class_add_private (klass, sizeof (GtrBerkeleyPrivate));
 
   object_class->finalize = gtranslator_berkeley_finalize;
 }
@@ -615,14 +615,14 @@ gtranslator_berkeley_class_init (GtranslatorBerkeleyClass * klass)
 /**
  * gtranslator_berkeley_new:
  * 
- * Creates a new #GtranslatorBerkeley object.
+ * Creates a new #GtrBerkeley object.
  *
- * Returns: a new #GtranslatorBerkeley object
+ * Returns: a new #GtrBerkeley object
  */
-GtranslatorBerkeley *
+GtrBerkeley *
 gtranslator_berkeley_new ()
 {
-  GtranslatorBerkeley *berkeley;
+  GtrBerkeley *berkeley;
 
   berkeley = g_object_new (GTR_TYPE_BERKELEY, NULL);
 
diff --git a/src/translation-memory/berkeley/gtr-berkeley.h b/src/translation-memory/berkeley/gtr-berkeley.h
index a21ec83..27c5c11 100644
--- a/src/translation-memory/berkeley/gtr-berkeley.h
+++ b/src/translation-memory/berkeley/gtr-berkeley.h
@@ -27,33 +27,33 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_BERKELEY		(gtranslator_berkeley_get_type ())
-#define GTR_BERKELEY(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_BERKELEY, GtranslatorBerkeley))
-#define GTR_BERKELEY_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_BERKELEY, GtranslatorBerkeleyClass))
+#define GTR_BERKELEY(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_BERKELEY, GtrBerkeley))
+#define GTR_BERKELEY_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_BERKELEY, GtrBerkeleyClass))
 #define GTR_IS_BERKELEY(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_BERKELEY))
 #define GTR_IS_BERKELEY_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_BERKELEY))
-#define GTR_BERKELEY_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_BERKELEY, GtranslatorBerkeleyClass))
+#define GTR_BERKELEY_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_BERKELEY, GtrBerkeleyClass))
 /* Private structure type */
-typedef struct _GtranslatorBerkeleyPrivate GtranslatorBerkeleyPrivate;
+typedef struct _GtrBerkeleyPrivate GtrBerkeleyPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorBerkeley GtranslatorBerkeley;
+typedef struct _GtrBerkeley GtrBerkeley;
 
-struct _GtranslatorBerkeley
+struct _GtrBerkeley
 {
   GObject parent_instance;
 
   /*< private > */
-  GtranslatorBerkeleyPrivate *priv;
+  GtrBerkeleyPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorBerkeleyClass GtranslatorBerkeleyClass;
+typedef struct _GtrBerkeleyClass GtrBerkeleyClass;
 
-struct _GtranslatorBerkeleyClass
+struct _GtrBerkeleyClass
 {
   GObjectClass parent_class;
 };
@@ -67,7 +67,7 @@ gtranslator_berkeley_get_type (void)
 
      GType gtranslator_berkeley_register_type (GTypeModule * module);
 
-     GtranslatorBerkeley *gtranslator_berkeley_new (void);
+     GtrBerkeley *gtranslator_berkeley_new (void);
 
 G_END_DECLS
 #endif /* __BERKELEY_H__ */
diff --git a/src/translation-memory/berkeley/gtr-db-base.c b/src/translation-memory/berkeley/gtr-db-base.c
index 0334209..db5c539 100644
--- a/src/translation-memory/berkeley/gtr-db-base.c
+++ b/src/translation-memory/berkeley/gtr-db-base.c
@@ -36,11 +36,11 @@
 #define GTR_DB_BASE_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 (object),		       \
 						 GTR_TYPE_DB_BASE,     \
-						 GtranslatorDbBasePrivate))
+						 GtrDbBasePrivate))
 
-G_DEFINE_TYPE (GtranslatorDbBase, gtranslator_db_base, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GtrDbBase, gtranslator_db_base, G_TYPE_OBJECT)
 
-struct _GtranslatorDbBasePrivate
+struct _GtrDbBasePrivate
 {
   DB *db;
   gchar *path;
@@ -83,7 +83,7 @@ get_db_base_directory ()
 }
 
 static void
-gtranslator_db_base_init (GtranslatorDbBase * base)
+gtranslator_db_base_init (GtrDbBase * base)
 {
   base->priv = GTR_DB_BASE_GET_PRIVATE (base);
 
@@ -93,7 +93,7 @@ gtranslator_db_base_init (GtranslatorDbBase * base)
 static void
 gtranslator_db_base_finalize (GObject * object)
 {
-  GtranslatorDbBase *base = GTR_DB_BASE (object);
+  GtrDbBase *base = GTR_DB_BASE (object);
   int err;
 
   if ((err = base->priv->db->close (base->priv->db, 0)) != 0)
@@ -105,17 +105,17 @@ gtranslator_db_base_finalize (GObject * object)
 }
 
 static void
-gtranslator_db_base_class_init (GtranslatorDbBaseClass * klass)
+gtranslator_db_base_class_init (GtrDbBaseClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorDbBasePrivate));
+  g_type_class_add_private (klass, sizeof (GtrDbBasePrivate));
 
   object_class->finalize = gtranslator_db_base_finalize;
 }
 
 void
-gtranslator_db_base_create_dabatase (GtranslatorDbBase * base,
+gtranslator_db_base_create_dabatase (GtrDbBase * base,
 				     const gchar * filename, DBTYPE type)
 {
   gint error;
@@ -146,7 +146,7 @@ gtranslator_db_base_create_dabatase (GtranslatorDbBase * base,
 }
 
 void
-gtranslator_db_base_show_error (GtranslatorDbBase * base, int error)
+gtranslator_db_base_show_error (GtrDbBase * base, int error)
 {
   gchar *err = NULL;
   DB_ENV *env;
@@ -184,14 +184,14 @@ gtranslator_db_base_show_error (GtranslatorDbBase * base, int error)
 }
 
 gint
-gtranslator_db_base_put (GtranslatorDbBase * base,
+gtranslator_db_base_put (GtrDbBase * base,
 			 DBT * key, DBT * data, u_int32_t flags)
 {
   return base->priv->db->put (base->priv->db, NULL, key, data, flags);
 }
 
 gint
-gtranslator_db_base_get (GtranslatorDbBase * base, DBT * key, DBT * data)
+gtranslator_db_base_get (GtrDbBase * base, DBT * key, DBT * data)
 {
   return base->priv->db->get (base->priv->db, NULL, key, data, 0);
 }
diff --git a/src/translation-memory/berkeley/gtr-db-base.h b/src/translation-memory/berkeley/gtr-db-base.h
index d7187d1..de4e7ba 100644
--- a/src/translation-memory/berkeley/gtr-db-base.h
+++ b/src/translation-memory/berkeley/gtr-db-base.h
@@ -28,33 +28,33 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_DB_BASE		(gtranslator_db_base_get_type ())
-#define GTR_DB_BASE(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_DB_BASE, GtranslatorDbBase))
-#define GTR_DB_BASE_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_DB_BASE, GtranslatorDbBaseClass))
+#define GTR_DB_BASE(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_DB_BASE, GtrDbBase))
+#define GTR_DB_BASE_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_DB_BASE, GtrDbBaseClass))
 #define GTR_IS_DB_BASE(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_DB_BASE))
 #define GTR_IS_DB_BASE_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_DB_BASE))
-#define GTR_DB_BASE_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_DB_BASE, GtranslatorDbBaseClass))
+#define GTR_DB_BASE_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_DB_BASE, GtrDbBaseClass))
 /* Private structure type */
-typedef struct _GtranslatorDbBasePrivate GtranslatorDbBasePrivate;
+typedef struct _GtrDbBasePrivate GtrDbBasePrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorDbBase GtranslatorDbBase;
+typedef struct _GtrDbBase GtrDbBase;
 
-struct _GtranslatorDbBase
+struct _GtrDbBase
 {
   GObject parent_instance;
 
   /*< private > */
-  GtranslatorDbBasePrivate *priv;
+  GtrDbBasePrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorDbBaseClass GtranslatorDbBaseClass;
+typedef struct _GtrDbBaseClass GtrDbBaseClass;
 
-struct _GtranslatorDbBaseClass
+struct _GtrDbBaseClass
 {
   GObjectClass parent_class;
 };
@@ -68,17 +68,17 @@ gtranslator_db_base_get_type (void)
 
      GType gtranslator_db_base_register_type (GTypeModule * module);
 
-     void gtranslator_db_base_create_dabatase (GtranslatorDbBase * base,
+     void gtranslator_db_base_create_dabatase (GtrDbBase * base,
 					       const gchar * filename,
 					       DBTYPE type);
 
-     void gtranslator_db_base_show_error (GtranslatorDbBase * base,
+     void gtranslator_db_base_show_error (GtrDbBase * base,
 					  gint error);
 
-     gint gtranslator_db_base_put (GtranslatorDbBase * base,
+     gint gtranslator_db_base_put (GtrDbBase * base,
 				   DBT * key, DBT * data, u_int32_t flags);
 
-     gint gtranslator_db_base_get (GtranslatorDbBase * base,
+     gint gtranslator_db_base_get (GtrDbBase * base,
 				   DBT * key, DBT * data);
 
 G_END_DECLS
diff --git a/src/translation-memory/berkeley/gtr-db-keys.c b/src/translation-memory/berkeley/gtr-db-keys.c
index 27864c2..53751f4 100644
--- a/src/translation-memory/berkeley/gtr-db-keys.c
+++ b/src/translation-memory/berkeley/gtr-db-keys.c
@@ -34,16 +34,16 @@
 #define GTR_DB_KEYS_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 (object),		       \
 						 GTR_TYPE_DB_KEYS,     \
-						 GtranslatorDbKeysPrivate))
+						 GtrDbKeysPrivate))
 
-G_DEFINE_TYPE (GtranslatorDbKeys, gtranslator_db_keys, G_TYPE_OBJECT)
-     struct _GtranslatorDbKeysPrivate
+G_DEFINE_TYPE (GtrDbKeys, gtranslator_db_keys, G_TYPE_OBJECT)
+     struct _GtrDbKeysPrivate
      {
        db_recno_t *list;
        gsize count;
      };
 
-     static void gtranslator_db_keys_init (GtranslatorDbKeys * db_keys)
+     static void gtranslator_db_keys_init (GtrDbKeys * db_keys)
 {
   db_keys->priv = GTR_DB_KEYS_GET_PRIVATE (db_keys);
 }
@@ -51,7 +51,7 @@ G_DEFINE_TYPE (GtranslatorDbKeys, gtranslator_db_keys, G_TYPE_OBJECT)
 static void
 gtranslator_db_keys_finalize (GObject * object)
 {
-  GtranslatorDbKeys *keys = GTR_DB_KEYS (object);
+  GtrDbKeys *keys = GTR_DB_KEYS (object);
 
   g_free (keys->priv->list);
 
@@ -59,11 +59,11 @@ gtranslator_db_keys_finalize (GObject * object)
 }
 
 static void
-gtranslator_db_keys_class_init (GtranslatorDbKeysClass * klass)
+gtranslator_db_keys_class_init (GtrDbKeysClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GtranslatorDbKeysPrivate));
+  g_type_class_add_private (klass, sizeof (GtrDbKeysPrivate));
 
   object_class->finalize = gtranslator_db_keys_finalize;
 }
@@ -72,14 +72,14 @@ gtranslator_db_keys_class_init (GtranslatorDbKeysClass * klass)
  * gtranslator_db_keys_new:
  * @data: the db_recno_t with the list of keys stored into it
  *
- * Creates a new #GtranslatorDbKeys object.
+ * Creates a new #GtrDbKeys object.
  *
- * Returns: a new #GtranslatorDbKeys object
+ * Returns: a new #GtrDbKeys object
  */
-GtranslatorDbKeys *
+GtrDbKeys *
 gtranslator_db_keys_new (DBT * data)
 {
-  GtranslatorDbKeys *db_keys;
+  GtrDbKeys *db_keys;
 
   db_keys = g_object_new (GTR_TYPE_DB_KEYS, NULL);
 
@@ -94,14 +94,14 @@ gtranslator_db_keys_new (DBT * data)
  * gtranslator_db_keys_new_with_size:
  * @cnt: the number of element for the list
  *
- * Creates a new #GtranslatorDbKeys object with #cnt elements.
+ * Creates a new #GtrDbKeys object with #cnt elements.
  *
- * Returns: a new #GtranslatorDbKeys object
+ * Returns: a new #GtrDbKeys object
  */
-GtranslatorDbKeys *
+GtrDbKeys *
 gtranslator_db_keys_new_with_size (gsize cnt)
 {
-  GtranslatorDbKeys *db_keys;
+  GtrDbKeys *db_keys;
 
   db_keys = g_object_new (GTR_TYPE_DB_KEYS, NULL);
 
@@ -113,14 +113,14 @@ gtranslator_db_keys_new_with_size (gsize cnt)
 
 /**
  * gtranslator_db_keys_get_list:
- * @db_keys: a #GtranslatorDbKeys
+ * @db_keys: a #GtrDbKeys
  * 
  * Gets the list of keys.
  * 
  * Returns: the list of keys
  */
 db_recno_t *
-gtranslator_db_keys_get_list (GtranslatorDbKeys * db_keys)
+gtranslator_db_keys_get_list (GtrDbKeys * db_keys)
 {
   g_return_val_if_fail (GTR_IS_DB_KEYS (db_keys), NULL);
 
@@ -129,14 +129,14 @@ gtranslator_db_keys_get_list (GtranslatorDbKeys * db_keys)
 
 /**
  * gtranslator_db_keys_get_count:
- * @db_keys: a #GtranslatorDbKeys
+ * @db_keys: a #GtrDbKeys
  *
  * Gets the number of elements in the list.
  *
  * Returns: the number of elements in the list
  */
 gsize
-gtranslator_db_keys_get_count (GtranslatorDbKeys * db_keys)
+gtranslator_db_keys_get_count (GtrDbKeys * db_keys)
 {
   g_return_val_if_fail (GTR_IS_DB_KEYS (db_keys), 0);
 
@@ -144,7 +144,7 @@ gtranslator_db_keys_get_count (GtranslatorDbKeys * db_keys)
 }
 
 void
-gtranslator_db_keys_set_count (GtranslatorDbKeys * db_keys, gsize count)
+gtranslator_db_keys_set_count (GtrDbKeys * db_keys, gsize count)
 {
   g_return_if_fail (GTR_IS_DB_KEYS (db_keys));
 
diff --git a/src/translation-memory/berkeley/gtr-db-keys.h b/src/translation-memory/berkeley/gtr-db-keys.h
index 6dd7d34..12bc175 100644
--- a/src/translation-memory/berkeley/gtr-db-keys.h
+++ b/src/translation-memory/berkeley/gtr-db-keys.h
@@ -28,33 +28,33 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_DB_KEYS		(gtranslator_db_keys_get_type ())
-#define GTR_DB_KEYS(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_DB_KEYS, GtranslatorDbKeys))
-#define GTR_DB_KEYS_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_DB_KEYS, GtranslatorDbKeysClass))
+#define GTR_DB_KEYS(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_DB_KEYS, GtrDbKeys))
+#define GTR_DB_KEYS_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_DB_KEYS, GtrDbKeysClass))
 #define GTR_IS_DB_KEYS(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_DB_KEYS))
 #define GTR_IS_DB_KEYS_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_DB_KEYS))
-#define GTR_DB_KEYS_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_DB_KEYS, GtranslatorDbKeysClass))
+#define GTR_DB_KEYS_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_DB_KEYS, GtrDbKeysClass))
 /* Private structure type */
-typedef struct _GtranslatorDbKeysPrivate GtranslatorDbKeysPrivate;
+typedef struct _GtrDbKeysPrivate GtrDbKeysPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorDbKeys GtranslatorDbKeys;
+typedef struct _GtrDbKeys GtrDbKeys;
 
-struct _GtranslatorDbKeys
+struct _GtrDbKeys
 {
   GObject parent_instance;
 
   /*< private > */
-  GtranslatorDbKeysPrivate *priv;
+  GtrDbKeysPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorDbKeysClass GtranslatorDbKeysClass;
+typedef struct _GtrDbKeysClass GtrDbKeysClass;
 
-struct _GtranslatorDbKeysClass
+struct _GtrDbKeysClass
 {
   GObjectClass parent_class;
 };
@@ -68,15 +68,15 @@ gtranslator_db_keys_get_type (void)
 
      GType gtranslator_db_keys_register_type (GTypeModule * module);
 
-     GtranslatorDbKeys *gtranslator_db_keys_new (DBT * data);
+     GtrDbKeys *gtranslator_db_keys_new (DBT * data);
 
-     GtranslatorDbKeys *gtranslator_db_keys_new_with_size (gsize cnt);
+     GtrDbKeys *gtranslator_db_keys_new_with_size (gsize cnt);
 
-     db_recno_t *gtranslator_db_keys_get_list (GtranslatorDbKeys * db_keys);
+     db_recno_t *gtranslator_db_keys_get_list (GtrDbKeys * db_keys);
 
-     gsize gtranslator_db_keys_get_count (GtranslatorDbKeys * db_keys);
+     gsize gtranslator_db_keys_get_count (GtrDbKeys * db_keys);
 
-     void gtranslator_db_keys_set_count (GtranslatorDbKeys * db_keys,
+     void gtranslator_db_keys_set_count (GtrDbKeys * db_keys,
 					 gsize count);
 
 G_END_DECLS
diff --git a/src/translation-memory/berkeley/gtr-db-orig.c b/src/translation-memory/berkeley/gtr-db-orig.c
index 3d93abf..5c3c170 100644
--- a/src/translation-memory/berkeley/gtr-db-orig.c
+++ b/src/translation-memory/berkeley/gtr-db-orig.c
@@ -33,15 +33,15 @@
 #define GTR_DB_ORIG_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 (object),		       \
 						 GTR_TYPE_DB_ORIG,     \
-						 GtranslatorDbOrigPrivate))
+						 GtrDbOrigPrivate))
 
-G_DEFINE_TYPE (GtranslatorDbOrig, gtranslator_db_orig, GTR_TYPE_DB_BASE)
-     struct _GtranslatorDbOrigPrivate
+G_DEFINE_TYPE (GtrDbOrig, gtranslator_db_orig, GTR_TYPE_DB_BASE)
+     struct _GtrDbOrigPrivate
      {
 
      };
 
-     static void gtranslator_db_orig_init (GtranslatorDbOrig * db_orig)
+     static void gtranslator_db_orig_init (GtrDbOrig * db_orig)
 {
   //db_orig->priv = GTR_DB_ORIG_GET_PRIVATE (db_orig);
 
@@ -56,11 +56,11 @@ gtranslator_db_orig_finalize (GObject * object)
 }
 
 static void
-gtranslator_db_orig_class_init (GtranslatorDbOrigClass * klass)
+gtranslator_db_orig_class_init (GtrDbOrigClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  //g_type_class_add_private (klass, sizeof (GtranslatorDbOrigPrivate));
+  //g_type_class_add_private (klass, sizeof (GtrDbOrigPrivate));
 
   object_class->finalize = gtranslator_db_orig_finalize;
 }
@@ -68,14 +68,14 @@ gtranslator_db_orig_class_init (GtranslatorDbOrigClass * klass)
 /**
  * gtranslator_db_orig_new:
  * 
- * Creates a new #GtranslatorDbOrig object.
+ * Creates a new #GtrDbOrig object.
  * 
- * Returns: a newly #GtranslatorDbOrig object
+ * Returns: a newly #GtrDbOrig object
  */
-GtranslatorDbOrig *
+GtrDbOrig *
 gtranslator_db_orig_new ()
 {
-  GtranslatorDbOrig *db_orig;
+  GtrDbOrig *db_orig;
 
   db_orig = g_object_new (GTR_TYPE_DB_ORIG, NULL);
 
@@ -84,9 +84,9 @@ gtranslator_db_orig_new ()
 
 /**
  * gtranslator_db_orig_write:
- * @orig: a #GtranslatorDbOrig
+ * @orig: a #GtrDbOrig
  * @string: string to store in the database
- * @value: the foreign key from #GtranslatorDbTrans
+ * @value: the foreign key from #GtrDbTrans
  *
  * Stores the @string in the database with the right foreign key @value.
  * It returns TRUE if there was not any error.
@@ -94,7 +94,7 @@ gtranslator_db_orig_new ()
  * Returns: TRUE if it was successfully stored.
  */
 gboolean
-gtranslator_db_orig_write (GtranslatorDbOrig * orig,
+gtranslator_db_orig_write (GtrDbOrig * orig,
 			   const gchar * string, db_recno_t value)
 {
   DBT key, data;
@@ -119,16 +119,16 @@ gtranslator_db_orig_write (GtranslatorDbOrig * orig,
 
 /**
  * gtranslator_db_orig_read:
- * @orig: a #GtranslatorDbOrig
- * @string: the primary key of the #GtranslatorDbOrig
+ * @orig: a #GtrDbOrig
+ * @string: the primary key of the #GtrDbOrig
  *
- * Gets the foreign key for #GtranslatorDbTrans for a given #GtranslatorDbOrig
+ * Gets the foreign key for #GtrDbTrans for a given #GtrDbOrig
  * primary key.
  *
- * Returns: the foreign key for #GtranslatorDbTrans
+ * Returns: the foreign key for #GtrDbTrans
  */
 db_recno_t
-gtranslator_db_orig_read (GtranslatorDbOrig * orig, const gchar * string)
+gtranslator_db_orig_read (GtrDbOrig * orig, const gchar * string)
 {
   DBT key, data;
   gint error;
diff --git a/src/translation-memory/berkeley/gtr-db-orig.h b/src/translation-memory/berkeley/gtr-db-orig.h
index bf06d24..dd76202 100644
--- a/src/translation-memory/berkeley/gtr-db-orig.h
+++ b/src/translation-memory/berkeley/gtr-db-orig.h
@@ -28,35 +28,35 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_DB_ORIG		(gtranslator_db_orig_get_type ())
-#define GTR_DB_ORIG(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_DB_ORIG, GtranslatorDbOrig))
-#define GTR_DB_ORIG_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_DB_ORIG, GtranslatorDbOrigClass))
+#define GTR_DB_ORIG(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_DB_ORIG, GtrDbOrig))
+#define GTR_DB_ORIG_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_DB_ORIG, GtrDbOrigClass))
 #define GTR_IS_DB_ORIG(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_DB_ORIG))
 #define GTR_IS_DB_ORIG_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_DB_ORIG))
-#define GTR_DB_ORIG_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_DB_ORIG, GtranslatorDbOrigClass))
+#define GTR_DB_ORIG_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_DB_ORIG, GtrDbOrigClass))
 /* Private structure type */
-typedef struct _GtranslatorDbOrigPrivate GtranslatorDbOrigPrivate;
+typedef struct _GtrDbOrigPrivate GtrDbOrigPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorDbOrig GtranslatorDbOrig;
+typedef struct _GtrDbOrig GtrDbOrig;
 
-struct _GtranslatorDbOrig
+struct _GtrDbOrig
 {
-  GtranslatorDbBase parent_instance;
+  GtrDbBase parent_instance;
 
   /*< private > */
-  GtranslatorDbOrigPrivate *priv;
+  GtrDbOrigPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorDbOrigClass GtranslatorDbOrigClass;
+typedef struct _GtrDbOrigClass GtrDbOrigClass;
 
-struct _GtranslatorDbOrigClass
+struct _GtrDbOrigClass
 {
-  GtranslatorDbBaseClass parent_class;
+  GtrDbBaseClass parent_class;
 };
 
 /*
@@ -68,13 +68,13 @@ gtranslator_db_orig_get_type (void)
 
      GType gtranslator_db_orig_register_type (GTypeModule * module);
 
-     GtranslatorDbOrig *gtranslator_db_orig_new (void);
+     GtrDbOrig *gtranslator_db_orig_new (void);
 
-     gboolean gtranslator_db_orig_write (GtranslatorDbOrig * orig,
+     gboolean gtranslator_db_orig_write (GtrDbOrig * orig,
 					 const gchar * string,
 					 db_recno_t value);
 
-     db_recno_t gtranslator_db_orig_read (GtranslatorDbOrig * orig,
+     db_recno_t gtranslator_db_orig_read (GtrDbOrig * orig,
 					  const gchar * string);
 
 G_END_DECLS
diff --git a/src/translation-memory/berkeley/gtr-db-trans.c b/src/translation-memory/berkeley/gtr-db-trans.c
index 30f9129..d12a817 100644
--- a/src/translation-memory/berkeley/gtr-db-trans.c
+++ b/src/translation-memory/berkeley/gtr-db-trans.c
@@ -33,15 +33,15 @@
 #define GTR_DB_TRANS_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 (object),		       \
 						 GTR_TYPE_DB_TRANS,     \
-						 GtranslatorDbTransPrivate))
+						 GtrDbTransPrivate))
 
-G_DEFINE_TYPE (GtranslatorDbTrans, gtranslator_db_trans, GTR_TYPE_DB_BASE)
-     struct _GtranslatorDbTransPrivate
+G_DEFINE_TYPE (GtrDbTrans, gtranslator_db_trans, GTR_TYPE_DB_BASE)
+     struct _GtrDbTransPrivate
      {
 
      };
 
-     static void gtranslator_db_trans_init (GtranslatorDbTrans * db_trans)
+     static void gtranslator_db_trans_init (GtrDbTrans * db_trans)
 {
   //db_trans->priv = GTR_DB_TRANS_GET_PRIVATE (db_trans);
 
@@ -56,11 +56,11 @@ gtranslator_db_trans_finalize (GObject * object)
 }
 
 static void
-gtranslator_db_trans_class_init (GtranslatorDbTransClass * klass)
+gtranslator_db_trans_class_init (GtrDbTransClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  //g_type_class_add_private (klass, sizeof (GtranslatorDbTransPrivate));
+  //g_type_class_add_private (klass, sizeof (GtrDbTransPrivate));
 
   object_class->finalize = gtranslator_db_trans_finalize;
 }
@@ -68,14 +68,14 @@ gtranslator_db_trans_class_init (GtranslatorDbTransClass * klass)
 /**
  * gtranslator_db_trans_new:
  * 
- * Creates a new #GtranslatorDbTrans object.
+ * Creates a new #GtrDbTrans object.
  * 
- * Returns: a newly #GtranslatorDbTrans object
+ * Returns: a newly #GtrDbTrans object
  */
-GtranslatorDbTrans *
+GtrDbTrans *
 gtranslator_db_trans_new ()
 {
-  GtranslatorDbTrans *db_trans;
+  GtrDbTrans *db_trans;
 
   db_trans = g_object_new (GTR_TYPE_DB_TRANS, NULL);
 
@@ -84,7 +84,7 @@ gtranslator_db_trans_new ()
 
 /**
  * gtranslator_db_trans_write_string:
- * @db_trans: a #GtranslatorDbTrans
+ * @db_trans: a #GtrDbTrans
  * @translation: string to be stored in the database
  * @key: the index record in the database to be modified
  * 
@@ -93,7 +93,7 @@ gtranslator_db_trans_new ()
  * Returns: if @index is 0 then returns the new index, else returns @index
  */
 db_recno_t
-gtranslator_db_trans_write_string (GtranslatorDbTrans * db_trans,
+gtranslator_db_trans_write_string (GtrDbTrans * db_trans,
 				   const gchar * translation, db_recno_t key)
 {
   gchar *array[2];
@@ -111,7 +111,7 @@ gtranslator_db_trans_write_string (GtranslatorDbTrans * db_trans,
 
 /**
  * gtranslator_db_trans_write:
- * @db_trans: a #GtranslatorDbTrans
+ * @db_trans: a #GtrDbTrans
  * @translations: array of translations
  * @index: the index record in the database to be modified
  *
@@ -120,7 +120,7 @@ gtranslator_db_trans_write_string (GtranslatorDbTrans * db_trans,
  * Returns: if @index is 0 then returns the new index, else returns @index
  */
 db_recno_t
-gtranslator_db_trans_write (GtranslatorDbTrans * db_trans,
+gtranslator_db_trans_write (GtrDbTrans * db_trans,
 			    gchar ** translations, db_recno_t index)
 {
   DBT key, data;
@@ -200,7 +200,7 @@ gtranslator_db_trans_write (GtranslatorDbTrans * db_trans,
 
 /**
  * gtranslator_db_trans_read:
- * @db_trans: a #GtranslatorDbTrans
+ * @db_trans: a #GtrDbTrans
  * @index: the index record in the database
  *
  * Retrieves translations stored under given @index. Returns an #GPtrArray of
@@ -208,7 +208,7 @@ gtranslator_db_trans_write (GtranslatorDbTrans * db_trans,
  * The caller must free the #GPtrArray.
  */
 GPtrArray *
-gtranslator_db_trans_read (GtranslatorDbTrans * db_trans, db_recno_t index)
+gtranslator_db_trans_read (GtrDbTrans * db_trans, db_recno_t index)
 {
   DBT key, data;
   gint error;
diff --git a/src/translation-memory/berkeley/gtr-db-trans.h b/src/translation-memory/berkeley/gtr-db-trans.h
index 76b262c..1a7add1 100644
--- a/src/translation-memory/berkeley/gtr-db-trans.h
+++ b/src/translation-memory/berkeley/gtr-db-trans.h
@@ -28,35 +28,35 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_DB_TRANS		(gtranslator_db_trans_get_type ())
-#define GTR_DB_TRANS(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_DB_TRANS, GtranslatorDbTrans))
-#define GTR_DB_TRANS_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_DB_TRANS, GtranslatorDbTransClass))
+#define GTR_DB_TRANS(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_DB_TRANS, GtrDbTrans))
+#define GTR_DB_TRANS_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_DB_TRANS, GtrDbTransClass))
 #define GTR_IS_DB_TRANS(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_DB_TRANS))
 #define GTR_IS_DB_TRANS_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_DB_TRANS))
-#define GTR_DB_TRANS_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_DB_TRANS, GtranslatorDbTransClass))
+#define GTR_DB_TRANS_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_DB_TRANS, GtrDbTransClass))
 /* Private structure type */
-typedef struct _GtranslatorDbTransPrivate GtranslatorDbTransPrivate;
+typedef struct _GtrDbTransPrivate GtrDbTransPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorDbTrans GtranslatorDbTrans;
+typedef struct _GtrDbTrans GtrDbTrans;
 
-struct _GtranslatorDbTrans
+struct _GtrDbTrans
 {
-  GtranslatorDbBase parent_instance;
+  GtrDbBase parent_instance;
 
   /*< private > */
-  GtranslatorDbTransPrivate *priv;
+  GtrDbTransPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorDbTransClass GtranslatorDbTransClass;
+typedef struct _GtrDbTransClass GtrDbTransClass;
 
-struct _GtranslatorDbTransClass
+struct _GtrDbTransClass
 {
-  GtranslatorDbBaseClass parent_class;
+  GtrDbBaseClass parent_class;
 };
 
 /*
@@ -68,18 +68,18 @@ gtranslator_db_trans_get_type (void)
 
      GType gtranslator_db_trans_register_type (GTypeModule * module);
 
-     GtranslatorDbTrans *gtranslator_db_trans_new (void);
+     GtrDbTrans *gtranslator_db_trans_new (void);
 
-     db_recno_t gtranslator_db_trans_write_string (GtranslatorDbTrans *
+     db_recno_t gtranslator_db_trans_write_string (GtrDbTrans *
 						   db_trans,
 						   const gchar * translation,
 						   db_recno_t key);
 
-     db_recno_t gtranslator_db_trans_write (GtranslatorDbTrans * db_trans,
+     db_recno_t gtranslator_db_trans_write (GtrDbTrans * db_trans,
 					    gchar ** translations,
 					    db_recno_t index);
 
-     GPtrArray *gtranslator_db_trans_read (GtranslatorDbTrans * db_trans,
+     GPtrArray *gtranslator_db_trans_read (GtrDbTrans * db_trans,
 					   db_recno_t index);
 
 G_END_DECLS
diff --git a/src/translation-memory/berkeley/gtr-db-words.c b/src/translation-memory/berkeley/gtr-db-words.c
index c43e5a8..4619328 100644
--- a/src/translation-memory/berkeley/gtr-db-words.c
+++ b/src/translation-memory/berkeley/gtr-db-words.c
@@ -34,15 +34,15 @@
 #define GTR_DB_WORDS_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 (object),		       \
 						 GTR_TYPE_DB_WORDS,     \
-						 GtranslatorDbWordsPrivate))
+						 GtrDbWordsPrivate))
 
-G_DEFINE_TYPE (GtranslatorDbWords, gtranslator_db_words, GTR_TYPE_DB_BASE)
-     struct _GtranslatorDbWordsPrivate
+G_DEFINE_TYPE (GtrDbWords, gtranslator_db_words, GTR_TYPE_DB_BASE)
+     struct _GtrDbWordsPrivate
      {
 
      };
 
-     static void gtranslator_db_words_init (GtranslatorDbWords * db_words)
+     static void gtranslator_db_words_init (GtrDbWords * db_words)
 {
   //db_words->priv = GTR_DB_WORDS_GET_PRIVATE (db_words);
 
@@ -57,19 +57,19 @@ gtranslator_db_words_finalize (GObject * object)
 }
 
 static void
-gtranslator_db_words_class_init (GtranslatorDbWordsClass * klass)
+gtranslator_db_words_class_init (GtrDbWordsClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  //g_type_class_add_private (klass, sizeof (GtranslatorDbWordsPrivate));
+  //g_type_class_add_private (klass, sizeof (GtrDbWordsPrivate));
 
   object_class->finalize = gtranslator_db_words_finalize;
 }
 
-GtranslatorDbWords *
+GtrDbWords *
 gtranslator_db_words_new ()
 {
-  GtranslatorDbWords *db_words;
+  GtrDbWords *db_words;
 
   db_words = g_object_new (GTR_TYPE_DB_WORDS, NULL);
 
@@ -77,7 +77,7 @@ gtranslator_db_words_new ()
 }
 
 gboolean
-gtranslator_db_words_append (GtranslatorDbWords * db_words,
+gtranslator_db_words_append (GtrDbWords * db_words,
 			     const gchar * word,
 			     guint sentence_size, db_recno_t value)
 {
@@ -90,7 +90,7 @@ gtranslator_db_words_append (GtranslatorDbWords * db_words,
   DBT key, data;
   gsize len;
   gsize buf_len;
-  GtranslatorDbKeys *keys;
+  GtrDbKeys *keys;
   db_recno_t *value_buf = NULL;
   gint error = 0;
 
@@ -149,14 +149,14 @@ gtranslator_db_words_append (GtranslatorDbWords * db_words,
   return TRUE;
 }
 
-GtranslatorDbKeys *
-gtranslator_db_words_read (GtranslatorDbWords * db_words,
+GtrDbKeys *
+gtranslator_db_words_read (GtrDbWords * db_words,
 			   const gchar * word, guint sentence_size)
 {
   DBT key, data;
   gsize len;
   gsize buf_len;
-  GtranslatorDbKeys *keys;
+  GtrDbKeys *keys;
   gint error = 0;
 
   /*
diff --git a/src/translation-memory/berkeley/gtr-db-words.h b/src/translation-memory/berkeley/gtr-db-words.h
index 008e0fd..d2f9851 100644
--- a/src/translation-memory/berkeley/gtr-db-words.h
+++ b/src/translation-memory/berkeley/gtr-db-words.h
@@ -29,35 +29,35 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_DB_WORDS		(gtranslator_db_words_get_type ())
-#define GTR_DB_WORDS(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_DB_WORDS, GtranslatorDbWords))
-#define GTR_DB_WORDS_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_DB_WORDS, GtranslatorDbWordsClass))
+#define GTR_DB_WORDS(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_DB_WORDS, GtrDbWords))
+#define GTR_DB_WORDS_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_DB_WORDS, GtrDbWordsClass))
 #define GTR_IS_DB_WORDS(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_DB_WORDS))
 #define GTR_IS_DB_WORDS_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_DB_WORDS))
-#define GTR_DB_WORDS_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_DB_WORDS, GtranslatorDbWordsClass))
+#define GTR_DB_WORDS_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_DB_WORDS, GtrDbWordsClass))
 /* Private structure type */
-typedef struct _GtranslatorDbWordsPrivate GtranslatorDbWordsPrivate;
+typedef struct _GtrDbWordsPrivate GtrDbWordsPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorDbWords GtranslatorDbWords;
+typedef struct _GtrDbWords GtrDbWords;
 
-struct _GtranslatorDbWords
+struct _GtrDbWords
 {
-  GtranslatorDbBase parent_instance;
+  GtrDbBase parent_instance;
 
   /*< private > */
-  GtranslatorDbWordsPrivate *priv;
+  GtrDbWordsPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorDbWordsClass GtranslatorDbWordsClass;
+typedef struct _GtrDbWordsClass GtrDbWordsClass;
 
-struct _GtranslatorDbWordsClass
+struct _GtrDbWordsClass
 {
-  GtranslatorDbBaseClass parent_class;
+  GtrDbBaseClass parent_class;
 };
 
 /*
@@ -69,14 +69,14 @@ gtranslator_db_words_get_type (void)
 
      GType gtranslator_db_words_register_type (GTypeModule * module);
 
-     GtranslatorDbWords *gtranslator_db_words_new (void);
+     GtrDbWords *gtranslator_db_words_new (void);
 
-     gboolean gtranslator_db_words_append (GtranslatorDbWords * db_words,
+     gboolean gtranslator_db_words_append (GtrDbWords * db_words,
 					   const gchar * word,
 					   guint sentence_size,
 					   db_recno_t value);
 
-     GtranslatorDbKeys *gtranslator_db_words_read (GtranslatorDbWords *
+     GtrDbKeys *gtranslator_db_words_read (GtrDbWords *
 						   db_words,
 						   const gchar * word,
 						   guint sentence_size);
diff --git a/src/translation-memory/gtr-translation-memory-ui.c b/src/translation-memory/gtr-translation-memory-ui.c
index 82876dc..6c3f7e4 100644
--- a/src/translation-memory/gtr-translation-memory-ui.c
+++ b/src/translation-memory/gtr-translation-memory-ui.c
@@ -42,14 +42,14 @@
 #define GTR_TRANSLATION_MEMORY_UI_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 							(object),	               \
 							GTR_TYPE_TRANSLATION_MEMORY_UI,	       \
-							GtranslatorTranslationMemoryUiPrivate))
+							GtrTranslationMemoryUiPrivate))
 
-G_DEFINE_TYPE (GtranslatorTranslationMemoryUi,
+G_DEFINE_TYPE (GtrTranslationMemoryUi,
 	       gtranslator_translation_memory_ui, GTK_TYPE_SCROLLED_WINDOW)
-     struct _GtranslatorTranslationMemoryUiPrivate
+     struct _GtrTranslationMemoryUiPrivate
      {
        GtkWidget *tree_view;
-       GtranslatorTab *tab;
+       GtrTab *tab;
 
        gchar **tm_list;
      };
@@ -68,15 +68,15 @@ G_DEFINE_TYPE (GtranslatorTranslationMemoryUi,
 
      static void
        on_activate_item_cb (GtkMenuItem * menuitem,
-			    GtranslatorTranslationMemoryUi * tm_ui)
+			    GtrTranslationMemoryUi * tm_ui)
 {
-  GtranslatorView *view;
+  GtrView *view;
   GtkTextBuffer *buffer;
-  GtranslatorPo *po;
+  GtrPo *po;
   GList *current_msg = NULL;
-  GtranslatorMsg *msg;
+  GtrMsg *msg;
   gint index;
-  GtranslatorWindow *window;
+  GtrWindow *window;
 
   window = gtranslator_application_get_active_window (GTR_APP);
 
@@ -104,19 +104,19 @@ G_DEFINE_TYPE (GtranslatorTranslationMemoryUi,
 static void
 free_list (gpointer data, gpointer useless)
 {
-  GtranslatorTranslationMemoryMatch *match =
-    (GtranslatorTranslationMemoryMatch *) data;
+  GtrTranslationMemoryMatch *match =
+    (GtrTranslationMemoryMatch *) data;
 
   g_free (match->match);
   g_free (match);
 }
 
 static void
-showed_message_cb (GtranslatorTab * tab,
-		   GtranslatorMsg * msg,
-		   GtranslatorTranslationMemoryUi * tm_ui)
+showed_message_cb (GtrTab * tab,
+		   GtrMsg * msg,
+		   GtrTranslationMemoryUi * tm_ui)
 {
-  GtranslatorTranslationMemory *tm;
+  GtrTranslationMemory *tm;
   GtkListStore *model;
   GtkTreeIter iter;
   GtkTreeViewColumn *level_column;
@@ -130,7 +130,7 @@ showed_message_cb (GtranslatorTab * tab,
   GtkWidget *tm_item;
   GtkWidget *tm_menu;
   GtkWidget *items_menu;
-  GtranslatorWindow *window;
+  GtrWindow *window;
   GtkUIManager *manager;
   gchar *item_name;
 
@@ -169,8 +169,8 @@ showed_message_cb (GtranslatorTab * tab,
 
   for (l = tm_list; l; l = l->next)
     {
-      GtranslatorTranslationMemoryMatch *match;
-      match = (GtranslatorTranslationMemoryMatch *) l->data;
+      GtrTranslationMemoryMatch *match;
+      match = (GtrTranslationMemoryMatch *) l->data;
       tm_ui->priv->tm_list[i - 1] = g_strdup (match->match);
       level_column =
 	gtk_tree_view_get_column (GTK_TREE_VIEW (tm_ui->priv->tree_view), 0);
@@ -216,7 +216,7 @@ showed_message_cb (GtranslatorTab * tab,
       gtk_widget_show (tm_item);
 
       accel_path =
-	g_strdup_printf ("<Gtranslator-sheet>/Edit/_Translation Memory/%s",
+	g_strdup_printf ("<Gtr-sheet>/Edit/_Translation Memory/%s",
 			 item_name);
 
       gtk_menu_item_set_accel_path (GTK_MENU_ITEM (tm_item), accel_path);
@@ -267,10 +267,10 @@ tree_view_size_cb (GtkWidget * widget,
 
 
 static void
-gtranslator_translation_memory_ui_draw (GtranslatorTranslationMemoryUi *
+gtranslator_translation_memory_ui_draw (GtrTranslationMemoryUi *
 					tm_ui)
 {
-  GtranslatorTranslationMemoryUiPrivate *priv = tm_ui->priv;
+  GtrTranslationMemoryUiPrivate *priv = tm_ui->priv;
   GtkListStore *model;
   GtkCellRenderer *level_renderer, *string_renderer, *shortcut_renderer;
   GtkTreeViewColumn *shortcut, *string, *level;
@@ -320,7 +320,7 @@ gtranslator_translation_memory_ui_draw (GtranslatorTranslationMemoryUi *
 }
 
 static void
-gtranslator_translation_memory_ui_init (GtranslatorTranslationMemoryUi *
+gtranslator_translation_memory_ui_init (GtrTranslationMemoryUi *
 					tm_ui)
 {
   tm_ui->priv = GTR_TRANSLATION_MEMORY_UI_GET_PRIVATE (tm_ui);
@@ -332,7 +332,7 @@ gtranslator_translation_memory_ui_init (GtranslatorTranslationMemoryUi *
 static void
 gtranslator_translation_memory_ui_finalize (GObject * object)
 {
-  GtranslatorTranslationMemoryUi *tm_ui = GTR_TRANSLATION_MEMORY_UI (object);
+  GtrTranslationMemoryUi *tm_ui = GTR_TRANSLATION_MEMORY_UI (object);
 
   g_strfreev (tm_ui->priv->tm_list);
 
@@ -342,12 +342,12 @@ gtranslator_translation_memory_ui_finalize (GObject * object)
 
 static void
 gtranslator_translation_memory_ui_class_init
-  (GtranslatorTranslationMemoryUiClass * klass)
+  (GtrTranslationMemoryUiClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   g_type_class_add_private (klass,
-			    sizeof (GtranslatorTranslationMemoryUiPrivate));
+			    sizeof (GtrTranslationMemoryUiPrivate));
 
   object_class->finalize = gtranslator_translation_memory_ui_finalize;
 }
@@ -355,7 +355,7 @@ gtranslator_translation_memory_ui_class_init
 GtkWidget *
 gtranslator_translation_memory_ui_new (GtkWidget * tab)
 {
-  GtranslatorTranslationMemoryUi *tm_ui;
+  GtrTranslationMemoryUi *tm_ui;
   tm_ui = g_object_new (GTR_TYPE_TRANSLATION_MEMORY_UI, NULL);
 
   tm_ui->priv->tab = GTR_TAB (tab);
diff --git a/src/translation-memory/gtr-translation-memory-ui.h b/src/translation-memory/gtr-translation-memory-ui.h
index e527424..5d0028f 100644
--- a/src/translation-memory/gtr-translation-memory-ui.h
+++ b/src/translation-memory/gtr-translation-memory-ui.h
@@ -30,35 +30,35 @@ G_BEGIN_DECLS
  * Type checking and casting macros
  */
 #define GTR_TYPE_TRANSLATION_MEMORY_UI	        (gtranslator_translation_memory_ui_get_type ())
-#define GTR_TRANSLATION_MEMORY_UI(o)	        (G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_TRANSLATION_MEMORY_UI, GtranslatorTranslationMemoryUi))
-#define GTR_TRANSLATION_MEMORY_UI_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_TRANSLATION_MEMORY_UI, GtranslatorTranslationMemoryUiClass))
+#define GTR_TRANSLATION_MEMORY_UI(o)	        (G_TYPE_CHECK_INSTANCE_CAST ((o), GTR_TYPE_TRANSLATION_MEMORY_UI, GtrTranslationMemoryUi))
+#define GTR_TRANSLATION_MEMORY_UI_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST((k), GTR_TYPE_TRANSLATION_MEMORY_UI, GtrTranslationMemoryUiClass))
 #define GTR_IS_TRANSLATION_MEMORY_UI(o)	        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTR_TYPE_TRANSLATION_MEMORY_UI))
 #define GTR_IS_TRANSLATION_MEMORY_UI_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GTR_TYPE_TRANSLATION_MEMORY_UI))
-#define GTR_TRANSLATION_MEMORY_UI_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_TRANSLATION_MEMORY_UI, GtranslatorTranslationMemoryUiClass))
+#define GTR_TRANSLATION_MEMORY_UI_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GTR_TYPE_TRANSLATION_MEMORY_UI, GtrTranslationMemoryUiClass))
 /* Private structure type */
-typedef struct _GtranslatorTranslationMemoryUiPrivate
-  GtranslatorTranslationMemoryUiPrivate;
+typedef struct _GtrTranslationMemoryUiPrivate
+  GtrTranslationMemoryUiPrivate;
 
 /*
  * Main object structure
  */
-typedef struct _GtranslatorTranslationMemoryUi GtranslatorTranslationMemoryUi;
+typedef struct _GtrTranslationMemoryUi GtrTranslationMemoryUi;
 
-struct _GtranslatorTranslationMemoryUi
+struct _GtrTranslationMemoryUi
 {
   GtkScrolledWindow parent_instance;
 
   /*< private > */
-  GtranslatorTranslationMemoryUiPrivate *priv;
+  GtrTranslationMemoryUiPrivate *priv;
 };
 
 /*
  * Class definition
  */
-typedef struct _GtranslatorTranslationMemoryUiClass
-  GtranslatorTranslationMemoryUiClass;
+typedef struct _GtrTranslationMemoryUiClass
+  GtrTranslationMemoryUiClass;
 
-struct _GtranslatorTranslationMemoryUiClass
+struct _GtrTranslationMemoryUiClass
 {
   GtkScrolledWindowClass parent_class;
 };
diff --git a/src/translation-memory/gtr-translation-memory.c b/src/translation-memory/gtr-translation-memory.c
index 98a6880..e8727ce 100644
--- a/src/translation-memory/gtr-translation-memory.c
+++ b/src/translation-memory/gtr-translation-memory.c
@@ -19,14 +19,14 @@
 
 /**
  * gtranslator_translation_memory_store:
- * @obj: a #GtranslatorTranslationMemory
+ * @obj: a #GtrTranslationMemory
  * @original: the untranslated text
  * @translation: the @original text translated
  *
  * Stores the @original and @translation strings in the database.
  */
 gboolean
-gtranslator_translation_memory_store (GtranslatorTranslationMemory * obj,
+gtranslator_translation_memory_store (GtrTranslationMemory * obj,
 				      const gchar * original,
 				      const gchar * translation)
 {
@@ -37,7 +37,7 @@ gtranslator_translation_memory_store (GtranslatorTranslationMemory * obj,
 
 /* Default implementation */
 static gboolean
-gtranslator_translation_memory_store_default (GtranslatorTranslationMemory *
+gtranslator_translation_memory_store_default (GtrTranslationMemory *
 					      obj, const gchar * original,
 					      const gchar * translation)
 {
@@ -46,15 +46,15 @@ gtranslator_translation_memory_store_default (GtranslatorTranslationMemory *
 
 /**
  * gtranslator_translation_memory_lookup:
- * @obj: a #GtranslatorTranslationMemory
+ * @obj: a #GtrTranslationMemory
  * @phrase: the unstranslated text to search for translations.
  *
- * Looks for the @phrase in the database and gets a list of the #GtranslatorTranslationMemoryMatch.
+ * Looks for the @phrase in the database and gets a list of the #GtrTranslationMemoryMatch.
  *
- * Returns: a list of #GtranslatorTranslationMemoryMatch.
+ * Returns: a list of #GtrTranslationMemoryMatch.
  */
 GList *
-gtranslator_translation_memory_lookup (GtranslatorTranslationMemory * obj,
+gtranslator_translation_memory_lookup (GtrTranslationMemory * obj,
 				       const gchar * phrase)
 {
   g_return_val_if_fail (GTR_IS_TRANSLATION_MEMORY (obj), 0);
@@ -63,7 +63,7 @@ gtranslator_translation_memory_lookup (GtranslatorTranslationMemory * obj,
 
 /* Default implementation */
 static GList *
-gtranslator_translation_memory_lookup_default (GtranslatorTranslationMemory *
+gtranslator_translation_memory_lookup_default (GtrTranslationMemory *
 					       obj, const gchar * phrase)
 {
   g_return_val_if_reached (0);
@@ -76,7 +76,7 @@ gtranslator_translation_memory_lookup_default (GtranslatorTranslationMemory *
  * Sets the number of omits used in the search.
  */
 void
-gtranslator_translation_memory_set_max_omits (GtranslatorTranslationMemory *
+gtranslator_translation_memory_set_max_omits (GtrTranslationMemory *
 					      obj, gsize omits)
 {
   g_return_if_fail (GTR_IS_TRANSLATION_MEMORY (obj));
@@ -86,7 +86,7 @@ gtranslator_translation_memory_set_max_omits (GtranslatorTranslationMemory *
 /* Default implementation */
 static void
 gtranslator_translation_memory_set_max_omits_default
-  (GtranslatorTranslationMemory * obj, gsize omits)
+  (GtrTranslationMemory * obj, gsize omits)
 {
   g_return_if_reached ();
 }
@@ -98,7 +98,7 @@ gtranslator_translation_memory_set_max_omits_default
  * Sets the difference in the length of string for searching in the database.
  */
 void
-gtranslator_translation_memory_set_max_delta (GtranslatorTranslationMemory *
+gtranslator_translation_memory_set_max_delta (GtrTranslationMemory *
 					      obj, gsize delta)
 {
   g_return_if_fail (GTR_IS_TRANSLATION_MEMORY (obj));
@@ -108,7 +108,7 @@ gtranslator_translation_memory_set_max_delta (GtranslatorTranslationMemory *
 /* Default implementation */
 static void
 gtranslator_translation_memory_set_max_delta_default
-  (GtranslatorTranslationMemory * obj, gsize omits)
+  (GtrTranslationMemory * obj, gsize omits)
 {
   g_return_if_reached ();
 }
@@ -120,7 +120,7 @@ gtranslator_translation_memory_set_max_delta_default
  * Sets the number of item to return in gtranslator_translation_memory_lookup().
  */
 void
-gtranslator_translation_memory_set_max_items (GtranslatorTranslationMemory *
+gtranslator_translation_memory_set_max_items (GtrTranslationMemory *
 					      obj, gint items)
 {
   g_return_if_fail (GTR_IS_TRANSLATION_MEMORY (obj));
@@ -130,13 +130,13 @@ gtranslator_translation_memory_set_max_items (GtranslatorTranslationMemory *
 /* Default implementation */
 static void
 gtranslator_translation_memory_set_max_items_default
-  (GtranslatorTranslationMemory * obj, gint items)
+  (GtrTranslationMemory * obj, gint items)
 {
   g_return_if_reached ();
 }
 
 static void
-gtranslator_translation_memory_base_init (GtranslatorTranslationMemoryIface *
+gtranslator_translation_memory_base_init (GtrTranslationMemoryIface *
 					  klass)
 {
   static gboolean initialized = FALSE;
@@ -161,7 +161,7 @@ gtranslator_translation_memory_get_type (void)
   if (!type)
     {
       static const GTypeInfo info = {
-	sizeof (GtranslatorTranslationMemoryIface),
+	sizeof (GtrTranslationMemoryIface),
 	(GBaseInitFunc) gtranslator_translation_memory_base_init,
 	NULL,
 	NULL,
@@ -173,7 +173,7 @@ gtranslator_translation_memory_get_type (void)
       };
       type =
 	g_type_register_static (G_TYPE_INTERFACE,
-				"GtranslatorTranslationMemory", &info, 0);
+				"GtrTranslationMemory", &info, 0);
       g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
     }
   return type;
diff --git a/src/translation-memory/gtr-translation-memory.h b/src/translation-memory/gtr-translation-memory.h
index a19bdee..a9cf32e 100644
--- a/src/translation-memory/gtr-translation-memory.h
+++ b/src/translation-memory/gtr-translation-memory.h
@@ -22,29 +22,29 @@
 
 G_BEGIN_DECLS
 #define GTR_TYPE_TRANSLATION_MEMORY (gtranslator_translation_memory_get_type ())
-#define GTR_TRANSLATION_MEMORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTR_TYPE_TRANSLATION_MEMORY, GtranslatorTranslationMemory))
+#define GTR_TRANSLATION_MEMORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTR_TYPE_TRANSLATION_MEMORY, GtrTranslationMemory))
 #define GTR_IS_TRANSLATION_MEMORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTR_TYPE_TRANSLATION_MEMORY))
-#define GTR_TRANSLATION_MEMORY_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTR_TYPE_TRANSLATION_MEMORY, GtranslatorTranslationMemoryIface))
-typedef struct _GtranslatorTranslationMemory GtranslatorTranslationMemory;
-typedef struct _GtranslatorTranslationMemoryIface
-  GtranslatorTranslationMemoryIface;
+#define GTR_TRANSLATION_MEMORY_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTR_TYPE_TRANSLATION_MEMORY, GtrTranslationMemoryIface))
+typedef struct _GtrTranslationMemory GtrTranslationMemory;
+typedef struct _GtrTranslationMemoryIface
+  GtrTranslationMemoryIface;
 
-struct _GtranslatorTranslationMemoryIface
+struct _GtrTranslationMemoryIface
 {
   GTypeInterface g_iface;
 
 
-    gboolean (*store) (GtranslatorTranslationMemory * obj,
+    gboolean (*store) (GtrTranslationMemory * obj,
 		       const gchar * original, const gchar * translation);
-  GList *(*lookup) (GtranslatorTranslationMemory * obj, const gchar * phrase);
-  void (*set_max_omits) (GtranslatorTranslationMemory * obj, gsize omits);
-  void (*set_max_delta) (GtranslatorTranslationMemory * obj, gsize delta);
-  void (*set_max_items) (GtranslatorTranslationMemory * obj, gint items);
+  GList *(*lookup) (GtrTranslationMemory * obj, const gchar * phrase);
+  void (*set_max_omits) (GtrTranslationMemory * obj, gsize omits);
+  void (*set_max_delta) (GtrTranslationMemory * obj, gsize delta);
+  void (*set_max_items) (GtrTranslationMemory * obj, gint items);
 };
 
-typedef struct _GtranslatorTranslationMemoryMatch
-  GtranslatorTranslationMemoryMatch;
-struct _GtranslatorTranslationMemoryMatch
+typedef struct _GtrTranslationMemoryMatch
+  GtrTranslationMemoryMatch;
+struct _GtrTranslationMemoryMatch
 {
   gchar *match;
   gint level;
@@ -52,23 +52,23 @@ struct _GtranslatorTranslationMemoryMatch
 
 GType gtranslator_translation_memory_get_type (void);
 
-gboolean gtranslator_translation_memory_store (GtranslatorTranslationMemory *
+gboolean gtranslator_translation_memory_store (GtrTranslationMemory *
 					       obj, const gchar * original,
 					       const gchar * translation);
 
-GList *gtranslator_translation_memory_lookup (GtranslatorTranslationMemory *
+GList *gtranslator_translation_memory_lookup (GtrTranslationMemory *
 					      obj, const gchar * phrase);
 
 void
-gtranslator_translation_memory_set_max_omits (GtranslatorTranslationMemory *
+gtranslator_translation_memory_set_max_omits (GtrTranslationMemory *
 					      obj, gsize omits);
 
 void
-gtranslator_translation_memory_set_max_delta (GtranslatorTranslationMemory *
+gtranslator_translation_memory_set_max_delta (GtrTranslationMemory *
 					      obj, gsize delta);
 
 void
-gtranslator_translation_memory_set_max_items (GtranslatorTranslationMemory *
+gtranslator_translation_memory_set_max_items (GtrTranslationMemory *
 					      obj, gint items);
 
 G_END_DECLS



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]