[nautilus-actions] Rename interface classes



commit 7465bd2d10900ad3326b6d25d6476411fe625998
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Sep 8 19:55:58 2015 +0200

    Rename interface classes

 src/ui/Makefile.am                                 |   40 ++--
 src/ui/fma-confirm-logout.h                        |    8 +-
 src/ui/{nact-iaction-tab.c => fma-iaction-tab.c}   |  184 ++++++++++----------
 src/ui/{nact-iaction-tab.h => fma-iaction-tab.h}   |   36 ++--
 ...{nact-ibasenames-tab.c => fma-ibasenames-tab.c} |   80 +++++-----
 ...{nact-ibasenames-tab.h => fma-ibasenames-tab.h} |   34 ++--
 ...icapabilities-tab.c => fma-icapabilities-tab.c} |   66 ++++----
 ...icapabilities-tab.h => fma-icapabilities-tab.h} |   34 ++--
 src/ui/{nact-icommand-tab.c => fma-icommand-tab.c} |  156 ++++++++--------
 src/ui/{nact-icommand-tab.h => fma-icommand-tab.h} |   34 ++--
 ...t-ienvironment-tab.c => fma-ienvironment-tab.c} |  172 +++++++++---------
 ...t-ienvironment-tab.h => fma-ienvironment-tab.h} |   34 ++--
 ...{nact-iexecution-tab.c => fma-iexecution-tab.c} |   98 +++++-----
 ...{nact-iexecution-tab.h => fma-iexecution-tab.h} |   34 ++--
 src/ui/{nact-ifolders-tab.c => fma-ifolders-tab.c} |   66 ++++----
 src/ui/{nact-ifolders-tab.h => fma-ifolders-tab.h} |   32 ++--
 ...{nact-imimetypes-tab.c => fma-imimetypes-tab.c} |   66 ++++----
 ...{nact-imimetypes-tab.h => fma-imimetypes-tab.h} |   34 ++--
 ...act-iproperties-tab.c => fma-iproperties-tab.c} |  108 ++++++------
 ...act-iproperties-tab.h => fma-iproperties-tab.h} |   34 ++--
 src/ui/{nact-ischemes-tab.c => fma-ischemes-tab.c} |   66 ++++----
 src/ui/{nact-ischemes-tab.h => fma-ischemes-tab.h} |   34 ++--
 src/ui/nact-main-window-def.h                      |   20 +-
 src/ui/nact-main-window.c                          |  100 ++++++------
 src/ui/nact-match-list.h                           |    4 +-
 src/ui/nact-schemes-list.c                         |    2 +-
 26 files changed, 788 insertions(+), 788 deletions(-)
---
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index a129ac5..1d7a1ab 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -85,28 +85,28 @@ fma_config_tool_SOURCES = \
        fma-confirm-logout.h                                                            \
        fma-export-ask.c                                                                        \
        fma-export-ask.h                                                                        \
-       nact-iaction-tab.c                                                                      \
-       nact-iaction-tab.h                                                                      \
-       nact-ibasenames-tab.c                                                           \
-       nact-ibasenames-tab.h                                                           \
-       nact-icapabilities-tab.c                                                        \
-       nact-icapabilities-tab.h                                                        \
-       nact-icommand-tab.c                                                                     \
-       nact-icommand-tab.h                                                                     \
+       fma-iaction-tab.c                                                                       \
+       fma-iaction-tab.h                                                                       \
+       fma-ibasenames-tab.c                                                            \
+       fma-ibasenames-tab.h                                                            \
+       fma-icapabilities-tab.c                                                 \
+       fma-icapabilities-tab.h                                                 \
+       fma-icommand-tab.c                                                                      \
+       fma-icommand-tab.h                                                                      \
        nact-icon-chooser.c                                                                     \
        nact-icon-chooser.h                                                                     \
-       nact-ienvironment-tab.c                                                         \
-       nact-ienvironment-tab.h                                                         \
-       nact-iexecution-tab.c                                                           \
-       nact-iexecution-tab.h                                                           \
-       nact-ifolders-tab.c                                                                     \
-       nact-ifolders-tab.h                                                                     \
-       nact-imimetypes-tab.c                                                           \
-       nact-imimetypes-tab.h                                                           \
-       nact-iproperties-tab.c                                                          \
-       nact-iproperties-tab.h                                                          \
-       nact-ischemes-tab.c                                                                     \
-       nact-ischemes-tab.h                                                                     \
+       fma-ienvironment-tab.c                                                          \
+       fma-ienvironment-tab.h                                                          \
+       fma-iexecution-tab.c                                                            \
+       fma-iexecution-tab.h                                                            \
+       fma-ifolders-tab.c                                                                      \
+       fma-ifolders-tab.h                                                                      \
+       fma-imimetypes-tab.c                                                            \
+       fma-imimetypes-tab.h                                                            \
+       fma-iproperties-tab.c                                                           \
+       fma-iproperties-tab.h                                                           \
+       fma-ischemes-tab.c                                                                      \
+       fma-ischemes-tab.h                                                                      \
        nact-main-tab.c                                                                         \
        nact-main-tab.h                                                                         \
        nact-main-window.c                                                                      \
diff --git a/src/ui/fma-confirm-logout.h b/src/ui/fma-confirm-logout.h
index 625f8bc..567ad99 100644
--- a/src/ui/fma-confirm-logout.h
+++ b/src/ui/fma-confirm-logout.h
@@ -31,12 +31,12 @@
 #define __UI_FMA_CONFIRM_LOGOUT_H__
 
 /**
- * SECTION: nact_preferences_editor
+ * SECTION: fma_confirm_logout
  * @short_description: #FMAConfirmLogout class definition.
- * @include: ui/nact-preferences-editor.h
+ * @include: ui/fma-confirm-logout.h
  *
- * This class is derived from NactWindow.
- * It encapsulates the "PreferencesDialog" widget dialog.
+ * This class is derived from BaseDialog.
+ * It encapsulates the logout confirmation dialog.
  */
 
 #include "base-dialog.h"
diff --git a/src/ui/nact-iaction-tab.c b/src/ui/fma-iaction-tab.c
similarity index 80%
rename from src/ui/nact-iaction-tab.c
rename to src/ui/fma-iaction-tab.c
index 6e83461..8d6a52c 100644
--- a/src/ui/nact-iaction-tab.c
+++ b/src/ui/fma-iaction-tab.c
@@ -45,19 +45,19 @@
 #include "base-gtk-utils.h"
 #include "nact-main-tab.h"
 #include "nact-main-window.h"
-#include "nact-iaction-tab.h"
+#include "fma-iaction-tab.h"
 #include "nact-icon-chooser.h"
 #include "nact-tree-view.h"
 
 /* private interface data
  */
-struct _NactIActionTabInterfacePrivate {
+struct _FMAIActionTabInterfacePrivate {
        void *empty;                                            /* so that gcc -pedantic is happy */
 };
 
 /* Context identifier, set against the menubar
  */
-#define IACTION_TAB_CONTEXT                            "nact-iaction-tab-context"
+#define IACTION_TAB_CONTEXT                            "fma-iaction-tab-context"
 
 /* data set against the instance
  */
@@ -66,37 +66,37 @@ typedef struct {
 }
        IActionData;
 
-#define IACTION_TAB_PROP_DATA                  "nact-iaction-tab-data"
+#define IACTION_TAB_PROP_DATA                  "fma-iaction-tab-data"
 
 static guint st_initializations = 0;   /* interface initialisation count */
 
 static GType        register_type( void );
-static void         interface_base_init( NactIActionTabInterface *klass );
-static void         interface_base_finalize( NactIActionTabInterface *klass );
-static void         initialize_gtk( NactIActionTab *instance );
-static void         initialize_window( NactIActionTab *instance );
-static void         on_main_item_updated( NactIActionTab *instance, FMAIContext *context, guint data, void 
*empty );
-static void         on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIActionTab 
*instance );
-static void         on_target_selection_toggled( GtkToggleButton *button, NactIActionTab *instance );
-static void         on_target_location_toggled( GtkToggleButton *button, NactIActionTab *instance );
-static void         check_for_label( NactIActionTab *instance, GtkEntry *entry, const gchar *label );
-static void         on_label_changed( GtkEntry *entry, NactIActionTab *instance );
-static void         set_label_label( NactIActionTab *instance, const gchar *color );
-static void         on_target_toolbar_toggled( GtkToggleButton *button, NactIActionTab *instance );
-static void         on_toolbar_same_label_toggled( GtkToggleButton *button, NactIActionTab *instance );
-static void         toolbar_same_label_set_sensitive( NactIActionTab *instance, FMAObjectItem *item );
-static void         setup_toolbar_label( NactIActionTab *instance, FMAObjectItem *item, const gchar *label );
-static void         on_toolbar_label_changed( GtkEntry *entry, NactIActionTab *instance );
-static void         toolbar_label_set_sensitive( NactIActionTab *instance, FMAObjectItem *item );
-static void         on_tooltip_changed( GtkEntry *entry, NactIActionTab *instance );
-static void         on_icon_browse( GtkButton *button, NactIActionTab *instance );
-static void         on_icon_changed( GtkEntry *entry, NactIActionTab *instance );
-
-static IActionData *get_iaction_data( NactIActionTab *instance );
-static void         on_instance_finalized( gpointer user_data, NactIActionTab *instance );
+static void         interface_base_init( FMAIActionTabInterface *klass );
+static void         interface_base_finalize( FMAIActionTabInterface *klass );
+static void         initialize_gtk( FMAIActionTab *instance );
+static void         initialize_window( FMAIActionTab *instance );
+static void         on_main_item_updated( FMAIActionTab *instance, FMAIContext *context, guint data, void 
*empty );
+static void         on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIActionTab 
*instance );
+static void         on_target_selection_toggled( GtkToggleButton *button, FMAIActionTab *instance );
+static void         on_target_location_toggled( GtkToggleButton *button, FMAIActionTab *instance );
+static void         check_for_label( FMAIActionTab *instance, GtkEntry *entry, const gchar *label );
+static void         on_label_changed( GtkEntry *entry, FMAIActionTab *instance );
+static void         set_label_label( FMAIActionTab *instance, const gchar *color );
+static void         on_target_toolbar_toggled( GtkToggleButton *button, FMAIActionTab *instance );
+static void         on_toolbar_same_label_toggled( GtkToggleButton *button, FMAIActionTab *instance );
+static void         toolbar_same_label_set_sensitive( FMAIActionTab *instance, FMAObjectItem *item );
+static void         setup_toolbar_label( FMAIActionTab *instance, FMAObjectItem *item, const gchar *label );
+static void         on_toolbar_label_changed( GtkEntry *entry, FMAIActionTab *instance );
+static void         toolbar_label_set_sensitive( FMAIActionTab *instance, FMAObjectItem *item );
+static void         on_tooltip_changed( GtkEntry *entry, FMAIActionTab *instance );
+static void         on_icon_browse( GtkButton *button, FMAIActionTab *instance );
+static void         on_icon_changed( GtkEntry *entry, FMAIActionTab *instance );
+
+static IActionData *get_iaction_data( FMAIActionTab *instance );
+static void         on_instance_finalized( gpointer user_data, FMAIActionTab *instance );
 
 GType
