[nautilus-actions/file-manager-actions] NADataDef, NADataGroup and NADataTypes are renamed to FMADataDef, FMADataGroup and FMADataTypes (res



commit 218efb6bc65419f5ac240668923669e02bfaa452
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Sep 7 20:53:10 2015 +0200

    NADataDef, NADataGroup and NADataTypes are renamed to FMADataDef, FMADataGroup and FMADataTypes (resp.)

 src/api/Makefile.am                            |    4 +-
 src/api/fma-data-boxed.h                       |   14 ++--
 src/api/{na-data-def.h => fma-data-def.h}      |   20 +++---
 src/api/{na-data-types.h => fma-data-types.h}  |   10 +-
 src/api/na-ifactory-object-data.h              |    2 +-
 src/api/na-ifactory-object.h                   |   10 +-
 src/api/na-ifactory-provider.h                 |    4 +-
 src/core/Makefile.am                           |    4 +-
 src/core/fma-boxed.c                           |    4 +-
 src/core/fma-data-boxed.c                      |   54 +++++++-------
 src/core/{na-data-def.c => fma-data-def.c}     |   18 ++--
 src/core/{na-data-types.c => fma-data-types.c} |    8 +-
 src/core/na-factory-object.c                   |   98 ++++++++++++------------
 src/core/na-factory-object.h                   |    6 +-
 src/core/na-factory-provider.c                 |    4 +-
 src/core/na-factory-provider.h                 |    2 +-
 src/core/na-icontext-factory.c                 |    6 +-
 src/core/na-ifactory-object.c                  |   10 +-
 src/core/na-object-action-factory.c            |   16 ++--
 src/core/na-object-action.c                    |   10 +-
 src/core/na-object-id-factory.c                |    6 +-
 src/core/na-object-item-factory.c              |    6 +-
 src/core/na-object-menu-factory.c              |   14 ++--
 src/core/na-object-menu.c                      |    6 +-
 src/core/na-object-profile-factory.c           |   12 ++--
 src/core/na-object-profile.c                   |    6 +-
 src/core/na-settings.c                         |    2 +-
 src/io-desktop/nadp-keys.h                     |    2 +-
 src/io-desktop/nadp-reader.c                   |    4 +-
 src/io-desktop/nadp-reader.h                   |    2 +-
 src/io-desktop/nadp-writer.c                   |    4 +-
 src/io-gconf/nagp-reader.c                     |   12 ++--
 src/io-gconf/nagp-reader.h                     |    2 +-
 src/io-gconf/nagp-writer.c                     |    6 +-
 src/io-xml/naxml-keys.h                        |    2 +-
 src/io-xml/naxml-reader.c                      |   20 +++---
 src/io-xml/naxml-reader.h                      |    2 +-
 src/io-xml/naxml-writer.c                      |   68 ++++++++--------
 src/utils/na-print-schemas.c                   |   36 +++++-----
 src/utils/nautilus-actions-new.c               |   12 ++--
 40 files changed, 264 insertions(+), 264 deletions(-)
---
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
index 637d4ed..83a8d9e 100644
--- a/src/api/Makefile.am
+++ b/src/api/Makefile.am
@@ -40,8 +40,8 @@ api_include_HEADERS = \
        fma-boxed.h                                                                                     \
        fma-core-utils.h                                                                                \
        fma-data-boxed.h                                                                                \
-       na-data-def.h                                                                           \
-       na-data-types.h                                                                         \
+       fma-data-def.h                                                                          \
+       fma-data-types.h                                                                                \
        na-gconf-monitor.h                                                                      \
        na-gconf-utils.h                                                                        \
        na-icontext.h                                                                           \
diff --git a/src/api/fma-data-boxed.h b/src/api/fma-data-boxed.h
index 5077f8c..de7647d 100644
--- a/src/api/fma-data-boxed.h
+++ b/src/api/fma-data-boxed.h
@@ -40,9 +40,9 @@
  * A #FMADataBoxed object has a type and a value.
  *
  * #FMADataBoxed class is derived from #FMABoxed one, and implements the same
- * types that those defined in na-data-types.h.
+ * types that those defined in fma-data-types.h.
  *
- * Additionally, #FMADataBoxed class holds the #NADataDef data definition
+ * Additionally, #FMADataBoxed class holds the #FMADataDef data definition
  * suitable for a NAFactoryObject object. It such provides default value
  * and validity status.
  *
@@ -52,7 +52,7 @@
 #include <glib-object.h>
 
 #include "fma-boxed.h"
-#include "na-data-def.h"
+#include "fma-data-def.h"
 
 G_BEGIN_DECLS
 
@@ -83,12 +83,12 @@ typedef struct {
 
 GType             fma_data_boxed_get_type( void );
 
-FMADataBoxed     *fma_data_boxed_new            ( const NADataDef *def );
+FMADataBoxed     *fma_data_boxed_new            ( const FMADataDef *def );
 
-const NADataDef *fma_data_boxed_get_data_def   ( const FMADataBoxed *boxed );
-void              fma_data_boxed_set_data_def   ( FMADataBoxed *boxed, const NADataDef *def );
+const FMADataDef *fma_data_boxed_get_data_def   ( const FMADataBoxed *boxed );
+void              fma_data_boxed_set_data_def   ( FMADataBoxed *boxed, const FMADataDef *def );
 
-GParamSpec       *fma_data_boxed_get_param_spec ( const NADataDef *def );
+GParamSpec       *fma_data_boxed_get_param_spec ( const FMADataDef *def );
 
 gboolean          fma_data_boxed_is_default     ( const FMADataBoxed *boxed );
 gboolean          fma_data_boxed_is_valid       ( const FMADataBoxed *boxed );
diff --git a/src/api/na-data-def.h b/src/api/fma-data-def.h
similarity index 93%
rename from src/api/na-data-def.h
rename to src/api/fma-data-def.h
index 0fd28f8..79db09f 100644
--- a/src/api/na-data-def.h
+++ b/src/api/fma-data-def.h
@@ -32,11 +32,11 @@
 
 /**
  * SECTION: data-def
- * @title: NADataDef, NADataGroup
+ * @title: FMADataDef, FMADataGroup
  * @short_description: The Data Factory Structure Definitions
- * @include: file-manager-actions/na-data-def.h
+ * @include: file-manager-actions/fma-data-def.h
  *
- * #NADataDef and #NADataGroup are structures which handle the list of
+ * #FMADataDef and #FMADataGroup are structures which handle the list of
  * elementary datas for each and every #NAObjectItem which happens to
  * implement the #NAIFactoryObject interface.
  */
@@ -46,7 +46,7 @@
 G_BEGIN_DECLS
 
 /**
- * NADataDef:
+ * FMADataDef:
  * @name:             both the id and the canonical name.
  *                    Used when getting/setting properties.
  *                    Is defined in na-ifactory-object-data.h and must be globally unique.
@@ -121,10 +121,10 @@ typedef struct {
        gchar     *option_label;
        gchar     *option_arg_label;
 }
-       NADataDef;
+       FMADataDef;
 
 /**
- * NADataGroup:
+ * FMADataGroup:
  * @group: the name of the group, as defined in na-ifactory-object-data.h.
  * @def: the list of the corresponding data structures.
  *
@@ -133,12 +133,12 @@ typedef struct {
  * these groups.
  */
 typedef struct {
-       gchar     *group;
-       NADataDef *def;
+       gchar      *group;
+       FMADataDef *def;
 }
-       NADataGroup;
+       FMADataGroup;
 
-const NADataDef *na_data_def_get_data_def( const NADataGroup *group, const gchar *group_name, const gchar 
*name );
+const FMADataDef *fma_data_def_get_data_def( const FMADataGroup *group, const gchar *group_name, const gchar 
*name );
 
 G_END_DECLS
 
diff --git a/src/api/na-data-types.h b/src/api/fma-data-types.h
similarity index 94%
rename from src/api/na-data-types.h
rename to src/api/fma-data-types.h
index d5fb51b..47a8465 100644
--- a/src/api/na-data-types.h
+++ b/src/api/fma-data-types.h
@@ -32,9 +32,9 @@
 
 /**
  * SECTION: data-type
- * @title: NADataType
+ * @title: FMADataType
  * @short_description: The Data Factory Type Definitions
- * @include: file-manager-actions/na-data-types.h
+ * @include: file-manager-actions/fma-data-types.h
  */
 
 #include <glib.h>
@@ -42,7 +42,7 @@
 G_BEGIN_DECLS
 
 /**
- * NADataType:
+ * FMADataType:
  * @NA_DATA_TYPE_BOOLEAN:       a boolean
  *                              can be initialized with "true" or "false" (case insensitive)
  * @NA_DATA_TYPE_POINTER:       a ( void * ) pointer
@@ -85,9 +85,9 @@ typedef enum {
        /* count of defined types */
        NA_DATA_TYPE_N
 }
-       NADataType;
+       FMADataType;
 
-const gchar *na_data_types_get_gconf_dump_key( guint type );
+const gchar *fma_data_types_get_gconf_dump_key( guint type );
 
 G_END_DECLS
 
diff --git a/src/api/na-ifactory-object-data.h b/src/api/na-ifactory-object-data.h
index fc133cc..2605fd6 100644
--- a/src/api/na-ifactory-object-data.h
+++ b/src/api/na-ifactory-object-data.h
@@ -38,7 +38,7 @@
  *
  * Each elementary data get its own name here.
  *
- * Through #NADataDef and #NADataGroup definitions, each #NAObjectItem
+ * Through #FMADataDef and #FMADataGroup definitions, each #NAObjectItem
  * derived object which implement the #NAIFactoryObject interface will
  * dynamically define a property for each attached elementary data.
  */
diff --git a/src/api/na-ifactory-object.h b/src/api/na-ifactory-object.h
index 85b150f..ea6a450 100644
--- a/src/api/na-ifactory-object.h
+++ b/src/api/na-ifactory-object.h
@@ -76,7 +76,7 @@
  * </refsect2>
  */
 
-#include "na-data-def.h"
+#include "fma-data-def.h"
 #include "fma-data-boxed.h"
 #include "na-ifactory-provider-provider.h"
 
@@ -93,7 +93,7 @@ typedef struct _NAIFactoryObjectInterfacePrivate     NAIFactoryObjectInterfacePr
 /**
  * NAIFactoryObjectInterface:
  * @get_version: returns the version of this interface the NAObjectItem implements.
- * @get_groups:  returns a pointer to the NADataGroup which defines this object.
+ * @get_groups:  returns a pointer to the FMADataGroup which defines this object.
  * @copy:        post copy callback.
  * @are_equal:   tests if two NAObjectItem are equals.
  * @is_valid:    tests if one NAObjectItem is valid.
@@ -128,11 +128,11 @@ typedef struct {
         * get_groups:
         * @instance: this #NAIFactoryObject instance.
         *
-        * Returns: a pointer to the NADataGroup which defines this object.
+        * Returns: a pointer to the FMADataGroup which defines this object.
         *
         * Since: 2.30
         */
-       NADataGroup * ( *get_groups ) ( const NAIFactoryObject *instance );
+       FMADataGroup * ( *get_groups ) ( const NAIFactoryObject *instance );
 
        /**
         * copy:
@@ -239,7 +239,7 @@ typedef struct {
 GType        na_ifactory_object_get_type( void );
 
 FMADataBoxed *na_ifactory_object_get_data_boxed ( const NAIFactoryObject *object, const gchar *name );
-NADataGroup *na_ifactory_object_get_data_groups( const NAIFactoryObject *object );
+FMADataGroup *na_ifactory_object_get_data_groups( const NAIFactoryObject *object );
 void        *na_ifactory_object_get_as_void    ( const NAIFactoryObject *object, const gchar *name );
 void         na_ifactory_object_set_from_void  ( NAIFactoryObject *object, const gchar *name, const void 
*data );
 
diff --git a/src/api/na-ifactory-provider.h b/src/api/na-ifactory-provider.h
index b314f4d..540d100 100644
--- a/src/api/na-ifactory-provider.h
+++ b/src/api/na-ifactory-provider.h
@@ -198,7 +198,7 @@ typedef struct {
         * @reader_data: the data associated to this instance, as provided
         *  when na_ifactory_provider_read_item() was called.
         * @object: the #NAIFactoryobject being unserialized.
-        * @def: a #NADataDef structure which identifies the data to be unserialized.
+        * @def: a #FMADataDef structure which identifies the data to be unserialized.
         * @messages: a pointer to a #GSList list of strings; the provider
         *  may append messages to this list, but shouldn't reinitialize it.
         *
@@ -209,7 +209,7 @@ typedef struct {
         *
         * Since: 2.30
         */
-       FMADataBoxed * ( *read_data )  ( const NAIFactoryProvider *reader, void *reader_data, const 
NAIFactoryObject *object, const NADataDef *def, GSList **messages );
+       FMADataBoxed * ( *read_data )  ( const NAIFactoryProvider *reader, void *reader_data, const 
NAIFactoryObject *object, const FMADataDef *def, GSList **messages );
 
        /**
         * read_done:
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 314f5c2..dd213e1 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -56,8 +56,8 @@ libna_core_la_SOURCES = \
        fma-boxed.c                                                                                     \
        fma-core-utils.c                                                                                \
        fma-data-boxed.c                                                                                \
-       na-data-def.c                                                                           \
-       na-data-types.c                                                                         \
+       fma-data-def.c                                                                          \
+       fma-data-types.c                                                                                \
        na-desktop-environment.c                                                        \
        na-desktop-environment.h                                                        \
        na-exporter.c                                                                           \
diff --git a/src/core/fma-boxed.c b/src/core/fma-boxed.c
index 6288c1c..cef2710 100644
--- a/src/core/fma-boxed.c
+++ b/src/core/fma-boxed.c
@@ -35,7 +35,7 @@
 #include <string.h>
 
 #include <api/fma-boxed.h>
-#include <api/na-data-types.h>
+#include <api/fma-data-types.h>
 #include <api/fma-core-utils.h>
 
 /* private class data
@@ -485,7 +485,7 @@ string_to_array( const gchar *string )
 /**
  * fma_boxed_set_type:
  * @boxed: this #FMABoxed object.
- * @type: the required type as defined in na-data-types.h
+ * @type: the required type as defined in fma-data-types.h
  *
  * Set the type of the just-allocated @boxed object.
  *
diff --git a/src/core/fma-data-boxed.c b/src/core/fma-data-boxed.c
index e9d6886..c50bf9b 100644
--- a/src/core/fma-data-boxed.c
+++ b/src/core/fma-data-boxed.c
@@ -37,8 +37,8 @@
 
 #include <api/fma-core-utils.h>
 #include <api/na-gconf-utils.h>
-#include <api/na-data-def.h>
-#include <api/na-data-types.h>
+#include <api/fma-data-def.h>
+#include <api/fma-data-types.h>
 #include <api/fma-data-boxed.h>
 
 /* private class data
@@ -52,7 +52,7 @@ struct _FMADataBoxedClassPrivate {
  */
 typedef struct {
        guint           type;
-       GParamSpec * ( *spec )      ( const NADataDef * );
+       GParamSpec * ( *spec )      ( const FMADataDef * );
        gboolean     ( *is_default )( const FMADataBoxed * );
        gboolean     ( *is_valid )  ( const FMADataBoxed * );
 }
@@ -62,7 +62,7 @@ typedef struct {
  */
 struct _FMADataBoxedPrivate {
        gboolean            dispose_has_run;
-       const NADataDef    *data_def ;
+       const FMADataDef    *data_def ;
        const DataBoxedDef *boxed_def;
 };
 
@@ -76,30 +76,30 @@ static void                instance_finalize( GObject *object );
 
 static const DataBoxedDef *get_data_boxed_def( guint type );
 
-static GParamSpec         *bool_spec( const NADataDef *idtype );
+static GParamSpec         *bool_spec( const FMADataDef *idtype );
 static gboolean            bool_is_default( const FMADataBoxed *boxed );
 static gboolean            bool_is_valid( const FMADataBoxed *boxed );
 
-static GParamSpec         *pointer_spec( const NADataDef *idtype );
+static GParamSpec         *pointer_spec( const FMADataDef *idtype );
 static gboolean            pointer_is_default( const FMADataBoxed *boxed );
 static gboolean            pointer_is_valid( const FMADataBoxed *boxed );
 
-static GParamSpec         *string_spec( const NADataDef *idtype );
+static GParamSpec         *string_spec( const FMADataDef *idtype );
 static gboolean            string_is_default( const FMADataBoxed *boxed );
 static gboolean            string_is_valid( const FMADataBoxed *boxed );
 
-static GParamSpec         *string_list_spec( const NADataDef *idtype );
+static GParamSpec         *string_list_spec( const FMADataDef *idtype );
 static gboolean            string_list_is_default( const FMADataBoxed *boxed );
 static gboolean            string_list_is_valid( const FMADataBoxed *boxed );
 
 static gboolean            locale_is_default( const FMADataBoxed *boxed );
 static gboolean            locale_is_valid( const FMADataBoxed *boxed );
 
-static GParamSpec         *uint_spec( const NADataDef *idtype );
+static GParamSpec         *uint_spec( const FMADataDef *idtype );
 static gboolean            uint_is_default( const FMADataBoxed *boxed );
 static gboolean            uint_is_valid( const FMADataBoxed *boxed );
 
-static GParamSpec         *uint_list_spec( const NADataDef *idtype );
+static GParamSpec         *uint_list_spec( const FMADataDef *idtype );
 static gboolean            uint_list_is_default( const FMADataBoxed *boxed );
 static gboolean            uint_list_is_valid( const FMADataBoxed *boxed );
 
@@ -267,14 +267,14 @@ get_data_boxed_def( guint type )
 
 /**
  * fma_data_boxed_new:
- * @def: the #NADataDef definition structure for this boxed.
+ * @def: the #FMADataDef definition structure for this boxed.
  *
  * Returns: a newly allocated #FMADataBoxed.
  *
  * Since: 2.30
  */
 FMADataBoxed *
-fma_data_boxed_new( const NADataDef *def )
+fma_data_boxed_new( const FMADataDef *def )
 {
        FMADataBoxed *boxed;
 
@@ -292,15 +292,15 @@ fma_data_boxed_new( const NADataDef *def )
  * fma_data_boxed_get_data_def:
  * @boxed: this #FMADataBoxed object.
  *
- * Returns: a pointer to the #NADataDef structure attached to the object.
+ * Returns: a pointer to the #FMADataDef structure attached to the object.
  * Should never be %NULL.
  *
  * Since: 2.30
  */
-const NADataDef *
+const FMADataDef *
 fma_data_boxed_get_data_def( const FMADataBoxed *boxed )
 {
-       const NADataDef *def;
+       const FMADataDef *def;
 
        g_return_val_if_fail( FMA_IS_DATA_BOXED( boxed ), NULL );
 
@@ -317,16 +317,16 @@ fma_data_boxed_get_data_def( const FMADataBoxed *boxed )
 /**
  * fma_data_boxed_set_data_def:
  * @boxed: this #FMADataBoxed object.
- * @def: the new #NADataDef to be set.
+ * @def: the new #FMADataDef to be set.
  *
- * Changes the #NADataDef a @boxed points to:
+ * Changes the #FMADataDef a @boxed points to:
  * -> the new type must be the same that the previous one.
  * -> value is unchanged.
  *
  * Since: 2.30
  */
 void
-fma_data_boxed_set_data_def( FMADataBoxed *boxed, const NADataDef *new_def )
+fma_data_boxed_set_data_def( FMADataBoxed *boxed, const FMADataDef *new_def )
 {
        g_return_if_fail( FMA_IS_DATA_BOXED( boxed ));
        g_return_if_fail( boxed->private->data_def );
@@ -335,20 +335,20 @@ fma_data_boxed_set_data_def( FMADataBoxed *boxed, const NADataDef *new_def )
 
        if( !boxed->private->dispose_has_run ){
 
-               boxed->private->data_def = ( NADataDef * ) new_def;
+               boxed->private->data_def = ( FMADataDef * ) new_def;
        }
 }
 
 /**
  * fma_data_boxed_get_param_spec:
- * @def: a #NADataDef definition structure.
+ * @def: a #FMADataDef definition structure.
  *
  * Returns: a #GParamSpec structure.
  *
  * Since: 2.30
  */
 GParamSpec *
-fma_data_boxed_get_param_spec( const NADataDef *def )
+fma_data_boxed_get_param_spec( const FMADataDef *def )
 {
        GParamSpec *spec;
        const DataBoxedDef *fn;
@@ -576,7 +576,7 @@ fma_data_boxed_set_from_void( FMADataBoxed *boxed, const void *value )
 #endif /* NA_ENABLE_DEPRECATED */
 
 static GParamSpec *
-bool_spec( const NADataDef *def )
+bool_spec( const FMADataDef *def )
 {
        return( g_param_spec_boolean(
                        def->name,
@@ -607,7 +607,7 @@ bool_is_valid( const FMADataBoxed *boxed )
 }
 
 static GParamSpec *
-pointer_spec( const NADataDef *def )
+pointer_spec( const FMADataDef *def )
 {
        return( g_param_spec_pointer(
                        def->name,
@@ -645,7 +645,7 @@ pointer_is_valid( const FMADataBoxed *boxed )
 }
 
 static GParamSpec *
-string_spec( const NADataDef *def )
+string_spec( const FMADataDef *def )
 {
        return( g_param_spec_string(
                        def->name,
@@ -702,7 +702,7 @@ string_is_valid( const FMADataBoxed *boxed )
 }
 
 static GParamSpec *
-string_list_spec( const NADataDef *def )
+string_list_spec( const FMADataDef *def )
 {
        return( g_param_spec_pointer(
                        def->name,
@@ -795,7 +795,7 @@ locale_is_valid( const FMADataBoxed *boxed )
 }
 
 static GParamSpec *
-uint_spec( const NADataDef *def )
+uint_spec( const FMADataDef *def )
 {
        return( g_param_spec_uint(
                        def->name,
@@ -828,7 +828,7 @@ uint_is_valid( const FMADataBoxed *boxed )
 }
 
 static GParamSpec *
-uint_list_spec( const NADataDef *def )
+uint_list_spec( const FMADataDef *def )
 {
        return( g_param_spec_pointer(
                        def->name,
diff --git a/src/core/na-data-def.c b/src/core/fma-data-def.c
similarity index 80%
rename from src/core/na-data-def.c
rename to src/core/fma-data-def.c
index 4d9a26e..aafb2f7 100644
--- a/src/core/na-data-def.c
+++ b/src/core/fma-data-def.c
@@ -33,25 +33,25 @@
 
 #include <string.h>
 
-#include <api/na-data-def.h>
+#include <api/fma-data-def.h>
 
 /**
- * na_data_def_get_data_def:
- * @group: a #NADataGroup structure array.
+ * fma_data_def_get_data_def:
+ * @group: a #FMADataGroup structure array.
  * @group_name: the searched group name.
  * @name: the searched data name.
  *
- * Returns: a pointer to the #NADataDef structure, or %NULL if not found.
+ * Returns: a pointer to the #FMADataDef structure, or %NULL if not found.
  *
  * Since: 2.30
  */
-const NADataDef *
-na_data_def_get_data_def( const NADataGroup *group, const gchar *group_name, const gchar *name )
+const FMADataDef *
+fma_data_def_get_data_def( const FMADataGroup *group, const gchar *group_name, const gchar *name )
 {
-       NADataGroup *igroup;
-       NADataDef *idef;
+       FMADataGroup *igroup;
+       FMADataDef *idef;
 
-       igroup = ( NADataGroup * ) group;
+       igroup = ( FMADataGroup * ) group;
        while( igroup->group ){
                if( !strcmp( igroup->group, group_name )){
                        idef = igroup->def;
diff --git a/src/core/na-data-types.c b/src/core/fma-data-types.c
similarity index 92%
rename from src/core/na-data-types.c
rename to src/core/fma-data-types.c
index 379bfd9..6750e82 100644
--- a/src/core/na-data-types.c
+++ b/src/core/fma-data-types.c
@@ -31,7 +31,7 @@
 #include <config.h>
 #endif
 
-#include <api/na-data-types.h>
+#include <api/fma-data-types.h>
 #include <api/fma-core-utils.h>
 
 typedef struct {
@@ -53,7 +53,7 @@ static FactoryType st_factory_type[] = {
 };
 
 /**
- * na_data_types_get_gconf_dump_key:
+ * fma_data_types_get_gconf_dump_key:
  * @type: the FactoryData type.
  *
  * Returns: the GConf key suitable for this type.
@@ -64,9 +64,9 @@ static FactoryType st_factory_type[] = {
  * Since: 2.30
  */
 const gchar *
-na_data_types_get_gconf_dump_key( guint type )
+fma_data_types_get_gconf_dump_key( guint type )
 {
-       static const gchar *thisfn = "na_data_types_get_gconf_dump_key";
+       static const gchar *thisfn = "fma_data_types_get_gconf_dump_key";
        FactoryType *str;
 
        str = st_factory_type;
diff --git a/src/core/na-factory-object.c b/src/core/na-factory-object.c
index 58984cf..9194761 100644
--- a/src/core/na-factory-object.c
+++ b/src/core/na-factory-object.c
@@ -37,7 +37,7 @@
 
 #include <api/fma-core-utils.h>
 #include <api/fma-data-boxed.h>
-#include <api/na-data-types.h>
+#include <api/fma-data-types.h>
 #include <api/na-iio-provider.h>
 #include <api/na-ifactory-provider.h>
 #include <api/na-object-api.h>
@@ -45,7 +45,7 @@
 #include "na-factory-object.h"
 #include "na-factory-provider.h"
 
-typedef gboolean ( *NADataDefIterFunc )( NADataDef *def, void *user_data );
+typedef gboolean ( *FMADataDefIterFunc )( FMADataDef *def, void *user_data );
 
 enum {
        DATA_DEF_ITER_SET_PROPERTIES = 1,
@@ -92,13 +92,13 @@ typedef struct {
 extern gboolean                   ifactory_object_initialized;
 extern gboolean                   ifactory_object_finalized;
 
-static gboolean     define_class_properties_iter( const NADataDef *def, GObjectClass *class );
-static gboolean     set_defaults_iter( NADataDef *def, NafoDefaultIter *data );
-static gboolean     is_valid_mandatory_iter( const NADataDef *def, NafoValidIter *data );
-static gboolean     read_data_iter( NADataDef *def, NafoReadIter *iter );
+static gboolean     define_class_properties_iter( const FMADataDef *def, GObjectClass *class );
+static gboolean     set_defaults_iter( FMADataDef *def, NafoDefaultIter *data );
+static gboolean     is_valid_mandatory_iter( const FMADataDef *def, NafoValidIter *data );
+static gboolean     read_data_iter( FMADataDef *def, NafoReadIter *iter );
 static gboolean     write_data_iter( const NAIFactoryObject *object, FMADataBoxed *boxed, NafoWriteIter 
*iter );
 
-static NADataGroup *v_get_groups( const NAIFactoryObject *object );
+static FMADataGroup *v_get_groups( const NAIFactoryObject *object );
 static void         v_copy( NAIFactoryObject *target, const NAIFactoryObject *source );
 static gboolean     v_are_equal( const NAIFactoryObject *a, const NAIFactoryObject *b );
 static gboolean     v_is_valid( const NAIFactoryObject *object );
@@ -109,17 +109,17 @@ static guint        v_write_done( NAIFactoryObject *serializable, const NAIFacto
 
 static void         attach_boxed_to_object( NAIFactoryObject *object, FMADataBoxed *boxed );
 static void         free_data_boxed_list( NAIFactoryObject *object );
-static void         iter_on_data_defs( const NADataGroup *idgroups, guint mode, NADataDefIterFunc pfn, void 
*user_data );
+static void         iter_on_data_defs( const FMADataGroup *idgroups, guint mode, FMADataDefIterFunc pfn, 
void *user_data );
 
 /*
  * na_factory_object_define_properties:
  * @class: the #GObjectClass.
- * @groups: the list of #NADataGroup structure which define the data of the class.
+ * @groups: the list of #FMADataGroup structure which define the data of the class.
  *
  * Initializes all the properties for the class.
  */
 void
-na_factory_object_define_properties( GObjectClass *class, const NADataGroup *groups )
+na_factory_object_define_properties( GObjectClass *class, const FMADataGroup *groups )
 {
        static const gchar *thisfn = "na_factory_object_define_properties";
 
@@ -130,11 +130,11 @@ na_factory_object_define_properties( GObjectClass *class, const NADataGroup *gro
 
        /* define class properties
         */
-       iter_on_data_defs( groups, DATA_DEF_ITER_SET_PROPERTIES, ( NADataDefIterFunc ) 
define_class_properties_iter, class );
+       iter_on_data_defs( groups, DATA_DEF_ITER_SET_PROPERTIES, ( FMADataDefIterFunc ) 
define_class_properties_iter, class );
 }
 
 static gboolean
-define_class_properties_iter( const NADataDef *def, GObjectClass *class )
+define_class_properties_iter( const FMADataDef *def, GObjectClass *class )
 {
        static const gchar *thisfn = "na_factory_object_define_class_properties_iter";
        gboolean stop;
@@ -161,21 +161,21 @@ define_class_properties_iter( const NADataDef *def, GObjectClass *class )
  * @object: this #NAIFactoryObject object.
  * @name: the searched name.
  *
- * Returns: the #NADataDef structure which describes this @name, or %NULL.
+ * Returns: the #FMADataDef structure which describes this @name, or %NULL.
  */
-NADataDef *
+FMADataDef *
 na_factory_object_get_data_def( const NAIFactoryObject *object, const gchar *name )
 {
-       NADataDef *def;
+       FMADataDef *def;
 
        g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NULL );
 
        def = NULL;
 
-       NADataGroup *groups = v_get_groups( object );
+       FMADataGroup *groups = v_get_groups( object );
        while( groups->group ){
 
-               NADataDef *def = groups->def;
+               FMADataDef *def = groups->def;
                if( def ){
                        while( def->name ){
 
@@ -195,12 +195,12 @@ na_factory_object_get_data_def( const NAIFactoryObject *object, const gchar *nam
  * na_factory_object_get_data_groups:
  * @object: the #NAIFactoryObject instance.
  *
- * Returns: a pointer to the list of #NADataGroup which define the data.
+ * Returns: a pointer to the list of #FMADataGroup which define the data.
  */
-NADataGroup *
+FMADataGroup *
 na_factory_object_get_data_groups( const NAIFactoryObject *object )
 {
-       NADataGroup *groups;
+       FMADataGroup *groups;
 
        g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NULL );
 
@@ -249,7 +249,7 @@ na_factory_object_get_default( NAIFactoryObject *object, const gchar *name )
 {
        static const gchar *thisfn = "na_factory_object_set_defaults";
        gchar *value;
-       NADataDef *def;
+       FMADataDef *def;
 
        g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NULL );
 
@@ -275,7 +275,7 @@ void
 na_factory_object_set_defaults( NAIFactoryObject *object )
 {
        static const gchar *thisfn = "na_factory_object_set_defaults";
-       NADataGroup *groups;
+       FMADataGroup *groups;
        NafoDefaultIter *iter_data;
 
        g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
@@ -284,13 +284,13 @@ na_factory_object_set_defaults( NAIFactoryObject *object )
 
        groups = v_get_groups( object );
        if( !groups ){
-               g_warning( "%s: no NADataGroup found for %s", thisfn, G_OBJECT_TYPE_NAME( object ));
+               g_warning( "%s: no FMADataGroup found for %s", thisfn, G_OBJECT_TYPE_NAME( object ));
 
        } else {
                iter_data = g_new0( NafoDefaultIter, 1 );
                iter_data->object = object;
 
-               iter_on_data_defs( groups, DATA_DEF_ITER_SET_DEFAULTS, ( NADataDefIterFunc ) 
set_defaults_iter, iter_data );
+               iter_on_data_defs( groups, DATA_DEF_ITER_SET_DEFAULTS, ( FMADataDefIterFunc ) 
set_defaults_iter, iter_data );
 
                g_free( iter_data );
        }
@@ -303,7 +303,7 @@ na_factory_object_set_defaults( NAIFactoryObject *object )
  * as an 'unset' value.
  */
 static gboolean
-set_defaults_iter( NADataDef *def, NafoDefaultIter *data )
+set_defaults_iter( FMADataDef *def, NafoDefaultIter *data )
 {
        FMADataBoxed *boxed = na_ifactory_object_get_data_boxed( data->object, def->name );
 
@@ -340,8 +340,8 @@ na_factory_object_move_boxed( NAIFactoryObject *target, const NAIFactoryObject *
 
                attach_boxed_to_object( target, boxed );
 
-               const NADataDef *src_def = fma_data_boxed_get_data_def( boxed );
-               NADataDef *tgt_def = na_factory_object_get_data_def( target, src_def->name );
+               const FMADataDef *src_def = fma_data_boxed_get_data_def( boxed );
+               FMADataDef *tgt_def = na_factory_object_get_data_def( target, src_def->name );
                fma_data_boxed_set_data_def( boxed, tgt_def );
        }
 }
@@ -361,7 +361,7 @@ na_factory_object_copy( NAIFactoryObject *target, const NAIFactoryObject *source
        GList *dest_list, *idest, *inext;
        GList *src_list, *isrc;
        FMADataBoxed *boxed;
-       const NADataDef *def;
+       const FMADataDef *def;
        void *provider, *provider_data;
 
        g_return_if_fail( NA_IS_IFACTORY_OBJECT( target ));
@@ -441,7 +441,7 @@ na_factory_object_are_equal( const NAIFactoryObject *a, const NAIFactoryObject *
        for( ia = a_list ; ia && are_equal ; ia = ia->next ){
 
                FMADataBoxed *a_boxed = FMA_DATA_BOXED( ia->data );
-               const NADataDef *a_def = fma_data_boxed_get_data_def( a_boxed );
+               const FMADataDef *a_def = fma_data_boxed_get_data_def( a_boxed );
                if( a_def->comparable ){
 
                        FMADataBoxed *b_boxed = na_ifactory_object_get_data_boxed( b, a_def->name );
@@ -461,7 +461,7 @@ na_factory_object_are_equal( const NAIFactoryObject *a, const NAIFactoryObject *
        for( ib = b_list ; ib && are_equal ; ib = ib->next ){
 
                FMADataBoxed *b_boxed = FMA_DATA_BOXED( ib->data );
-               const NADataDef *b_def = fma_data_boxed_get_data_def( b_boxed );
+               const FMADataDef *b_def = fma_data_boxed_get_data_def( b_boxed );
                if( b_def->comparable ){
 
                        FMADataBoxed *a_boxed = na_ifactory_object_get_data_boxed( a, b_def->name );
@@ -488,7 +488,7 @@ na_factory_object_is_valid( const NAIFactoryObject *object )
 {
        static const gchar *thisfn = "na_factory_object_is_valid";
        gboolean is_valid;
-       NADataGroup *groups;
+       FMADataGroup *groups;
        GList *list, *iv;
 
        g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), FALSE );
@@ -506,7 +506,7 @@ na_factory_object_is_valid( const NAIFactoryObject *object )
 
        groups = v_get_groups( object );
        if( groups ){
-               iter_on_data_defs( groups, DATA_DEF_ITER_IS_VALID, ( NADataDefIterFunc ) 
is_valid_mandatory_iter, &iter_data );
+               iter_on_data_defs( groups, DATA_DEF_ITER_IS_VALID, ( FMADataDefIterFunc ) 
is_valid_mandatory_iter, &iter_data );
        }
        is_valid = iter_data.is_valid;
 
@@ -520,7 +520,7 @@ na_factory_object_is_valid( const NAIFactoryObject *object )
 }
 
 static gboolean
-is_valid_mandatory_iter( const NADataDef *def, NafoValidIter *data )
+is_valid_mandatory_iter( const FMADataDef *def, NafoValidIter *data )
 {
        FMADataBoxed *boxed;
 
@@ -557,7 +557,7 @@ na_factory_object_dump( const NAIFactoryObject *object )
 
        for( it = list ; it ; it = it->next ){
                FMADataBoxed *boxed = FMA_DATA_BOXED( it->data );
-               const NADataDef *def = fma_data_boxed_get_data_def( boxed );
+               const FMADataDef *def = fma_data_boxed_get_data_def( boxed );
                length = MAX( length, strlen( def->name ));
        }
 
@@ -566,7 +566,7 @@ na_factory_object_dump( const NAIFactoryObject *object )
 
        for( it = list ; it ; it = it->next ){
                FMADataBoxed *boxed = FMA_DATA_BOXED( it->data );
-               const NADataDef *def = fma_data_boxed_get_data_def( boxed );
+               const FMADataDef *def = fma_data_boxed_get_data_def( boxed );
                gchar *value = fma_boxed_get_string( FMA_BOXED( boxed ));
                g_debug( "| %s: %*s=%s", thisfn, length, def->name+l_prefix, value );
                g_free( value );
@@ -603,7 +603,7 @@ na_factory_object_read_item( NAIFactoryObject *object, const NAIFactoryProvider
        g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
        g_return_if_fail( NA_IS_IFACTORY_PROVIDER( reader ));
 
-       NADataGroup *groups = v_get_groups( object );
+       FMADataGroup *groups = v_get_groups( object );
 
        if( groups ){
                v_read_start( object, reader, reader_data, messages );
@@ -614,20 +614,20 @@ na_factory_object_read_item( NAIFactoryObject *object, const NAIFactoryProvider
                iter->reader_data = reader_data;
                iter->messages = messages;
 
-               iter_on_data_defs( groups, DATA_DEF_ITER_READ_ITEM, ( NADataDefIterFunc ) read_data_iter, 
iter );
+               iter_on_data_defs( groups, DATA_DEF_ITER_READ_ITEM, ( FMADataDefIterFunc ) read_data_iter, 
iter );
 
                g_free( iter );
 
                v_read_done( object, reader, reader_data, messages );
 
        } else {
-               g_warning( "%s: class %s doesn't return any NADataGroup structure",
+               g_warning( "%s: class %s doesn't return any FMADataGroup structure",
                                thisfn, G_OBJECT_TYPE_NAME( object ));
        }
 }
 
 static gboolean
-read_data_iter( NADataDef *def, NafoReadIter *iter )
+read_data_iter( FMADataDef *def, NafoReadIter *iter )
 {
        gboolean stop;
 
@@ -667,7 +667,7 @@ na_factory_object_write_item( NAIFactoryObject *object, const NAIFactoryProvider
 {
        static const gchar *thisfn = "na_factory_object_write_item";
        guint code;
-       NADataGroup *groups;
+       FMADataGroup *groups;
        gchar *msg;
 
        g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
@@ -681,7 +681,7 @@ na_factory_object_write_item( NAIFactoryObject *object, const NAIFactoryProvider
                code = v_write_start( object, writer, writer_data, messages );
 
        } else {
-               msg = g_strdup_printf( "%s: class %s doesn't return any NADataGroup structure",
+               msg = g_strdup_printf( "%s: class %s doesn't return any FMADataGroup structure",
                                thisfn, G_OBJECT_TYPE_NAME( object ));
                g_warning( "%s", msg );
                *messages = g_slist_append( *messages, msg );
@@ -711,7 +711,7 @@ na_factory_object_write_item( NAIFactoryObject *object, const NAIFactoryProvider
 static gboolean
 write_data_iter( const NAIFactoryObject *object, FMADataBoxed *boxed, NafoWriteIter *iter )
 {
-       const NADataDef *def = fma_data_boxed_get_data_def( boxed );
+       const FMADataDef *def = fma_data_boxed_get_data_def( boxed );
 
        if( def->writable ){
                iter->code = na_factory_provider_write_data( iter->writer, iter->writer_data, object, boxed, 
iter->messages );
@@ -817,9 +817,9 @@ na_factory_object_set_from_value( NAIFactoryObject *object, const gchar *name, c
                fma_boxed_set_from_value( FMA_BOXED( boxed ), value );
 
        } else {
-               NADataDef *def = na_factory_object_get_data_def( object, name );
+               FMADataDef *def = na_factory_object_get_data_def( object, name );
                if( !def ){
-                       g_warning( "%s: unknown NADataDef %s", thisfn, name );
+                       g_warning( "%s: unknown FMADataDef %s", thisfn, name );
 
                } else {
                        boxed = fma_data_boxed_new( def );
@@ -849,9 +849,9 @@ na_factory_object_set_from_void( NAIFactoryObject *object, const gchar *name, co
                fma_boxed_set_from_void( FMA_BOXED( boxed ), data );
 
        } else {
-               NADataDef *def = na_factory_object_get_data_def( object, name );
+               FMADataDef *def = na_factory_object_get_data_def( object, name );
                if( !def ){
-                       g_warning( "%s: unknown NADataDef %s for %s", thisfn, name, G_OBJECT_TYPE_NAME( 
object ));
+                       g_warning( "%s: unknown FMADataDef %s for %s", thisfn, name, G_OBJECT_TYPE_NAME( 
object ));
 
                } else {
                        boxed = fma_data_boxed_new( def );
@@ -861,7 +861,7 @@ na_factory_object_set_from_void( NAIFactoryObject *object, const gchar *name, co
        }
 }
 
-static NADataGroup *
+static FMADataGroup *
 v_get_groups( const NAIFactoryObject *object )
 {
        if( NA_IFACTORY_OBJECT_GET_INTERFACE( object )->get_groups ){
@@ -964,10 +964,10 @@ free_data_boxed_list( NAIFactoryObject *object )
  * the iter function must return TRUE to stops the enumeration
  */
 static void
-iter_on_data_defs( const NADataGroup *groups, guint mode, NADataDefIterFunc pfn, void *user_data )
+iter_on_data_defs( const FMADataGroup *groups, guint mode, FMADataDefIterFunc pfn, void *user_data )
 {
        static const gchar *thisfn = "na_factory_object_iter_on_data_defs";
-       NADataDef *def;
+       FMADataDef *def;
        gboolean stop;
 
        stop = FALSE;
diff --git a/src/core/na-factory-object.h b/src/core/na-factory-object.h
index 368a4b3..e3ed2d4 100644
--- a/src/core/na-factory-object.h
+++ b/src/core/na-factory-object.h
@@ -46,9 +46,9 @@ typedef gboolean ( *NAFactoryObjectIterBoxedFn )( const NAIFactoryObject *object
 
 #define NA_IFACTORY_OBJECT_PROP_DATA                   "na-ifactory-object-prop-data"
 
-void         na_factory_object_define_properties( GObjectClass *class, const NADataGroup *groups );
-NADataDef   *na_factory_object_get_data_def     ( const NAIFactoryObject *object, const gchar *name );
-NADataGroup *na_factory_object_get_data_groups  ( const NAIFactoryObject *object );
+void         na_factory_object_define_properties( GObjectClass *class, const FMADataGroup *groups );
+FMADataDef   *na_factory_object_get_data_def     ( const NAIFactoryObject *object, const gchar *name );
+FMADataGroup *na_factory_object_get_data_groups  ( const NAIFactoryObject *object );
 void         na_factory_object_iter_on_boxed    ( const NAIFactoryObject *object, NAFactoryObjectIterBoxedFn 
pfn, void *user_data );
 
 gchar       *na_factory_object_get_default      ( NAIFactoryObject *object, const gchar *name );
diff --git a/src/core/na-factory-provider.c b/src/core/na-factory-provider.c
index 2a56f1a..e7e2392 100644
--- a/src/core/na-factory-provider.c
+++ b/src/core/na-factory-provider.c
@@ -40,7 +40,7 @@
  * @reader: the instance which implements this #NAIFactoryProvider interface.
  * @reader_data: instance data.
  * @object: the #NAIFactoryobject being unserialized.
- * @def: a #NADataDef structure which identifies the data to be unserialized.
+ * @def: a #FMADataDef structure which identifies the data to be unserialized.
  * @messages: a pointer to a #GSList list of strings; the implementation
  *  may append messages to this list, but shouldn't reinitialize it.
  *
@@ -50,7 +50,7 @@
  */
 FMADataBoxed *
 na_factory_provider_read_data( const NAIFactoryProvider *reader, void *reader_data,
-                                                               const NAIFactoryObject *object, const 
NADataDef *def,
+                                                               const NAIFactoryObject *object, const 
FMADataDef *def,
                                                                GSList **messages )
 {
        FMADataBoxed *boxed;
diff --git a/src/core/na-factory-provider.h b/src/core/na-factory-provider.h
index edc960b..b02c730 100644
--- a/src/core/na-factory-provider.h
+++ b/src/core/na-factory-provider.h
@@ -43,7 +43,7 @@
 G_BEGIN_DECLS
 
 FMADataBoxed *na_factory_provider_read_data ( const NAIFactoryProvider *reader, void *reader_data,
-                                                                       const NAIFactoryObject *object, const 
NADataDef *def,
+                                                                       const NAIFactoryObject *object, const 
FMADataDef *def,
                                                                        GSList **messages );
 
 guint        na_factory_provider_write_data( const NAIFactoryProvider *writer, void *writer_data,
diff --git a/src/core/na-icontext-factory.c b/src/core/na-icontext-factory.c
index 6b1745a..b564a5a 100644
--- a/src/core/na-icontext-factory.c
+++ b/src/core/na-icontext-factory.c
@@ -34,15 +34,15 @@
 #include <glib/gi18n.h>
 
 #include <api/na-ifactory-object-data.h>
-#include <api/na-data-def.h>
-#include <api/na-data-types.h>
+#include <api/fma-data-def.h>
+#include <api/fma-data-types.h>
 
 /*
  * As of 3.2 non copyables data are:
  * - multiple flag
  */
 
-NADataDef data_def_conditions [] = {
+FMADataDef data_def_conditions [] = {
 
        { NAFO_DATA_BASENAMES,
                                TRUE,
diff --git a/src/core/na-ifactory-object.c b/src/core/na-ifactory-object.c
index b0780c5..8bad586 100644
--- a/src/core/na-ifactory-object.c
+++ b/src/core/na-ifactory-object.c
@@ -164,7 +164,7 @@ na_ifactory_object_get_data_boxed( const NAIFactoryObject *object, const gchar *
 
        for( ip = list ; ip ; ip = ip->next ){
                FMADataBoxed *boxed = FMA_DATA_BOXED( ip->data );
-               const NADataDef *def = fma_data_boxed_get_data_def( boxed );
+               const FMADataDef *def = fma_data_boxed_get_data_def( boxed );
 
                if( !strcmp( def->name, name )){
                        return( boxed );
@@ -178,17 +178,17 @@ na_ifactory_object_get_data_boxed( const NAIFactoryObject *object, const gchar *
  * na_ifactory_object_get_data_groups:
  * @object: a #NAIFactoryObject object.
  *
- * The returned #NADataGroup is owned by the #NAIFactoryObject @object,
+ * The returned #FMADataGroup is owned by the #NAIFactoryObject @object,
  * and should not be released by the caller.
  *
- * Returns: The #NADataGroup groups definition, or %NULL.
+ * Returns: The #FMADataGroup groups definition, or %NULL.
  *
  * Since: 2.30
  */
-NADataGroup *
+FMADataGroup *
 na_ifactory_object_get_data_groups( const NAIFactoryObject *object )
 {
-       NADataGroup *groups;
+       FMADataGroup *groups;
 
        g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NULL );
 
diff --git a/src/core/na-object-action-factory.c b/src/core/na-object-action-factory.c
index 5d0cb67..16566e7 100644
--- a/src/core/na-object-action-factory.c
+++ b/src/core/na-object-action-factory.c
@@ -34,19 +34,19 @@
 #include <glib/gi18n.h>
 
 #include <api/na-ifactory-object-data.h>
-#include <api/na-data-def.h>
-#include <api/na-data-types.h>
+#include <api/fma-data-def.h>
+#include <api/fma-data-types.h>
 
 /*
  * As of 3.2 non copyables data are:
  * - n/a
  */
 
-extern NADataDef data_def_id [];                       /* defined in na-object-id-factory.c */
-extern NADataDef data_def_item [];                     /* defined in na-object-item-factory.c */
-extern NADataDef data_def_conditions [];       /* defined in na-icontext-factory.c */
+extern FMADataDef data_def_id [];                      /* defined in na-object-id-factory.c */
+extern FMADataDef data_def_item [];                    /* defined in na-object-item-factory.c */
+extern FMADataDef data_def_conditions [];      /* defined in na-icontext-factory.c */
 
-static NADataDef data_def_action [] = {
+static FMADataDef data_def_action [] = {
 
        /* this version number, expressed as a string, is obsoleted starting with .desktop
         * files introduction ; it is replaced by an integer version number, at the item level
@@ -233,7 +233,7 @@ static NADataDef data_def_action [] = {
  * these are obsoleted since 1.9 (which was a non-official version)
  * readable but non writable, no default, not copyable
  */
-NADataDef data_def_action_v1 [] = {
+FMADataDef data_def_action_v1 [] = {
 
        { NAFO_DATA_PATH,
                                TRUE,
@@ -436,7 +436,7 @@ NADataDef data_def_action_v1 [] = {
        { NULL },
 };
 
-NADataGroup action_data_groups [] = {
+FMADataGroup action_data_groups [] = {
        { NA_FACTORY_OBJECT_ID_GROUP,         data_def_id },
        { NA_FACTORY_OBJECT_ITEM_GROUP,       data_def_item },
        { NA_FACTORY_OBJECT_ACTION_GROUP,     data_def_action },
diff --git a/src/core/na-object-action.c b/src/core/na-object-action.c
index 6a90afd..626da4e 100644
--- a/src/core/na-object-action.c
+++ b/src/core/na-object-action.c
@@ -58,8 +58,8 @@ struct _NAObjectActionPrivate {
 /* i18n: default label for a new action */
 #define NEW_NAUTILUS_ACTION                            N_( "New Nautilus action" )
 
-extern NADataGroup action_data_groups [];              /* defined in na-object-action-factory.c */
-extern NADataDef   data_def_action_v1 [];              /* defined in na-object-action-factory.c */
+extern FMADataGroup action_data_groups [];             /* defined in na-object-action-factory.c */
+extern FMADataDef   data_def_action_v1 [];             /* defined in na-object-action-factory.c */
 
 static NAObjectItemClass *st_parent_class = NULL;
 
@@ -77,7 +77,7 @@ static gboolean     object_is_valid( const NAObject *object );
 
 static void         ifactory_object_iface_init( NAIFactoryObjectInterface *iface, void *user_data );
 static guint        ifactory_object_get_version( const NAIFactoryObject *instance );
-static NADataGroup *ifactory_object_get_groups( const NAIFactoryObject *instance );
+static FMADataGroup *ifactory_object_get_groups( const NAIFactoryObject *instance );
 static void         ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider *reader, 
void *reader_data, GSList **messages );
 static guint        ifactory_object_write_start( NAIFactoryObject *instance, const NAIFactoryProvider 
*writer, void *writer_data, GSList **messages );
 static guint        ifactory_object_write_done( NAIFactoryObject *instance, const NAIFactoryProvider 
*writer, void *writer_data, GSList **messages );
@@ -369,7 +369,7 @@ ifactory_object_get_version( const NAIFactoryObject *instance )
        return( 1 );
 }
 
-static NADataGroup *
+static FMADataGroup *
 ifactory_object_get_groups( const NAIFactoryObject *instance )
 {
        return( action_data_groups );
@@ -464,7 +464,7 @@ read_done_convert_v1_to_v2( NAIFactoryObject *instance )
 {
        static const gchar *thisfn = "na_object_action_read_done_read_done_convert_v1_to_last";
        GList *to_move;
-       NADataDef *def;
+       FMADataDef *def;
        FMADataBoxed *boxed;
        GList *ibox;
        NAObjectProfile *profile;
diff --git a/src/core/na-object-id-factory.c b/src/core/na-object-id-factory.c
index 9427b00..0e9e825 100644
--- a/src/core/na-object-id-factory.c
+++ b/src/core/na-object-id-factory.c
@@ -32,15 +32,15 @@
 #endif
 
 #include <api/na-ifactory-object-data.h>
-#include <api/na-data-def.h>
-#include <api/na-data-types.h>
+#include <api/fma-data-def.h>
+#include <api/fma-data-types.h>
 
 /*
  * As of 3.2 non copyables data are:
  * - the parent pointer
  */
 
-NADataDef data_def_id [] = {
+FMADataDef data_def_id [] = {
 
        /* this data is marked non readable / non writable as it has to be read
         * written specifically when serializing / deserializing items
diff --git a/src/core/na-object-item-factory.c b/src/core/na-object-item-factory.c
index 238a43a..23c999c 100644
--- a/src/core/na-object-item-factory.c
+++ b/src/core/na-object-item-factory.c
@@ -34,8 +34,8 @@
 #include <glib/gi18n.h>
 
 #include <api/na-ifactory-object-data.h>
-#include <api/na-data-def.h>
-#include <api/na-data-types.h>
+#include <api/fma-data-def.h>
+#include <api/fma-data-types.h>
 
 /*
  * As of 3.2 non copyables data are:
@@ -45,7 +45,7 @@
  * - read-only status
  */
 
-NADataDef data_def_item [] = {
+FMADataDef data_def_item [] = {
 
        /* this data is marked as non readable as it has to be read specifically
         * in order to be able to create the corresponding NAObjectItem-derived
diff --git a/src/core/na-object-menu-factory.c b/src/core/na-object-menu-factory.c
index bb84def..94399de 100644
--- a/src/core/na-object-menu-factory.c
+++ b/src/core/na-object-menu-factory.c
@@ -32,23 +32,23 @@
 #endif
 
 #include <api/na-ifactory-object-data.h>
-#include <api/na-data-def.h>
-#include <api/na-data-types.h>
+#include <api/fma-data-def.h>
+#include <api/fma-data-types.h>
 
-extern NADataDef data_def_id [];                       /* defined in na-object-id-factory.c */
-extern NADataDef data_def_item [];                     /* defined in na-object-item-factory.c */
-extern NADataDef data_def_conditions [];       /* defined in na-icontext-factory.c */
+extern FMADataDef data_def_id [];                      /* defined in na-object-id-factory.c */
+extern FMADataDef data_def_item [];                    /* defined in na-object-item-factory.c */
+extern FMADataDef data_def_conditions [];      /* defined in na-icontext-factory.c */
 
 /*
  * As of 3.2 non copyables data are:
  * - n/a
  */
 
-static NADataDef data_def_menu [] = {
+static FMADataDef data_def_menu [] = {
        { NULL },
 };
 
-NADataGroup menu_data_groups [] = {
+FMADataGroup menu_data_groups [] = {
        { NA_FACTORY_OBJECT_ID_GROUP,         data_def_id },
        { NA_FACTORY_OBJECT_ITEM_GROUP,       data_def_item },
        { NA_FACTORY_OBJECT_MENU_GROUP,       data_def_menu },
diff --git a/src/core/na-object-menu.c b/src/core/na-object-menu.c
index 011ef30..0fa599c 100644
--- a/src/core/na-object-menu.c
+++ b/src/core/na-object-menu.c
@@ -56,7 +56,7 @@ struct _NAObjectMenuPrivate {
 /* i18n: default label for a new menu */
 #define NEW_NAUTILUS_MENU                              N_( "New Nautilus menu" )
 
-extern NADataGroup menu_data_groups [];                        /* defined in na-item-menu-factory.c */
+extern FMADataGroup menu_data_groups [];                       /* defined in na-item-menu-factory.c */
 
 static NAObjectItemClass *st_parent_class = NULL;
 
@@ -72,7 +72,7 @@ static void         object_dump( const NAObject *object );
 
 static void         ifactory_object_iface_init( NAIFactoryObjectInterface *iface, void *user_data );
 static guint        ifactory_object_get_version( const NAIFactoryObject *instance );
-static NADataGroup *ifactory_object_get_groups( const NAIFactoryObject *instance );
+static FMADataGroup *ifactory_object_get_groups( const NAIFactoryObject *instance );
 static void         ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider *reader, 
void *reader_data, GSList **messages );
 static guint        ifactory_object_write_start( NAIFactoryObject *instance, const NAIFactoryProvider 
*writer, void *writer_data, GSList **messages );
 static guint        ifactory_object_write_done( NAIFactoryObject *instance, const NAIFactoryProvider 
*writer, void *writer_data, GSList **messages );
@@ -285,7 +285,7 @@ ifactory_object_get_version( const NAIFactoryObject *instance )
        return( 1 );
 }
 
-static NADataGroup *
+static FMADataGroup *
 ifactory_object_get_groups( const NAIFactoryObject *instance )
 {
        return( menu_data_groups );
diff --git a/src/core/na-object-profile-factory.c b/src/core/na-object-profile-factory.c
index 3615f4b..8d80348 100644
--- a/src/core/na-object-profile-factory.c
+++ b/src/core/na-object-profile-factory.c
@@ -34,13 +34,13 @@
 #include <glib/gi18n.h>
 
 #include <api/na-ifactory-object-data.h>
-#include <api/na-data-def.h>
-#include <api/na-data-types.h>
+#include <api/fma-data-def.h>
+#include <api/fma-data-types.h>
 
-extern NADataDef data_def_id [];                       /* defined in na-object-id-factory.c */
-extern NADataDef data_def_conditions [];       /* defined in na-icontext-factory.c */
+extern FMADataDef data_def_id [];                      /* defined in na-object-id-factory.c */
+extern FMADataDef data_def_conditions [];      /* defined in na-icontext-factory.c */
 
-static NADataDef data_def_profile [] = {
+static FMADataDef data_def_profile [] = {
 
        { NAFO_DATA_DESCNAME,
                                TRUE,
@@ -311,7 +311,7 @@ static NADataDef data_def_profile [] = {
        { NULL },
 };
 
-NADataGroup profile_data_groups [] = {
+FMADataGroup profile_data_groups [] = {
        { NA_FACTORY_OBJECT_ID_GROUP,         data_def_id },
        { NA_FACTORY_OBJECT_PROFILE_GROUP,    data_def_profile },
        { NA_FACTORY_OBJECT_CONDITIONS_GROUP, data_def_conditions },
diff --git a/src/core/na-object-profile.c b/src/core/na-object-profile.c
index e6df942..7b7d1cb 100644
--- a/src/core/na-object-profile.c
+++ b/src/core/na-object-profile.c
@@ -64,7 +64,7 @@ struct _NAObjectProfilePrivate {
 #define na_object_is_dir( obj )                                (( gboolean ) GPOINTER_TO_UINT( 
na_ifactory_object_get_as_void( NA_IFACTORY_OBJECT( obj ), NAFO_DATA_ISDIR )))
 #define na_object_is_multiple( obj )           (( gboolean ) GPOINTER_TO_UINT( 
na_ifactory_object_get_as_void( NA_IFACTORY_OBJECT( obj ), NAFO_DATA_MULTIPLE )))
 
-extern NADataGroup profile_data_groups [];     /* defined in na-item-profile-factory.c */
+extern FMADataGroup profile_data_groups [];    /* defined in na-item-profile-factory.c */
 
 static NAObjectIdClass *st_parent_class = NULL;
 
@@ -81,7 +81,7 @@ static gboolean     object_is_valid( const NAObject *object );
 
 static void         ifactory_object_iface_init( NAIFactoryObjectInterface *iface, void *user_data );
 static guint        ifactory_object_get_version( const NAIFactoryObject *instance );
-static NADataGroup *ifactory_object_get_groups( const NAIFactoryObject *instance );
+static FMADataGroup *ifactory_object_get_groups( const NAIFactoryObject *instance );
 static void         ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider *reader, 
void *reader_data, GSList **messages );
 static guint        ifactory_object_write_done( NAIFactoryObject *instance, const NAIFactoryProvider 
*writer, void *writer_data, GSList **messages );
 
@@ -334,7 +334,7 @@ ifactory_object_get_version( const NAIFactoryObject *instance )
        return( 1 );
 }
 
-static NADataGroup *
+static FMADataGroup *
 ifactory_object_get_groups( const NAIFactoryObject *instance )
 {
        return( profile_data_groups );
diff --git a/src/core/na-settings.c b/src/core/na-settings.c
index d76cbab..bab280e 100644
--- a/src/core/na-settings.c
+++ b/src/core/na-settings.c
@@ -37,7 +37,7 @@
 #include <strings.h>
 
 #include "api/fma-boxed.h"
-#include "api/na-data-types.h"
+#include "api/fma-data-types.h"
 #include "api/fma-core-utils.h"
 #include "api/na-timeout.h"
 
diff --git a/src/io-desktop/nadp-keys.h b/src/io-desktop/nadp-keys.h
index e971f8d..e7f310d 100644
--- a/src/io-desktop/nadp-keys.h
+++ b/src/io-desktop/nadp-keys.h
@@ -30,7 +30,7 @@
 #ifndef __NADP_KEYS_H__
 #define __NADP_KEYS_H__
 
-#include <api/na-data-def.h>
+#include <api/fma-data-def.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/io-desktop/nadp-reader.c b/src/io-desktop/nadp-reader.c
index 2ae9839..3a5de59 100644
--- a/src/io-desktop/nadp-reader.c
+++ b/src/io-desktop/nadp-reader.c
@@ -36,7 +36,7 @@
 #include <string.h>
 
 #include <api/fma-core-utils.h>
-#include <api/na-data-types.h>
+#include <api/fma-data-types.h>
 #include <api/na-ifactory-object-data.h>
 #include <api/na-ifactory-provider.h>
 #include <api/na-object-api.h>
@@ -483,7 +483,7 @@ read_start_profile_attach_profile( const NAIFactoryProvider *provider, NAObjectP
  * letting the caller deal with default values
  */
 FMADataBoxed *
-nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void *reader_data, const 
NAIFactoryObject *object, const NADataDef *def, GSList **messages )
+nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void *reader_data, const 
NAIFactoryObject *object, const FMADataDef *def, GSList **messages )
 {
        static const gchar *thisfn = "nadp_reader_ifactory_provider_read_data";
        FMADataBoxed *boxed;
diff --git a/src/io-desktop/nadp-reader.h b/src/io-desktop/nadp-reader.h
index 131b20a..283a359 100644
--- a/src/io-desktop/nadp-reader.h
+++ b/src/io-desktop/nadp-reader.h
@@ -41,7 +41,7 @@ GList       *nadp_iio_provider_read_items            ( const NAIIOProvider *prov
 guint        nadp_reader_iimporter_import_from_uri   ( const NAIImporter *instance, void *parms_ptr );
 
 void         nadp_reader_ifactory_provider_read_start( const NAIFactoryProvider *reader, void *reader_data, 
const NAIFactoryObject *serializable, GSList **messages );
-FMADataBoxed *nadp_reader_ifactory_provider_read_data ( const NAIFactoryProvider *reader, void *reader_data, 
const NAIFactoryObject *serializable, const NADataDef *iddef, GSList **messages );
+FMADataBoxed *nadp_reader_ifactory_provider_read_data ( const NAIFactoryProvider *reader, void *reader_data, 
const NAIFactoryObject *serializable, const FMADataDef *iddef, GSList **messages );
 void         nadp_reader_ifactory_provider_read_done ( const NAIFactoryProvider *reader, void *reader_data, 
const NAIFactoryObject *serializable, GSList **messages );
 
 G_END_DECLS
diff --git a/src/io-desktop/nadp-writer.c b/src/io-desktop/nadp-writer.c
index f127588..9117e41 100644
--- a/src/io-desktop/nadp-writer.c
+++ b/src/io-desktop/nadp-writer.c
@@ -35,7 +35,7 @@
 #include <string.h>
 
 #include <api/fma-core-utils.h>
-#include <api/na-data-types.h>
+#include <api/fma-data-types.h>
 #include <api/na-object-api.h>
 #include <api/na-ifactory-provider.h>
 
@@ -505,7 +505,7 @@ nadp_writer_ifactory_provider_write_data(
        static const gchar *thisfn = "nadp_writer_ifactory_provider_write_data";
        NadpDesktopFile *ndf;
        guint code;
-       const NADataDef *def;
+       const FMADataDef *def;
        gchar *profile_id;
        gchar *group_name;
        gchar *str_value;
diff --git a/src/io-gconf/nagp-reader.c b/src/io-gconf/nagp-reader.c
index 49ed101..8fd3450 100644
--- a/src/io-gconf/nagp-reader.c
+++ b/src/io-gconf/nagp-reader.c
@@ -33,8 +33,8 @@
 
 #include <string.h>
 
-#include <api/na-data-def.h>
-#include <api/na-data-types.h>
+#include <api/fma-data-def.h>
+#include <api/fma-data-types.h>
 #include <api/na-ifactory-provider.h>
 #include <api/na-iio-provider.h>
 #include <api/na-object-api.h>
@@ -60,7 +60,7 @@ static gboolean      read_done_item_is_writable( const NAIFactoryProvider *provi
 static void          read_done_action_read_profiles( const NAIFactoryProvider *provider, NAObjectAction 
*action, ReaderData *data, GSList **messages );
 static void          read_done_action_load_profile( const NAIFactoryProvider *provider, ReaderData *data, 
const gchar *path, GSList **messages );
 
-static FMADataBoxed  *get_boxed_from_path( const NagpGConfProvider *provider, const gchar *path, ReaderData 
*reader_data, const NADataDef *def );
+static FMADataBoxed  *get_boxed_from_path( const NagpGConfProvider *provider, const gchar *path, ReaderData 
*reader_data, const FMADataDef *def );
 static gboolean      is_key_writable( NagpGConfProvider *gconf, const gchar *key );
 
 /*
@@ -196,7 +196,7 @@ read_start_profile_attach_profile( const NAIFactoryProvider *provider, NAObjectP
 }
 
 FMADataBoxed *
-nagp_reader_read_data( const NAIFactoryProvider *provider, void *reader_data, const NAIFactoryObject 
*object, const NADataDef *def, GSList **messages )
+nagp_reader_read_data( const NAIFactoryProvider *provider, void *reader_data, const NAIFactoryObject 
*object, const FMADataDef *def, GSList **messages )
 {
        static const gchar *thisfn = "nagp_reader_read_data";
        FMADataBoxed *boxed;
@@ -211,7 +211,7 @@ nagp_reader_read_data( const NAIFactoryProvider *provider, void *reader_data, co
                        def->name );*/
 
        if( !def->gconf_entry || !strlen( def->gconf_entry )){
-               g_warning( "%s: GConf entry is not set for NADataDef %s", thisfn, def->name );
+               g_warning( "%s: GConf entry is not set for FMADataDef %s", thisfn, def->name );
                return( NULL );
        }
 
@@ -356,7 +356,7 @@ read_done_action_load_profile( const NAIFactoryProvider *provider, ReaderData *d
 }
 
 static FMADataBoxed *
-get_boxed_from_path( const NagpGConfProvider *provider, const gchar *path, ReaderData *reader_data, const 
NADataDef *def )
+get_boxed_from_path( const NagpGConfProvider *provider, const gchar *path, ReaderData *reader_data, const 
FMADataDef *def )
 {
        static const gchar *thisfn = "nagp_reader_get_boxed_from_path";
        FMADataBoxed *boxed;
diff --git a/src/io-gconf/nagp-reader.h b/src/io-gconf/nagp-reader.h
index 6db0597..9a9c0b1 100644
--- a/src/io-gconf/nagp-reader.h
+++ b/src/io-gconf/nagp-reader.h
@@ -38,7 +38,7 @@ G_BEGIN_DECLS
 GList       *nagp_iio_provider_read_items( const NAIIOProvider *provider, GSList **messages );
 
 void         nagp_reader_read_start( const NAIFactoryProvider *provider, void *reader_data, const 
NAIFactoryObject *object, GSList **messages  );
-FMADataBoxed *nagp_reader_read_data ( const NAIFactoryProvider *provider, void *reader_data, const 
NAIFactoryObject *object, const NADataDef *def, GSList **messages );
+FMADataBoxed *nagp_reader_read_data ( const NAIFactoryProvider *provider, void *reader_data, const 
NAIFactoryObject *object, const FMADataDef *def, GSList **messages );
 void         nagp_reader_read_done ( const NAIFactoryProvider *provider, void *reader_data, const 
NAIFactoryObject *object, GSList **messages  );
 
 G_END_DECLS
diff --git a/src/io-gconf/nagp-writer.c b/src/io-gconf/nagp-writer.c
index 9f58133..0593b6f 100644
--- a/src/io-gconf/nagp-writer.c
+++ b/src/io-gconf/nagp-writer.c
@@ -33,8 +33,8 @@
 
 #include <string.h>
 
-#include <api/na-data-def.h>
-#include <api/na-data-types.h>
+#include <api/fma-data-def.h>
+#include <api/fma-data-types.h>
 #include <api/na-iio-provider.h>
 #include <api/na-ifactory-provider.h>
 #include <api/na-object-api.h>
@@ -285,7 +285,7 @@ nagp_writer_write_data( const NAIFactoryProvider *provider, void *writer_data,
 {
        static const gchar *thisfn = "nagp_writer_write_data";
        guint code;
-       const NADataDef *def;
+       const FMADataDef *def;
        gchar *this_id;
        gchar *this_path, *path;
        gchar *msg;
diff --git a/src/io-xml/naxml-keys.h b/src/io-xml/naxml-keys.h
index 8d7e513..e1a28a0 100644
--- a/src/io-xml/naxml-keys.h
+++ b/src/io-xml/naxml-keys.h
@@ -30,7 +30,7 @@
 #ifndef __NAXML_KEYS_H__
 #define __NAXML_KEYS_H__
 
-#include <api/na-data-def.h>
+#include <api/fma-data-def.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/io-xml/naxml-reader.c b/src/io-xml/naxml-reader.c
index f92efc3..4d18e8f 100644
--- a/src/io-xml/naxml-reader.c
+++ b/src/io-xml/naxml-reader.c
@@ -37,7 +37,7 @@
 
 #include <api/fma-core-utils.h>
 #include <api/na-gconf-utils.h>
-#include <api/na-data-types.h>
+#include <api/fma-data-types.h>
 #include <api/na-ifactory-provider.h>
 #include <api/na-object-api.h>
 
@@ -64,7 +64,7 @@ typedef struct {
        guint   ( *fn_list_parms )     ( NAXMLReader *, xmlNode * );
        guint   ( *fn_element_parms )  ( NAXMLReader *, xmlNode * );
        guint   ( *fn_element_content )( NAXMLReader *, xmlNode * );
-       gchar * ( *fn_get_value )      ( NAXMLReader *, xmlNode *, const NADataDef *def );
+       gchar * ( *fn_get_value )      ( NAXMLReader *, xmlNode *, const FMADataDef *def );
 }
        RootNodeStr;
 
@@ -110,12 +110,12 @@ static NAXMLReader  *reader_new( void );
 static guint         schema_parse_schema_content( NAXMLReader *reader, xmlNode *node );
 static void          schema_check_for_id( NAXMLReader *reader, xmlNode *iter );
 static void          schema_check_for_type( NAXMLReader *reader, xmlNode *iter );
-static gchar        *schema_read_value( NAXMLReader *reader, xmlNode *node, const NADataDef *def );
+static gchar        *schema_read_value( NAXMLReader *reader, xmlNode *node, const FMADataDef *def );
 
 static guint         dump_parse_list_parms( NAXMLReader *reader, xmlNode *node );
 static guint         dump_parse_entry_content( NAXMLReader *reader, xmlNode *node );
 static void          dump_check_for_type( NAXMLReader *reader, xmlNode *key_node );
-static gchar        *dump_read_value( NAXMLReader *reader, xmlNode *node, const NADataDef *def );
+static gchar        *dump_read_value( NAXMLReader *reader, xmlNode *node, const FMADataDef *def );
 
 static RootNodeStr st_root_node_str[] = {
 
@@ -155,7 +155,7 @@ static RootNodeStr st_root_node_str[] = {
 
 static void          read_start_profile_attach_profile( NAXMLReader *reader, NAObjectProfile *profile );
 static gboolean      read_data_is_path_adhoc_for_object( NAXMLReader *reader, const NAIFactoryObject 
*object, xmlChar *text );
-static FMADataBoxed  *read_data_boxed_from_node( NAXMLReader *reader, xmlChar *text, xmlNode *parent, const 
NADataDef *def );
+static FMADataBoxed  *read_data_boxed_from_node( NAXMLReader *reader, xmlChar *text, xmlNode *parent, const 
FMADataDef *def );
 static void          read_done_item_set_localized_icon( NAXMLReader *reader, NAObjectItem *item );
 static void          read_done_action_read_profiles( NAXMLReader *reader, NAObjectAction *action );
 static gchar        *read_done_action_get_next_profile_id( NAXMLReader *reader );
@@ -630,7 +630,7 @@ read_start_profile_attach_profile( NAXMLReader *reader, NAObjectProfile *profile
  * versions). So do not remove dealt-with nodes here
  */
 FMADataBoxed *
-naxml_reader_read_data( const NAIFactoryProvider *provider, void *reader_data, const NAIFactoryObject 
*object, const NADataDef *def, GSList **messages )
+naxml_reader_read_data( const NAIFactoryProvider *provider, void *reader_data, const NAIFactoryObject 
*object, const FMADataDef *def, GSList **messages )
 {
        static const gchar *thisfn = "naxml_reader_read_data";
        xmlNode *parent_node;
@@ -643,7 +643,7 @@ naxml_reader_read_data( const NAIFactoryProvider *provider, void *reader_data, c
                        thisfn, ( void * ) reader_data, ( void * ) object, G_OBJECT_TYPE_NAME( object ), 
def->name );
 
        if( !def->gconf_entry || !strlen( def->gconf_entry )){
-               g_warning( "%s: GConf entry is not set for NADataDef %s", thisfn, def->name );
+               g_warning( "%s: GConf entry is not set for FMADataDef %s", thisfn, def->name );
                return( NULL );
        }
 
@@ -724,7 +724,7 @@ read_data_is_path_adhoc_for_object( NAXMLReader *reader, const NAIFactoryObject
 }
 
 static FMADataBoxed *
-read_data_boxed_from_node( NAXMLReader *reader, xmlChar *path, xmlNode *parent, const NADataDef *def )
+read_data_boxed_from_node( NAXMLReader *reader, xmlChar *path, xmlNode *parent, const FMADataDef *def )
 {
        FMADataBoxed *boxed;
        gchar *entry;
@@ -1084,7 +1084,7 @@ schema_check_for_type( NAXMLReader *reader, xmlNode *iter )
 }
 
 static gchar *
-schema_read_value( NAXMLReader *reader, xmlNode *node, const NADataDef *def )
+schema_read_value( NAXMLReader *reader, xmlNode *node, const FMADataDef *def )
 {
        gchar *value;
 
@@ -1211,7 +1211,7 @@ dump_check_for_type( NAXMLReader *reader, xmlNode *key_node )
  * string list is converted to GSList, then to a FMABoxed string list 'value;value'
  */
 static gchar *
-dump_read_value( NAXMLReader *reader, xmlNode *node, const NADataDef *def )
+dump_read_value( NAXMLReader *reader, xmlNode *node, const FMADataDef *def )
 {
        gchar *string;
        GSList *slist;
diff --git a/src/io-xml/naxml-reader.h b/src/io-xml/naxml-reader.h
index 6f68737..50528d0 100644
--- a/src/io-xml/naxml-reader.h
+++ b/src/io-xml/naxml-reader.h
@@ -80,7 +80,7 @@ GType        naxml_reader_get_type( void );
 guint        naxml_reader_import_from_uri( const NAIImporter *instance, void *parms_ptr );
 
 void         naxml_reader_read_start( const NAIFactoryProvider *provider, void *reader_data, const 
NAIFactoryObject *object, GSList **messages  );
-FMADataBoxed *naxml_reader_read_data ( const NAIFactoryProvider *provider, void *reader_data, const 
NAIFactoryObject *object, const NADataDef *def, GSList **messages );
+FMADataBoxed *naxml_reader_read_data ( const NAIFactoryProvider *provider, void *reader_data, const 
NAIFactoryObject *object, const FMADataDef *def, GSList **messages );
 void         naxml_reader_read_done ( const NAIFactoryProvider *provider, void *reader_data, const 
NAIFactoryObject *object, GSList **messages  );
 
 G_END_DECLS
diff --git a/src/io-xml/naxml-writer.c b/src/io-xml/naxml-writer.c
index 3b74357..44a682b 100644
--- a/src/io-xml/naxml-writer.c
+++ b/src/io-xml/naxml-writer.c
@@ -37,7 +37,7 @@
 #include <string.h>
 
 #include <api/fma-core-utils.h>
-#include <api/na-data-types.h>
+#include <api/fma-data-types.h>
 #include <api/na-object-api.h>
 #include <api/na-ifactory-provider.h>
 #include <api/na-iio-provider.h>
@@ -87,8 +87,8 @@ struct ExportFormatFn {
        gchar  *list_node;
        void ( *write_list_attribs_fn )( NAXMLWriter *, const NAObjectItem * );
        gchar  *element_node;
-       void ( *write_data_fn )( NAXMLWriter *, const NAObjectId *, const FMADataBoxed *, const NADataDef * );
-       void ( *write_type_fn )( NAXMLWriter *, const NAObjectItem *, const NADataDef *, const gchar * );
+       void ( *write_data_fn )( NAXMLWriter *, const NAObjectId *, const FMADataBoxed *, const FMADataDef * 
);
+       void ( *write_type_fn )( NAXMLWriter *, const NAObjectItem *, const FMADataDef *, const gchar * );
 };
 
 static GObjectClass *st_parent_class = NULL;
@@ -99,19 +99,19 @@ static void            instance_init( GTypeInstance *instance, gpointer klass );
 static void            instance_dispose( GObject *object );
 static void            instance_finalize( GObject *object );
 
-static void            write_start_write_type( NAXMLWriter *writer, NAObjectItem *object, const NADataGroup 
*groups );
-static void            write_start_write_version( NAXMLWriter *writer, NAObjectItem *object, const 
NADataGroup *groups );
+static void            write_start_write_type( NAXMLWriter *writer, NAObjectItem *object, const FMADataGroup 
*groups );
+static void            write_start_write_version( NAXMLWriter *writer, NAObjectItem *object, const 
FMADataGroup *groups );
 
-static void            write_data_schema_v1( NAXMLWriter *writer, const NAObjectId *object, const 
FMADataBoxed *boxed, const NADataDef *def );
-static void            write_data_schema_v1_element( NAXMLWriter *writer, const NADataDef *def );
-static void            write_type_schema_v1( NAXMLWriter *writer, const NAObjectItem *object, const 
NADataDef *def, const gchar *value );
-static void            write_data_schema_v2( NAXMLWriter *writer, const NAObjectId *object, const 
FMADataBoxed *boxed, const NADataDef *def );
-static void            write_data_schema_v2_element( NAXMLWriter *writer, const NADataDef *def, const gchar 
*object_id, const gchar *value_str );
-static void            write_type_schema_v2( NAXMLWriter *writer, const NAObjectItem *object, const 
NADataDef *def, const gchar *value );
+static void            write_data_schema_v1( NAXMLWriter *writer, const NAObjectId *object, const 
FMADataBoxed *boxed, const FMADataDef *def );
+static void            write_data_schema_v1_element( NAXMLWriter *writer, const FMADataDef *def );
+static void            write_type_schema_v1( NAXMLWriter *writer, const NAObjectItem *object, const 
FMADataDef *def, const gchar *value );
+static void            write_data_schema_v2( NAXMLWriter *writer, const NAObjectId *object, const 
FMADataBoxed *boxed, const FMADataDef *def );
+static void            write_data_schema_v2_element( NAXMLWriter *writer, const FMADataDef *def, const gchar 
*object_id, const gchar *value_str );
+static void            write_type_schema_v2( NAXMLWriter *writer, const NAObjectItem *object, const 
FMADataDef *def, const gchar *value );
 static void            write_list_attribs_dump( NAXMLWriter *writer, const NAObjectItem *object );
-static void            write_data_dump( NAXMLWriter *writer, const NAObjectId *object, const FMADataBoxed 
*boxed, const NADataDef *def );
-static void            write_data_dump_element( NAXMLWriter *writer, const NADataDef *def, const 
FMADataBoxed *boxed, const gchar *entry, const gchar *value_str );
-static void            write_type_dump( NAXMLWriter *writer, const NAObjectItem *object, const NADataDef 
*def, const gchar *value );
+static void            write_data_dump( NAXMLWriter *writer, const NAObjectId *object, const FMADataBoxed 
*boxed, const FMADataDef *def );
+static void            write_data_dump_element( NAXMLWriter *writer, const FMADataDef *def, const 
FMADataBoxed *boxed, const gchar *entry, const gchar *value_str );
+static void            write_type_dump( NAXMLWriter *writer, const NAObjectItem *object, const FMADataDef 
*def, const gchar *value );
 
 static xmlDocPtr       build_xml_doc( NAXMLWriter *writer );
 static gchar          *convert_to_gconf_slist( const gchar *str );
@@ -412,7 +412,7 @@ guint
 naxml_writer_write_start( const NAIFactoryProvider *provider, void *writer_data, const NAIFactoryObject 
*object, GSList **messages  )
 {
        NAXMLWriter *writer;
-       NADataGroup *groups;
+       FMADataGroup *groups;
 
        g_debug( "naxml_writer_write_start: object=%p (%s)", ( void * ) object, G_OBJECT_TYPE_NAME( object ));
 
@@ -439,29 +439,29 @@ naxml_writer_write_start( const NAIFactoryProvider *provider, void *writer_data,
  * explicitly write the 'Type' node
  */
 static void
-write_start_write_type( NAXMLWriter *writer, NAObjectItem *object, const NADataGroup *groups )
+write_start_write_type( NAXMLWriter *writer, NAObjectItem *object, const FMADataGroup *groups )
 {
-       const NADataDef *def;
+       const FMADataDef *def;
        const gchar *svalue;
 
        writer->private->schema_node = NULL;
        writer->private->locale_node = NULL;
-       def = na_data_def_get_data_def( groups, NA_FACTORY_OBJECT_ITEM_GROUP, NAFO_DATA_TYPE );
+       def = fma_data_def_get_data_def( groups, NA_FACTORY_OBJECT_ITEM_GROUP, NAFO_DATA_TYPE );
        svalue = NA_IS_OBJECT_ACTION( object ) ? NAGP_VALUE_TYPE_ACTION : NAGP_VALUE_TYPE_MENU;
 
        ( *writer->private->fn_str->write_type_fn )( writer, object, def, svalue );
 }
 
 static void
-write_start_write_version( NAXMLWriter *writer, NAObjectItem *object, const NADataGroup *groups )
+write_start_write_version( NAXMLWriter *writer, NAObjectItem *object, const FMADataGroup *groups )
 {
-       const NADataDef *def;
+       const FMADataDef *def;
        guint iversion;
        gchar *svalue;
 
        writer->private->schema_node = NULL;
        writer->private->locale_node = NULL;
-       def = na_data_def_get_data_def( groups, NA_FACTORY_OBJECT_ITEM_GROUP, NAFO_DATA_IVERSION );
+       def = fma_data_def_get_data_def( groups, NA_FACTORY_OBJECT_ITEM_GROUP, NAFO_DATA_IVERSION );
        iversion = na_object_get_iversion( object );
        svalue = g_strdup_printf( "%d", iversion );
 
@@ -474,9 +474,9 @@ guint
 naxml_writer_write_data( const NAIFactoryProvider *provider, void *writer_data, const NAIFactoryObject 
*object, const FMADataBoxed *boxed, GSList **messages )
 {
        NAXMLWriter *writer;
-       const NADataDef *def;
+       const FMADataDef *def;
 
-       /*NADataDef *def = fma_data_boxed_get_data_def( boxed );
+       /*FMADataDef *def = fma_data_boxed_get_data_def( boxed );
        g_debug( "naxml_writer_write_data: def=%s", def->name );*/
 
        def = fma_data_boxed_get_data_def( boxed );
@@ -503,7 +503,7 @@ naxml_writer_write_done( const NAIFactoryProvider *provider, void *writer_data,
 }
 
 static void
-write_data_schema_v1( NAXMLWriter *writer, const NAObjectId *object, const FMADataBoxed *boxed, const 
NADataDef *def )
+write_data_schema_v1( NAXMLWriter *writer, const NAObjectId *object, const FMADataBoxed *boxed, const 
FMADataDef *def )
 {
        write_data_schema_v2( writer, object, boxed, def );
 
@@ -511,7 +511,7 @@ write_data_schema_v1( NAXMLWriter *writer, const NAObjectId *object, const FMADa
 }
 
 static void
-write_data_schema_v1_element( NAXMLWriter *writer, const NADataDef *def )
+write_data_schema_v1_element( NAXMLWriter *writer, const FMADataDef *def )
 {
        if( !writer->private->locale_node ){
                writer->private->locale_node = xmlNewChild( writer->private->schema_node, NULL, BAD_CAST( 
NAXML_KEY_SCHEMA_NODE_LOCALE ), NULL );
@@ -524,7 +524,7 @@ write_data_schema_v1_element( NAXMLWriter *writer, const NADataDef *def )
 }
 
 static void
-write_type_schema_v1( NAXMLWriter *writer, const NAObjectItem *object, const NADataDef *def, const gchar 
*value )
+write_type_schema_v1( NAXMLWriter *writer, const NAObjectItem *object, const FMADataDef *def, const gchar 
*value )
 {
        gchar *object_id;
 
@@ -541,7 +541,7 @@ write_type_schema_v1( NAXMLWriter *writer, const NAObjectItem *object, const NAD
  *  <applyto>/apps/file-manager-actions/configurations/item_id/profile_id/entry</applyto>
  */
 static void
-write_data_schema_v2( NAXMLWriter *writer, const NAObjectId *object, const FMADataBoxed *boxed, const 
NADataDef *def )
+write_data_schema_v2( NAXMLWriter *writer, const NAObjectId *object, const FMADataBoxed *boxed, const 
FMADataDef *def )
 {
        gchar *object_id;
        gchar *value_str;
@@ -589,7 +589,7 @@ write_data_schema_v2( NAXMLWriter *writer, const NAObjectId *object, const FMADa
  *  <applyto>/apps/file-manager-actions/configurations/item_id/profile_id/entry</applyto>
  */
 static void
-write_data_schema_v2_element( NAXMLWriter *writer, const NADataDef *def, const gchar *object_id, const gchar 
*value_str )
+write_data_schema_v2_element( NAXMLWriter *writer, const FMADataDef *def, const gchar *object_id, const 
gchar *value_str )
 {
        xmlChar *content;
        xmlNodePtr parent_value_node;
@@ -604,7 +604,7 @@ write_data_schema_v2_element( NAXMLWriter *writer, const NADataDef *def, const g
        xmlNewChild( writer->private->schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_APPLYTO ), content );
        xmlFree( content );
 
-       xmlNewChild( writer->private->schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_TYPE ), BAD_CAST( 
na_data_types_get_gconf_dump_key( def->type )));
+       xmlNewChild( writer->private->schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_TYPE ), BAD_CAST( 
fma_data_types_get_gconf_dump_key( def->type )));
        if( def->type == NA_DATA_TYPE_STRING_LIST ){
                xmlNewChild( writer->private->schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_LISTTYPE ), 
BAD_CAST( "string" ));
        }
@@ -628,7 +628,7 @@ write_data_schema_v2_element( NAXMLWriter *writer, const NADataDef *def, const g
  *  <applyto>/apps/file-manager-actions/configurations/item_id/profile_id/entry</applyto>
  */
 static void
-write_type_schema_v2( NAXMLWriter *writer, const NAObjectItem *object, const NADataDef *def, const gchar 
*value )
+write_type_schema_v2( NAXMLWriter *writer, const NAObjectItem *object, const FMADataDef *def, const gchar 
*value )
 {
        gchar *object_id;
 
@@ -653,7 +653,7 @@ write_list_attribs_dump( NAXMLWriter *writer, const NAObjectItem *object )
 }
 
 static void
-write_data_dump( NAXMLWriter *writer, const NAObjectId *object, const FMADataBoxed *boxed, const NADataDef 
*def )
+write_data_dump( NAXMLWriter *writer, const NAObjectId *object, const FMADataBoxed *boxed, const FMADataDef 
*def )
 {
        gchar *entry;
        gchar *value_str;
@@ -693,7 +693,7 @@ write_data_dump( NAXMLWriter *writer, const NAObjectId *object, const FMADataBox
 }
 
 static void
-write_data_dump_element( NAXMLWriter *writer, const NADataDef *def, const FMADataBoxed *boxed, const gchar 
*entry, const gchar *value_str )
+write_data_dump_element( NAXMLWriter *writer, const FMADataDef *def, const FMADataBoxed *boxed, const gchar 
*entry, const gchar *value_str )
 {
        xmlNodePtr entry_node;
        xmlNodePtr value_node;
@@ -723,13 +723,13 @@ write_data_dump_element( NAXMLWriter *writer, const NADataDef *def, const FMADat
 
        } else {
                encoded_content = xmlEncodeSpecialChars( writer->private->doc, BAD_CAST( value_str ));
-               xmlNewChild( value_node, NULL, BAD_CAST( na_data_types_get_gconf_dump_key( def->type )), 
encoded_content );
+               xmlNewChild( value_node, NULL, BAD_CAST( fma_data_types_get_gconf_dump_key( def->type )), 
encoded_content );
                xmlFree( encoded_content );
        }
 }
 
 static void
-write_type_dump( NAXMLWriter *writer, const NAObjectItem *object, const NADataDef *def, const gchar *value )
+write_type_dump( NAXMLWriter *writer, const NAObjectItem *object, const FMADataDef *def, const gchar *value )
 {
        write_data_dump_element( writer, def, NULL, def->gconf_entry, value );
 }
diff --git a/src/utils/na-print-schemas.c b/src/utils/na-print-schemas.c
index ed8a3f7..4527357 100644
--- a/src/utils/na-print-schemas.c
+++ b/src/utils/na-print-schemas.c
@@ -40,7 +40,7 @@
 #include <stdlib.h>
 
 #include <api/fma-core-utils.h>
-#include <api/na-data-types.h>
+#include <api/fma-data-types.h>
 #include <api/na-ifactory-object-data.h>
 
 #include <io-gconf/nagp-keys.h>
@@ -49,9 +49,9 @@
 
 #include "console-utils.h"
 
-extern NADataGroup menu_data_groups[];                         /* defined in na-object-menu-factory.c */
-extern NADataGroup action_data_groups[];                       /* defined in na-object-action-factory.c */
-extern NADataGroup profile_data_groups[];                      /* defined in na-object-profile-factory.c */
+extern FMADataGroup menu_data_groups[];                                /* defined in 
na-object-menu-factory.c */
+extern FMADataGroup action_data_groups[];                      /* defined in na-object-action-factory.c */
+extern FMADataGroup profile_data_groups[];                     /* defined in na-object-profile-factory.c */
 
 static gboolean   output_action = FALSE;
 static gboolean   output_menu   = FALSE;
@@ -75,9 +75,9 @@ static GOptionEntry misc_entries[] = {
 };
 
 static GOptionContext *init_options( void );
-static NADataGroup    *build_full_action_group( void );
-static int             output_to_stdout( NADataGroup *groups, GSList **msgs );
-static void            attach_schema_node( xmlDocPtr doc, xmlNodePtr list_node, const NADataDef *data_def );
+static FMADataGroup    *build_full_action_group( void );
+static int             output_to_stdout( FMADataGroup *groups, GSList **msgs );
+static void            attach_schema_node( xmlDocPtr doc, xmlNodePtr list_node, const FMADataDef *data_def );
 static void            exit_with_usage( void );
 
 int
@@ -89,7 +89,7 @@ main( int argc, char** argv )
        GError *error = NULL;
        GSList *msgs = NULL;
        GSList *im;
-       NADataGroup *full_action_groups = NULL;
+       FMADataGroup *full_action_groups = NULL;
 
 #if !GLIB_CHECK_VERSION( 2,36, 0 )
        g_type_init();
@@ -197,33 +197,33 @@ init_options( void )
 }
 
 /*
- * build a NADataGroup array with action and profile definitions
+ * build a FMADataGroup array with action and profile definitions
  * so that the action schemas also include profile ones
  */
-static NADataGroup *
+static FMADataGroup *
 build_full_action_group( void )
 {
        guint i, action_count, profile_count;
-       NADataGroup *group;
+       FMADataGroup *group;
 
        for( action_count = 0 ; action_data_groups[action_count].group ; ++action_count )
                ;
        for( profile_count = 0 ; profile_data_groups[profile_count].group ; ++profile_count )
                ;
-       group = g_new0( NADataGroup, 1+action_count+profile_count );
+       group = g_new0( FMADataGroup, 1+action_count+profile_count );
 
        for( i = action_count = 0 ; action_data_groups[action_count].group ; ++action_count, ++i ){
-               memcpy( group+i, action_data_groups+action_count, sizeof( NADataGroup ));
+               memcpy( group+i, action_data_groups+action_count, sizeof( FMADataGroup ));
        }
        for( profile_count = 0 ; profile_data_groups[profile_count].group ; ++profile_count, ++i ){
-               memcpy( group+i, profile_data_groups+profile_count, sizeof( NADataGroup ));
+               memcpy( group+i, profile_data_groups+profile_count, sizeof( FMADataGroup ));
        }
 
        return( group );
 }
 
 static int
-output_to_stdout( NADataGroup *groups, GSList **msgs )
+output_to_stdout( FMADataGroup *groups, GSList **msgs )
 {
        xmlDocPtr doc;
        xmlNodePtr root_node;
@@ -244,7 +244,7 @@ output_to_stdout( NADataGroup *groups, GSList **msgs )
                        if( groups[ig].def[id].writable ){
                                if( !fma_core_utils_slist_count( displayed, groups[ig].def[id].name )){
                                        displayed = g_slist_prepend( displayed, groups[ig].def[id].name );
-                                       attach_schema_node( doc, list_node, ( const NADataDef * ) 
groups[ig].def+id );
+                                       attach_schema_node( doc, list_node, ( const FMADataDef * ) 
groups[ig].def+id );
                                }
                        }
                }
@@ -261,7 +261,7 @@ output_to_stdout( NADataGroup *groups, GSList **msgs )
 }
 
 static void
-attach_schema_node( xmlDocPtr doc, xmlNodePtr list_node, const NADataDef *def )
+attach_schema_node( xmlDocPtr doc, xmlNodePtr list_node, const FMADataDef *def )
 {
        xmlNodePtr schema_node;
        xmlChar *content;
@@ -276,7 +276,7 @@ attach_schema_node( xmlDocPtr doc, xmlNodePtr list_node, const NADataDef *def )
 
        xmlNewChild( schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_OWNER ), BAD_CAST( PACKAGE_TARNAME ));
 
-       xmlNewChild( schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_TYPE ), BAD_CAST( 
na_data_types_get_gconf_dump_key( def->type )));
+       xmlNewChild( schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_TYPE ), BAD_CAST( 
fma_data_types_get_gconf_dump_key( def->type )));
        if( def->type == NA_DATA_TYPE_STRING_LIST ){
                xmlNewChild( schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_LISTTYPE ), BAD_CAST( 
"string" ));
        }
diff --git a/src/utils/nautilus-actions-new.c b/src/utils/nautilus-actions-new.c
index 10e72ee..12cb7e3 100644
--- a/src/utils/nautilus-actions-new.c
+++ b/src/utils/nautilus-actions-new.c
@@ -50,7 +50,7 @@
 #include "console-utils.h"
 
 typedef struct {
-       NADataGroup *group;
+       FMADataGroup *group;
        gchar       *group_name;
        gchar       *data_name;
        void        *arg_data;
@@ -95,8 +95,8 @@ static gboolean   output_desktop   = FALSE;
 /* misc entries */
 static gboolean   version          = FALSE;
 
-extern NADataGroup action_data_groups[];                       /* defined in na-object-action-factory.c */
-extern NADataGroup profile_data_groups[];                      /* defined in na-object-profile-factory.c */
+extern FMADataGroup action_data_groups[];                      /* defined in na-object-action-factory.c */
+extern FMADataGroup profile_data_groups[];                     /* defined in na-object-profile-factory.c */
 
 static const ArgFromDataDef st_arg_from_data_def[] = {
                { action_data_groups,  NA_FACTORY_OBJECT_ITEM_GROUP,       NAFO_DATA_LABEL,              
&label },
@@ -301,14 +301,14 @@ build_option_entries( const ArgFromDataDef *defs, guint nbdefs, const GOptionEnt
        GOptionEntry *ient;
        const GOptionEntry *iadd;
        const ArgFromDataDef *idef;
-       const NADataDef *data_def;
+       const FMADataDef *data_def;
 
        entries = g_new0( GOptionEntry, 1+nbdefs+nbadds );
        ient = entries;
 
        idef = defs;
        while( idef->group ){
-               data_def = na_data_def_get_data_def( idef->group, idef->group_name, idef->data_name );
+               data_def = fma_data_def_get_data_def( idef->group, idef->group_name, idef->data_name );
 
                if( data_def ){
                        ient->long_name = data_def->option_long;
@@ -320,7 +320,7 @@ build_option_entries( const ArgFromDataDef *defs, guint nbdefs, const GOptionEnt
                        ient->arg_description = data_def->option_arg_label;
 
                } else {
-                       g_warning( "%s: group=%s, name=%s: unable to find NADataDef structure", thisfn, 
idef->group_name, idef->data_name );
+                       g_warning( "%s: group=%s, name=%s: unable to find FMADataDef structure", thisfn, 
idef->group_name, idef->data_name );
                }
 
                idef++;


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