-nact_iaction_tab_get_type( void )
+fma_iaction_tab_get_type( void )
 {
        static GType iface_type = 0;
 
@@ -110,11 +110,11 @@ nact_iaction_tab_get_type( void )
 static GType
 register_type( void )
 {
-       static const gchar *thisfn = "nact_iaction_tab_register_type";
+       static const gchar *thisfn = "fma_iaction_tab_register_type";
        GType type;
 
        static const GTypeInfo info = {
-               sizeof( NactIActionTabInterface ),
+               sizeof( FMAIActionTabInterface ),
                ( GBaseInitFunc ) interface_base_init,
                ( GBaseFinalizeFunc ) interface_base_finalize,
                NULL,
@@ -127,7 +127,7 @@ register_type( void )
 
        g_debug( "%s", thisfn );
 
-       type = g_type_register_static( G_TYPE_INTERFACE, "NactIActionTab", &info, 0 );
+       type = g_type_register_static( G_TYPE_INTERFACE, "FMAIActionTab", &info, 0 );
 
        g_type_interface_add_prerequisite( type, GTK_TYPE_APPLICATION_WINDOW );
 
@@ -135,24 +135,24 @@ register_type( void )
 }
 
 static void
-interface_base_init( NactIActionTabInterface *klass )
+interface_base_init( FMAIActionTabInterface *klass )
 {
-       static const gchar *thisfn = "nact_iaction_tab_interface_base_init";
+       static const gchar *thisfn = "fma_iaction_tab_interface_base_init";
 
        if( !st_initializations ){
 
                g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
 
-               klass->private = g_new0( NactIActionTabInterfacePrivate, 1 );
+               klass->private = g_new0( FMAIActionTabInterfacePrivate, 1 );
        }
 
        st_initializations += 1;
 }
 
 static void
-interface_base_finalize( NactIActionTabInterface *klass )
+interface_base_finalize( FMAIActionTabInterface *klass )
 {
-       static const gchar *thisfn = "nact_iaction_tab_interface_base_finalize";
+       static const gchar *thisfn = "fma_iaction_tab_interface_base_finalize";
 
        st_initializations -= 1;
 
@@ -165,18 +165,18 @@ interface_base_finalize( NactIActionTabInterface *klass )
 }
 
 /**
- * nact_iaction_tab_init:
- * @instance: this #NactIActionTab instance.
+ * fma_iaction_tab_init:
+ * @instance: this #FMAIActionTab instance.
  *
  * Initialize the interface
  */
 void
-nact_iaction_tab_init( NactIActionTab *instance )
+fma_iaction_tab_init( FMAIActionTab *instance )
 {
-       static const gchar *thisfn = "nact_iaction_tab_init";
+       static const gchar *thisfn = "fma_iaction_tab_init";
        IActionData *data;
 
-       g_return_if_fail( instance && NACT_IS_IACTION_TAB( instance ));
+       g_return_if_fail( instance && FMA_IS_IACTION_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
@@ -206,15 +206,15 @@ nact_iaction_tab_init( NactIActionTab *instance )
  * Icon Chooser).
  */
 static void
-initialize_gtk( NactIActionTab *instance )
+initialize_gtk( FMAIActionTab *instance )
 {
-       static const gchar *thisfn = "nact_iaction_tab_initialize_gtk";
+       static const gchar *thisfn = "fma_iaction_tab_initialize_gtk";
        GtkWidget *frame;
        GtkWidget *button;
        gint size;
        GtkRequisition minimal_size, natural_size;
 
-       g_return_if_fail( NACT_IS_IACTION_TAB( instance ));
+       g_return_if_fail( FMA_IS_IACTION_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
@@ -231,12 +231,12 @@ initialize_gtk( NactIActionTab *instance )
 }
 
 static void
-initialize_window( NactIActionTab *instance )
+initialize_window( FMAIActionTab *instance )
 {
-       static const gchar *thisfn = "nact_iaction_tab_initialize_window";
+       static const gchar *thisfn = "fma_iaction_tab_initialize_window";
        NactTreeView *tview;
 
-       g_return_if_fail( NACT_IS_IACTION_TAB( instance ));
+       g_return_if_fail( FMA_IS_IACTION_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
@@ -289,21 +289,21 @@ initialize_window( NactIActionTab *instance )
 }
 
 /**
- * nact_iaction_tab_has_label:
- * @window: this #NactIActionTab instance.
+ * fma_iaction_tab_has_label:
+ * @window: this #FMAIActionTab instance.
  *
  * An action or a menu can only be written if it has at least a label.
  *
  * Returns %TRUE if the label of the action or of the menu is not empty.
  */
 gboolean
-nact_iaction_tab_has_label( NactIActionTab *instance )
+fma_iaction_tab_has_label( FMAIActionTab *instance )
 {
        GtkWidget *label_widget;
        const gchar *label;
        gboolean has_label = FALSE;
 
-       g_return_val_if_fail( NACT_IS_IACTION_TAB( instance ), FALSE );
+       g_return_val_if_fail( FMA_IS_IACTION_TAB( instance ), FALSE );
 
        label_widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionMenuLabelEntry" );
        label = gtk_entry_get_text( GTK_ENTRY( label_widget ));
@@ -313,12 +313,12 @@ nact_iaction_tab_has_label( NactIActionTab *instance )
 }
 
 static void
-on_main_item_updated( NactIActionTab *instance, FMAIContext *context, guint data, void *empty )
+on_main_item_updated( FMAIActionTab *instance, FMAIContext *context, guint data, void *empty )
 {
        GtkWidget *label_widget;
        gchar *label;
 
-       g_return_if_fail( instance && NACT_IS_IACTION_TAB( instance ));
+       g_return_if_fail( instance && FMA_IS_IACTION_TAB( instance ));
 
        if( context && FMA_IS_OBJECT_ITEM( context )){
                label_widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), 
"ActionMenuLabelEntry" );
@@ -330,9 +330,9 @@ on_main_item_updated( NactIActionTab *instance, FMAIContext *context, guint data
 }
 
 static void
-on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIActionTab *instance )
+on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIActionTab *instance )
 {
-       static const gchar *thisfn = "nact_iaction_tab_on_tree_selection_changed";
+       static const gchar *thisfn = "fma_iaction_tab_on_tree_selection_changed";
        guint count_selected;
        gboolean enable_tab;
        FMAObjectItem *item;
@@ -347,7 +347,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIActi
        IActionData *data;
 
        g_return_if_fail( instance && NACT_IS_MAIN_WINDOW( instance ));
-       g_return_if_fail( NACT_IS_IACTION_TAB( instance ));
+       g_return_if_fail( FMA_IS_IACTION_TAB( instance ));
 
        count_selected = g_list_length( selected_items );
        g_debug( "%s: tview=%p, selected_items=%p (count=%u), instance=%p (%s)",
@@ -449,15 +449,15 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIActi
 }
 
 static void
-on_target_selection_toggled( GtkToggleButton *button, NactIActionTab *instance )
+on_target_selection_toggled( GtkToggleButton *button, FMAIActionTab *instance )
 {
-       static const gchar *thisfn = "nact_iaction_tab_on_target_selection_toggled";
+       static const gchar *thisfn = "fma_iaction_tab_on_target_selection_toggled";
        FMAObjectItem *item;
        gboolean is_target;
        gboolean editable;
        IActionData *data;
 
-       g_return_if_fail( NACT_IS_IACTION_TAB( instance ));
+       g_return_if_fail( FMA_IS_IACTION_TAB( instance ));
 
        data = get_iaction_data( instance );
 
@@ -494,15 +494,15 @@ on_target_selection_toggled( GtkToggleButton *button, NactIActionTab *instance )
 }
 
 static void
-on_target_location_toggled( GtkToggleButton *button, NactIActionTab *instance )
+on_target_location_toggled( GtkToggleButton *button, FMAIActionTab *instance )
 {
-       static const gchar *thisfn = "nact_iaction_tab_on_target_location_toggled";
+       static const gchar *thisfn = "fma_iaction_tab_on_target_location_toggled";
        FMAObjectItem *item;
        gboolean is_target;
        gboolean editable;
        IActionData *data;
 
-       g_return_if_fail( NACT_IS_IACTION_TAB( instance ));
+       g_return_if_fail( FMA_IS_IACTION_TAB( instance ));
 
        data = get_iaction_data( instance );
 
@@ -539,12 +539,12 @@ on_target_location_toggled( GtkToggleButton *button, NactIActionTab *instance )
 }
 
 static void
-check_for_label( NactIActionTab *instance, GtkEntry *entry, const gchar *label )
+check_for_label( FMAIActionTab *instance, GtkEntry *entry, const gchar *label )
 {
        FMAObjectItem *item;
        NactStatusbar *bar;
 
-       g_return_if_fail( NACT_IS_IACTION_TAB( instance ));
+       g_return_if_fail( FMA_IS_IACTION_TAB( instance ));
        g_return_if_fail( GTK_IS_ENTRY( entry ));
 
        bar = nact_main_window_get_statusbar( NACT_MAIN_WINDOW( instance ));
@@ -566,14 +566,14 @@ check_for_label( NactIActionTab *instance, GtkEntry *entry, const gchar *label )
 }
 
 static void
-on_label_changed( GtkEntry *entry, NactIActionTab *instance )
+on_label_changed( GtkEntry *entry, FMAIActionTab *instance )
 {
-       static const gchar *thisfn = "nact_iaction_tab_on_label_changed";
+       static const gchar *thisfn = "fma_iaction_tab_on_label_changed";
        FMAObjectItem *item;
        const gchar *label;
        IActionData *data;
 
-       g_return_if_fail( NACT_IS_IACTION_TAB( instance ));
+       g_return_if_fail( FMA_IS_IACTION_TAB( instance ));
 
        data = get_iaction_data( instance );
 
@@ -603,7 +603,7 @@ on_label_changed( GtkEntry *entry, NactIActionTab *instance )
 }
 
 static void
-set_label_label( NactIActionTab *instance, const gchar *color_str )
+set_label_label( FMAIActionTab *instance, const gchar *color_str )
 {
        GtkWidget *label;
        GdkRGBA color;
@@ -615,15 +615,15 @@ set_label_label( NactIActionTab *instance, const gchar *color_str )
 }
 
 static void
-on_target_toolbar_toggled( GtkToggleButton *button, NactIActionTab *instance )
+on_target_toolbar_toggled( GtkToggleButton *button, FMAIActionTab *instance )
 {
-       static const gchar *thisfn = "nact_iaction_tab_on_target_toolbar_toggled";
+       static const gchar *thisfn = "fma_iaction_tab_on_target_toolbar_toggled";
        FMAObjectAction *item;
        gboolean is_target;
        gboolean editable;
        IActionData *data;
 
-       g_return_if_fail( NACT_IS_IACTION_TAB( instance ));
+       g_return_if_fail( FMA_IS_IACTION_TAB( instance ));
 
        data = get_iaction_data( instance );
 
@@ -662,9 +662,9 @@ on_target_toolbar_toggled( GtkToggleButton *button, NactIActionTab *instance )
 }
 
 static void
-on_toolbar_same_label_toggled( GtkToggleButton *button, NactIActionTab *instance )
+on_toolbar_same_label_toggled( GtkToggleButton *button, FMAIActionTab *instance )
 {
-       static const gchar *thisfn = "nact_iaction_tab_on_toolbar_same_label_toggled";
+       static const gchar *thisfn = "fma_iaction_tab_on_toolbar_same_label_toggled";
        FMAObjectItem *item;
        gboolean same_label;
        gboolean editable;
@@ -672,7 +672,7 @@ on_toolbar_same_label_toggled( GtkToggleButton *button, NactIActionTab *instance
        GtkWidget *label_widget;
        IActionData *data;
 
-       g_return_if_fail( NACT_IS_IACTION_TAB( instance ));
+       g_return_if_fail( FMA_IS_IACTION_TAB( instance ));
 
        data = get_iaction_data( instance );
 
@@ -719,7 +719,7 @@ on_toolbar_same_label_toggled( GtkToggleButton *button, NactIActionTab *instance
 }
 
 static void
-toolbar_same_label_set_sensitive( NactIActionTab *instance, FMAObjectItem *item )
+toolbar_same_label_set_sensitive( FMAIActionTab *instance, FMAObjectItem *item )
 {
        GtkToggleButton *toggle;
        gboolean target_toolbar;
@@ -735,7 +735,7 @@ toolbar_same_label_set_sensitive( NactIActionTab *instance, FMAObjectItem *item
  * setup the label of the toolbar according to the toolbar_same_label flag
  */
 static void
-setup_toolbar_label( NactIActionTab *instance, FMAObjectItem *item, const gchar *label )
+setup_toolbar_label( FMAIActionTab *instance, FMAObjectItem *item, const gchar *label )
 {
        GtkWidget *label_widget;
 
@@ -748,14 +748,14 @@ setup_toolbar_label( NactIActionTab *instance, FMAObjectItem *item, const gchar
 }
 
 static void
-on_toolbar_label_changed( GtkEntry *entry, NactIActionTab *instance )
+on_toolbar_label_changed( GtkEntry *entry, FMAIActionTab *instance )
 {
-       static const gchar *thisfn = "nact_iaction_tab_on_toolbar_label_changed";
+       static const gchar *thisfn = "fma_iaction_tab_on_toolbar_label_changed";
        FMAObjectItem *item;
        const gchar *label;
        IActionData *data;
 
-       g_return_if_fail( NACT_IS_IACTION_TAB( instance ));
+       g_return_if_fail( FMA_IS_IACTION_TAB( instance ));
 
        data = get_iaction_data( instance );
 
@@ -779,7 +779,7 @@ on_toolbar_label_changed( GtkEntry *entry, NactIActionTab *instance )
 }
 
 static void
-toolbar_label_set_sensitive( NactIActionTab *instance, FMAObjectItem *item )
+toolbar_label_set_sensitive( FMAIActionTab *instance, FMAObjectItem *item )
 {
        gboolean is_action;
        gboolean same_label;
@@ -792,13 +792,13 @@ toolbar_label_set_sensitive( NactIActionTab *instance, FMAObjectItem *item )
 }
 
 static void
-on_tooltip_changed( GtkEntry *entry, NactIActionTab *instance )
+on_tooltip_changed( GtkEntry *entry, FMAIActionTab *instance )
 {
-       static const gchar *thisfn = "nact_iaction_tab_on_tooltip_changed";
+       static const gchar *thisfn = "fma_iaction_tab_on_tooltip_changed";
        FMAObjectItem *item;
        IActionData *data;
 
-       g_return_if_fail( NACT_IS_IACTION_TAB( instance ));
+       g_return_if_fail( FMA_IS_IACTION_TAB( instance ));
 
        data = get_iaction_data( instance );
 
@@ -821,15 +821,15 @@ on_tooltip_changed( GtkEntry *entry, NactIActionTab *instance )
 }
 
 static void
-on_icon_browse( GtkButton *button, NactIActionTab *instance )
+on_icon_browse( GtkButton *button, FMAIActionTab *instance )
 {
-       static const gchar *thisfn = "nact_iaction_tab_on_icon_browse";
+       static const gchar *thisfn = "fma_iaction_tab_on_icon_browse";
        FMAObjectItem *item;
        GtkWidget *icon_entry;
        gchar *icon_name;
        gchar *new_icon_name;
 
-       g_return_if_fail( NACT_IS_IACTION_TAB( instance ));
+       g_return_if_fail( FMA_IS_IACTION_TAB( instance ));
 
        g_debug( "%s: button=%p, instance=%p (%s)",
                        thisfn,
@@ -856,15 +856,15 @@ on_icon_browse( GtkButton *button, NactIActionTab *instance )
 }
 
 static void
-on_icon_changed( GtkEntry *icon_entry, NactIActionTab *instance )
+on_icon_changed( GtkEntry *icon_entry, FMAIActionTab *instance )
 {
-       static const gchar *thisfn = "nact_iaction_tab_on_icon_changed";
+       static const gchar *thisfn = "fma_iaction_tab_on_icon_changed";
        GtkImage *image;
        FMAObjectItem *item;
        gchar *icon_name;
        IActionData *data;
 
-       g_return_if_fail( NACT_IS_IACTION_TAB( instance ));
+       g_return_if_fail( FMA_IS_IACTION_TAB( instance ));
 
        g_debug( "%s: icon_entry=%p, instance=%p (%s)",
                        thisfn,
@@ -899,7 +899,7 @@ on_icon_changed( GtkEntry *icon_entry, NactIActionTab *instance )
 }
 
 static IActionData *
-get_iaction_data( NactIActionTab *instance )
+get_iaction_data( FMAIActionTab *instance )
 {
        IActionData *data;
 
@@ -914,9 +914,9 @@ get_iaction_data( NactIActionTab *instance )
 }
 
 static void
-on_instance_finalized( gpointer user_data, NactIActionTab *instance )
+on_instance_finalized( gpointer user_data, FMAIActionTab *instance )
 {
-       static const gchar *thisfn = "nact_iaction_tab_on_instance_finalized";
+       static const gchar *thisfn = "fma_iaction_tab_on_instance_finalized";
        IActionData *data;
 
        g_debug( "%s: instance=%p, user_data=%p", thisfn, ( void * ) instance, ( void * ) user_data );
diff --git a/src/ui/nact-iaction-tab.h b/src/ui/fma-iaction-tab.h
similarity index 57%
rename from src/ui/nact-iaction-tab.h
rename to src/ui/fma-iaction-tab.h
index f90dd05..4a1f6b9 100644
--- a/src/ui/nact-iaction-tab.h
+++ b/src/ui/fma-iaction-tab.h
@@ -27,13 +27,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __UI_NACT_IACTION_TAB_H__
-#define __UI_NACT_IACTION_TAB_H__
+#ifndef __UI_FMA_IACTION_TAB_H__
+#define __UI_FMA_IACTION_TAB_H__
 
 /**
- * SECTION: nact_iaction_tab
- * @short_description: #NactIActionTab interface definition.
- * @include: ui/nact-iaction-tab.h
+ * SECTION: fma_iaction_tab
+ * @short_description: #FMAIActionTab interface definition.
+ * @include: ui/fma-iaction-tab.h
  *
  * This interface implements the "Nautilus Menu Item" tab of the notebook.
  *
@@ -46,27 +46,27 @@
 
 G_BEGIN_DECLS
 
-#define NACT_TYPE_IACTION_TAB                      ( nact_iaction_tab_get_type())
-#define NACT_IACTION_TAB( instance )               ( G_TYPE_CHECK_INSTANCE_CAST( instance, 
NACT_TYPE_IACTION_TAB, NactIActionTab ))
-#define NACT_IS_IACTION_TAB( instance )            ( G_TYPE_CHECK_INSTANCE_TYPE( instance, 
NACT_TYPE_IACTION_TAB ))
-#define NACT_IACTION_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), 
NACT_TYPE_IACTION_TAB, NactIActionTabInterface ))
+#define FMA_TYPE_IACTION_TAB                      ( fma_iaction_tab_get_type())
+#define FMA_IACTION_TAB( instance )               ( G_TYPE_CHECK_INSTANCE_CAST( instance, 
FMA_TYPE_IACTION_TAB, FMAIActionTab ))
+#define FMA_IS_IACTION_TAB( instance )            ( G_TYPE_CHECK_INSTANCE_TYPE( instance, 
FMA_TYPE_IACTION_TAB ))
+#define FMA_IACTION_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), 
FMA_TYPE_IACTION_TAB, FMAIActionTabInterface ))
 
-typedef struct _NactIActionTab                     NactIActionTab;
-typedef struct _NactIActionTabInterfacePrivate     NactIActionTabInterfacePrivate;
+typedef struct _FMAIActionTab                     FMAIActionTab;
+typedef struct _FMAIActionTabInterfacePrivate     FMAIActionTabInterfacePrivate;
 
 typedef struct {
        /*< private >*/
-       GTypeInterface                  parent;
-       NactIActionTabInterfacePrivate *private;
+       GTypeInterface                 parent;
+       FMAIActionTabInterfacePrivate *private;
 }
-       NactIActionTabInterface;
+       FMAIActionTabInterface;
 
-GType    nact_iaction_tab_get_type ( void );
+GType    fma_iaction_tab_get_type ( void );
 
-void     nact_iaction_tab_init     ( NactIActionTab *instance );
+void     fma_iaction_tab_init     ( FMAIActionTab *instance );
 
-gboolean nact_iaction_tab_has_label( NactIActionTab *instance );
+gboolean fma_iaction_tab_has_label( FMAIActionTab *instance );
 
 G_END_DECLS
 
-#endif /* __UI_NACT_IACTION_TAB_H__ */
+#endif /* __UI_FMA_IACTION_TAB_H__ */
diff --git a/src/ui/nact-ibasenames-tab.c b/src/ui/fma-ibasenames-tab.c
similarity index 75%
rename from src/ui/nact-ibasenames-tab.c
rename to src/ui/fma-ibasenames-tab.c
index 1807032..f5c1633 100644
--- a/src/ui/nact-ibasenames-tab.c
+++ b/src/ui/fma-ibasenames-tab.c
@@ -38,14 +38,14 @@
 #include "core/fma-gtk-utils.h"
 
 #include "base-gtk-utils.h"
-#include "nact-ibasenames-tab.h"
+#include "fma-ibasenames-tab.h"
 #include "nact-main-tab.h"
 #include "nact-main-window.h"
 #include "nact-match-list.h"
 
 /* private interface data
  */
-struct _NactIBasenamesTabInterfacePrivate {
+struct _FMAIBasenamesTabInterfacePrivate {
        void *empty;                                            /* so that gcc -pedantic is happy */
 };
 
@@ -60,24 +60,24 @@ typedef struct {
 }
        IBasenamesData;
 
-#define IBASENAMES_TAB_PROP_DATA               "nact-ibasenames-tab-data"
+#define IBASENAMES_TAB_PROP_DATA               "fma-ibasenames-tab-data"
 
 static guint    st_initializations = 0;        /* interface initialization count */
 
 static GType           register_type( void );
-static void            interface_base_init( NactIBasenamesTabInterface *klass );
-static void            interface_base_finalize( NactIBasenamesTabInterface *klass );
-static void            initialize_gtk( NactIBasenamesTab *instance );
-static void            initialize_window( NactIBasenamesTab *instance );
-static void            on_tree_selection_changed( NactTreeView *tview, GList *selected_items, 
NactIBasenamesTab *instance );
-static void            on_matchcase_toggled( GtkToggleButton *button, NactIBasenamesTab *instance );
+static void            interface_base_init( FMAIBasenamesTabInterface *klass );
+static void            interface_base_finalize( FMAIBasenamesTabInterface *klass );
+static void            initialize_gtk( FMAIBasenamesTab *instance );
+static void            initialize_window( FMAIBasenamesTab *instance );
+static void            on_tree_selection_changed( NactTreeView *tview, GList *selected_items, 
FMAIBasenamesTab *instance );
+static void            on_matchcase_toggled( GtkToggleButton *button, FMAIBasenamesTab *instance );
 static GSList         *get_basenames( void *context );
 static void            set_basenames( void *context, GSList *filters );
-static IBasenamesData *get_ibasenames_data( NactIBasenamesTab *instance );
-static void            on_instance_finalized( gpointer user_data, NactIBasenamesTab *instance );
+static IBasenamesData *get_ibasenames_data( FMAIBasenamesTab *instance );
+static void            on_instance_finalized( gpointer user_data, FMAIBasenamesTab *instance );
 
 GType
-nact_ibasenames_tab_get_type( void )
+fma_ibasenames_tab_get_type( void )
 {
        static GType iface_type = 0;
 
@@ -91,11 +91,11 @@ nact_ibasenames_tab_get_type( void )
 static GType
 register_type( void )
 {
-       static const gchar *thisfn = "nact_ibasenames_tab_register_type";
+       static const gchar *thisfn = "fma_ibasenames_tab_register_type";
        GType type;
 
        static const GTypeInfo info = {
-               sizeof( NactIBasenamesTabInterface ),
+               sizeof( FMAIBasenamesTabInterface ),
                ( GBaseInitFunc ) interface_base_init,
                ( GBaseFinalizeFunc ) interface_base_finalize,
                NULL,
@@ -108,7 +108,7 @@ register_type( void )
 
        g_debug( "%s", thisfn );
 
-       type = g_type_register_static( G_TYPE_INTERFACE, "NactIBasenamesTab", &info, 0 );
+       type = g_type_register_static( G_TYPE_INTERFACE, "FMAIBasenamesTab", &info, 0 );
 
        g_type_interface_add_prerequisite( type, GTK_TYPE_APPLICATION_WINDOW );
 
@@ -116,24 +116,24 @@ register_type( void )
 }
 
 static void
-interface_base_init( NactIBasenamesTabInterface *klass )
+interface_base_init( FMAIBasenamesTabInterface *klass )
 {
-       static const gchar *thisfn = "nact_ibasenames_tab_interface_base_init";
+       static const gchar *thisfn = "fma_ibasenames_tab_interface_base_init";
 
        if( !st_initializations ){
 
                g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
 
-               klass->private = g_new0( NactIBasenamesTabInterfacePrivate, 1 );
+               klass->private = g_new0( FMAIBasenamesTabInterfacePrivate, 1 );
        }
 
        st_initializations += 1;
 }
 
 static void
-interface_base_finalize( NactIBasenamesTabInterface *klass )
+interface_base_finalize( FMAIBasenamesTabInterface *klass )
 {
-       static const gchar *thisfn = "nact_ibasenames_tab_interface_base_finalize";
+       static const gchar *thisfn = "fma_ibasenames_tab_interface_base_finalize";
 
        st_initializations -= 1;
 
@@ -146,19 +146,19 @@ interface_base_finalize( NactIBasenamesTabInterface *klass )
 }
 
 /*
- * nact_ibasenames_tab_init:
- * @instance: this #NactIBasenamesTab instance.
+ * fma_ibasenames_tab_init:
+ * @instance: this #FMAIBasenamesTab instance.
  *
  * Initialize the interface
  * Connect to #BaseWindow signals
  */
 void
-nact_ibasenames_tab_init( NactIBasenamesTab *instance )
+fma_ibasenames_tab_init( FMAIBasenamesTab *instance )
 {
-       static const gchar *thisfn = "nact_ibasenames_tab_init";
+       static const gchar *thisfn = "fma_ibasenames_tab_init";
        IBasenamesData *data;
 
-       g_return_if_fail( NACT_IS_IBASENAMES_TAB( instance ));
+       g_return_if_fail( FMA_IS_IBASENAMES_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn,
@@ -176,16 +176,16 @@ nact_ibasenames_tab_init( NactIBasenamesTab *instance )
 
 /*
  * on_base_initialize_gtk:
- * @window: this #NactIBasenamesTab instance.
+ * @window: this #FMAIBasenamesTab instance.
  *
  * Initializes the tab widget at initial load.
  */
 static void
-initialize_gtk( NactIBasenamesTab *instance )
+initialize_gtk( FMAIBasenamesTab *instance )
 {
-       static const gchar *thisfn = "nact_ibasenames_tab_initialize_gtk";
+       static const gchar *thisfn = "fma_ibasenames_tab_initialize_gtk";
 
-       g_return_if_fail( instance && NACT_IS_IBASENAMES_TAB( instance ));
+       g_return_if_fail( instance && FMA_IS_IBASENAMES_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
@@ -208,18 +208,18 @@ initialize_gtk( NactIBasenamesTab *instance )
 
 /*
  * on_base_initialize_window:
- * @window: this #NactIBasenamesTab instance.
+ * @window: this #FMAIBasenamesTab instance.
  *
  * Initializes the tab widget at each time the widget will be displayed.
  * Connect signals and setup runtime values.
  */
 static void
-initialize_window( NactIBasenamesTab *instance )
+initialize_window( FMAIBasenamesTab *instance )
 {
-       static const gchar *thisfn = "nact_ibasenames_tab_initialize_window";
+       static const gchar *thisfn = "fma_ibasenames_tab_initialize_window";
        NactTreeView *tview;
 
-       g_return_if_fail( instance && NACT_IS_IBASENAMES_TAB( instance ));
+       g_return_if_fail( instance && FMA_IS_IBASENAMES_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
@@ -235,7 +235,7 @@ initialize_window( NactIBasenamesTab *instance )
 }
 
 static void
-on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIBasenamesTab *instance )
+on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIBasenamesTab *instance )
 {
        FMAIContext *context;
        gboolean editable;
@@ -251,7 +251,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIBase
        enable_tab = ( context != NULL );
        nact_main_tab_enable_page( NACT_MAIN_WINDOW( instance ), TAB_BASENAMES, enable_tab );
 
-       data = get_ibasenames_data( NACT_IBASENAMES_TAB( instance ));
+       data = get_ibasenames_data( FMA_IBASENAMES_TAB( instance ));
        data->on_selection_change = TRUE;
 
        matchcase_button = GTK_TOGGLE_BUTTON( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), 
"BasenamesMatchcaseButton" ));
@@ -263,14 +263,14 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIBase
 }
 
 static void
-on_matchcase_toggled( GtkToggleButton *button, NactIBasenamesTab *instance )
+on_matchcase_toggled( GtkToggleButton *button, FMAIBasenamesTab *instance )
 {
        FMAIContext *context;
        gboolean editable;
        gboolean matchcase;
        IBasenamesData *data;
 
-       data = get_ibasenames_data( NACT_IBASENAMES_TAB( instance ));
+       data = get_ibasenames_data( FMA_IBASENAMES_TAB( instance ));
 
        if( !data->on_selection_change ){
                g_object_get( G_OBJECT( instance ),
@@ -306,7 +306,7 @@ set_basenames( void *context, GSList *filters )
 }
 
 static IBasenamesData *
-get_ibasenames_data( NactIBasenamesTab *instance )
+get_ibasenames_data( FMAIBasenamesTab *instance )
 {
        IBasenamesData *data;
 
@@ -321,9 +321,9 @@ get_ibasenames_data( NactIBasenamesTab *instance )
 }
 
 static void
-on_instance_finalized( gpointer user_data, NactIBasenamesTab *instance )
+on_instance_finalized( gpointer user_data, FMAIBasenamesTab *instance )
 {
-       static const gchar *thisfn = "nact_ibasenames_tab_on_instance_finalized";
+       static const gchar *thisfn = "fma_ibasenames_tab_on_instance_finalized";
        IBasenamesData *data;
 
        g_debug( "%s: instance=%p, user_data=%p", thisfn, ( void * ) instance, ( void * ) user_data );
diff --git a/src/ui/nact-ibasenames-tab.h b/src/ui/fma-ibasenames-tab.h
similarity index 54%
rename from src/ui/nact-ibasenames-tab.h
rename to src/ui/fma-ibasenames-tab.h
index 6c549aa..b32f522 100644
--- a/src/ui/nact-ibasenames-tab.h
+++ b/src/ui/fma-ibasenames-tab.h
@@ -27,13 +27,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __UI_NACT_IBASENAMES_TAB_H__
-#define __UI_NACT_IBASENAMES_TAB_H__
+#ifndef __UI_FMA_IBASENAMES_TAB_H__
+#define __UI_FMA_IBASENAMES_TAB_H__
 
 /**
- * SECTION: nact_ibasenames_tab
- * @short_description: #NactIBasenamesTab interface declaration.
- * @include: ui/nact-ibasenames-tab.h
+ * SECTION: fma_ibasenames_tab
+ * @short_description: #FMAIBasenamesTab interface declaration.
+ * @include: ui/fma-ibasenames-tab.h
  *
  * This interface implements all the widgets which define the
  * basenames-based conditions.
@@ -43,25 +43,25 @@
 
 G_BEGIN_DECLS
 
-#define NACT_TYPE_IBASENAMES_TAB                      ( nact_ibasenames_tab_get_type())
-#define NACT_IBASENAMES_TAB( instance )               ( G_TYPE_CHECK_INSTANCE_CAST( instance, 
NACT_TYPE_IBASENAMES_TAB, NactIBasenamesTab ))
-#define NACT_IS_IBASENAMES_TAB( instance )            ( G_TYPE_CHECK_INSTANCE_TYPE( instance, 
NACT_TYPE_IBASENAMES_TAB ))
-#define NACT_IBASENAMES_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), 
NACT_TYPE_IBASENAMES_TAB, NactIBasenamesTabInterface ))
+#define FMA_TYPE_IBASENAMES_TAB                      ( fma_ibasenames_tab_get_type())
+#define FMA_IBASENAMES_TAB( instance )               ( G_TYPE_CHECK_INSTANCE_CAST( instance, 
FMA_TYPE_IBASENAMES_TAB, FMAIBasenamesTab ))
+#define FMA_IS_IBASENAMES_TAB( instance )            ( G_TYPE_CHECK_INSTANCE_TYPE( instance, 
FMA_TYPE_IBASENAMES_TAB ))
+#define FMA_IBASENAMES_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), 
FMA_TYPE_IBASENAMES_TAB, FMAIBasenamesTabInterface ))
 
-typedef struct _NactIBasenamesTab                     NactIBasenamesTab;
-typedef struct _NactIBasenamesTabInterfacePrivate     NactIBasenamesTabInterfacePrivate;
+typedef struct _FMAIBasenamesTab                     FMAIBasenamesTab;
+typedef struct _FMAIBasenamesTabInterfacePrivate     FMAIBasenamesTabInterfacePrivate;
 
 typedef struct {
        /*< private >*/
-       GTypeInterface                     parent;
-       NactIBasenamesTabInterfacePrivate *private;
+       GTypeInterface                    parent;
+       FMAIBasenamesTabInterfacePrivate *private;
 }
-       NactIBasenamesTabInterface;
+       FMAIBasenamesTabInterface;
 
-GType nact_ibasenames_tab_get_type( void );
+GType fma_ibasenames_tab_get_type( void );
 
-void  nact_ibasenames_tab_init    ( NactIBasenamesTab *instance );
+void  fma_ibasenames_tab_init    ( FMAIBasenamesTab *instance );
 
 G_END_DECLS
 
-#endif /* __UI_NACT_IBASENAMES_TAB_H__ */
+#endif /* __UI_FMA_IBASENAMES_TAB_H__ */
diff --git a/src/ui/nact-icapabilities-tab.c b/src/ui/fma-icapabilities-tab.c
similarity index 71%
rename from src/ui/nact-icapabilities-tab.c
rename to src/ui/fma-icapabilities-tab.c
index 5b4fb2b..c13cf98 100644
--- a/src/ui/nact-icapabilities-tab.c
+++ b/src/ui/fma-icapabilities-tab.c
@@ -42,11 +42,11 @@
 #include "nact-main-window.h"
 #include "nact-match-list.h"
 #include "fma-add-capability-dialog.h"
-#include "nact-icapabilities-tab.h"
+#include "fma-icapabilities-tab.h"
 
 /* private interface data
  */
-struct _NactICapabilitiesTabInterfacePrivate {
+struct _FMAICapabilitiesTabInterfacePrivate {
        void *empty;                                            /* so that gcc -pedantic is happy */
 };
 
@@ -55,18 +55,18 @@ struct _NactICapabilitiesTabInterfacePrivate {
 static guint st_initializations = 0;   /* interface initialization count */
 
 static GType   register_type( void );
-static void    interface_base_init( NactICapabilitiesTabInterface *klass );
-static void    interface_base_finalize( NactICapabilitiesTabInterface *klass );
-static void    initialize_gtk( NactICapabilitiesTab *instance );
-static void    initialize_window( NactICapabilitiesTab *instance );
-static void    on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactICapabilitiesTab 
*instance );
-static void    on_add_clicked( GtkButton *button, NactICapabilitiesTab *instance );
+static void    interface_base_init( FMAICapabilitiesTabInterface *klass );
+static void    interface_base_finalize( FMAICapabilitiesTabInterface *klass );
+static void    initialize_gtk( FMAICapabilitiesTab *instance );
+static void    initialize_window( FMAICapabilitiesTab *instance );
+static void    on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAICapabilitiesTab 
*instance );
+static void    on_add_clicked( GtkButton *button, FMAICapabilitiesTab *instance );
 static GSList *get_capabilities( FMAIContext *context );
 static void    set_capabilities( FMAIContext *context, GSList *list );
-static void    on_instance_finalized( gpointer user_data, NactICapabilitiesTab *instance );
+static void    on_instance_finalized( gpointer user_data, FMAICapabilitiesTab *instance );
 
 GType
-nact_icapabilities_tab_get_type( void )
+fma_icapabilities_tab_get_type( void )
 {
        static GType iface_type = 0;
 
@@ -80,11 +80,11 @@ nact_icapabilities_tab_get_type( void )
 static GType
 register_type( void )
 {
-       static const gchar *thisfn = "nact_icapabilities_tab_register_type";
+       static const gchar *thisfn = "fma_icapabilities_tab_register_type";
        GType type;
 
        static const GTypeInfo info = {
-               sizeof( NactICapabilitiesTabInterface ),
+               sizeof( FMAICapabilitiesTabInterface ),
                ( GBaseInitFunc ) interface_base_init,
                ( GBaseFinalizeFunc ) interface_base_finalize,
                NULL,
@@ -97,7 +97,7 @@ register_type( void )
 
        g_debug( "%s", thisfn );
 
-       type = g_type_register_static( G_TYPE_INTERFACE, "NactICapabilitiesTab", &info, 0 );
+       type = g_type_register_static( G_TYPE_INTERFACE, "FMAICapabilitiesTab", &info, 0 );
 
        g_type_interface_add_prerequisite( type, GTK_TYPE_APPLICATION_WINDOW );
 
@@ -105,24 +105,24 @@ register_type( void )
 }
 
 static void
-interface_base_init( NactICapabilitiesTabInterface *klass )
+interface_base_init( FMAICapabilitiesTabInterface *klass )
 {
-       static const gchar *thisfn = "nact_icapabilities_tab_interface_base_init";
+       static const gchar *thisfn = "fma_icapabilities_tab_interface_base_init";
 
        if( !st_initializations ){
 
                g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
 
-               klass->private = g_new0( NactICapabilitiesTabInterfacePrivate, 1 );
+               klass->private = g_new0( FMAICapabilitiesTabInterfacePrivate, 1 );
        }
 
        st_initializations += 1;
 }
 
 static void
-interface_base_finalize( NactICapabilitiesTabInterface *klass )
+interface_base_finalize( FMAICapabilitiesTabInterface *klass )
 {
-       static const gchar *thisfn = "nact_icapabilities_tab_interface_base_finalize";
+       static const gchar *thisfn = "fma_icapabilities_tab_interface_base_finalize";
 
        st_initializations -= 1;
 
@@ -135,18 +135,18 @@ interface_base_finalize( NactICapabilitiesTabInterface *klass )
 }
 
 /**
- * nact_icapabilities_tab_init:
- * @instance: this #NactICapabilitiesTab instance.
+ * fma_icapabilities_tab_init:
+ * @instance: this #FMAICapabilitiesTab instance.
  *
  * Initialize the interface
  * Connect to #BaseWindow signals
  */
 void
-nact_icapabilities_tab_init( NactICapabilitiesTab *instance )
+fma_icapabilities_tab_init( FMAICapabilitiesTab *instance )
 {
-       static const gchar *thisfn = "nact_icapabilities_tab_init";
+       static const gchar *thisfn = "fma_icapabilities_tab_init";
 
-       g_return_if_fail( NACT_IS_ICAPABILITIES_TAB( instance ));
+       g_return_if_fail( FMA_IS_ICAPABILITIES_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn,
@@ -160,11 +160,11 @@ nact_icapabilities_tab_init( NactICapabilitiesTab *instance )
 }
 
 static void
-initialize_gtk( NactICapabilitiesTab *instance )
+initialize_gtk( FMAICapabilitiesTab *instance )
 {
-       static const gchar *thisfn = "nact_icapabilities_tab_initialize_gtk";
+       static const gchar *thisfn = "fma_icapabilities_tab_initialize_gtk";
 
-       g_return_if_fail( NACT_IS_ICAPABILITIES_TAB( instance ));
+       g_return_if_fail( FMA_IS_ICAPABILITIES_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
@@ -186,12 +186,12 @@ initialize_gtk( NactICapabilitiesTab *instance )
 }
 
 static void
-initialize_window( NactICapabilitiesTab *instance )
+initialize_window( FMAICapabilitiesTab *instance )
 {
-       static const gchar *thisfn = "nact_icapabilities_tab_initialize_window";
+       static const gchar *thisfn = "fma_icapabilities_tab_initialize_window";
        NactTreeView *tview;
 
-       g_return_if_fail( NACT_IS_ICAPABILITIES_TAB( instance ));
+       g_return_if_fail( FMA_IS_ICAPABILITIES_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
@@ -204,7 +204,7 @@ initialize_window( NactICapabilitiesTab *instance )
 }
 
 static void
-on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactICapabilitiesTab *instance )
+on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAICapabilitiesTab *instance )
 {
        FMAIContext *context;
        gboolean editable;
@@ -219,7 +219,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactICapa
 }
 
 static void
-on_add_clicked( GtkButton *button, NactICapabilitiesTab *instance )
+on_add_clicked( GtkButton *button, FMAICapabilitiesTab *instance )
 {
        FMAIContext *context;
        GSList *capabilities;
@@ -253,9 +253,9 @@ set_capabilities( FMAIContext *context, GSList *list )
 }
 
 static void
-on_instance_finalized( gpointer user_data, NactICapabilitiesTab *instance )
+on_instance_finalized( gpointer user_data, FMAICapabilitiesTab *instance )
 {
-       static const gchar *thisfn = "nact_icapabilities_tab_on_instance_finalized";
+       static const gchar *thisfn = "fma_icapabilities_tab_on_instance_finalized";
 
        g_debug( "%s: instance=%p, user_data=%p", thisfn, ( void * ) instance, ( void * ) user_data );
 }
diff --git a/src/ui/nact-icapabilities-tab.h b/src/ui/fma-icapabilities-tab.h
similarity index 52%
rename from src/ui/nact-icapabilities-tab.h
rename to src/ui/fma-icapabilities-tab.h
index 5c9c935..9fef47a 100644
--- a/src/ui/nact-icapabilities-tab.h
+++ b/src/ui/fma-icapabilities-tab.h
@@ -27,13 +27,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __UI_NACT_ICAPABILITIES_TAB_H__
-#define __UI_NACT_ICAPABILITIES_TAB_H__
+#ifndef __UI_FMA_ICAPABILITIES_TAB_H__
+#define __UI_FMA_ICAPABILITIES_TAB_H__
 
 /**
- * SECTION: nact_icapabilities_tab
- * @short_description: #NactICapabilitiesTab interface declaration.
- * @include: ui/nact-icapabilities-tab.h
+ * SECTION: fma_icapabilities_tab
+ * @short_description: #FMAICapabilitiesTab interface declaration.
+ * @include: ui/fma-icapabilities-tab.h
  *
  * This interface implements all the widgets which define the
  * conditions for the action.
@@ -43,25 +43,25 @@
 
 G_BEGIN_DECLS
 
-#define NACT_TYPE_ICAPABILITIES_TAB                      ( nact_icapabilities_tab_get_type())
-#define NACT_ICAPABILITIES_TAB( instance )               ( G_TYPE_CHECK_INSTANCE_CAST( instance, 
NACT_TYPE_ICAPABILITIES_TAB, NactICapabilitiesTab ))
-#define NACT_IS_ICAPABILITIES_TAB( instance )            ( G_TYPE_CHECK_INSTANCE_TYPE( instance, 
NACT_TYPE_ICAPABILITIES_TAB ))
-#define NACT_ICAPABILITIES_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), 
NACT_TYPE_ICAPABILITIES_TAB, NactICapabilitiesTabInterface ))
+#define FMA_TYPE_ICAPABILITIES_TAB                      ( fma_icapabilities_tab_get_type())
+#define FMA_ICAPABILITIES_TAB( instance )               ( G_TYPE_CHECK_INSTANCE_CAST( instance, 
FMA_TYPE_ICAPABILITIES_TAB, FMAICapabilitiesTab ))
+#define FMA_IS_ICAPABILITIES_TAB( instance )            ( G_TYPE_CHECK_INSTANCE_TYPE( instance, 
FMA_TYPE_ICAPABILITIES_TAB ))
+#define FMA_ICAPABILITIES_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), 
FMA_TYPE_ICAPABILITIES_TAB, FMAICapabilitiesTabInterface ))
 
-typedef struct _NactICapabilitiesTab                     NactICapabilitiesTab;
-typedef struct _NactICapabilitiesTabInterfacePrivate     NactICapabilitiesTabInterfacePrivate;
+typedef struct _FMAICapabilitiesTab                     FMAICapabilitiesTab;
+typedef struct _FMAICapabilitiesTabInterfacePrivate     FMAICapabilitiesTabInterfacePrivate;
 
 typedef struct {
        /*< private >*/
-       GTypeInterface                        parent;
-       NactICapabilitiesTabInterfacePrivate *private;
+       GTypeInterface                       parent;
+       FMAICapabilitiesTabInterfacePrivate *private;
 }
-       NactICapabilitiesTabInterface;
+       FMAICapabilitiesTabInterface;
 
-GType nact_icapabilities_tab_get_type( void );
+GType fma_icapabilities_tab_get_type( void );
 
-void  nact_icapabilities_tab_init    ( NactICapabilitiesTab *instance );
+void  fma_icapabilities_tab_init    ( FMAICapabilitiesTab *instance );
 
 G_END_DECLS
 
-#endif /* __UI_NACT_ICAPABILITIES_TAB_H__ */
+#endif /* __UI_FMA_ICAPABILITIES_TAB_H__ */
diff --git a/src/ui/nact-icommand-tab.c b/src/ui/fma-icommand-tab.c
similarity index 77%
rename from src/ui/nact-icommand-tab.c
rename to src/ui/fma-icommand-tab.c
index f05c123..e12b5d2 100644
--- a/src/ui/nact-icommand-tab.c
+++ b/src/ui/fma-icommand-tab.c
@@ -46,18 +46,18 @@
 #include "base-gtk-utils.h"
 #include "nact-main-tab.h"
 #include "nact-main-window.h"
-#include "nact-icommand-tab.h"
-#include "nact-ischemes-tab.h"
+#include "fma-icommand-tab.h"
+#include "fma-ischemes-tab.h"
 
 /* private interface data
  */
-struct _NactICommandTabInterfacePrivate {
+struct _FMAICommandTabInterfacePrivate {
        void *empty;                                            /* so that gcc -pedantic is happy */
 };
 
 /* a data set in the LegendDialog GObject
  */
-#define ICOMMAND_TAB_LEGEND_VISIBLE                    "nact-icommand-tab-legend-dialog-visible"
+#define ICOMMAND_TAB_LEGEND_VISIBLE                    "fma-icommand-tab-legend-dialog-visible"
 
 /* data set against the instance
  */
@@ -68,42 +68,42 @@ typedef struct {
 }
        ICommandData;
 
-#define ICOMMAND_TAB_PROP_DATA                         "nact-icommand-tab-data"
+#define ICOMMAND_TAB_PROP_DATA                         "fma-icommand-tab-data"
 
 static guint st_initializations = 0;   /* interface initialization count */
 
 static GType         register_type( void );
-static void          interface_base_init( NactICommandTabInterface *klass );
-static void          interface_base_finalize( NactICommandTabInterface *klass );
-static void          initialize_gtk( NactICommandTab *instance );
-static void          initialize_window( NactICommandTab *instance );
-static void          on_main_item_updated( NactICommandTab *instance, FMAIContext *context, guint data, void 
*empty );
-static void          on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactICommandTab 
*instance );
-static GtkWidget    *get_label_entry( NactICommandTab *instance );
-static GtkButton    *get_legend_button( NactICommandTab *instance );
-static GtkWindow    *get_legend_dialog( NactICommandTab *instance );
-static GtkWidget    *get_parameters_entry( NactICommandTab *instance );
-static GtkButton    *get_path_button( NactICommandTab *instance );
-static GtkWidget    *get_path_entry( NactICommandTab *instance );
-static void          legend_dialog_show( NactICommandTab *instance );
-static void          legend_dialog_hide( NactICommandTab *instance );
-static void          on_label_changed( GtkEntry *entry, NactICommandTab *instance );
-static void          on_legend_clicked( GtkButton *button, NactICommandTab *instance );
+static void          interface_base_init( FMAICommandTabInterface *klass );
+static void          interface_base_finalize( FMAICommandTabInterface *klass );
+static void          initialize_gtk( FMAICommandTab *instance );
+static void          initialize_window( FMAICommandTab *instance );
+static void          on_main_item_updated( FMAICommandTab *instance, FMAIContext *context, guint data, void 
*empty );
+static void          on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAICommandTab 
*instance );
+static GtkWidget    *get_label_entry( FMAICommandTab *instance );
+static GtkButton    *get_legend_button( FMAICommandTab *instance );
+static GtkWindow    *get_legend_dialog( FMAICommandTab *instance );
+static GtkWidget    *get_parameters_entry( FMAICommandTab *instance );
+static GtkButton    *get_path_button( FMAICommandTab *instance );
+static GtkWidget    *get_path_entry( FMAICommandTab *instance );
+static void          legend_dialog_show( FMAICommandTab *instance );
+static void          legend_dialog_hide( FMAICommandTab *instance );
+static void          on_label_changed( GtkEntry *entry, FMAICommandTab *instance );
+static void          on_legend_clicked( GtkButton *button, FMAICommandTab *instance );
 #if 0
-static gboolean      on_legend_dialog_deleted( GtkWidget *dialog, GdkEvent *event, NactICommandTab *instance 
);
+static gboolean      on_legend_dialog_deleted( GtkWidget *dialog, GdkEvent *event, FMAICommandTab *instance 
);
 #endif
-static void          on_parameters_changed( GtkEntry *entry, NactICommandTab *instance );
-static void          on_path_browse( GtkButton *button, NactICommandTab *instance );
-static void          on_path_changed( GtkEntry *entry, NactICommandTab *instance );
-static void          on_wdir_browse( GtkButton *button, NactICommandTab *instance );
-static void          on_wdir_changed( GtkEntry *entry, NactICommandTab *instance );
-static gchar        *parse_parameters( NactICommandTab *instance );
-static void          update_example_label( NactICommandTab *instance, FMAObjectProfile *profile );
-static ICommandData *get_icommand_data( NactICommandTab *instance );
-static void          on_instance_finalized( gpointer user_data, NactICommandTab *instance );
+static void          on_parameters_changed( GtkEntry *entry, FMAICommandTab *instance );
+static void          on_path_browse( GtkButton *button, FMAICommandTab *instance );
+static void          on_path_changed( GtkEntry *entry, FMAICommandTab *instance );
+static void          on_wdir_browse( GtkButton *button, FMAICommandTab *instance );
+static void          on_wdir_changed( GtkEntry *entry, FMAICommandTab *instance );
+static gchar        *parse_parameters( FMAICommandTab *instance );
+static void          update_example_label( FMAICommandTab *instance, FMAObjectProfile *profile );
+static ICommandData *get_icommand_data( FMAICommandTab *instance );
+static void          on_instance_finalized( gpointer user_data, FMAICommandTab *instance );
 
 GType
-nact_icommand_tab_get_type( void )
+fma_icommand_tab_get_type( void )
 {
        static GType iface_type = 0;
 
@@ -117,11 +117,11 @@ nact_icommand_tab_get_type( void )
 static GType
 register_type( void )
 {
-       static const gchar *thisfn = "nact_icommand_tab_register_type";
+       static const gchar *thisfn = "fma_icommand_tab_register_type";
        GType type;
 
        static const GTypeInfo info = {
-               sizeof( NactICommandTabInterface ),
+               sizeof( FMAICommandTabInterface ),
                ( GBaseInitFunc ) interface_base_init,
                ( GBaseFinalizeFunc ) interface_base_finalize,
                NULL,
@@ -134,7 +134,7 @@ register_type( void )
 
        g_debug( "%s", thisfn );
 
-       type = g_type_register_static( G_TYPE_INTERFACE, "NactICommandTab", &info, 0 );
+       type = g_type_register_static( G_TYPE_INTERFACE, "FMAICommandTab", &info, 0 );
 
        g_type_interface_add_prerequisite( type, GTK_TYPE_APPLICATION_WINDOW );
 
@@ -142,24 +142,24 @@ register_type( void )
 }
 
 static void
-interface_base_init( NactICommandTabInterface *klass )
+interface_base_init( FMAICommandTabInterface *klass )
 {
-       static const gchar *thisfn = "nact_icommand_tab_interface_base_init";
+       static const gchar *thisfn = "fma_icommand_tab_interface_base_init";
 
        if( !st_initializations ){
 
                g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
 
-               klass->private = g_new0( NactICommandTabInterfacePrivate, 1 );
+               klass->private = g_new0( FMAICommandTabInterfacePrivate, 1 );
        }
 
        st_initializations += 1;
 }
 
 static void
-interface_base_finalize( NactICommandTabInterface *klass )
+interface_base_finalize( FMAICommandTabInterface *klass )
 {
-       static const gchar *thisfn = "nact_icommand_tab_interface_base_finalize";
+       static const gchar *thisfn = "fma_icommand_tab_interface_base_finalize";
 
        st_initializations -= 1;
 
@@ -172,19 +172,19 @@ interface_base_finalize( NactICommandTabInterface *klass )
 }
 
 /*
- * nact_icommand_tab_init:
- * @instance: this #NactICommandTab instance.
+ * fma_icommand_tab_init:
+ * @instance: this #FMAICommandTab instance.
  *
  * Initialize the interface
  * Connect to #BaseWindow signals
  */
 void
-nact_icommand_tab_init( NactICommandTab *instance )
+fma_icommand_tab_init( FMAICommandTab *instance )
 {
-       static const gchar *thisfn = "nact_icommand_tab_init";
+       static const gchar *thisfn = "fma_icommand_tab_init";
        ICommandData *data;
 
-       g_return_if_fail( NACT_IS_ICOMMAND_TAB( instance ));
+       g_return_if_fail( FMA_IS_ICOMMAND_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn,
@@ -200,21 +200,21 @@ nact_icommand_tab_init( NactICommandTab *instance )
 }
 
 static void
-initialize_gtk( NactICommandTab *instance )
+initialize_gtk( FMAICommandTab *instance )
 {
 }
 
 /*
  * on_base_initialize_window:
- * @window: this #NactICommandTab instance.
+ * @window: this #FMAICommandTab instance.
  *
  * Initializes the tab widget at each time the widget will be displayed.
  * Connect signals and setup runtime values.
  */
 static void
-initialize_window( NactICommandTab *instance )
+initialize_window( FMAICommandTab *instance )
 {
-       static const gchar *thisfn = "nact_icommand_tab_initialize_window";
+       static const gchar *thisfn = "fma_icommand_tab_initialize_window";
 #if 0
        GtkWindow *legend_dialog;
 #endif
@@ -223,7 +223,7 @@ initialize_window( NactICommandTab *instance )
        ICommandData *data;
        NactTreeView *tview;
 
-       g_return_if_fail( NACT_IS_ICOMMAND_TAB( instance ));
+       g_return_if_fail( FMA_IS_ICOMMAND_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
@@ -289,12 +289,12 @@ initialize_window( NactICommandTab *instance )
 }
 
 static void
-on_main_item_updated( NactICommandTab *instance, FMAIContext *context, guint data, void *empty )
+on_main_item_updated( FMAICommandTab *instance, FMAIContext *context, guint data, void *empty )
 {
        GtkWidget *label_widget;
        gchar *label;
 
-       g_return_if_fail( instance && NACT_IS_ICOMMAND_TAB( instance ));
+       g_return_if_fail( instance && FMA_IS_ICOMMAND_TAB( instance ));
 
        if( FMA_IS_OBJECT_PROFILE( context )){
                label_widget = get_label_entry( instance );
@@ -305,9 +305,9 @@ on_main_item_updated( NactICommandTab *instance, FMAIContext *context, guint dat
 }
 
 static void
-on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactICommandTab *instance )
+on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAICommandTab *instance )
 {
-       static const gchar *thisfn = "nact_icommand_tab_on_tree_selection_changed";
+       static const gchar *thisfn = "fma_icommand_tab_on_tree_selection_changed";
        FMAObjectProfile *profile;
        gboolean editable;
        gboolean enable_tab;
@@ -317,7 +317,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIComm
        GtkButton *legend_button;
        ICommandData *data;
 
-       g_return_if_fail( NACT_IS_ICOMMAND_TAB( instance ));
+       g_return_if_fail( FMA_IS_ICOMMAND_TAB( instance ));
 
        g_debug( "%s: tview=%p, selected_items=%p (count=%d), instance=%p (%s)",
                        thisfn, tview,
@@ -387,19 +387,19 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIComm
 }
 
 static GtkWidget *
-get_label_entry( NactICommandTab *instance )
+get_label_entry( FMAICommandTab *instance )
 {
        return( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ProfileLabelEntry" ));
 }
 
 static GtkButton *
-get_legend_button( NactICommandTab *instance )
+get_legend_button( FMAICommandTab *instance )
 {
        return( GTK_BUTTON( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), 
"CommandLegendButton" )));
 }
 
 static GtkWindow *
-get_legend_dialog( NactICommandTab *instance )
+get_legend_dialog( FMAICommandTab *instance )
 {
 #if 0
        return( base_window_get_gtk_toplevel_by_name( BASE_WINDOW( instance ), "LegendDialog" ));
@@ -408,25 +408,25 @@ get_legend_dialog( NactICommandTab *instance )
 }
 
 static GtkWidget *
-get_parameters_entry( NactICommandTab *instance )
+get_parameters_entry( FMAICommandTab *instance )
 {
        return( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "CommandParametersEntry" ));
 }
 
 static GtkButton *
-get_path_button( NactICommandTab *instance )
+get_path_button( FMAICommandTab *instance )
 {
        return( GTK_BUTTON( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "CommandPathButton" 
)));
 }
 
 static GtkWidget *
-get_path_entry( NactICommandTab *instance )
+get_path_entry( FMAICommandTab *instance )
 {
        return( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "CommandPathEntry" ));
 }
 
 static void
-legend_dialog_hide( NactICommandTab *instance )
+legend_dialog_hide( FMAICommandTab *instance )
 {
        GtkWindow *legend_dialog;
        GtkButton *legend_button;
@@ -454,7 +454,7 @@ legend_dialog_hide( NactICommandTab *instance )
 }
 
 static void
-legend_dialog_show( NactICommandTab *instance )
+legend_dialog_show( FMAICommandTab *instance )
 {
        GtkWindow *legend_dialog;
 
@@ -470,7 +470,7 @@ legend_dialog_show( NactICommandTab *instance )
 }
 
 static void
-on_label_changed( GtkEntry *entry, NactICommandTab *instance )
+on_label_changed( GtkEntry *entry, FMAICommandTab *instance )
 {
        FMAObjectProfile *profile;
        const gchar *label;
@@ -493,7 +493,7 @@ on_label_changed( GtkEntry *entry, NactICommandTab *instance )
 }
 
 static void
-on_legend_clicked( GtkButton *button, NactICommandTab *instance )
+on_legend_clicked( GtkButton *button, FMAICommandTab *instance )
 {
        if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( button ))){
                legend_dialog_show( instance );
@@ -505,7 +505,7 @@ on_legend_clicked( GtkButton *button, NactICommandTab *instance )
 
 #if 0
 static gboolean
-on_legend_dialog_deleted( GtkWidget *dialog, GdkEvent *event, NactICommandTab *instance )
+on_legend_dialog_deleted( GtkWidget *dialog, GdkEvent *event, FMAICommandTab *instance )
 {
        /*g_debug( "on_legend_dialog_deleted" );*/
        legend_dialog_hide( instance );
@@ -514,7 +514,7 @@ on_legend_dialog_deleted( GtkWidget *dialog, GdkEvent *event, NactICommandTab *i
 #endif
 
 static void
-on_parameters_changed( GtkEntry *entry, NactICommandTab *instance )
+on_parameters_changed( GtkEntry *entry, FMAICommandTab *instance )
 {
        FMAObjectProfile *profile;
        ICommandData *data;
@@ -536,7 +536,7 @@ on_parameters_changed( GtkEntry *entry, NactICommandTab *instance )
 }
 
 static void
-on_path_browse( GtkButton *button, NactICommandTab *instance )
+on_path_browse( GtkButton *button, FMAICommandTab *instance )
 {
        base_gtk_utils_select_file(
                        GTK_APPLICATION_WINDOW( instance ),
@@ -545,7 +545,7 @@ on_path_browse( GtkButton *button, NactICommandTab *instance )
 }
 
 static void
-on_path_changed( GtkEntry *entry, NactICommandTab *instance )
+on_path_changed( GtkEntry *entry, FMAICommandTab *instance )
 {
        FMAObjectProfile *profile;
        ICommandData *data;
@@ -567,7 +567,7 @@ on_path_changed( GtkEntry *entry, NactICommandTab *instance )
 }
 
 static void
-on_wdir_browse( GtkButton *button, NactICommandTab *instance )
+on_wdir_browse( GtkButton *button, FMAICommandTab *instance )
 {
        GtkWidget *wdir_entry;
        FMAObjectProfile *profile;
@@ -590,7 +590,7 @@ on_wdir_browse( GtkButton *button, NactICommandTab *instance )
 }
 
 static void
-on_wdir_changed( GtkEntry *entry, NactICommandTab *instance )
+on_wdir_changed( GtkEntry *entry, FMAICommandTab *instance )
 {
        FMAObjectProfile *profile;
        ICommandData *data;
@@ -614,9 +614,9 @@ on_wdir_changed( GtkEntry *entry, NactICommandTab *instance )
  * See core/fma-tokens.c for valid parameters
  */
 static gchar *
-parse_parameters( NactICommandTab *instance )
+parse_parameters( FMAICommandTab *instance )
 {
-       static const gchar *thisfn = "nact_icommand_tab_parse_parameters";
+       static const gchar *thisfn = "fma_icommand_tab_parse_parameters";
 
        const gchar *command = gtk_entry_get_text( GTK_ENTRY( get_path_entry( instance )));
        const gchar *param_template = gtk_entry_get_text( GTK_ENTRY( get_parameters_entry( instance )));
@@ -634,7 +634,7 @@ parse_parameters( NactICommandTab *instance )
 }
 
 static void
-update_example_label( NactICommandTab *instance, FMAObjectProfile *profile )
+update_example_label( FMAICommandTab *instance, FMAObjectProfile *profile )
 {
        /*static const char *thisfn = "nact_iconditions_update_example_label";*/
        gchar *newlabel;
@@ -665,9 +665,9 @@ update_example_label( NactICommandTab *instance, FMAObjectProfile *profile )
 }
 
 static ICommandData *
-get_icommand_data( NactICommandTab *instance )
+get_icommand_data( FMAICommandTab *instance )
 {
-       static const gchar *thisfn = "nact_icommand_tab_get_icommand_data";
+       static const gchar *thisfn = "fma_icommand_tab_get_icommand_data";
        ICommandData *data;
 
        data = ( ICommandData * ) g_object_get_data( G_OBJECT( instance ), ICOMMAND_TAB_PROP_DATA );
@@ -682,9 +682,9 @@ get_icommand_data( NactICommandTab *instance )
 }
 
 static void
-on_instance_finalized( gpointer user_data, NactICommandTab *instance )
+on_instance_finalized( gpointer user_data, FMAICommandTab *instance )
 {
-       static const gchar *thisfn = "nact_icommand_tab_on_instance_finalized";
+       static const gchar *thisfn = "fma_icommand_tab_on_instance_finalized";
        ICommandData *data;
 
        g_debug( "%s: instance=%p, user_data=%p", thisfn, ( void * ) instance, ( void * ) user_data );
diff --git a/src/ui/nact-icommand-tab.h b/src/ui/fma-icommand-tab.h
similarity index 55%
rename from src/ui/nact-icommand-tab.h
rename to src/ui/fma-icommand-tab.h
index 1cdd5d2..80739d7 100644
--- a/src/ui/nact-icommand-tab.h
+++ b/src/ui/fma-icommand-tab.h
@@ -27,13 +27,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __UI_NACT_ICOMMAND_TAB_H__
-#define __UI_NACT_ICOMMAND_TAB_H__
+#ifndef __UI_FMA_ICOMMAND_TAB_H__
+#define __UI_FMA_ICOMMAND_TAB_H__
 
 /**
- * SECTION: nact_icommand_tab
- * @short_description: #NactICommandTab interface declaration.
- * @include: ui/nact-icommand-tab.h
+ * SECTION: fma_icommand_tab
+ * @short_description: #FMAICommandTab interface declaration.
+ * @include: ui/fma-icommand-tab.h
  *
  * This interface implements all the widgets which define the
  * actual action to be executed (from FMAObjectProfile).
@@ -43,25 +43,25 @@
 
 G_BEGIN_DECLS
 
-#define NACT_TYPE_ICOMMAND_TAB                      ( nact_icommand_tab_get_type())
-#define NACT_ICOMMAND_TAB( instance )               ( G_TYPE_CHECK_INSTANCE_CAST( instance, 
NACT_TYPE_ICOMMAND_TAB, NactICommandTab ))
-#define NACT_IS_ICOMMAND_TAB( instance )            ( G_TYPE_CHECK_INSTANCE_TYPE( instance, 
NACT_TYPE_ICOMMAND_TAB ))
-#define NACT_ICOMMAND_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), 
NACT_TYPE_ICOMMAND_TAB, NactICommandTabInterface ))
+#define FMA_TYPE_ICOMMAND_TAB                      ( fma_icommand_tab_get_type())
+#define FMA_ICOMMAND_TAB( instance )               ( G_TYPE_CHECK_INSTANCE_CAST( instance, 
FMA_TYPE_ICOMMAND_TAB, FMAICommandTab ))
+#define FMA_IS_ICOMMAND_TAB( instance )            ( G_TYPE_CHECK_INSTANCE_TYPE( instance, 
FMA_TYPE_ICOMMAND_TAB ))
+#define FMA_ICOMMAND_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), 
FMA_TYPE_ICOMMAND_TAB, FMAICommandTabInterface ))
 
-typedef struct _NactICommandTab                     NactICommandTab;
-typedef struct _NactICommandTabInterfacePrivate     NactICommandTabInterfacePrivate;
+typedef struct _FMAICommandTab                     FMAICommandTab;
+typedef struct _FMAICommandTabInterfacePrivate     FMAICommandTabInterfacePrivate;
 
 typedef struct {
        /*< private >*/
-       GTypeInterface                   parent;
-       NactICommandTabInterfacePrivate *private;
+       GTypeInterface                  parent;
+       FMAICommandTabInterfacePrivate *private;
 }
-       NactICommandTabInterface;
+       FMAICommandTabInterface;
 
-GType nact_icommand_tab_get_type( void );
+GType fma_icommand_tab_get_type( void );
 
-void  nact_icommand_tab_init    ( NactICommandTab *instance );
+void  fma_icommand_tab_init    ( FMAICommandTab *instance );
 
 G_END_DECLS
 
-#endif /* __UI_NACT_ICOMMAND_TAB_H__ */
+#endif /* __UI_FMA_ICOMMAND_TAB_H__ */
diff --git a/src/ui/nact-ienvironment-tab.c b/src/ui/fma-ienvironment-tab.c
similarity index 83%
rename from src/ui/nact-ienvironment-tab.c
rename to src/ui/fma-ienvironment-tab.c
index de8a6d3..26b7d71 100644
--- a/src/ui/nact-ienvironment-tab.c
+++ b/src/ui/fma-ienvironment-tab.c
@@ -46,11 +46,11 @@
 #include "base-gtk-utils.h"
 #include "nact-main-tab.h"
 #include "nact-main-window.h"
-#include "nact-ienvironment-tab.h"
+#include "fma-ienvironment-tab.h"
 
 /* private interface data
  */
-struct _NactIEnvironmentTabInterfacePrivate {
+struct _FMAIEnvironmentTabInterfacePrivate {
        void *empty;                                            /* so that gcc -pedantic is happy */
 };
 
@@ -92,42 +92,42 @@ typedef struct {
 }
        IEnvironData;
 
-#define IENVIRON_TAB_PROP_DATA                         "nact-ienviron-tab-data"
+#define IENVIRON_TAB_PROP_DATA                         "fma-ienviron-tab-data"
 
 static guint st_initializations = 0;           /* interface initialization count */
 
 static GType         register_type( void );
-static void          interface_base_init( NactIEnvironmentTabInterface *klass );
-static void          interface_base_finalize( NactIEnvironmentTabInterface *klass );
-static void          initialize_gtk( NactIEnvironmentTab *instance );
-static void          initialize_window( NactIEnvironmentTab *instance );
-static void          on_tree_selection_changed( NactTreeView *tview, GList *selected_items, 
NactIEnvironmentTab *instance );
-static void          on_selcount_ope_changed( GtkComboBox *combo, NactIEnvironmentTab *instance );
-static void          on_selcount_int_changed( GtkEntry *entry, NactIEnvironmentTab *instance );
-static void          on_selection_count_changed( NactIEnvironmentTab *instance );
-static void          on_show_always_toggled( GtkToggleButton *togglebutton, NactIEnvironmentTab *instance );
-static void          on_only_show_toggled( GtkToggleButton *togglebutton, NactIEnvironmentTab *instance );
-static void          on_do_not_show_toggled( GtkToggleButton *togglebutton, NactIEnvironmentTab *instance );
-static void          on_desktop_toggled( GtkCellRendererToggle *renderer, gchar *path, NactIEnvironmentTab 
*instance );
-static void          on_try_exec_changed( GtkEntry *entry, NactIEnvironmentTab *instance );
-static void          on_try_exec_browse( GtkButton *button, NactIEnvironmentTab *instance );
-static void          on_show_if_registered_changed( GtkEntry *entry, NactIEnvironmentTab *instance );
-static void          on_show_if_true_changed( GtkEntry *entry, NactIEnvironmentTab *instance );
-static void          on_show_if_running_changed( GtkEntry *entry, NactIEnvironmentTab *instance );
-static void          on_show_if_running_browse( GtkButton *button, NactIEnvironmentTab *instance );
-static void          init_selection_count_combobox( NactIEnvironmentTab *instance );
-static gchar        *get_selection_count_selection( NactIEnvironmentTab *instance );
-static void          set_selection_count_selection( NactIEnvironmentTab *instance, const gchar *ope, const 
gchar *uint );
-static void          dispose_selection_count_combobox( NactIEnvironmentTab *instance );
-static void          init_desktop_listview( NactIEnvironmentTab *instance );
-static void          raz_desktop_listview( NactIEnvironmentTab *instance );
-static void          setup_desktop_listview( NactIEnvironmentTab *instance, GSList *show );
-static void          dispose_desktop_listview( NactIEnvironmentTab *instance );
-static IEnvironData *get_ienviron_data( NactIEnvironmentTab *instance );
-static void          on_instance_finalized( gpointer user_data, NactIEnvironmentTab *instance );
+static void          interface_base_init( FMAIEnvironmentTabInterface *klass );
+static void          interface_base_finalize( FMAIEnvironmentTabInterface *klass );
+static void          initialize_gtk( FMAIEnvironmentTab *instance );
+static void          initialize_window( FMAIEnvironmentTab *instance );
+static void          on_tree_selection_changed( NactTreeView *tview, GList *selected_items, 
FMAIEnvironmentTab *instance );
+static void          on_selcount_ope_changed( GtkComboBox *combo, FMAIEnvironmentTab *instance );
+static void          on_selcount_int_changed( GtkEntry *entry, FMAIEnvironmentTab *instance );
+static void          on_selection_count_changed( FMAIEnvironmentTab *instance );
+static void          on_show_always_toggled( GtkToggleButton *togglebutton, FMAIEnvironmentTab *instance );
+static void          on_only_show_toggled( GtkToggleButton *togglebutton, FMAIEnvironmentTab *instance );
+static void          on_do_not_show_toggled( GtkToggleButton *togglebutton, FMAIEnvironmentTab *instance );
+static void          on_desktop_toggled( GtkCellRendererToggle *renderer, gchar *path, FMAIEnvironmentTab 
*instance );
+static void          on_try_exec_changed( GtkEntry *entry, FMAIEnvironmentTab *instance );
+static void          on_try_exec_browse( GtkButton *button, FMAIEnvironmentTab *instance );
+static void          on_show_if_registered_changed( GtkEntry *entry, FMAIEnvironmentTab *instance );
+static void          on_show_if_true_changed( GtkEntry *entry, FMAIEnvironmentTab *instance );
+static void          on_show_if_running_changed( GtkEntry *entry, FMAIEnvironmentTab *instance );
+static void          on_show_if_running_browse( GtkButton *button, FMAIEnvironmentTab *instance );
+static void          init_selection_count_combobox( FMAIEnvironmentTab *instance );
+static gchar        *get_selection_count_selection( FMAIEnvironmentTab *instance );
+static void          set_selection_count_selection( FMAIEnvironmentTab *instance, const gchar *ope, const 
gchar *uint );
+static void          dispose_selection_count_combobox( FMAIEnvironmentTab *instance );
+static void          init_desktop_listview( FMAIEnvironmentTab *instance );
+static void          raz_desktop_listview( FMAIEnvironmentTab *instance );
+static void          setup_desktop_listview( FMAIEnvironmentTab *instance, GSList *show );
+static void          dispose_desktop_listview( FMAIEnvironmentTab *instance );
+static IEnvironData *get_ienviron_data( FMAIEnvironmentTab *instance );
+static void          on_instance_finalized( gpointer user_data, FMAIEnvironmentTab *instance );
 
 GType
-nact_ienvironment_tab_get_type( void )
+fma_ienvironment_tab_get_type( void )
 {
        static GType iface_type = 0;
 
@@ -141,11 +141,11 @@ nact_ienvironment_tab_get_type( void )
 static GType
 register_type( void )
 {
-       static const gchar *thisfn = "nact_ienvironment_tab_register_type";
+       static const gchar *thisfn = "fma_ienvironment_tab_register_type";
        GType type;
 
        static const GTypeInfo info = {
-               sizeof( NactIEnvironmentTabInterface ),
+               sizeof( FMAIEnvironmentTabInterface ),
                ( GBaseInitFunc ) interface_base_init,
                ( GBaseFinalizeFunc ) interface_base_finalize,
                NULL,
@@ -158,7 +158,7 @@ register_type( void )
 
        g_debug( "%s", thisfn );
 
-       type = g_type_register_static( G_TYPE_INTERFACE, "NactIEnvironmentTab", &info, 0 );
+       type = g_type_register_static( G_TYPE_INTERFACE, "FMAIEnvironmentTab", &info, 0 );
 
        g_type_interface_add_prerequisite( type, GTK_TYPE_APPLICATION_WINDOW );
 
@@ -166,24 +166,24 @@ register_type( void )
 }
 
 static void
-interface_base_init( NactIEnvironmentTabInterface *klass )
+interface_base_init( FMAIEnvironmentTabInterface *klass )
 {
-       static const gchar *thisfn = "nact_ienvironment_tab_interface_base_init";
+       static const gchar *thisfn = "fma_ienvironment_tab_interface_base_init";
 
        if( !st_initializations ){
 
                g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
 
-               klass->private = g_new0( NactIEnvironmentTabInterfacePrivate, 1 );
+               klass->private = g_new0( FMAIEnvironmentTabInterfacePrivate, 1 );
        }
 
        st_initializations += 1;
 }
 
 static void
-interface_base_finalize( NactIEnvironmentTabInterface *klass )
+interface_base_finalize( FMAIEnvironmentTabInterface *klass )
 {
-       static const gchar *thisfn = "nact_ienvironment_tab_interface_base_finalize";
+       static const gchar *thisfn = "fma_ienvironment_tab_interface_base_finalize";
 
        st_initializations -= 1;
 
@@ -196,19 +196,19 @@ interface_base_finalize( NactIEnvironmentTabInterface *klass )
 }
 
 /**
- * nact_ienvironment_tab_init:
- * @instance: this #NactIEnvironmentTab instance.
+ * fma_ienvironment_tab_init:
+ * @instance: this #FMAIEnvironmentTab instance.
  *
  * Initialize the interface
  * Connect to #BaseWindow signals
  */
 void
-nact_ienvironment_tab_init( NactIEnvironmentTab *instance )
+fma_ienvironment_tab_init( FMAIEnvironmentTab *instance )
 {
-       static const gchar *thisfn = "nact_ienvironment_tab_init";
+       static const gchar *thisfn = "fma_ienvironment_tab_init";
        IEnvironData *data;
 
-       g_return_if_fail( NACT_IS_IENVIRONMENT_TAB( instance ));
+       g_return_if_fail( FMA_IS_IENVIRONMENT_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn,
@@ -226,16 +226,16 @@ nact_ienvironment_tab_init( NactIEnvironmentTab *instance )
 
 /*
  * on_base_initialize_gtk:
- * @window: this #NactIEnvironmentTab instance.
+ * @window: this #FMAIEnvironmentTab instance.
  *
  * Initializes the tab widget at initial load.
  */
 static void
-initialize_gtk( NactIEnvironmentTab *instance )
+initialize_gtk( FMAIEnvironmentTab *instance )
 {
-       static const gchar *thisfn = "nact_ienvironment_tab_initialize_gtk";
+       static const gchar *thisfn = "fma_ienvironment_tab_initialize_gtk";
 
-       g_return_if_fail( NACT_IS_IENVIRONMENT_TAB( instance ));
+       g_return_if_fail( FMA_IS_IENVIRONMENT_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
@@ -246,15 +246,15 @@ initialize_gtk( NactIEnvironmentTab *instance )
 
 /*
  * on_base_initialize_window:
- * @window: this #NactIEnvironmentTab instance.
+ * @window: this #FMAIEnvironmentTab instance.
  *
  * Initializes the tab widget at each time the widget will be displayed.
  * Connect signals and setup runtime values.
  */
 static void
-initialize_window( NactIEnvironmentTab *instance )
+initialize_window( FMAIEnvironmentTab *instance )
 {
-       static const gchar *thisfn = "nact_ienvironment_tab_initialize_window";
+       static const gchar *thisfn = "fma_ienvironment_tab_initialize_window";
        GtkTreeView *listview;
        GtkTreeModel *model;
        GtkTreeIter iter;
@@ -264,7 +264,7 @@ initialize_window( NactIEnvironmentTab *instance )
        const FMADesktopEnv *desktops;
        NactTreeView *tview;
 
-       g_return_if_fail( NACT_IS_IENVIRONMENT_TAB( instance ));
+       g_return_if_fail( FMA_IS_IENVIRONMENT_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
@@ -346,9 +346,9 @@ initialize_window( NactIEnvironmentTab *instance )
 }
 
 static void
-on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIEnvironmentTab *instance )
+on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIEnvironmentTab *instance )
 {
-       static const gchar *thisfn = "nact_ienvironment_tab_on_tree_selection_changed";
+       static const gchar *thisfn = "fma_ienvironment_tab_on_tree_selection_changed";
        FMAIContext *context;
        gboolean editable;
        gboolean enable_tab;
@@ -363,7 +363,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIEnvi
        gchar *text;
        IEnvironData *data;
 
-       g_return_if_fail( NACT_IS_IENVIRONMENT_TAB( instance ));
+       g_return_if_fail( FMA_IS_IENVIRONMENT_TAB( instance ));
 
        g_debug( "%s: tview=%p, selected_items=%p (count=%d), instance=%p (%s)",
                        thisfn, tview,
@@ -480,19 +480,19 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIEnvi
 }
 
 static void
-on_selcount_ope_changed( GtkComboBox *combo, NactIEnvironmentTab *instance )
+on_selcount_ope_changed( GtkComboBox *combo, FMAIEnvironmentTab *instance )
 {
        on_selection_count_changed( instance );
 }
 
 static void
-on_selcount_int_changed( GtkEntry *entry, NactIEnvironmentTab *instance )
+on_selcount_int_changed( GtkEntry *entry, FMAIEnvironmentTab *instance )
 {
        on_selection_count_changed( instance );
 }
 
 static void
-on_selection_count_changed( NactIEnvironmentTab *instance )
+on_selection_count_changed( FMAIEnvironmentTab *instance )
 {
        FMAIContext *context;
        gchar *selcount;
@@ -526,15 +526,15 @@ on_selection_count_changed( NactIEnvironmentTab *instance )
  * as far as I know, this case is the only which has this drawback...
  */
 static void
-on_show_always_toggled( GtkToggleButton *toggle_button, NactIEnvironmentTab *instance )
+on_show_always_toggled( GtkToggleButton *toggle_button, FMAIEnvironmentTab *instance )
 {
-       static const gchar *thisfn = "nact_ienvironment_tab_on_show_always_toggled";
+       static const gchar *thisfn = "fma_ienvironment_tab_on_show_always_toggled";
        FMAIContext *context;
        gboolean editable;
        gboolean active;
        GtkTreeView *listview;
 
-       g_return_if_fail( NACT_IS_IENVIRONMENT_TAB( instance ));
+       g_return_if_fail( FMA_IS_IENVIRONMENT_TAB( instance ));
 
        g_debug( "%s: toggle_button=%p (active=%s), instance=%p",
                        thisfn,
@@ -567,9 +567,9 @@ on_show_always_toggled( GtkToggleButton *toggle_button, NactIEnvironmentTab *ins
 }
 
 static void
-on_only_show_toggled( GtkToggleButton *toggle_button, NactIEnvironmentTab *instance )
+on_only_show_toggled( GtkToggleButton *toggle_button, FMAIEnvironmentTab *instance )
 {
-       static const gchar *thisfn = "nact_ienvironment_tab_on_only_show_toggled";
+       static const gchar *thisfn = "fma_ienvironment_tab_on_only_show_toggled";
        FMAIContext *context;
        gboolean editable;
        gboolean active;
@@ -608,9 +608,9 @@ on_only_show_toggled( GtkToggleButton *toggle_button, NactIEnvironmentTab *insta
 }
 
 static void
-on_do_not_show_toggled( GtkToggleButton *toggle_button, NactIEnvironmentTab *instance )
+on_do_not_show_toggled( GtkToggleButton *toggle_button, FMAIEnvironmentTab *instance )
 {
-       static const gchar *thisfn = "nact_ienvironment_tab_on_do_not_show_toggled";
+       static const gchar *thisfn = "fma_ienvironment_tab_on_do_not_show_toggled";
        FMAIContext *context;
        gboolean editable;
        gboolean active;
@@ -649,9 +649,9 @@ on_do_not_show_toggled( GtkToggleButton *toggle_button, NactIEnvironmentTab *ins
 }
 
 static void
-on_desktop_toggled( GtkCellRendererToggle *renderer, gchar *path, NactIEnvironmentTab *instance )
+on_desktop_toggled( GtkCellRendererToggle *renderer, gchar *path, FMAIEnvironmentTab *instance )
 {
-       static const gchar *thisfn = "nact_ienvironment_tab_on_desktop_toggled";
+       static const gchar *thisfn = "fma_ienvironment_tab_on_desktop_toggled";
        FMAIContext *context;
        gboolean editable;
        GtkTreeView *listview;
@@ -704,7 +704,7 @@ on_desktop_toggled( GtkCellRendererToggle *renderer, gchar *path, NactIEnvironme
 }
 
 static void
-on_try_exec_changed( GtkEntry *entry, NactIEnvironmentTab *instance )
+on_try_exec_changed( GtkEntry *entry, FMAIEnvironmentTab *instance )
 {
        FMAIContext *context;
        const gchar *text;
@@ -719,7 +719,7 @@ on_try_exec_changed( GtkEntry *entry, NactIEnvironmentTab *instance )
 }
 
 static void
-on_try_exec_browse( GtkButton *button, NactIEnvironmentTab *instance )
+on_try_exec_browse( GtkButton *button, FMAIEnvironmentTab *instance )
 {
        GtkWidget *entry;
 
@@ -732,7 +732,7 @@ on_try_exec_browse( GtkButton *button, NactIEnvironmentTab *instance )
 }
 
 static void
-on_show_if_registered_changed( GtkEntry *entry, NactIEnvironmentTab *instance )
+on_show_if_registered_changed( GtkEntry *entry, FMAIEnvironmentTab *instance )
 {
        FMAIContext *context;
        const gchar *text;
@@ -747,7 +747,7 @@ on_show_if_registered_changed( GtkEntry *entry, NactIEnvironmentTab *instance )
 }
 
 static void
-on_show_if_true_changed( GtkEntry *entry, NactIEnvironmentTab *instance )
+on_show_if_true_changed( GtkEntry *entry, FMAIEnvironmentTab *instance )
 {
        FMAIContext *context;
        const gchar *text;
@@ -762,7 +762,7 @@ on_show_if_true_changed( GtkEntry *entry, NactIEnvironmentTab *instance )
 }
 
 static void
-on_show_if_running_changed( GtkEntry *entry, NactIEnvironmentTab *instance )
+on_show_if_running_changed( GtkEntry *entry, FMAIEnvironmentTab *instance )
 {
        FMAIContext *context;
        const gchar *text;
@@ -777,7 +777,7 @@ on_show_if_running_changed( GtkEntry *entry, NactIEnvironmentTab *instance )
 }
 
 static void
-on_show_if_running_browse( GtkButton *button, NactIEnvironmentTab *instance )
+on_show_if_running_browse( GtkButton *button, FMAIEnvironmentTab *instance )
 {
        GtkWidget *entry;
 
@@ -790,7 +790,7 @@ on_show_if_running_browse( GtkButton *button, NactIEnvironmentTab *instance )
 }
 
 static void
-init_selection_count_combobox( NactIEnvironmentTab *instance )
+init_selection_count_combobox( FMAIEnvironmentTab *instance )
 {
        GtkTreeModel *model;
        guint i;
@@ -826,7 +826,7 @@ init_selection_count_combobox( NactIEnvironmentTab *instance )
 }
 
 static gchar *
-get_selection_count_selection( NactIEnvironmentTab *instance )
+get_selection_count_selection( FMAIEnvironmentTab *instance )
 {
        GtkComboBox *combo;
        GtkEntry *entry;
@@ -852,7 +852,7 @@ get_selection_count_selection( NactIEnvironmentTab *instance )
 }
 
 static void
-set_selection_count_selection( NactIEnvironmentTab *instance, const gchar *ope, const gchar *uint )
+set_selection_count_selection( FMAIEnvironmentTab *instance, const gchar *ope, const gchar *uint )
 {
        GtkComboBox *combo;
        GtkEntry *entry;
@@ -873,7 +873,7 @@ set_selection_count_selection( NactIEnvironmentTab *instance, const gchar *ope,
 }
 
 static void
-dispose_selection_count_combobox( NactIEnvironmentTab *instance )
+dispose_selection_count_combobox( FMAIEnvironmentTab *instance )
 {
        GtkWidget *combo;
        GtkTreeModel *model;
@@ -886,7 +886,7 @@ dispose_selection_count_combobox( NactIEnvironmentTab *instance )
 }
 
 static void
-init_desktop_listview( NactIEnvironmentTab *instance )
+init_desktop_listview( FMAIEnvironmentTab *instance )
 {
        GtkTreeView *listview;
        GtkListStore *model;
@@ -922,7 +922,7 @@ init_desktop_listview( NactIEnvironmentTab *instance )
 }
 
 static void
-raz_desktop_listview( NactIEnvironmentTab *instance )
+raz_desktop_listview( FMAIEnvironmentTab *instance )
 {
        GtkTreeView *listview;
        GtkTreeModel *model;
@@ -942,9 +942,9 @@ raz_desktop_listview( NactIEnvironmentTab *instance )
 }
 
 static void
-setup_desktop_listview( NactIEnvironmentTab *instance, GSList *show )
+setup_desktop_listview( FMAIEnvironmentTab *instance, GSList *show )
 {
-       static const gchar *thisfn = "nact_ienvironment_tab_setup_desktop_listview";
+       static const gchar *thisfn = "fma_ienvironment_tab_setup_desktop_listview";
        GtkTreeView *listview;
        GtkTreeModel *model;
        GtkTreeIter iter;
@@ -980,7 +980,7 @@ setup_desktop_listview( NactIEnvironmentTab *instance, GSList *show )
 }
 
 static void
-dispose_desktop_listview( NactIEnvironmentTab *instance )
+dispose_desktop_listview( FMAIEnvironmentTab *instance )
 {
        GtkWidget *listview;
        GtkTreeModel *model;
@@ -996,7 +996,7 @@ dispose_desktop_listview( NactIEnvironmentTab *instance )
 }
 
 static IEnvironData *
-get_ienviron_data( NactIEnvironmentTab *instance )
+get_ienviron_data( FMAIEnvironmentTab *instance )
 {
        IEnvironData *data;
 
@@ -1011,9 +1011,9 @@ get_ienviron_data( NactIEnvironmentTab *instance )
 }
 
 static void
-on_instance_finalized( gpointer user_data, NactIEnvironmentTab *instance )
+on_instance_finalized( gpointer user_data, FMAIEnvironmentTab *instance )
 {
-       static const gchar *thisfn = "nact_ienvironment_tab_on_instance_finalized";
+       static const gchar *thisfn = "fma_ienvironment_tab_on_instance_finalized";
        IEnvironData *data;
 
        g_debug( "%s: instance=%p, user_data=%p", thisfn, ( void * ) instance, ( void * ) user_data );
diff --git a/src/ui/nact-ienvironment-tab.h b/src/ui/fma-ienvironment-tab.h
similarity index 55%
rename from src/ui/nact-ienvironment-tab.h
rename to src/ui/fma-ienvironment-tab.h
index 7618aee..8d1076c 100644
--- a/src/ui/nact-ienvironment-tab.h
+++ b/src/ui/fma-ienvironment-tab.h
@@ -27,13 +27,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __UI_NACT_IENVIRONMENT_TAB_H__
-#define __UI_NACT_IENVIRONMENT_TAB_H__
+#ifndef __UI_FMA_IENVIRONMENT_TAB_H__
+#define __UI_FMA_IENVIRONMENT_TAB_H__
 
 /**
- * SECTION: nact_ienvironment_tab
- * @short_description: #NactIEnvironmentTab interface declaration.
- * @include: ui/nact-ienvironment-tab.h
+ * SECTION: fma_ienvironment_tab
+ * @short_description: #FMAIEnvironmentTab interface declaration.
+ * @include: ui/fma-ienvironment-tab.h
  *
  * This interface implements all the widgets which define the
  * actual action to be executed.
@@ -47,25 +47,25 @@
 
 G_BEGIN_DECLS
 
-#define NACT_TYPE_IENVIRONMENT_TAB                      ( nact_ienvironment_tab_get_type())
-#define NACT_IENVIRONMENT_TAB( instance )               ( G_TYPE_CHECK_INSTANCE_CAST( instance, 
NACT_TYPE_IENVIRONMENT_TAB, NactIEnvironmentTab ))
-#define NACT_IS_IENVIRONMENT_TAB( instance )            ( G_TYPE_CHECK_INSTANCE_TYPE( instance, 
NACT_TYPE_IENVIRONMENT_TAB ))
-#define NACT_IENVIRONMENT_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), 
NACT_TYPE_IENVIRONMENT_TAB, NactIEnvironmentTabInterface ))
+#define FMA_TYPE_IENVIRONMENT_TAB                      ( fma_ienvironment_tab_get_type())
+#define FMA_IENVIRONMENT_TAB( instance )               ( G_TYPE_CHECK_INSTANCE_CAST( instance, 
FMA_TYPE_IENVIRONMENT_TAB, FMAIEnvironmentTab ))
+#define FMA_IS_IENVIRONMENT_TAB( instance )            ( G_TYPE_CHECK_INSTANCE_TYPE( instance, 
FMA_TYPE_IENVIRONMENT_TAB ))
+#define FMA_IENVIRONMENT_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), 
FMA_TYPE_IENVIRONMENT_TAB, FMAIEnvironmentTabInterface ))
 
-typedef struct _NactIEnvironmentTab                     NactIEnvironmentTab;
-typedef struct _NactIEnvironmentTabInterfacePrivate     NactIEnvironmentTabInterfacePrivate;
+typedef struct _FMAIEnvironmentTab                     FMAIEnvironmentTab;
+typedef struct _FMAIEnvironmentTabInterfacePrivate     FMAIEnvironmentTabInterfacePrivate;
 
 typedef struct {
        /*< private >*/
-       GTypeInterface                       parent;
-       NactIEnvironmentTabInterfacePrivate *private;
+       GTypeInterface                      parent;
+       FMAIEnvironmentTabInterfacePrivate *private;
 }
-       NactIEnvironmentTabInterface;
+       FMAIEnvironmentTabInterface;
 
-GType nact_ienvironment_tab_get_type( void );
+GType fma_ienvironment_tab_get_type( void );
 
-void  nact_ienvironment_tab_init    ( NactIEnvironmentTab *instance );
+void  fma_ienvironment_tab_init    ( FMAIEnvironmentTab *instance );
 
 G_END_DECLS
 
-#endif /* __UI_NACT_IENVIRONMENT_TAB_H__ */
+#endif /* __UI_FMA_IENVIRONMENT_TAB_H__ */
diff --git a/src/ui/nact-iexecution-tab.c b/src/ui/fma-iexecution-tab.c
similarity index 79%
rename from src/ui/nact-iexecution-tab.c
rename to src/ui/fma-iexecution-tab.c
index 280f7e1..11cb3cd 100644
--- a/src/ui/nact-iexecution-tab.c
+++ b/src/ui/fma-iexecution-tab.c
@@ -40,11 +40,11 @@
 #include "base-gtk-utils.h"
 #include "nact-main-tab.h"
 #include "nact-main-window.h"
-#include "nact-iexecution-tab.h"
+#include "fma-iexecution-tab.h"
 
 /* private interface data
  */
-struct _NactIExecutionTabInterfacePrivate {
+struct _FMAIExecutionTabInterfacePrivate {
        void *empty;                                            /* so that gcc -pedantic is happy */
 };
 
@@ -55,28 +55,28 @@ typedef struct {
 }
        IExecutionData;
 
-#define IEXECUTION_TAB_PROP_DATA               "nact-iexecution-tab-data"
+#define IEXECUTION_TAB_PROP_DATA               "fma-iexecution-tab-data"
 
 static guint st_initializations = 0;   /* interface initialization count */
 
 static GType           register_type( void );
-static void            interface_base_init( NactIExecutionTabInterface *klass );
-static void            interface_base_finalize( NactIExecutionTabInterface *klass );
-static void            initialize_window( NactIExecutionTab *instance );
-static void            on_tree_selection_changed( NactTreeView *tview, GList *selected_items, 
NactIExecutionTab *instance );
-static void            on_normal_mode_toggled( GtkToggleButton *togglebutton, NactIExecutionTab *instance );
-static void            on_terminal_mode_toggled( GtkToggleButton *togglebutton, NactIExecutionTab *instance 
);
-static void            on_embedded_mode_toggled( GtkToggleButton *togglebutton, NactIExecutionTab *instance 
);
-static void            on_display_mode_toggled( GtkToggleButton *togglebutton, NactIExecutionTab *instance );
-static void            execution_mode_toggle( NactIExecutionTab *instance, GtkToggleButton *togglebutton, 
GCallback cb, const gchar *mode );
-static void            on_startup_notify_toggled( GtkToggleButton *togglebutton, NactIExecutionTab *instance 
);
-static void            on_startup_class_changed( GtkEntry *entry, NactIExecutionTab *instance );
-static void            on_execute_as_changed( GtkEntry *entry, NactIExecutionTab *instance );
-static IExecutionData *get_iexecution_data( NactIExecutionTab *instance );
-static void            on_instance_finalized( gpointer user_data, NactIExecutionTab *instance );
+static void            interface_base_init( FMAIExecutionTabInterface *klass );
+static void            interface_base_finalize( FMAIExecutionTabInterface *klass );
+static void            initialize_window( FMAIExecutionTab *instance );
+static void            on_tree_selection_changed( NactTreeView *tview, GList *selected_items, 
FMAIExecutionTab *instance );
+static void            on_normal_mode_toggled( GtkToggleButton *togglebutton, FMAIExecutionTab *instance );
+static void            on_terminal_mode_toggled( GtkToggleButton *togglebutton, FMAIExecutionTab *instance );
+static void            on_embedded_mode_toggled( GtkToggleButton *togglebutton, FMAIExecutionTab *instance );
+static void            on_display_mode_toggled( GtkToggleButton *togglebutton, FMAIExecutionTab *instance );
+static void            execution_mode_toggle( FMAIExecutionTab *instance, GtkToggleButton *togglebutton, 
GCallback cb, const gchar *mode );
+static void            on_startup_notify_toggled( GtkToggleButton *togglebutton, FMAIExecutionTab *instance 
);
+static void            on_startup_class_changed( GtkEntry *entry, FMAIExecutionTab *instance );
+static void            on_execute_as_changed( GtkEntry *entry, FMAIExecutionTab *instance );
+static IExecutionData *get_iexecution_data( FMAIExecutionTab *instance );
+static void            on_instance_finalized( gpointer user_data, FMAIExecutionTab *instance );
 
 GType
-nact_iexecution_tab_get_type( void )
+fma_iexecution_tab_get_type( void )
 {
        static GType iface_type = 0;
 
@@ -90,11 +90,11 @@ nact_iexecution_tab_get_type( void )
 static GType
 register_type( void )
 {
-       static const gchar *thisfn = "nact_iexecution_tab_register_type";
+       static const gchar *thisfn = "fma_iexecution_tab_register_type";
        GType type;
 
        static const GTypeInfo info = {
-               sizeof( NactIExecutionTabInterface ),
+               sizeof( FMAIExecutionTabInterface ),
                ( GBaseInitFunc ) interface_base_init,
                ( GBaseFinalizeFunc ) interface_base_finalize,
                NULL,
@@ -107,7 +107,7 @@ register_type( void )
 
        g_debug( "%s", thisfn );
 
-       type = g_type_register_static( G_TYPE_INTERFACE, "NactIExecutionTab", &info, 0 );
+       type = g_type_register_static( G_TYPE_INTERFACE, "FMAIExecutionTab", &info, 0 );
 
        g_type_interface_add_prerequisite( type, GTK_TYPE_APPLICATION_WINDOW );
 
@@ -115,24 +115,24 @@ register_type( void )
 }
 
 static void
-interface_base_init( NactIExecutionTabInterface *klass )
+interface_base_init( FMAIExecutionTabInterface *klass )
 {
-       static const gchar *thisfn = "nact_iexecution_tab_interface_base_init";
+       static const gchar *thisfn = "fma_iexecution_tab_interface_base_init";
 
        if( !st_initializations ){
 
                g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
 
-               klass->private = g_new0( NactIExecutionTabInterfacePrivate, 1 );
+               klass->private = g_new0( FMAIExecutionTabInterfacePrivate, 1 );
        }
 
        st_initializations += 1;
 }
 
 static void
-interface_base_finalize( NactIExecutionTabInterface *klass )
+interface_base_finalize( FMAIExecutionTabInterface *klass )
 {
-       static const gchar *thisfn = "nact_iexecution_tab_interface_base_finalize";
+       static const gchar *thisfn = "fma_iexecution_tab_interface_base_finalize";
 
        st_initializations -= 1;
 
@@ -145,19 +145,19 @@ interface_base_finalize( NactIExecutionTabInterface *klass )
 }
 
 /**
- * nact_iexecution_tab_init:
- * @instance: this #NactIExecutionTab instance.
+ * fma_iexecution_tab_init:
+ * @instance: this #FMAIExecutionTab instance.
  *
  * Initialize the interface
  * Connect to #BaseWindow signals
  */
 void
-nact_iexecution_tab_init( NactIExecutionTab *instance )
+fma_iexecution_tab_init( FMAIExecutionTab *instance )
 {
-       static const gchar *thisfn = "nact_iexecution_tab_init";
+       static const gchar *thisfn = "fma_iexecution_tab_init";
        IExecutionData *data;
 
-       g_return_if_fail( instance && NACT_IS_IEXECUTION_TAB( instance ));
+       g_return_if_fail( instance && FMA_IS_IEXECUTION_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn,
@@ -174,18 +174,18 @@ nact_iexecution_tab_init( NactIExecutionTab *instance )
 
 /*
  * on_base_initialize_window:
- * @window: this #NactIExecutionTab instance.
+ * @window: this #FMAIExecutionTab instance.
  *
  * Initializes the tab widget at each time the widget will be displayed.
  * Connect signals and setup runtime values.
  */
 static void
-initialize_window( NactIExecutionTab *instance )
+initialize_window( FMAIExecutionTab *instance )
 {
-       static const gchar *thisfn = "nact_iexecution_tab_initialize_window";
+       static const gchar *thisfn = "fma_iexecution_tab_initialize_window";
        NactTreeView *tview;
 
-       g_return_if_fail( NACT_IS_IEXECUTION_TAB( instance ));
+       g_return_if_fail( FMA_IS_IEXECUTION_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
@@ -226,9 +226,9 @@ initialize_window( NactIExecutionTab *instance )
 }
 
 static void
-on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIExecutionTab *instance )
+on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIExecutionTab *instance )
 {
-       static const gchar *thisfn = "nact_iexecution_tab_on_tree_selection_changed";
+       static const gchar *thisfn = "fma_iexecution_tab_on_tree_selection_changed";
        FMAObjectProfile *profile;
        gboolean editable;
        gboolean enable_tab;
@@ -240,7 +240,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIExec
        GtkWidget *entry;
        IExecutionData *data;
 
-       g_return_if_fail( NACT_IS_IEXECUTION_TAB( instance ));
+       g_return_if_fail( FMA_IS_IEXECUTION_TAB( instance ));
 
        g_debug( "%s: tview=%p, selected_items=%p (count=%d), instance=%p (%s)",
                        thisfn, tview,
@@ -320,31 +320,31 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIExec
 }
 
 static void
-on_normal_mode_toggled( GtkToggleButton *togglebutton, NactIExecutionTab *instance )
+on_normal_mode_toggled( GtkToggleButton *togglebutton, FMAIExecutionTab *instance )
 {
        execution_mode_toggle( instance, togglebutton, G_CALLBACK( on_normal_mode_toggled ), "Normal" );
 }
 
 static void
-on_terminal_mode_toggled( GtkToggleButton *togglebutton, NactIExecutionTab *instance )
+on_terminal_mode_toggled( GtkToggleButton *togglebutton, FMAIExecutionTab *instance )
 {
        execution_mode_toggle( instance, togglebutton, G_CALLBACK( on_terminal_mode_toggled ), "Terminal" );
 }
 
 static void
-on_embedded_mode_toggled( GtkToggleButton *togglebutton, NactIExecutionTab *instance )
+on_embedded_mode_toggled( GtkToggleButton *togglebutton, FMAIExecutionTab *instance )
 {
        execution_mode_toggle( instance, togglebutton, G_CALLBACK( on_embedded_mode_toggled ), "Embedded" );
 }
 
 static void
-on_display_mode_toggled( GtkToggleButton *togglebutton, NactIExecutionTab *instance )
+on_display_mode_toggled( GtkToggleButton *togglebutton, FMAIExecutionTab *instance )
 {
        execution_mode_toggle( instance, togglebutton, G_CALLBACK( on_display_mode_toggled ), "DisplayOutput" 
);
 }
 
 static void
-execution_mode_toggle( NactIExecutionTab *instance, GtkToggleButton *toggle_button, GCallback cb, const 
gchar *mode )
+execution_mode_toggle( FMAIExecutionTab *instance, GtkToggleButton *toggle_button, GCallback cb, const gchar 
*mode )
 {
        FMAObjectProfile *profile;
        gboolean editable;
@@ -381,7 +381,7 @@ execution_mode_toggle( NactIExecutionTab *instance, GtkToggleButton *toggle_butt
 }
 
 static void
-on_startup_notify_toggled( GtkToggleButton *toggle_button, NactIExecutionTab *instance )
+on_startup_notify_toggled( GtkToggleButton *toggle_button, FMAIExecutionTab *instance )
 {
        FMAObjectProfile *profile;
        gboolean editable;
@@ -409,7 +409,7 @@ on_startup_notify_toggled( GtkToggleButton *toggle_button, NactIExecutionTab *in
 }
 
 static void
-on_startup_class_changed( GtkEntry *entry, NactIExecutionTab *instance )
+on_startup_class_changed( GtkEntry *entry, FMAIExecutionTab *instance )
 {
        FMAObjectProfile *profile;
        const gchar *text;
@@ -427,7 +427,7 @@ on_startup_class_changed( GtkEntry *entry, NactIExecutionTab *instance )
 }
 
 static void
-on_execute_as_changed( GtkEntry *entry, NactIExecutionTab *instance )
+on_execute_as_changed( GtkEntry *entry, FMAIExecutionTab *instance )
 {
        FMAObjectProfile *profile;
        const gchar *text;
@@ -445,7 +445,7 @@ on_execute_as_changed( GtkEntry *entry, NactIExecutionTab *instance )
 }
 
 static IExecutionData *
-get_iexecution_data( NactIExecutionTab *instance )
+get_iexecution_data( FMAIExecutionTab *instance )
 {
        IExecutionData *data;
 
@@ -460,9 +460,9 @@ get_iexecution_data( NactIExecutionTab *instance )
 }
 
 static void
-on_instance_finalized( gpointer user_data, NactIExecutionTab *instance )
+on_instance_finalized( gpointer user_data, FMAIExecutionTab *instance )
 {
-       static const gchar *thisfn = "nact_iexecution_tab_on_instance_finalized";
+       static const gchar *thisfn = "fma_iexecution_tab_on_instance_finalized";
        IExecutionData *data;
 
        g_debug( "%s: instance=%p, user_data=%p", thisfn, ( void * ) instance, ( void * ) user_data );
diff --git a/src/ui/nact-iexecution-tab.h b/src/ui/fma-iexecution-tab.h
similarity index 54%
rename from src/ui/nact-iexecution-tab.h
rename to src/ui/fma-iexecution-tab.h
index 751e54d..4d30ce3 100644
--- a/src/ui/nact-iexecution-tab.h
+++ b/src/ui/fma-iexecution-tab.h
@@ -27,13 +27,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __UI_NACT_IEXECUTION_TAB_H__
-#define __UI_NACT_IEXECUTION_TAB_H__
+#ifndef __UI_FMA_IEXECUTION_TAB_H__
+#define __UI_FMA_IEXECUTION_TAB_H__
 
 /**
- * SECTION: nact_iexecution_tab
- * @short_description: #NactIExecutionTab interface declaration.
- * @include: ui/nact-iexecution-tab.h
+ * SECTION: fma_iexecution_tab
+ * @short_description: #FMAIExecutionTab interface declaration.
+ * @include: ui/fma-iexecution-tab.h
  *
  * This interface implements all the widgets which define the
  * actual action to be executed.
@@ -43,25 +43,25 @@
 
 G_BEGIN_DECLS
 
-#define NACT_TYPE_IEXECUTION_TAB                      ( nact_iexecution_tab_get_type())
-#define NACT_IEXECUTION_TAB( instance )               ( G_TYPE_CHECK_INSTANCE_CAST( instance, 
NACT_TYPE_IEXECUTION_TAB, NactIExecutionTab ))
-#define NACT_IS_IEXECUTION_TAB( instance )            ( G_TYPE_CHECK_INSTANCE_TYPE( instance, 
NACT_TYPE_IEXECUTION_TAB ))
-#define NACT_IEXECUTION_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), 
NACT_TYPE_IEXECUTION_TAB, NactIExecutionTabInterface ))
+#define FMA_TYPE_IEXECUTION_TAB                      ( fma_iexecution_tab_get_type())
+#define FMA_IEXECUTION_TAB( instance )               ( G_TYPE_CHECK_INSTANCE_CAST( instance, 
FMA_TYPE_IEXECUTION_TAB, FMAIExecutionTab ))
+#define FMA_IS_IEXECUTION_TAB( instance )            ( G_TYPE_CHECK_INSTANCE_TYPE( instance, 
FMA_TYPE_IEXECUTION_TAB ))
+#define FMA_IEXECUTION_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), 
FMA_TYPE_IEXECUTION_TAB, FMAIExecutionTabInterface ))
 
-typedef struct _NactIExecutionTab                     NactIExecutionTab;
-typedef struct _NactIExecutionTabInterfacePrivate     NactIExecutionTabInterfacePrivate;
+typedef struct _FMAIExecutionTab                     FMAIExecutionTab;
+typedef struct _FMAIExecutionTabInterfacePrivate     FMAIExecutionTabInterfacePrivate;
 
 typedef struct {
        /*< private >*/
-       GTypeInterface                     parent;
-       NactIExecutionTabInterfacePrivate *private;
+       GTypeInterface                    parent;
+       FMAIExecutionTabInterfacePrivate *private;
 }
-       NactIExecutionTabInterface;
+       FMAIExecutionTabInterface;
 
-GType nact_iexecution_tab_get_type( void );
+GType fma_iexecution_tab_get_type( void );
 
-void  nact_iexecution_tab_init    ( NactIExecutionTab *instance );
+void  fma_iexecution_tab_init    ( FMAIExecutionTab *instance );
 
 G_END_DECLS
 
-#endif /* __UI_NACT_IEXECUTION_TAB_H__ */
+#endif /* __UI_FMA_IEXECUTION_TAB_H__ */
diff --git a/src/ui/nact-ifolders-tab.c b/src/ui/fma-ifolders-tab.c
similarity index 76%
rename from src/ui/nact-ifolders-tab.c
rename to src/ui/fma-ifolders-tab.c
index 1f640e2..494d066 100644
--- a/src/ui/nact-ifolders-tab.c
+++ b/src/ui/fma-ifolders-tab.c
@@ -44,11 +44,11 @@
 #include "nact-main-tab.h"
 #include "nact-main-window.h"
 #include "nact-match-list.h"
-#include "nact-ifolders-tab.h"
+#include "fma-ifolders-tab.h"
 
 /* private interface data
  */
-struct _NactIFoldersTabInterfacePrivate {
+struct _FMAIFoldersTabInterfacePrivate {
        void *empty;                                            /* so that gcc -pedantic is happy */
 };
 
@@ -59,18 +59,18 @@ struct _NactIFoldersTabInterfacePrivate {
 static guint st_initializations = 0;   /* interface initialization count */
 
 static GType   register_type( void );
-static void    interface_base_init( NactIFoldersTabInterface *klass );
-static void    interface_base_finalize( NactIFoldersTabInterface *klass );
-static void    initialize_gtk( NactIFoldersTab *instance );
-static void    initialize_window( NactIFoldersTab *instance );
-static void    on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIFoldersTab 
*instance );
-static void    on_browse_folder_clicked( GtkButton *button, NactIFoldersTab *instance );
+static void    interface_base_init( FMAIFoldersTabInterface *klass );
+static void    interface_base_finalize( FMAIFoldersTabInterface *klass );
+static void    initialize_gtk( FMAIFoldersTab *instance );
+static void    initialize_window( FMAIFoldersTab *instance );
+static void    on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIFoldersTab 
*instance );
+static void    on_browse_folder_clicked( GtkButton *button, FMAIFoldersTab *instance );
 static GSList *get_folders( void *context );
 static void    set_folders( void *context, GSList *filters );
-static void    on_instance_finalized( gpointer user_data, NactIFoldersTab *instance );
+static void    on_instance_finalized( gpointer user_data, FMAIFoldersTab *instance );
 
 GType
-nact_ifolders_tab_get_type( void )
+fma_ifolders_tab_get_type( void )
 {
        static GType iface_type = 0;
 
@@ -84,11 +84,11 @@ nact_ifolders_tab_get_type( void )
 static GType
 register_type( void )
 {
-       static const gchar *thisfn = "nact_ifolders_tab_register_type";
+       static const gchar *thisfn = "fma_ifolders_tab_register_type";
        GType type;
 
        static const GTypeInfo info = {
-               sizeof( NactIFoldersTabInterface ),
+               sizeof( FMAIFoldersTabInterface ),
                ( GBaseInitFunc ) interface_base_init,
                ( GBaseFinalizeFunc ) interface_base_finalize,
                NULL,
@@ -101,7 +101,7 @@ register_type( void )
 
        g_debug( "%s", thisfn );
 
-       type = g_type_register_static( G_TYPE_INTERFACE, "NactIFoldersTab", &info, 0 );
+       type = g_type_register_static( G_TYPE_INTERFACE, "FMAIFoldersTab", &info, 0 );
 
        g_type_interface_add_prerequisite( type, GTK_TYPE_APPLICATION_WINDOW );
 
@@ -109,24 +109,24 @@ register_type( void )
 }
 
 static void
-interface_base_init( NactIFoldersTabInterface *klass )
+interface_base_init( FMAIFoldersTabInterface *klass )
 {
-       static const gchar *thisfn = "nact_ifolders_tab_interface_base_init";
+       static const gchar *thisfn = "fma_ifolders_tab_interface_base_init";
 
        if( !st_initializations ){
 
                g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
 
-               klass->private = g_new0( NactIFoldersTabInterfacePrivate, 1 );
+               klass->private = g_new0( FMAIFoldersTabInterfacePrivate, 1 );
        }
 
        st_initializations += 1;
 }
 
 static void
-interface_base_finalize( NactIFoldersTabInterface *klass )
+interface_base_finalize( FMAIFoldersTabInterface *klass )
 {
-       static const gchar *thisfn = "nact_ifolders_tab_interface_base_finalize";
+       static const gchar *thisfn = "fma_ifolders_tab_interface_base_finalize";
 
        st_initializations -= 1;
 
@@ -139,18 +139,18 @@ interface_base_finalize( NactIFoldersTabInterface *klass )
 }
 
 /**
- * nact_ifolders_tab_init:
- * @instance: this #NactIFoldersTab instance.
+ * fma_ifolders_tab_init:
+ * @instance: this #FMAIFoldersTab instance.
  *
  * Initialize the interface
  * Connect to #BaseWindow signals
  */
 void
-nact_ifolders_tab_init( NactIFoldersTab *instance )
+fma_ifolders_tab_init( FMAIFoldersTab *instance )
 {
-       static const gchar *thisfn = "nact_ifolders_tab_init";
+       static const gchar *thisfn = "fma_ifolders_tab_init";
 
-       g_return_if_fail( NACT_IS_IFOLDERS_TAB( instance ));
+       g_return_if_fail( FMA_IS_IFOLDERS_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn,
@@ -164,11 +164,11 @@ nact_ifolders_tab_init( NactIFoldersTab *instance )
 }
 
 static void
-initialize_gtk( NactIFoldersTab *instance )
+initialize_gtk( FMAIFoldersTab *instance )
 {
-       static const gchar *thisfn = "nact_ifolders_tab_initialize_gtk";
+       static const gchar *thisfn = "fma_ifolders_tab_initialize_gtk";
 
-       g_return_if_fail( NACT_IS_IFOLDERS_TAB( instance ));
+       g_return_if_fail( FMA_IS_IFOLDERS_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
@@ -190,12 +190,12 @@ initialize_gtk( NactIFoldersTab *instance )
 }
 
 static void
-initialize_window( NactIFoldersTab *instance )
+initialize_window( FMAIFoldersTab *instance )
 {
-       static const gchar *thisfn = "nact_ifolders_tab_initialize_window";
+       static const gchar *thisfn = "fma_ifolders_tab_initialize_window";
        NactTreeView *tview;
 
-       g_return_if_fail( NACT_IS_IFOLDERS_TAB( instance ));
+       g_return_if_fail( FMA_IS_IFOLDERS_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
@@ -212,7 +212,7 @@ initialize_window( NactIFoldersTab *instance )
 }
 
 static void
-on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIFoldersTab *instance )
+on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIFoldersTab *instance )
 {
        FMAIContext *context;
        gboolean editable;
@@ -231,7 +231,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIFold
 }
 
 static void
-on_browse_folder_clicked( GtkButton *button, NactIFoldersTab *instance )
+on_browse_folder_clicked( GtkButton *button, FMAIFoldersTab *instance )
 {
        gchar *uri, *path;
        GtkWidget *dialog;
@@ -283,9 +283,9 @@ set_folders( void *context, GSList *filters )
 }
 
 static void
-on_instance_finalized( gpointer user_data, NactIFoldersTab *instance )
+on_instance_finalized( gpointer user_data, FMAIFoldersTab *instance )
 {
-       static const gchar *thisfn = "nact_ifolders_tab_on_instance_finalized";
+       static const gchar *thisfn = "fma_ifolders_tab_on_instance_finalized";
 
        g_debug( "%s: instance=%p, user_data=%p", thisfn, ( void * ) instance, ( void * ) user_data );
 }
diff --git a/src/ui/nact-ifolders-tab.h b/src/ui/fma-ifolders-tab.h
similarity index 57%
rename from src/ui/nact-ifolders-tab.h
rename to src/ui/fma-ifolders-tab.h
index 5ace4f4..eb0a150 100644
--- a/src/ui/nact-ifolders-tab.h
+++ b/src/ui/fma-ifolders-tab.h
@@ -27,13 +27,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __UI_NACT_IFOLDERS_TAB_H__
-#define __UI_NACT_IFOLDERS_TAB_H__
+#ifndef __UI_FMA_IFOLDERS_TAB_H__
+#define __UI_FMA_IFOLDERS_TAB_H__
 
 /**
- * SECTION: nact_ifolders_tab
- * @short_description: #NactIFoldersTab interface declaration.
- * @include: ui/nact-ifolders-tab.h
+ * SECTION: fma_ifolders_tab
+ * @short_description: #FMAIFoldersTab interface declaration.
+ * @include: ui/fma-ifolders-tab.h
  *
  * This interface implements all the widgets which are relevant for
  * items which are applied to backgrounds.
@@ -43,25 +43,25 @@
 
 G_BEGIN_DECLS
 
-#define NACT_TYPE_IFOLDERS_TAB                      ( nact_ifolders_tab_get_type())
-#define NACT_IFOLDERS_TAB( instance )               ( G_TYPE_CHECK_INSTANCE_CAST( instance, 
NACT_TYPE_IFOLDERS_TAB, NactIFoldersTab ))
-#define NACT_IS_IFOLDERS_TAB( instance )            ( G_TYPE_CHECK_INSTANCE_TYPE( instance, 
NACT_TYPE_IFOLDERS_TAB ))
-#define NACT_IFOLDERS_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), 
NACT_TYPE_IFOLDERS_TAB, NactIFoldersTabInterface ))
+#define FMA_TYPE_IFOLDERS_TAB                      ( fma_ifolders_tab_get_type())
+#define FMA_IFOLDERS_TAB( instance )               ( G_TYPE_CHECK_INSTANCE_CAST( instance, 
FMA_TYPE_IFOLDERS_TAB, FMAIFoldersTab ))
+#define FMA_IS_IFOLDERS_TAB( instance )            ( G_TYPE_CHECK_INSTANCE_TYPE( instance, 
FMA_TYPE_IFOLDERS_TAB ))
+#define FMA_IFOLDERS_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), 
FMA_TYPE_IFOLDERS_TAB, FMAIFoldersTabInterface ))
 
-typedef struct _NactIFoldersTab                     NactIFoldersTab;
-typedef struct _NactIFoldersTabInterfacePrivate     NactIFoldersTabInterfacePrivate;
+typedef struct _FMAIFoldersTab                     FMAIFoldersTab;
+typedef struct _FMAIFoldersTabInterfacePrivate     FMAIFoldersTabInterfacePrivate;
 
 typedef struct {
        /*< private >*/
        GTypeInterface                   parent;
-       NactIFoldersTabInterfacePrivate *private;
+       FMAIFoldersTabInterfacePrivate *private;
 }
-       NactIFoldersTabInterface;
+       FMAIFoldersTabInterface;
 
-GType nact_ifolders_tab_get_type( void );
+GType fma_ifolders_tab_get_type( void );
 
-void  nact_ifolders_tab_init    ( NactIFoldersTab *instance );
+void  fma_ifolders_tab_init    ( FMAIFoldersTab *instance );
 
 G_END_DECLS
 
-#endif /* __UI_NACT_IFOLDERS_TAB_H__ */
+#endif /* __UI_FMA_IFOLDERS_TAB_H__ */
diff --git a/src/ui/nact-imimetypes-tab.c b/src/ui/fma-imimetypes-tab.c
similarity index 71%
rename from src/ui/nact-imimetypes-tab.c
rename to src/ui/fma-imimetypes-tab.c
index 7415853..050c9b3 100644
--- a/src/ui/nact-imimetypes-tab.c
+++ b/src/ui/fma-imimetypes-tab.c
@@ -40,11 +40,11 @@
 #include "nact-main-tab.h"
 #include "nact-main-window.h"
 #include "nact-match-list.h"
-#include "nact-imimetypes-tab.h"
+#include "fma-imimetypes-tab.h"
 
 /* private interface data
  */
-struct _NactIMimetypesTabInterfacePrivate {
+struct _FMAIMimetypesTabInterfacePrivate {
        void *empty;                                            /* so that gcc -pedantic is happy */
 };
 
@@ -55,17 +55,17 @@ struct _NactIMimetypesTabInterfacePrivate {
 static guint st_initializations = 0;   /* interface initialization count */
 
 static GType   register_type( void );
-static void    interface_base_init( NactIMimetypesTabInterface *klass );
-static void    interface_base_finalize( NactIMimetypesTabInterface *klass );
-static void    initialize_gtk( NactIMimetypesTab *instance );
-static void    initialize_window( NactIMimetypesTab *instance );
-static void    on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIMimetypesTab 
*instance );
+static void    interface_base_init( FMAIMimetypesTabInterface *klass );
+static void    interface_base_finalize( FMAIMimetypesTabInterface *klass );
+static void    initialize_gtk( FMAIMimetypesTab *instance );
+static void    initialize_window( FMAIMimetypesTab *instance );
+static void    on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIMimetypesTab 
*instance );
 static GSList *get_mimetypes( void *context );
 static void    set_mimetypes( void *context, GSList *filters );
-static void    on_instance_finalized( gpointer user_data, NactIMimetypesTab *instance );
+static void    on_instance_finalized( gpointer user_data, FMAIMimetypesTab *instance );
 
 GType
-nact_imimetypes_tab_get_type( void )
+fma_imimetypes_tab_get_type( void )
 {
        static GType iface_type = 0;
 
@@ -79,11 +79,11 @@ nact_imimetypes_tab_get_type( void )
 static GType
 register_type( void )
 {
-       static const gchar *thisfn = "nact_imimetypes_tab_register_type";
+       static const gchar *thisfn = "fma_imimetypes_tab_register_type";
        GType type;
 
        static const GTypeInfo info = {
-               sizeof( NactIMimetypesTabInterface ),
+               sizeof( FMAIMimetypesTabInterface ),
                ( GBaseInitFunc ) interface_base_init,
                ( GBaseFinalizeFunc ) interface_base_finalize,
                NULL,
@@ -96,7 +96,7 @@ register_type( void )
 
        g_debug( "%s", thisfn );
 
-       type = g_type_register_static( G_TYPE_INTERFACE, "NactIMimetypesTab", &info, 0 );
+       type = g_type_register_static( G_TYPE_INTERFACE, "FMAIMimetypesTab", &info, 0 );
 
        g_type_interface_add_prerequisite( type, GTK_TYPE_APPLICATION_WINDOW );
 
@@ -104,24 +104,24 @@ register_type( void )
 }
 
 static void
-interface_base_init( NactIMimetypesTabInterface *klass )
+interface_base_init( FMAIMimetypesTabInterface *klass )
 {
-       static const gchar *thisfn = "nact_imimetypes_tab_interface_base_init";
+       static const gchar *thisfn = "fma_imimetypes_tab_interface_base_init";
 
        if( !st_initializations ){
 
                g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
 
-               klass->private = g_new0( NactIMimetypesTabInterfacePrivate, 1 );
+               klass->private = g_new0( FMAIMimetypesTabInterfacePrivate, 1 );
        }
 
        st_initializations += 1;
 }
 
 static void
-interface_base_finalize( NactIMimetypesTabInterface *klass )
+interface_base_finalize( FMAIMimetypesTabInterface *klass )
 {
-       static const gchar *thisfn = "nact_imimetypes_tab_interface_base_finalize";
+       static const gchar *thisfn = "fma_imimetypes_tab_interface_base_finalize";
 
        st_initializations -= 1;
 
@@ -134,18 +134,18 @@ interface_base_finalize( NactIMimetypesTabInterface *klass )
 }
 
 /*
- * nact_imimetypes_tab_init:
- * @instance: this #NactIMimetypesTab instance.
+ * fma_imimetypes_tab_init:
+ * @instance: this #FMAIMimetypesTab instance.
  *
  * Initialize the interface
  * Connect to #BaseWindow signals
  */
 void
-nact_imimetypes_tab_init( NactIMimetypesTab *instance )
+fma_imimetypes_tab_init( FMAIMimetypesTab *instance )
 {
-       static const gchar *thisfn = "nact_imimetypes_tab_init";
+       static const gchar *thisfn = "fma_imimetypes_tab_init";
 
-       g_return_if_fail( NACT_IS_IMIMETYPES_TAB( instance ));
+       g_return_if_fail( FMA_IS_IMIMETYPES_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn,
@@ -160,16 +160,16 @@ nact_imimetypes_tab_init( NactIMimetypesTab *instance )
 
 /*
  * initialize_gtk:
- * @window: this #NactIMimetypesTab instance.
+ * @window: this #FMAIMimetypesTab instance.
  *
  * Initializes the tab widget at initial load.
  */
 static void
-initialize_gtk( NactIMimetypesTab *instance )
+initialize_gtk( FMAIMimetypesTab *instance )
 {
-       static const gchar *thisfn = "nact_imimetypes_tab_initialize_gtk";
+       static const gchar *thisfn = "fma_imimetypes_tab_initialize_gtk";
 
-       g_return_if_fail( NACT_IS_IMIMETYPES_TAB( instance ));
+       g_return_if_fail( FMA_IS_IMIMETYPES_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
@@ -192,18 +192,18 @@ initialize_gtk( NactIMimetypesTab *instance )
 
 /*
  * initialize_window:
- * @window: this #NactIMimetypesTab instance.
+ * @window: this #FMAIMimetypesTab instance.
  *
  * Initializes the tab widget at each time the widget will be displayed.
  * Connect signals and setup runtime values.
  */
 static void
-initialize_window( NactIMimetypesTab *instance )
+initialize_window( FMAIMimetypesTab *instance )
 {
-       static const gchar *thisfn = "nact_imimetypes_tab_initialize_window";
+       static const gchar *thisfn = "fma_imimetypes_tab_initialize_window";
        NactTreeView *tview;
 
-       g_return_if_fail( NACT_IS_IMIMETYPES_TAB( instance ));
+       g_return_if_fail( FMA_IS_IMIMETYPES_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
@@ -216,7 +216,7 @@ initialize_window( NactIMimetypesTab *instance )
 }
 
 static void
-on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIMimetypesTab *instance )
+on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIMimetypesTab *instance )
 {
        FMAIContext *context;
        gboolean editable;
@@ -243,9 +243,9 @@ set_mimetypes( void *context, GSList *filters )
 }
 
 static void
-on_instance_finalized( gpointer user_data, NactIMimetypesTab *instance )
+on_instance_finalized( gpointer user_data, FMAIMimetypesTab *instance )
 {
-       static const gchar *thisfn = "nact_imimetypes_tab_on_instance_finalized";
+       static const gchar *thisfn = "fma_imimetypes_tab_on_instance_finalized";
 
        g_debug( "%s: instance=%p, user_data=%p", thisfn, ( void * ) instance, ( void * ) user_data );
 }
diff --git a/src/ui/nact-imimetypes-tab.h b/src/ui/fma-imimetypes-tab.h
similarity index 54%
rename from src/ui/nact-imimetypes-tab.h
rename to src/ui/fma-imimetypes-tab.h
index a96c863..9f3f42e 100644
--- a/src/ui/nact-imimetypes-tab.h
+++ b/src/ui/fma-imimetypes-tab.h
@@ -27,13 +27,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __UI_NACT_IMIMETYPES_TAB_H__
-#define __UI_NACT_IMIMETYPES_TAB_H__
+#ifndef __UI_FMA_IMIMETYPES_TAB_H__
+#define __UI_FMA_IMIMETYPES_TAB_H__
 
 /**
- * SECTION: nact_imimetypes_tab
- * @short_description: #NactIMimetypesTab interface declaration.
- * @include: ui/nact-imimetypes-tab.h
+ * SECTION: fma_imimetypes_tab
+ * @short_description: #FMAIMimetypesTab interface declaration.
+ * @include: ui/fma-imimetypes-tab.h
  *
  * This interface implements all the widgets which define the
  * mimetypes-based conditions.
@@ -43,25 +43,25 @@
 
 G_BEGIN_DECLS
 
-#define NACT_TYPE_IMIMETYPES_TAB                      ( nact_imimetypes_tab_get_type())
-#define NACT_IMIMETYPES_TAB( instance )               ( G_TYPE_CHECK_INSTANCE_CAST( instance, 
NACT_TYPE_IMIMETYPES_TAB, NactIMimetypesTab ))
-#define NACT_IS_IMIMETYPES_TAB( instance )            ( G_TYPE_CHECK_INSTANCE_TYPE( instance, 
NACT_TYPE_IMIMETYPES_TAB ))
-#define NACT_IMIMETYPES_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), 
NACT_TYPE_IMIMETYPES_TAB, NactIMimetypesTabInterface ))
+#define FMA_TYPE_IMIMETYPES_TAB                      ( fma_imimetypes_tab_get_type())
+#define FMA_IMIMETYPES_TAB( instance )               ( G_TYPE_CHECK_INSTANCE_CAST( instance, 
FMA_TYPE_IMIMETYPES_TAB, FMAIMimetypesTab ))
+#define FMA_IS_IMIMETYPES_TAB( instance )            ( G_TYPE_CHECK_INSTANCE_TYPE( instance, 
FMA_TYPE_IMIMETYPES_TAB ))
+#define FMA_IMIMETYPES_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), 
FMA_TYPE_IMIMETYPES_TAB, FMAIMimetypesTabInterface ))
 
-typedef struct _NactIMimetypesTab                     NactIMimetypesTab;
-typedef struct _NactIMimetypesTabInterfacePrivate     NactIMimetypesTabInterfacePrivate;
+typedef struct _FMAIMimetypesTab                     FMAIMimetypesTab;
+typedef struct _FMAIMimetypesTabInterfacePrivate     FMAIMimetypesTabInterfacePrivate;
 
 typedef struct {
        /*< private >*/
-       GTypeInterface                     parent;
-       NactIMimetypesTabInterfacePrivate *private;
+       GTypeInterface                    parent;
+       FMAIMimetypesTabInterfacePrivate *private;
 }
-       NactIMimetypesTabInterface;
+       FMAIMimetypesTabInterface;
 
-GType nact_imimetypes_tab_get_type( void );
+GType fma_imimetypes_tab_get_type( void );
 
-void  nact_imimetypes_tab_init    ( NactIMimetypesTab *instance );
+void  fma_imimetypes_tab_init    ( FMAIMimetypesTab *instance );
 
 G_END_DECLS
 
-#endif /* __UI_NACT_IMIMETYPES_TAB_H__ */
+#endif /* __UI_FMA_IMIMETYPES_TAB_H__ */
diff --git a/src/ui/nact-iproperties-tab.c b/src/ui/fma-iproperties-tab.c
similarity index 80%
rename from src/ui/nact-iproperties-tab.c
rename to src/ui/fma-iproperties-tab.c
index e70e839..7e0635e 100644
--- a/src/ui/nact-iproperties-tab.c
+++ b/src/ui/fma-iproperties-tab.c
@@ -41,13 +41,13 @@
 #include "core/fma-io-provider.h"
 
 #include "base-gtk-utils.h"
-#include "nact-iproperties-tab.h"
+#include "fma-iproperties-tab.h"
 #include "nact-main-tab.h"
 #include "nact-main-window.h"
 
 /* private interface data
  */
-struct _NactIPropertiesTabInterfacePrivate {
+struct _FMAIPropertiesTabInterfacePrivate {
        void *empty;                                            /* so that gcc -pedantic is happy */
 };
 
@@ -61,27 +61,27 @@ typedef struct {
 }
        IPropertiesData;
 
-#define IPROPERTIES_TAB_PROP_DATA              "nact-iproperties-tab-data"
+#define IPROPERTIES_TAB_PROP_DATA              "fma-iproperties-tab-data"
 
 static guint st_initializations = 0;   /* interface initialization count */
 
 static GType            register_type( void );
-static void             interface_base_init( NactIPropertiesTabInterface *klass );
-static void             interface_base_finalize( NactIPropertiesTabInterface *klass );
-static void             initialize_window( NactIPropertiesTab *instance );
-static void             on_tree_selection_changed( NactTreeView *tview, GList *selected_items, 
NactIPropertiesTab *instance );
-static void             on_main_item_updated( NactIPropertiesTab *instance, FMAIContext *context, guint 
data, void *empty );
-static GtkButton       *get_enabled_button( NactIPropertiesTab *instance );
-static void             on_enabled_toggled( GtkToggleButton *button, NactIPropertiesTab *instance );
-static void             on_readonly_toggled( GtkToggleButton *button, NactIPropertiesTab *instance );
-static void             on_description_changed( GtkTextBuffer *buffer, NactIPropertiesTab *instance );
-static void             on_shortcut_clicked( GtkButton *button, NactIPropertiesTab *instance );
-static void             display_provider_name( NactIPropertiesTab *instance, FMAObjectItem *item );
-static IPropertiesData *get_iproperties_data( NactIPropertiesTab *instance );
-static void             on_instance_finalized( gpointer user_data, NactIPropertiesTab *instance );
+static void             interface_base_init( FMAIPropertiesTabInterface *klass );
+static void             interface_base_finalize( FMAIPropertiesTabInterface *klass );
+static void             initialize_window( FMAIPropertiesTab *instance );
+static void             on_tree_selection_changed( NactTreeView *tview, GList *selected_items, 
FMAIPropertiesTab *instance );
+static void             on_main_item_updated( FMAIPropertiesTab *instance, FMAIContext *context, guint data, 
void *empty );
+static GtkButton       *get_enabled_button( FMAIPropertiesTab *instance );
+static void             on_enabled_toggled( GtkToggleButton *button, FMAIPropertiesTab *instance );
+static void             on_readonly_toggled( GtkToggleButton *button, FMAIPropertiesTab *instance );
+static void             on_description_changed( GtkTextBuffer *buffer, FMAIPropertiesTab *instance );
+static void             on_shortcut_clicked( GtkButton *button, FMAIPropertiesTab *instance );
+static void             display_provider_name( FMAIPropertiesTab *instance, FMAObjectItem *item );
+static IPropertiesData *get_iproperties_data( FMAIPropertiesTab *instance );
+static void             on_instance_finalized( gpointer user_data, FMAIPropertiesTab *instance );
 
 GType
-nact_iproperties_tab_get_type( void )
+fma_iproperties_tab_get_type( void )
 {
        static GType iface_type = 0;
 
@@ -95,11 +95,11 @@ nact_iproperties_tab_get_type( void )
 static GType
 register_type( void )
 {
-       static const gchar *thisfn = "nact_iproperties_tab_register_type";
+       static const gchar *thisfn = "fma_iproperties_tab_register_type";
        GType type;
 
        static const GTypeInfo info = {
-               sizeof( NactIPropertiesTabInterface ),
+               sizeof( FMAIPropertiesTabInterface ),
                ( GBaseInitFunc ) interface_base_init,
                ( GBaseFinalizeFunc ) interface_base_finalize,
                NULL,
@@ -112,7 +112,7 @@ register_type( void )
 
        g_debug( "%s", thisfn );
 
-       type = g_type_register_static( G_TYPE_INTERFACE, "NactIPropertiesTab", &info, 0 );
+       type = g_type_register_static( G_TYPE_INTERFACE, "FMAIPropertiesTab", &info, 0 );
 
        g_type_interface_add_prerequisite( type, GTK_TYPE_APPLICATION_WINDOW );
 
@@ -120,24 +120,24 @@ register_type( void )
 }
 
 static void
-interface_base_init( NactIPropertiesTabInterface *klass )
+interface_base_init( FMAIPropertiesTabInterface *klass )
 {
-       static const gchar *thisfn = "nact_iproperties_tab_interface_base_init";
+       static const gchar *thisfn = "fma_iproperties_tab_interface_base_init";
 
        if( !st_initializations ){
 
                g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
 
-               klass->private = g_new0( NactIPropertiesTabInterfacePrivate, 1 );
+               klass->private = g_new0( FMAIPropertiesTabInterfacePrivate, 1 );
        }
 
        st_initializations += 1;
 }
 
 static void
-interface_base_finalize( NactIPropertiesTabInterface *klass )
+interface_base_finalize( FMAIPropertiesTabInterface *klass )
 {
-       static const gchar *thisfn = "nact_iproperties_tab_interface_base_finalize";
+       static const gchar *thisfn = "fma_iproperties_tab_interface_base_finalize";
 
        st_initializations -= 1;
 
@@ -150,19 +150,19 @@ interface_base_finalize( NactIPropertiesTabInterface *klass )
 }
 
 /**
- * nact_iproperties_tab_init:
- * @instance: this #NactIPropertiesTab instance.
+ * fma_iproperties_tab_init:
+ * @instance: this #FMAIPropertiesTab instance.
  *
  * Initialize the interface
  * Connect to #BaseWindow signals
  */
 void
-nact_iproperties_tab_init( NactIPropertiesTab *instance )
+fma_iproperties_tab_init( FMAIPropertiesTab *instance )
 {
-       static const gchar *thisfn = "nact_iproperties_tab_init";
+       static const gchar *thisfn = "fma_iproperties_tab_init";
        IPropertiesData *data;
 
-       g_return_if_fail( NACT_IS_IPROPERTIES_TAB( instance ));
+       g_return_if_fail( FMA_IS_IPROPERTIES_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn,
@@ -178,15 +178,15 @@ nact_iproperties_tab_init( NactIPropertiesTab *instance )
 }
 
 static void
-initialize_window( NactIPropertiesTab *instance )
+initialize_window( FMAIPropertiesTab *instance )
 {
-       static const gchar *thisfn = "nact_iproperties_tab_initialize_window";
+       static const gchar *thisfn = "fma_iproperties_tab_initialize_window";
        GtkButton *enabled_button;
        GtkWidget *label_widget;
        GtkTextBuffer *buffer;
        NactTreeView *tview;
 
-       g_return_if_fail( NACT_IS_IPROPERTIES_TAB( instance ));
+       g_return_if_fail( FMA_IS_IPROPERTIES_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
@@ -220,9 +220,9 @@ initialize_window( NactIPropertiesTab *instance )
 }
 
 static void
-on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIPropertiesTab *instance )
+on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAIPropertiesTab *instance )
 {
-       static const gchar *thisfn = "nact_iproperties_tab_on_tree_selection_changed";
+       static const gchar *thisfn = "fma_iproperties_tab_on_tree_selection_changed";
        guint count_selected;
        FMAObjectItem *item;
        gboolean editable;
@@ -237,7 +237,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIProp
        gchar *label, *shortcut;
        IPropertiesData *data;
 
-       g_return_if_fail( NACT_IS_IPROPERTIES_TAB( instance ));
+       g_return_if_fail( FMA_IS_IPROPERTIES_TAB( instance ));
 
        count_selected = g_list_length( selected_items );
        g_debug( "%s: tview=%p, count_selected=%d, instance=%p (%s)",
@@ -313,9 +313,9 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIProp
 }
 
 static void
-on_main_item_updated( NactIPropertiesTab *instance, FMAIContext *context, guint data, void *empty )
+on_main_item_updated( FMAIPropertiesTab *instance, FMAIContext *context, guint data, void *empty )
 {
-       static const gchar *thisfn = "nact_iproperties_tab_on_main_item_updated";
+       static const gchar *thisfn = "fma_iproperties_tab_on_main_item_updated";
 
        if( data & MAIN_DATA_PROVIDER ){
 
@@ -328,15 +328,15 @@ on_main_item_updated( NactIPropertiesTab *instance, FMAIContext *context, guint
 }
 
 static GtkButton *
-get_enabled_button( NactIPropertiesTab *instance )
+get_enabled_button( FMAIPropertiesTab *instance )
 {
        return( GTK_BUTTON( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), 
"ActionEnabledButton" )));
 }
 
 static void
-on_enabled_toggled( GtkToggleButton *button, NactIPropertiesTab *instance )
+on_enabled_toggled( GtkToggleButton *button, FMAIPropertiesTab *instance )
 {
-       static const gchar *thisfn = "nact_iproperties_tab_on_enabled_toggled";
+       static const gchar *thisfn = "fma_iproperties_tab_on_enabled_toggled";
        FMAObjectItem *item;
        gboolean enabled;
        gboolean editable;
@@ -386,9 +386,9 @@ on_enabled_toggled( GtkToggleButton *button, NactIPropertiesTab *instance )
  * the most elegant, seems at least working without too drawbacks
  */
 static void
-on_readonly_toggled( GtkToggleButton *button, NactIPropertiesTab *instance )
+on_readonly_toggled( GtkToggleButton *button, FMAIPropertiesTab *instance )
 {
-       static const gchar *thisfn = "nact_iproperties_tab_on_readonly_toggled";
+       static const gchar *thisfn = "fma_iproperties_tab_on_readonly_toggled";
        gboolean active;
        IPropertiesData *data;
 
@@ -408,9 +408,9 @@ on_readonly_toggled( GtkToggleButton *button, NactIPropertiesTab *instance )
 
 #if 0
 static void
-on_readonly_toggle_cb( GtkToggleButton *button, NactIPropertiesTab *instance )
+on_readonly_toggle_cb( GtkToggleButton *button, FMAIPropertiesTab *instance )
 {
-       static const gchar *thisfn = "nact_iproperties_tab_on_readonly_toggle_cb";
+       static const gchar *thisfn = "fma_iproperties_tab_on_readonly_toggle_cb";
        g_debug( "%s: button=%p, instance=%p", thisfn, ( void * ) button, ( void * ) instance );
 
        if( rdbtn != GTK_WIDGET( button )){
@@ -425,9 +425,9 @@ on_readonly_toggle_cb( GtkToggleButton *button, NactIPropertiesTab *instance )
 
 static gboolean
 on_readonly_toggle_hook( GSignalInvocationHint *ihint,
-        guint n_param_values, const GValue *param_values, NactIPropertiesTab *instance )
+        guint n_param_values, const GValue *param_values, FMAIPropertiesTab *instance )
 {
-       static const gchar *thisfn = "nact_iproperties_tab_on_readonly_toggle_hook";
+       static const gchar *thisfn = "fma_iproperties_tab_on_readonly_toggle_hook";
        GtkWidget *button;
        GtkWidget *signaled_object;
 
@@ -450,9 +450,9 @@ on_readonly_toggle_hook( GSignalInvocationHint *ihint,
 #endif
 
 static void
-on_description_changed( GtkTextBuffer *buffer, NactIPropertiesTab *instance )
+on_description_changed( GtkTextBuffer *buffer, FMAIPropertiesTab *instance )
 {
-       static const gchar *thisfn = "nact_iproperties_tab_on_description_changed";
+       static const gchar *thisfn = "fma_iproperties_tab_on_description_changed";
        FMAObjectItem *item;
        GtkTextIter start, end;
        gchar *text;
@@ -474,7 +474,7 @@ on_description_changed( GtkTextBuffer *buffer, NactIPropertiesTab *instance )
 }
 
 static void
-on_shortcut_clicked( GtkButton *button, NactIPropertiesTab *instance )
+on_shortcut_clicked( GtkButton *button, FMAIPropertiesTab *instance )
 {
        FMAObjectItem *item;
 
@@ -489,7 +489,7 @@ on_shortcut_clicked( GtkButton *button, NactIPropertiesTab *instance )
 }
 
 static void
-display_provider_name( NactIPropertiesTab *instance, FMAObjectItem *item )
+display_provider_name( FMAIPropertiesTab *instance, FMAObjectItem *item )
 {
        GtkWidget *label_widget;
        gchar *label;
@@ -512,7 +512,7 @@ display_provider_name( NactIPropertiesTab *instance, FMAObjectItem *item )
 }
 
 static IPropertiesData *
-get_iproperties_data( NactIPropertiesTab *instance )
+get_iproperties_data( FMAIPropertiesTab *instance )
 {
        IPropertiesData *data;
 
@@ -527,9 +527,9 @@ get_iproperties_data( NactIPropertiesTab *instance )
 }
 
 static void
-on_instance_finalized( gpointer user_data, NactIPropertiesTab *instance )
+on_instance_finalized( gpointer user_data, FMAIPropertiesTab *instance )
 {
-       static const gchar *thisfn = "nact_iproperties_tab_on_instance_finalized";
+       static const gchar *thisfn = "fma_iproperties_tab_on_instance_finalized";
        IPropertiesData *data;
 
        g_debug( "%s: instance=%p, user_data=%p", thisfn, ( void * ) instance, ( void * ) user_data );
diff --git a/src/ui/nact-iproperties-tab.h b/src/ui/fma-iproperties-tab.h
similarity index 55%
rename from src/ui/nact-iproperties-tab.h
rename to src/ui/fma-iproperties-tab.h
index 3a31276..cd07d8e 100644
--- a/src/ui/nact-iproperties-tab.h
+++ b/src/ui/fma-iproperties-tab.h
@@ -27,13 +27,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __UI_NACT_IPROPERTIES_TAB_H__
-#define __UI_NACT_IPROPERTIES_TAB_H__
+#ifndef __UI_FMA_IPROPERTIES_TAB_H__
+#define __UI_FMA_IPROPERTIES_TAB_H__
 
 /**
- * SECTION: nact_iproperties_tab
- * @short_description: #NactIPropertiesTab interface definition.
- * @include: ui/nact-iproperties-tab.h
+ * SECTION: fma_iproperties_tab
+ * @short_description: #FMAIPropertiesTab interface definition.
+ * @include: ui/fma-iproperties-tab.h
  *
  * This interface implements the "Properties" tab of the notebook.
  *
@@ -45,25 +45,25 @@
 
 G_BEGIN_DECLS
 
-#define NACT_TYPE_IPROPERTIES_TAB                      ( nact_iproperties_tab_get_type())
-#define NACT_IPROPERTIES_TAB( instance )               ( G_TYPE_CHECK_INSTANCE_CAST( instance, 
NACT_TYPE_IPROPERTIES_TAB, NactIPropertiesTab ))
-#define NACT_IS_IPROPERTIES_TAB( instance )            ( G_TYPE_CHECK_INSTANCE_TYPE( instance, 
NACT_TYPE_IPROPERTIES_TAB ))
-#define NACT_IPROPERTIES_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), 
NACT_TYPE_IPROPERTIES_TAB, NactIPropertiesTabInterface ))
+#define FMA_TYPE_IPROPERTIES_TAB                      ( fma_iproperties_tab_get_type())
+#define FMA_IPROPERTIES_TAB( instance )               ( G_TYPE_CHECK_INSTANCE_CAST( instance, 
FMA_TYPE_IPROPERTIES_TAB, FMAIPropertiesTab ))
+#define FMA_IS_IPROPERTIES_TAB( instance )            ( G_TYPE_CHECK_INSTANCE_TYPE( instance, 
FMA_TYPE_IPROPERTIES_TAB ))
+#define FMA_IPROPERTIES_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), 
FMA_TYPE_IPROPERTIES_TAB, FMAIPropertiesTabInterface ))
 
-typedef struct _NactIPropertiesTab                     NactIPropertiesTab;
-typedef struct _NactIPropertiesTabInterfacePrivate     NactIPropertiesTabInterfacePrivate;
+typedef struct _FMAIPropertiesTab                     FMAIPropertiesTab;
+typedef struct _FMAIPropertiesTabInterfacePrivate     FMAIPropertiesTabInterfacePrivate;
 
 typedef struct {
        /*< private >*/
-       GTypeInterface                      parent;
-       NactIPropertiesTabInterfacePrivate *private;
+       GTypeInterface                     parent;
+       FMAIPropertiesTabInterfacePrivate *private;
 }
-       NactIPropertiesTabInterface;
+       FMAIPropertiesTabInterface;
 
-GType nact_iproperties_tab_get_type( void );
+GType fma_iproperties_tab_get_type( void );
 
-void  nact_iproperties_tab_init    ( NactIPropertiesTab *instance );
+void  fma_iproperties_tab_init    ( FMAIPropertiesTab *instance );
 
 G_END_DECLS
 
-#endif /* __UI_NACT_IPROPERTIES_TAB_H__ */
+#endif /* __UI_FMA_IPROPERTIES_TAB_H__ */
diff --git a/src/ui/nact-ischemes-tab.c b/src/ui/fma-ischemes-tab.c
similarity index 74%
rename from src/ui/nact-ischemes-tab.c
rename to src/ui/fma-ischemes-tab.c
index 5842db5..d1fd70f 100644
--- a/src/ui/nact-ischemes-tab.c
+++ b/src/ui/fma-ischemes-tab.c
@@ -43,11 +43,11 @@
 #include "nact-main-window.h"
 #include "nact-match-list.h"
 #include "fma-add-scheme-dialog.h"
-#include "nact-ischemes-tab.h"
+#include "fma-ischemes-tab.h"
 
 /* private interface data
  */
-struct _NactISchemesTabInterfacePrivate {
+struct _FMAISchemesTabInterfacePrivate {
        void *empty;                                            /* so that gcc -pedantic is happy */
 };
 
@@ -58,18 +58,18 @@ struct _NactISchemesTabInterfacePrivate {
 static guint st_initializations = 0;   /* interface initialization count */
 
 static GType   register_type( void );
-static void    interface_base_init( NactISchemesTabInterface *klass );
-static void    interface_base_finalize( NactISchemesTabInterface *klass );
-static void    initialize_gtk( NactISchemesTab *instance );
-static void    initialize_window( NactISchemesTab *instance );
-static void    on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactISchemesTab 
*instance );
-static void    on_add_from_defaults( GtkButton *button, NactISchemesTab *instance );
+static void    interface_base_init( FMAISchemesTabInterface *klass );
+static void    interface_base_finalize( FMAISchemesTabInterface *klass );
+static void    initialize_gtk( FMAISchemesTab *instance );
+static void    initialize_window( FMAISchemesTab *instance );
+static void    on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAISchemesTab 
*instance );
+static void    on_add_from_defaults( GtkButton *button, FMAISchemesTab *instance );
 static GSList *get_schemes( void *context );
 static void    set_schemes( void *context, GSList *filters );
-static void    on_instance_finalized( gpointer user_data, NactISchemesTab *instance );
+static void    on_instance_finalized( gpointer user_data, FMAISchemesTab *instance );
 
 GType
-nact_ischemes_tab_get_type( void )
+fma_ischemes_tab_get_type( void )
 {
        static GType iface_type = 0;
 
@@ -83,11 +83,11 @@ nact_ischemes_tab_get_type( void )
 static GType
 register_type( void )
 {
-       static const gchar *thisfn = "nact_ischemes_tab_register_type";
+       static const gchar *thisfn = "fma_ischemes_tab_register_type";
        GType type;
 
        static const GTypeInfo info = {
-               sizeof( NactISchemesTabInterface ),
+               sizeof( FMAISchemesTabInterface ),
                ( GBaseInitFunc ) interface_base_init,
                ( GBaseFinalizeFunc ) interface_base_finalize,
                NULL,
@@ -100,7 +100,7 @@ register_type( void )
 
        g_debug( "%s", thisfn );
 
-       type = g_type_register_static( G_TYPE_INTERFACE, "NactISchemesTab", &info, 0 );
+       type = g_type_register_static( G_TYPE_INTERFACE, "FMAISchemesTab", &info, 0 );
 
        g_type_interface_add_prerequisite( type, GTK_TYPE_APPLICATION_WINDOW );
 
@@ -108,24 +108,24 @@ register_type( void )
 }
 
 static void
-interface_base_init( NactISchemesTabInterface *klass )
+interface_base_init( FMAISchemesTabInterface *klass )
 {
-       static const gchar *thisfn = "nact_ischemes_tab_interface_base_init";
+       static const gchar *thisfn = "fma_ischemes_tab_interface_base_init";
 
        if( !st_initializations ){
 
                g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
 
-               klass->private = g_new0( NactISchemesTabInterfacePrivate, 1 );
+               klass->private = g_new0( FMAISchemesTabInterfacePrivate, 1 );
        }
 
        st_initializations += 1;
 }
 
 static void
-interface_base_finalize( NactISchemesTabInterface *klass )
+interface_base_finalize( FMAISchemesTabInterface *klass )
 {
-       static const gchar *thisfn = "nact_ischemes_tab_interface_base_finalize";
+       static const gchar *thisfn = "fma_ischemes_tab_interface_base_finalize";
 
        st_initializations -= 1;
 
@@ -138,18 +138,18 @@ interface_base_finalize( NactISchemesTabInterface *klass )
 }
 
 /**
- * nact_ischemes_tab_init:
- * @instance: this #NactISchemesTab instance.
+ * fma_ischemes_tab_init:
+ * @instance: this #FMAISchemesTab instance.
  *
  * Initialize the interface
  * Connect to #BaseWindow signals
  */
 void
-nact_ischemes_tab_init( NactISchemesTab *instance )
+fma_ischemes_tab_init( FMAISchemesTab *instance )
 {
-       static const gchar *thisfn = "nact_ischemes_tab_init";
+       static const gchar *thisfn = "fma_ischemes_tab_init";
 
-       g_return_if_fail( NACT_IS_ISCHEMES_TAB( instance ));
+       g_return_if_fail( FMA_IS_ISCHEMES_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn,
@@ -163,11 +163,11 @@ nact_ischemes_tab_init( NactISchemesTab *instance )
 }
 
 static void
-initialize_gtk( NactISchemesTab *instance )
+initialize_gtk( FMAISchemesTab *instance )
 {
-       static const gchar *thisfn = "nact_ischemes_tab_initialize_gtk";
+       static const gchar *thisfn = "fma_ischemes_tab_initialize_gtk";
 
-       g_return_if_fail( NACT_IS_ISCHEMES_TAB( instance ));
+       g_return_if_fail( FMA_IS_ISCHEMES_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
@@ -189,12 +189,12 @@ initialize_gtk( NactISchemesTab *instance )
 }
 
 static void
-initialize_window( NactISchemesTab *instance )
+initialize_window( FMAISchemesTab *instance )
 {
-       static const gchar *thisfn = "nact_ischemes_tab_initialize_window";
+       static const gchar *thisfn = "fma_ischemes_tab_initialize_window";
        NactTreeView *tview;
 
-       g_return_if_fail( NACT_IS_ISCHEMES_TAB( instance ));
+       g_return_if_fail( FMA_IS_ISCHEMES_TAB( instance ));
 
        g_debug( "%s: instance=%p (%s)",
                        thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ));
@@ -211,7 +211,7 @@ initialize_window( NactISchemesTab *instance )
 }
 
 static void
-on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactISchemesTab *instance )
+on_tree_selection_changed( NactTreeView *tview, GList *selected_items, FMAISchemesTab *instance )
 {
        FMAIContext *context;
        gboolean editable;
@@ -230,7 +230,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactISche
 }
 
 static void
-on_add_from_defaults( GtkButton *button, NactISchemesTab *instance )
+on_add_from_defaults( GtkButton *button, FMAISchemesTab *instance )
 {
        GSList *schemes;
        gchar *new_scheme;
@@ -262,9 +262,9 @@ set_schemes( void *context, GSList *filters )
 }
 
 static void
-on_instance_finalized( gpointer user_data, NactISchemesTab *instance )
+on_instance_finalized( gpointer user_data, FMAISchemesTab *instance )
 {
-       static const gchar *thisfn = "nact_ischemes_tab_on_instance_finalized";
+       static const gchar *thisfn = "fma_ischemes_tab_on_instance_finalized";
 
        g_debug( "%s: instance=%p, user_data=%p", thisfn, ( void * ) instance, ( void * ) user_data );
 }
diff --git a/src/ui/nact-ischemes-tab.h b/src/ui/fma-ischemes-tab.h
similarity index 55%
rename from src/ui/nact-ischemes-tab.h
rename to src/ui/fma-ischemes-tab.h
index 19a9245..ebb4412 100644
--- a/src/ui/nact-ischemes-tab.h
+++ b/src/ui/fma-ischemes-tab.h
@@ -27,13 +27,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __UI_NACT_ISCHEMES_TAB_H__
-#define __UI_NACT_ISCHEMES_TAB_H__
+#ifndef __UI_FMA_ISCHEMES_TAB_H__
+#define __UI_FMA_ISCHEMES_TAB_H__
 
 /**
- * SECTION: nact_ischemes_tab
- * @short_description: #NactISchemesTab interface declaration.
- * @include: ui/nact-ischemes-tab.h
+ * SECTION: fma_ischemes_tab
+ * @short_description: #FMAISchemesTab interface declaration.
+ * @include: ui/fma-ischemes-tab.h
  *
  * This interface implements all the widgets which define the
  * conditions for the action.
@@ -43,25 +43,25 @@
 
 G_BEGIN_DECLS
 
-#define NACT_TYPE_ISCHEMES_TAB                      ( nact_ischemes_tab_get_type())
-#define NACT_ISCHEMES_TAB( instance )               ( G_TYPE_CHECK_INSTANCE_CAST( instance, 
NACT_TYPE_ISCHEMES_TAB, NactISchemesTab ))
-#define NACT_IS_ISCHEMES_TAB( instance )            ( G_TYPE_CHECK_INSTANCE_TYPE( instance, 
NACT_TYPE_ISCHEMES_TAB ))
-#define NACT_ISCHEMES_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), 
NACT_TYPE_ISCHEMES_TAB, NactISchemesTabInterface ))
+#define FMA_TYPE_ISCHEMES_TAB                      ( fma_ischemes_tab_get_type())
+#define FMA_ISCHEMES_TAB( instance )               ( G_TYPE_CHECK_INSTANCE_CAST( instance, 
FMA_TYPE_ISCHEMES_TAB, FMAISchemesTab ))
+#define FMA_IS_ISCHEMES_TAB( instance )            ( G_TYPE_CHECK_INSTANCE_TYPE( instance, 
FMA_TYPE_ISCHEMES_TAB ))
+#define FMA_ISCHEMES_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), 
FMA_TYPE_ISCHEMES_TAB, FMAISchemesTabInterface ))
 
-typedef struct _NactISchemesTab                     NactISchemesTab;
-typedef struct _NactISchemesTabInterfacePrivate     NactISchemesTabInterfacePrivate;
+typedef struct _FMAISchemesTab                     FMAISchemesTab;
+typedef struct _FMAISchemesTabInterfacePrivate     FMAISchemesTabInterfacePrivate;
 
 typedef struct {
        /*< private >*/
-       GTypeInterface                   parent;
-       NactISchemesTabInterfacePrivate *private;
+       GTypeInterface                  parent;
+       FMAISchemesTabInterfacePrivate *private;
 }
-       NactISchemesTabInterface;
+       FMAISchemesTabInterface;
 
-GType nact_ischemes_tab_get_type( void );
+GType fma_ischemes_tab_get_type( void );
 
-void  nact_ischemes_tab_init    ( NactISchemesTab *instance );
+void  fma_ischemes_tab_init    ( FMAISchemesTab *instance );
 
 G_END_DECLS
 
-#endif /* __UI_NACT_ISCHEMES_TAB_H__ */
+#endif /* __UI_FMA_ISCHEMES_TAB_H__ */
diff --git a/src/ui/nact-main-window-def.h b/src/ui/nact-main-window-def.h
index 365a7f8..b7aa857 100644
--- a/src/ui/nact-main-window-def.h
+++ b/src/ui/nact-main-window-def.h
@@ -68,16 +68,16 @@
  *  |               fma_clipboard_new()
  *  |               nact_sort_buttons_new()
  *  |
- *  |               nact_iaction_tab_init()
- *  |               nact_icommand_tab_init()
- *  |               nact_ibasenames_tab_init()
- *  |               nact_imimetypes_tab_init()
- *  |               nact_ifolders_tab_init()
- *  |               nact_ischemes_tab_init()
- *  |               nact_icapabilities_tab_init()
- *  |               nact_ienvironment_tab_init()
- *  |               nact_iexecution_tab_init()
- *  |               nact_iproperties_tab_init()
+ *  |               fma_iaction_tab_init()
+ *  |               fma_icommand_tab_init()
+ *  |               fma_ibasenames_tab_init()
+ *  |               fma_imimetypes_tab_init()
+ *  |               fma_ifolders_tab_init()
+ *  |               fma_ischemes_tab_init()
+ *  |               fma_icapabilities_tab_init()
+ *  |               fma_ienvironment_tab_init()
+ *  |               fma_iexecution_tab_init()
+ *  |               fma_iproperties_tab_init()
  *  |
  *  |               setup_monitor_pivot()
  *  |               setup_delete_event()
diff --git a/src/ui/nact-main-window.c b/src/ui/nact-main-window.c
index 4dd386c..d124226 100644
--- a/src/ui/nact-main-window.c
+++ b/src/ui/nact-main-window.c
@@ -42,16 +42,16 @@
 #include "core/fma-iprefs.h"
 #include "core/fma-pivot.h"
 
-#include "nact-iaction-tab.h"
-#include "nact-icommand-tab.h"
-#include "nact-ibasenames-tab.h"
-#include "nact-imimetypes-tab.h"
-#include "nact-ifolders-tab.h"
-#include "nact-ischemes-tab.h"
-#include "nact-icapabilities-tab.h"
-#include "nact-ienvironment-tab.h"
-#include "nact-iexecution-tab.h"
-#include "nact-iproperties-tab.h"
+#include "fma-iaction-tab.h"
+#include "fma-icommand-tab.h"
+#include "fma-ibasenames-tab.h"
+#include "fma-imimetypes-tab.h"
+#include "fma-ifolders-tab.h"
+#include "fma-ischemes-tab.h"
+#include "fma-icapabilities-tab.h"
+#include "fma-ienvironment-tab.h"
+#include "fma-iexecution-tab.h"
+#include "fma-iproperties-tab.h"
 #include "nact-main-tab.h"
 #include "nact-main-window.h"
 #include "nact-menu.h"
@@ -155,16 +155,16 @@ static guint            st_signals[ LAST_SIGNAL ] = { 0 };
 
 static GType      register_type( void );
 static void       class_init( NactMainWindowClass *klass );
-static void       iaction_tab_iface_init( NactIActionTabInterface *iface, void *user_data );
-static void       icommand_tab_iface_init( NactICommandTabInterface *iface, void *user_data );
-static void       ibasenames_tab_iface_init( NactIBasenamesTabInterface *iface, void *user_data );
-static void       imimetypes_tab_iface_init( NactIMimetypesTabInterface *iface, void *user_data );
-static void       ifolders_tab_iface_init( NactIFoldersTabInterface *iface, void *user_data );
-static void       ischemes_tab_iface_init( NactISchemesTabInterface *iface, void *user_data );
-static void       icapabilities_tab_iface_init( NactICapabilitiesTabInterface *iface, void *user_data );
-static void       ienvironment_tab_iface_init( NactIEnvironmentTabInterface *iface, void *user_data );
-static void       iexecution_tab_iface_init( NactIExecutionTabInterface *iface, void *user_data );
-static void       iproperties_tab_iface_init( NactIPropertiesTabInterface *iface, void *user_data );
+static void       iaction_tab_iface_init( FMAIActionTabInterface *iface, void *user_data );
+static void       icommand_tab_iface_init( FMAICommandTabInterface *iface, void *user_data );
+static void       ibasenames_tab_iface_init( FMAIBasenamesTabInterface *iface, void *user_data );
+static void       imimetypes_tab_iface_init( FMAIMimetypesTabInterface *iface, void *user_data );
+static void       ifolders_tab_iface_init( FMAIFoldersTabInterface *iface, void *user_data );
+static void       ischemes_tab_iface_init( FMAISchemesTabInterface *iface, void *user_data );
+static void       icapabilities_tab_iface_init( FMAICapabilitiesTabInterface *iface, void *user_data );
+static void       ienvironment_tab_iface_init( FMAIEnvironmentTabInterface *iface, void *user_data );
+static void       iexecution_tab_iface_init( FMAIExecutionTabInterface *iface, void *user_data );
+static void       iproperties_tab_iface_init( FMAIPropertiesTabInterface *iface, void *user_data );
 static void       instance_init( GTypeInstance *instance, gpointer klass );
 static void       instance_get_property( GObject *object, guint property_id, GValue *value, GParamSpec *spec 
);
 static void       instance_set_property( GObject *object, guint property_id, const GValue *value, GParamSpec 
*spec );
@@ -286,25 +286,25 @@ register_type( void )
 
        type = g_type_register_static( GTK_TYPE_APPLICATION_WINDOW, "NactMainWindow", &info, 0 );
 
-       g_type_add_interface_static( type, NACT_TYPE_IACTION_TAB, &iaction_tab_iface_info );
+       g_type_add_interface_static( type, FMA_TYPE_IACTION_TAB, &iaction_tab_iface_info );
 
-       g_type_add_interface_static( type, NACT_TYPE_ICOMMAND_TAB, &icommand_tab_iface_info );
+       g_type_add_interface_static( type, FMA_TYPE_ICOMMAND_TAB, &icommand_tab_iface_info );
 
-       g_type_add_interface_static( type, NACT_TYPE_IBASENAMES_TAB, &ibasenames_tab_iface_info );
+       g_type_add_interface_static( type, FMA_TYPE_IBASENAMES_TAB, &ibasenames_tab_iface_info );
 
-       g_type_add_interface_static( type, NACT_TYPE_IMIMETYPES_TAB, &imimetypes_tab_iface_info );
+       g_type_add_interface_static( type, FMA_TYPE_IMIMETYPES_TAB, &imimetypes_tab_iface_info );
 
-       g_type_add_interface_static( type, NACT_TYPE_IFOLDERS_TAB, &ifolders_tab_iface_info );
+       g_type_add_interface_static( type, FMA_TYPE_IFOLDERS_TAB, &ifolders_tab_iface_info );
 
-       g_type_add_interface_static( type, NACT_TYPE_ISCHEMES_TAB, &ischemes_tab_iface_info );
+       g_type_add_interface_static( type, FMA_TYPE_ISCHEMES_TAB, &ischemes_tab_iface_info );
 
-       g_type_add_interface_static( type, NACT_TYPE_ICAPABILITIES_TAB, &icapabilities_tab_iface_info );
+       g_type_add_interface_static( type, FMA_TYPE_ICAPABILITIES_TAB, &icapabilities_tab_iface_info );
 
-       g_type_add_interface_static( type, NACT_TYPE_IENVIRONMENT_TAB, &ienvironment_tab_iface_info );
+       g_type_add_interface_static( type, FMA_TYPE_IENVIRONMENT_TAB, &ienvironment_tab_iface_info );
 
-       g_type_add_interface_static( type, NACT_TYPE_IEXECUTION_TAB, &iexecution_tab_iface_info );
+       g_type_add_interface_static( type, FMA_TYPE_IEXECUTION_TAB, &iexecution_tab_iface_info );
 
-       g_type_add_interface_static( type, NACT_TYPE_IPROPERTIES_TAB, &iproperties_tab_iface_info );
+       g_type_add_interface_static( type, FMA_TYPE_IPROPERTIES_TAB, &iproperties_tab_iface_info );
 
        return( type );
 }
@@ -414,7 +414,7 @@ class_init( NactMainWindowClass *klass )
 }
 
 static void
-iaction_tab_iface_init( NactIActionTabInterface *iface, void *user_data )
+iaction_tab_iface_init( FMAIActionTabInterface *iface, void *user_data )
 {
        static const gchar *thisfn = "nact_main_window_iaction_tab_iface_init";
 
@@ -422,7 +422,7 @@ iaction_tab_iface_init( NactIActionTabInterface *iface, void *user_data )
 }
 
 static void
-icommand_tab_iface_init( NactICommandTabInterface *iface, void *user_data )
+icommand_tab_iface_init( FMAICommandTabInterface *iface, void *user_data )
 {
        static const gchar *thisfn = "nact_main_window_icommand_tab_iface_init";
 
@@ -430,7 +430,7 @@ icommand_tab_iface_init( NactICommandTabInterface *iface, void *user_data )
 }
 
 static void
-ibasenames_tab_iface_init( NactIBasenamesTabInterface *iface, void *user_data )
+ibasenames_tab_iface_init( FMAIBasenamesTabInterface *iface, void *user_data )
 {
        static const gchar *thisfn = "nact_main_window_ibasenames_tab_iface_init";
 
@@ -438,7 +438,7 @@ ibasenames_tab_iface_init( NactIBasenamesTabInterface *iface, void *user_data )
 }
 
 static void
-imimetypes_tab_iface_init( NactIMimetypesTabInterface *iface, void *user_data )
+imimetypes_tab_iface_init( FMAIMimetypesTabInterface *iface, void *user_data )
 {
        static const gchar *thisfn = "nact_main_window_imimetypes_tab_iface_init";
 
@@ -446,7 +446,7 @@ imimetypes_tab_iface_init( NactIMimetypesTabInterface *iface, void *user_data )
 }
 
 static void
-ifolders_tab_iface_init( NactIFoldersTabInterface *iface, void *user_data )
+ifolders_tab_iface_init( FMAIFoldersTabInterface *iface, void *user_data )
 {
        static const gchar *thisfn = "nact_main_window_ifolders_tab_iface_init";
 
@@ -454,7 +454,7 @@ ifolders_tab_iface_init( NactIFoldersTabInterface *iface, void *user_data )
 }
 
 static void
-ischemes_tab_iface_init( NactISchemesTabInterface *iface, void *user_data )
+ischemes_tab_iface_init( FMAISchemesTabInterface *iface, void *user_data )
 {
        static const gchar *thisfn = "nact_main_window_ischemes_tab_iface_init";
 
@@ -462,7 +462,7 @@ ischemes_tab_iface_init( NactISchemesTabInterface *iface, void *user_data )
 }
 
 static void
-icapabilities_tab_iface_init( NactICapabilitiesTabInterface *iface, void *user_data )
+icapabilities_tab_iface_init( FMAICapabilitiesTabInterface *iface, void *user_data )
 {
        static const gchar *thisfn = "nact_main_window_icapabilities_tab_iface_init";
 
@@ -470,7 +470,7 @@ icapabilities_tab_iface_init( NactICapabilitiesTabInterface *iface, void *user_d
 }
 
 static void
-ienvironment_tab_iface_init( NactIEnvironmentTabInterface *iface, void *user_data )
+ienvironment_tab_iface_init( FMAIEnvironmentTabInterface *iface, void *user_data )
 {
        static const gchar *thisfn = "nact_main_window_ienvironment_tab_iface_init";
 
@@ -478,7 +478,7 @@ ienvironment_tab_iface_init( NactIEnvironmentTabInterface *iface, void *user_dat
 }
 
 static void
-iexecution_tab_iface_init( NactIExecutionTabInterface *iface, void *user_data )
+iexecution_tab_iface_init( FMAIExecutionTabInterface *iface, void *user_data )
 {
        static const gchar *thisfn = "nact_main_window_iexecution_tab_iface_init";
 
@@ -486,7 +486,7 @@ iexecution_tab_iface_init( NactIExecutionTabInterface *iface, void *user_data )
 }
 
 static void
-iproperties_tab_iface_init( NactIPropertiesTabInterface *iface, void *user_data )
+iproperties_tab_iface_init( FMAIPropertiesTabInterface *iface, void *user_data )
 {
        static const gchar *thisfn = "nact_main_window_iproperties_tab_iface_init";
 
@@ -671,16 +671,16 @@ nact_main_window_new( FMAApplication *application )
        /* initialize the notebook interfaces
         *  and monitor the updates which originates from each property tab
         */
-       nact_iaction_tab_init( NACT_IACTION_TAB( window ));
-       nact_icommand_tab_init( NACT_ICOMMAND_TAB( window ));
-       nact_ibasenames_tab_init( NACT_IBASENAMES_TAB( window ));
-       nact_imimetypes_tab_init( NACT_IMIMETYPES_TAB( window ));
-       nact_ifolders_tab_init( NACT_IFOLDERS_TAB( window ));
-       nact_ischemes_tab_init( NACT_ISCHEMES_TAB( window ));
-       nact_icapabilities_tab_init( NACT_ICAPABILITIES_TAB( window ));
-       nact_ienvironment_tab_init( NACT_IENVIRONMENT_TAB( window ));
-       nact_iexecution_tab_init( NACT_IEXECUTION_TAB( window ));
-       nact_iproperties_tab_init( NACT_IPROPERTIES_TAB( window ));
+       fma_iaction_tab_init( FMA_IACTION_TAB( window ));
+       fma_icommand_tab_init( FMA_ICOMMAND_TAB( window ));
+       fma_ibasenames_tab_init( FMA_IBASENAMES_TAB( window ));
+       fma_imimetypes_tab_init( FMA_IMIMETYPES_TAB( window ));
+       fma_ifolders_tab_init( FMA_IFOLDERS_TAB( window ));
+       fma_ischemes_tab_init( FMA_ISCHEMES_TAB( window ));
+       fma_icapabilities_tab_init( FMA_ICAPABILITIES_TAB( window ));
+       fma_ienvironment_tab_init( FMA_IENVIRONMENT_TAB( window ));
+       fma_iexecution_tab_init( FMA_IEXECUTION_TAB( window ));
+       fma_iproperties_tab_init( FMA_IPROPERTIES_TAB( window ));
 
        g_signal_connect( window, MAIN_SIGNAL_ITEM_UPDATED, G_CALLBACK( on_tab_item_updated ), NULL );
 
diff --git a/src/ui/nact-match-list.h b/src/ui/nact-match-list.h
index 5f6cef4..982cf38 100644
--- a/src/ui/nact-match-list.h
+++ b/src/ui/nact-match-list.h
@@ -35,10 +35,10 @@
  * @short_description: Implementation of a list match/does not match.
  * @include: ui/nact-match-list.h
  *
- * In an ideal world, this would be a base interface for NactISchemesTab,
+ * In an ideal world, this would be a base interface for FMAISchemesTab,
  * etc. interfaces.
  * In GObject world however, one cannot derived an interface, nor an interface
- * can implement another interface. The GObject solution would be for NactISchemesTab
+ * can implement another interface. The GObject solution would be for FMAISchemesTab
  * to requires NactIMatchList, and for NactMainWindow to implement this same
  * NactIMatchList interface. This is not very practical as NactMainWindow is
  * already some big bunch of code...
diff --git a/src/ui/nact-schemes-list.c b/src/ui/nact-schemes-list.c
index 7ee3d53..385def9 100644
--- a/src/ui/nact-schemes-list.c
+++ b/src/ui/nact-schemes-list.c
@@ -117,7 +117,7 @@ static SchemesListData *get_schemes_list_data( GtkTreeView *treeview );
  * Associates the SchemesListData structure to the widget.
  *
  * The default list of schemes is displayed in two cases:
- * - when adding a scheme to a FMAObjectItem (cf. NactISchemesTab)
+ * - when adding a scheme to a FMAObjectItem (cf. FMAISchemesTab)
  *   so the schemes list is opened for selection
  *
  *   we have chosen to not allow default schemes list edition in this mode


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