update to match new API

16 files changed, 119 insertions, 119 deletions

diff --git a/src/plugins/chat/chat.c b/src/plugins/chat/chat.c
index b9fceec8..2e352bb7 100644
--- a/src/plugins/chat/chat.c
+++ b/src/plugins/chat/chat.c
@@ -41,7 +41,7 @@ struct GNUNET_CHAT_safe_nick_write_struct
 {
   GtkListStore *model;
   GdkPixbuf *icon;
-  const struct GNUNET_ECRS_MetaData *meta;
+  const struct GNUNET_MetaData *meta;
   const char *nick;
   GNUNET_HashCode pid;
 };
@@ -119,7 +119,7 @@ add_nick_save_call (void *arg)
                       &iter,
                       CHAT_PID, pid,
                       CHAT_METADATA,
-                      GNUNET_ECRS_meta_data_duplicate (cls->meta), CHAT_ICON,
+                      GNUNET_meta_data_duplicate (cls->meta), CHAT_ICON,
                       cls->icon, CHAT_NICKNAME, cls->nick, -1);
   return NULL;
 }
@@ -134,7 +134,7 @@ remove_nick_save_call (void *arg)
   GtkListStore *model;
   GtkTreeIter iter;
   GNUNET_HashCode *pid;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
 
   model = GTK_LIST_STORE (cls->model);
   /* find and remove existing entry */
@@ -149,7 +149,7 @@ remove_nick_save_call (void *arg)
           if ((pid != NULL) &&
               (0 == memcmp (pid, &cls->pid, sizeof (GNUNET_HashCode))))
             {
-              GNUNET_ECRS_meta_data_destroy (meta);
+              GNUNET_meta_data_destroy (meta);
               GNUNET_free (pid);
               gtk_list_store_remove (model, &iter);
               return NULL;      /* done! */
@@ -178,7 +178,7 @@ static int
 receive_callback (void *cls,
                   struct GNUNET_CHAT_Room *room,
                   const GNUNET_HashCode * sender,
-                  const struct GNUNET_ECRS_MetaData *member_info,
+                  const struct GNUNET_MetaData *member_info,
                   const char *message, GNUNET_CHAT_MSG_OPTIONS options)
 {
   struct GNUNET_CHAT_gui_chat_client *client = cls;
@@ -186,7 +186,7 @@ receive_callback (void *cls,
   char *sndr;
 
   sndr =
-    sender == NULL ? _("anonymous") : GNUNET_PSEUDO_id_to_name (chat_ectx,
+    sender == NULL ? _("anonymous") : GNUNET_pseudonym_id_to_name (chat_ectx,
                                                                 chat_cfg,
                                                                 sender);
   writearg.text_view = client->text_view;
@@ -199,7 +199,7 @@ receive_callback (void *cls,
 
 static int
 member_list_callback (void *cls,
-                      const struct GNUNET_ECRS_MetaData *member_info,
+                      const struct GNUNET_MetaData *member_info,
                       const GNUNET_RSA_PublicKey * pkey,
                       GNUNET_CHAT_MSG_OPTIONS opt)
 {
@@ -208,7 +208,7 @@ member_list_callback (void *cls,
   char *nick;
 
   GNUNET_hash (pkey, sizeof (GNUNET_RSA_PublicKey), &writearg.pid);
-  nick = GNUNET_PSEUDO_id_to_name (chat_ectx, chat_cfg, &writearg.pid);
+  nick = GNUNET_pseudonym_id_to_name (chat_ectx, chat_cfg, &writearg.pid);
   writearg.model = client->nick_model;
   /* FIXME: set icon if pid == ours */
   writearg.icon = NULL;
@@ -264,7 +264,7 @@ create_chat_room_tab (const char *room_name, const char *nick)
   GtkWidget *chatnotebook;
   GtkTreeView *treeview;
   struct GNUNET_CHAT_gui_chat_client *client;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
   int col;
@@ -329,8 +329,8 @@ create_chat_room_tab (const char *room_name, const char *nick)
   list = client;
   GNUNET_mutex_unlock (lock);
 
-  meta = GNUNET_ECRS_meta_data_create ();
-  GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_TITLE, nick);
+  meta = GNUNET_meta_data_create ();
+  GNUNET_meta_data_insert (meta, EXTRACTOR_TITLE, nick);
   client->room =
     GNUNET_CHAT_join_room (chat_ectx, chat_cfg, nick,
                            meta,
@@ -338,7 +338,7 @@ create_chat_room_tab (const char *room_name, const char *nick)
                            -1,
                            &receive_callback, client, &member_list_callback,
                            client, NULL, NULL, &client->mypid);
-  GNUNET_ECRS_meta_data_destroy (meta);
+  GNUNET_meta_data_destroy (meta);
 }
 
 void
diff --git a/src/plugins/fs/collection.c b/src/plugins/fs/collection.c
index cc8a25a2..b7a3939f 100644
--- a/src/plugins/fs/collection.c
+++ b/src/plugins/fs/collection.c
@@ -69,7 +69,7 @@ createCollection_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   GtkWidget *w;
   GtkWidget *dialog;
   GtkWidget *spin;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
   struct GNUNET_ECRS_URI *root;
   GNUNET_Int32Time updateInterval;
 
@@ -134,7 +134,7 @@ createCollection_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
           gtk_dialog_run (GTK_DIALOG (dialog));
           gtk_widget_destroy (dialog);
         }
-      GNUNET_ECRS_meta_data_destroy (meta);
+      GNUNET_meta_data_destroy (meta);
     }
   gtk_widget_destroy (dialog);
   UNREF (metaXML);
@@ -170,7 +170,7 @@ void
 fs_collection_start ()
 {
   GtkWidget *w;
-  struct GNUNET_ECRS_MetaData *h;
+  struct GNUNET_MetaData *h;
 
   h = GNUNET_CO_collection_get_name ();
   if (NULL != h)
@@ -178,7 +178,7 @@ fs_collection_start ()
       w =
         glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                               "createCollection");
-      GNUNET_ECRS_meta_data_destroy (h);
+      GNUNET_meta_data_destroy (h);
     }
   else
     w =
diff --git a/src/plugins/fs/content_tracking.c b/src/plugins/fs/content_tracking.c
index 114f66e7..2a89c65e 100644
--- a/src/plugins/fs/content_tracking.c
+++ b/src/plugins/fs/content_tracking.c
@@ -42,7 +42,7 @@ clearContentList (void *mdl)
 {
   GtkTreeModel *model = GTK_TREE_MODEL (mdl);
   struct GNUNET_ECRS_URI *uri;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
   GtkTreeIter iter;
 
   GNUNET_GTK_DEBUG_BEGIN ();
@@ -54,7 +54,7 @@ clearContentList (void *mdl)
                               &iter,
                               NAMESPACE_URI, &uri, NAMESPACE_META, &meta, -1);
           GNUNET_ECRS_uri_destroy (uri);
-          GNUNET_ECRS_meta_data_destroy (meta);
+          GNUNET_meta_data_destroy (meta);
           gtk_list_store_set (GTK_LIST_STORE (model),
                               &iter,
                               NAMESPACE_URI, NULL, NAMESPACE_META, NULL, -1);
@@ -121,7 +121,7 @@ updateView (void *cls)
     glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                           "availableContentList");
   model = gtk_tree_view_get_model (GTK_TREE_VIEW (contentList));
-  filename = GNUNET_ECRS_meta_data_get_first_by_types (fi->meta,
+  filename = GNUNET_meta_data_get_first_by_types (fi->meta,
                                                        EXTRACTOR_FILENAME,
                                                        EXTRACTOR_TITLE,
                                                        EXTRACTOR_DESCRIPTION,
@@ -160,7 +160,7 @@ updateView (void *cls)
                       NAMESPACE_URISTRING, uriString,
                       NAMESPACE_URI, GNUNET_ECRS_uri_duplicate (fi->uri),
                       NAMESPACE_META,
-                      GNUNET_ECRS_meta_data_duplicate (fi->meta), -1);
+                      GNUNET_meta_data_duplicate (fi->meta), -1);
   GNUNET_free (size_h);
   GNUNET_free (filename);
   GNUNET_free (uriString);
diff --git a/src/plugins/fs/directory.c b/src/plugins/fs/directory.c
index 25a6e885..6b63f681 100644
--- a/src/plugins/fs/directory.c
+++ b/src/plugins/fs/directory.c
@@ -83,7 +83,7 @@ on_open_menu_activate_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   char *directory_data;
   unsigned long long directory_data_len;
   size_t dlen;
-  struct GNUNET_ECRS_MetaData *md;
+  struct GNUNET_MetaData *md;
   int fd;
   SearchList *list;
   struct GNUNET_ECRS_URI *uri;
@@ -126,7 +126,7 @@ on_open_menu_activate_fs (GtkWidget * dummy1, GtkWidget * dummy2)
                                        directory_data, directory_data_len,
                                        &md, &spcb, list);
   if (md != NULL)
-    GNUNET_ECRS_meta_data_destroy (md);
+    GNUNET_meta_data_destroy (md);
   MUNMAP (directory_data, dlen);
   CLOSE (fd);
   GNUNET_free (dn);
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index fdde54ca..a0d34c3f 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -87,7 +87,7 @@ refreshDirectoryViewFromDisk (DownloadList * list)
   const char *data;
   int fd;
   char *fn;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
   struct stat buf;
   const char *f;
 
@@ -149,7 +149,7 @@ refreshDirectoryViewFromDisk (DownloadList * list)
   MUNMAP ((void *) data, size);
   CLOSE (fd);
   if (meta != NULL)
-    GNUNET_ECRS_meta_data_destroy (meta);
+    GNUNET_meta_data_destroy (meta);
 }
 
 /**
@@ -306,7 +306,7 @@ fs_download_started (struct GNUNET_FSUI_DownloadList *fsui_dl,
     }
   list->fsui_list = fsui_dl;
   list->total = total;
-  list->is_directory = GNUNET_ECRS_meta_data_test_for_directory (fi->meta);
+  list->is_directory = GNUNET_meta_data_test_for_directory (fi->meta);
   list->has_terminated = ((state != GNUNET_FSUI_ACTIVE)
                           && (state != GNUNET_FSUI_PENDING));
   list->next = download_head;
@@ -329,7 +329,7 @@ fs_download_update (DownloadList * list,
   GtkTreeIter iter;
   GtkTreePath *path;
   unsigned int val;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
 
   path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
   if (path == NULL)
@@ -352,7 +352,7 @@ fs_download_update (DownloadList * list,
                                            data, size, &meta,
                                            &addFilesToDirectory, list);
       if (meta != NULL)
-        GNUNET_ECRS_meta_data_destroy (meta);
+        GNUNET_meta_data_destroy (meta);
     }
 }
 
@@ -532,7 +532,7 @@ typedef struct
 {
   char *uri_name;
   struct GNUNET_ECRS_URI *idc_uri;
-  struct GNUNET_ECRS_MetaData *idc_meta;
+  struct GNUNET_MetaData *idc_meta;
   char *idc_final_download_destination;
   SearchList *searchContext;
   DownloadList *parentContext;
@@ -831,7 +831,7 @@ on_statusDownloadURIEntry_editing_done_fs (GtkWidget * entry,
   strcat (sdc.idc_final_download_destination, dname);
 
   GNUNET_GTK_add_log_entry (_("Downloading `%s'\n"), uris);
-  sdc.idc_meta = GNUNET_ECRS_meta_data_create ();
+  sdc.idc_meta = GNUNET_meta_data_create ();
   sdc.anonymity =
     getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
                         "fsstatusAnonymitySpin");
@@ -839,7 +839,7 @@ on_statusDownloadURIEntry_editing_done_fs (GtkWidget * entry,
   sdc.searchContext = NULL;
   sdc.parentContext = NULL;
   GNUNET_GTK_run_with_save_calls (&init_download_helper, &sdc);
-  GNUNET_ECRS_meta_data_destroy (sdc.idc_meta);
+  GNUNET_meta_data_destroy (sdc.idc_meta);
   GNUNET_free (sdc.idc_final_download_destination);
   GNUNET_free (urid);
 }
diff --git a/src/plugins/fs/extensions/musicinsert.c b/src/plugins/fs/extensions/musicinsert.c
index 5e373ca8..cb20bc7d 100644
--- a/src/plugins/fs/extensions/musicinsert.c
+++ b/src/plugins/fs/extensions/musicinsert.c
@@ -459,8 +459,8 @@ updateColumns ()
 gboolean
 insertfiles ()
 {
-  struct GNUNET_ECRS_MetaData *dirmetadata;
-  struct GNUNET_ECRS_MetaData *tempmetadata;
+  struct GNUNET_MetaData *dirmetadata;
+  struct GNUNET_MetaData *tempmetadata;
   GArray *filesmetadatas, *files;
   gchar *temptext;
   gchar **dirkeywords;
@@ -498,16 +498,16 @@ insertfiles ()
 
   /* Manage album metadatas */
 
-  dirmetadata = GNUNET_ECRS_meta_data_create ();
+  dirmetadata = GNUNET_meta_data_create ();
 
   dirmetas[0] =
     gtk_combo_box_get_active_text (GTK_COMBO_BOX (artistcombobox));
   if (dirmetas[0])
-    GNUNET_ECRS_meta_data_insert (dirmetadata, EXTRACTOR_ARTIST, dirmetas[0]);
+    GNUNET_meta_data_insert (dirmetadata, EXTRACTOR_ARTIST, dirmetas[0]);
 
   dirmetas[1] = gtk_combo_box_get_active_text (GTK_COMBO_BOX (albumcombobox));
   if (dirmetas[1])
-    GNUNET_ECRS_meta_data_insert (dirmetadata, EXTRACTOR_ALBUM, dirmetas[1]);
+    GNUNET_meta_data_insert (dirmetadata, EXTRACTOR_ALBUM, dirmetas[1]);
 
   keywordsentry = glade_xml_get_widget (musicinsertXML, "keywordsentry");
   temptext = (gchar *) gtk_entry_get_text (GTK_ENTRY (keywordsentry));
@@ -517,13 +517,13 @@ insertfiles ()
   n = 0;
   while (dirkeywords[n])
     {
-      GNUNET_ECRS_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS,
+      GNUNET_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS,
                                     dirkeywords[n]);
       n++;
     }
   /* Add a standard keyword to allow finding all available music albums
    * on AFS in one search */
-  GNUNET_ECRS_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS,
+  GNUNET_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS,
                                 "music album");
 
 
@@ -548,13 +548,13 @@ insertfiles ()
   useforallflags = gtk_toggle_button_get_active (commentstogglebutton) << 3;
 
   filesmetadatas =
-    g_array_sized_new (FALSE, FALSE, sizeof (struct GNUNET_ECRS_MetaData *),
+    g_array_sized_new (FALSE, FALSE, sizeof (struct GNUNET_MetaData *),
                        20);
   files = g_array_sized_new (FALSE, FALSE, sizeof (gchar *), 20);
   i = 0;
   do
     {
-      tempmetadata = GNUNET_ECRS_meta_data_create ();
+      tempmetadata = GNUNET_meta_data_create ();
       tempmetas = malloc (sizeof (gchar *) * 8);
       g_array_append_val (filesmetadatas, tempmetadata);
       gtk_tree_model_get (GTK_TREE_MODEL (filelist_store),
@@ -571,28 +571,28 @@ insertfiles ()
 
 
       if (tempmetas[1])
-        GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
+        GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
                                       tempmetas[1]);
       if ((useforallflags & 0x1) && dirmetas[0])
-        GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
+        GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
                                       dirmetas[0]);
       else if (!(useforallflags & 0x1) && tempmetas[2])
-        GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_TITLE,
+        GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_TITLE,
                                       tempmetas[2]);
       if ((useforallflags & 0x2) && dirmetas[1])
-        GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_ARTIST,
+        GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_ARTIST,
                                       dirmetas[1]);
       else if (!(useforallflags & 0x2) && tempmetas[3])
-        GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
+        GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
                                       tempmetas[3]);
       if (tempmetas[4])
-        GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_ALBUM,
+        GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_ALBUM,
                                       tempmetas[4]);
       if (tempmetas[5])
-        GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_MIMETYPE,
+        GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_MIMETYPE,
                                       tempmetas[5]);
       if (tempmetas[6])
-        GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_FORMAT,
+        GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FORMAT,
                                       tempmetas[6]);
 
       if (!(useforallflags & 0x1))
@@ -600,7 +600,7 @@ insertfiles ()
           n = 0;
           while (dirkeywords[n])
             {
-              GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS,
+              GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS,
                                             dirkeywords[n]);
               n++;
             }
@@ -611,7 +611,7 @@ insertfiles ()
           n = 0;
           while (tempkeywords[n])
             {
-              GNUNET_ECRS_meta_data_insert (tempmetadata,
+              GNUNET_meta_data_insert (tempmetadata,
                                             EXTRACTOR_KEYWORDS,
                                             tempkeywords[n]);
               n++;
@@ -619,7 +619,7 @@ insertfiles ()
           g_strfreev (tempkeywords);
           /* Add a standard keyword to allow finding all available music files
            * on AFS in one search */
-          GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS,
+          GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS,
                                         "music");
         }
 
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index 676fae6f..2549e90d 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -652,7 +652,7 @@ fs_summary_start ()
 static void
 fs_summary_stop ()
 {
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
   GtkComboBox *searchCB;
   GtkTreeModel *model;
   GtkTreeIter iter;
@@ -669,7 +669,7 @@ fs_summary_stop ()
           gtk_list_store_set (GTK_LIST_STORE (model),
                               &iter, NS_SEARCH_METADATA, NULL, -1);
           if (meta != NULL)
-            GNUNET_ECRS_meta_data_destroy (meta);
+            GNUNET_meta_data_destroy (meta);
         }
       while (gtk_list_store_remove (GTK_LIST_STORE (model), &iter));
     }
diff --git a/src/plugins/fs/meta.c b/src/plugins/fs/meta.c
index c4c198ed..6e11a102 100644
--- a/src/plugins/fs/meta.c
+++ b/src/plugins/fs/meta.c
@@ -53,7 +53,7 @@ void
 createMetaDataListTreeView (GladeXML * xml,
                             const char *name,
                             const char *previewName,
-                            const struct GNUNET_ECRS_MetaData *init)
+                            const struct GNUNET_MetaData *init)
 {
   GtkTreeView *metaList;
   GtkListStore *metamodel;
@@ -99,13 +99,13 @@ createMetaDataListTreeView (GladeXML * xml,
   gtk_tree_view_set_model (metaList, GTK_TREE_MODEL (metamodel));
 
   if (init != NULL)
-    GNUNET_ECRS_meta_data_get_contents (init, &publishMetaData, metamodel);
+    GNUNET_meta_data_get_contents (init, &publishMetaData, metamodel);
   if ((previewName == NULL) || (init == NULL))
     return;
   preview = glade_xml_get_widget (xml, previewName);
 
   thumb = NULL;
-  ts = GNUNET_ECRS_meta_data_get_thumbnail (init, &thumb);
+  ts = GNUNET_meta_data_get_thumbnail (init, &thumb);
   preview = glade_xml_get_widget (xml, previewName);
   if (ts != 0)
     {
@@ -285,7 +285,7 @@ handleListRemove (GladeXML * xml, const char *listName)
 #define THUMBSIZE 128
 
 
-struct GNUNET_ECRS_MetaData *
+struct GNUNET_MetaData *
 getMetaDataFromList (GladeXML * xml,
                      const char *name, const char *previewName)
 {
@@ -293,7 +293,7 @@ getMetaDataFromList (GladeXML * xml,
   GtkWidget *preview;
   GtkTreeModel *metamodel;
   GtkTreeIter iter;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
   EXTRACTOR_KeywordType type;
   GdkPixbuf *pixbuf;
   GdkPixbuf *out;
@@ -305,7 +305,7 @@ getMetaDataFromList (GladeXML * xml,
 
   metaList = glade_xml_get_widget (xml, name);
   metamodel = gtk_tree_view_get_model (GTK_TREE_VIEW (metaList));
-  meta = GNUNET_ECRS_meta_data_create ();
+  meta = GNUNET_meta_data_create ();
   if (gtk_tree_model_get_iter_first (metamodel, &iter))
     {
       do
@@ -313,7 +313,7 @@ getMetaDataFromList (GladeXML * xml,
           gtk_tree_model_get (metamodel,
                               &iter,
                               META_TYPE, &type, META_VALUE, &mvalue, -1);
-          GNUNET_ECRS_meta_data_insert (meta, type, mvalue);
+          GNUNET_meta_data_insert (meta, type, mvalue);
           GNUNET_free_non_null (mvalue);
         }
       while (gtk_tree_model_iter_next (metamodel, &iter));
@@ -358,7 +358,7 @@ getMetaDataFromList (GladeXML * xml,
               binary = EXTRACTOR_binaryEncode ((const unsigned char *) thumb,
                                                length);
               free (thumb);
-              GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_THUMBNAIL_DATA,
+              GNUNET_meta_data_insert (meta, EXTRACTOR_THUMBNAIL_DATA,
                                             binary);
               GNUNET_free (binary);
             }
@@ -455,22 +455,22 @@ getSpinButtonValue (GladeXML * xml, const char *spinButtonName)
 
 
 char *
-getMimeTypeFromMetaData (const struct GNUNET_ECRS_MetaData *meta)
+getMimeTypeFromMetaData (const struct GNUNET_MetaData *meta)
 {
   char *mime;
 
-  mime = GNUNET_ECRS_meta_data_get_by_type (meta, EXTRACTOR_MIMETYPE);
+  mime = GNUNET_meta_data_get_by_type (meta, EXTRACTOR_MIMETYPE);
   if (mime == NULL)
     mime = GNUNET_strdup (_("unknown"));
   return GNUNET_GTK_validate_utf8 (mime);
 }
 
 char *
-getFileNameFromMetaData (const struct GNUNET_ECRS_MetaData *meta)
+getFileNameFromMetaData (const struct GNUNET_MetaData *meta)
 {
   char *name;
 
-  name = GNUNET_ECRS_meta_data_get_first_by_types (meta,
+  name = GNUNET_meta_data_get_first_by_types (meta,
                                                    EXTRACTOR_FILENAME,
                                                    EXTRACTOR_TITLE,
                                                    EXTRACTOR_ARTIST,
@@ -494,11 +494,11 @@ getFileNameFromMetaData (const struct GNUNET_ECRS_MetaData *meta)
 }
 
 char *
-getDescriptionFromMetaData (const struct GNUNET_ECRS_MetaData *meta)
+getDescriptionFromMetaData (const struct GNUNET_MetaData *meta)
 {
   char *desc;
 
-  desc = GNUNET_ECRS_meta_data_get_first_by_types (meta,
+  desc = GNUNET_meta_data_get_first_by_types (meta,
                                                    EXTRACTOR_DESCRIPTION,
                                                    EXTRACTOR_GENRE,
                                                    EXTRACTOR_ALBUM,
@@ -513,7 +513,7 @@ getDescriptionFromMetaData (const struct GNUNET_ECRS_MetaData *meta)
 }
 
 GdkPixbuf *
-getThumbnailFromMetaData (const struct GNUNET_ECRS_MetaData * meta)
+getThumbnailFromMetaData (const struct GNUNET_MetaData * meta)
 {
   GdkPixbuf *pixbuf;
   GdkPixbufLoader *loader;
@@ -521,7 +521,7 @@ getThumbnailFromMetaData (const struct GNUNET_ECRS_MetaData * meta)
   unsigned char *thumb;
 
   thumb = NULL;
-  ts = GNUNET_ECRS_meta_data_get_thumbnail (meta, &thumb);
+  ts = GNUNET_meta_data_get_thumbnail (meta, &thumb);
   if (ts != 0)
     {
       loader = gdk_pixbuf_loader_new ();
diff --git a/src/plugins/fs/meta.h b/src/plugins/fs/meta.h
index 7bbfaee0..3c2c2c6b 100644
--- a/src/plugins/fs/meta.h
+++ b/src/plugins/fs/meta.h
@@ -33,7 +33,7 @@
 void createMetaDataListTreeView (GladeXML * xml,
                                  const char *name,
                                  const char *previewName,
-                                 const struct GNUNET_ECRS_MetaData *init);
+                                 const struct GNUNET_MetaData *init);
 
 void createKeywordListTreeView (GladeXML * xml,
                                 const char *name,
@@ -52,7 +52,7 @@ void handleMetaDataListUpdate (GladeXML * xml,
 
 void handleListRemove (GladeXML * xml, const char *listName);
 
-struct GNUNET_ECRS_MetaData *getMetaDataFromList (GladeXML * xml,
+struct GNUNET_MetaData *getMetaDataFromList (GladeXML * xml,
                                                   const char *name,
                                                   const char *preview);
 
@@ -67,11 +67,11 @@ int tryParseTimeInterval (GladeXML * xml,
 
 int parseTimeInterval (const char *frequency, GNUNET_Int32Time * interval);
 
-char *getMimeTypeFromMetaData (const struct GNUNET_ECRS_MetaData *meta);
+char *getMimeTypeFromMetaData (const struct GNUNET_MetaData *meta);
 
-char *getFileNameFromMetaData (const struct GNUNET_ECRS_MetaData *meta);
+char *getFileNameFromMetaData (const struct GNUNET_MetaData *meta);
 
-char *getDescriptionFromMetaData (const struct GNUNET_ECRS_MetaData *meta);
+char *getDescriptionFromMetaData (const struct GNUNET_MetaData *meta);
 
 unsigned int getSpinButtonValue (GladeXML * xml, const char *spinButtonName);
 
@@ -79,7 +79,7 @@ int getToggleButtonValue (GladeXML * xml, const char *widgetName);
 
 const char *getEntryLineValue (GladeXML * xml, const char *widgetName);
 
-GdkPixbuf *getThumbnailFromMetaData (const struct GNUNET_ECRS_MetaData *meta);
+GdkPixbuf *getThumbnailFromMetaData (const struct GNUNET_MetaData *meta);
 
 GtkWidget *extractMainWidgetFromWindow (GladeXML * xml,
                                         const char *windowName);
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index c0200c58..4f24bd5e 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -51,7 +51,7 @@ typedef struct NL
   GtkTreeModel *model;
   char *name;
   GNUNET_HashCode id;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
 } NamespaceList;
 
 /**
@@ -320,7 +320,7 @@ addNamespaceContentToModel (void *cls,
   char *size_h;
 
   GNUNET_GTK_DEBUG_BEGIN ();
-  filename = GNUNET_ECRS_meta_data_get_first_by_types (fi->meta,
+  filename = GNUNET_meta_data_get_first_by_types (fi->meta,
                                                        EXTRACTOR_FILENAME,
                                                        EXTRACTOR_TITLE,
                                                        EXTRACTOR_ARTIST,
@@ -338,7 +338,7 @@ addNamespaceContentToModel (void *cls,
       while (NULL != (dotdot = strstr (filename, "..")))
         dotdot[0] = dotdot[1] = '_';
     }
-  desc = GNUNET_ECRS_meta_data_get_first_by_types (fi->meta,
+  desc = GNUNET_meta_data_get_first_by_types (fi->meta,
                                                    EXTRACTOR_DESCRIPTION,
                                                    EXTRACTOR_GENRE,
                                                    EXTRACTOR_ALBUM,
@@ -349,7 +349,7 @@ addNamespaceContentToModel (void *cls,
                                                    EXTRACTOR_KEYWORDS, -1);
   if (desc == NULL)
     desc = GNUNET_strdup ("");
-  mime = GNUNET_ECRS_meta_data_get_by_type (fi->meta, EXTRACTOR_MIMETYPE);
+  mime = GNUNET_meta_data_get_by_type (fi->meta, EXTRACTOR_MIMETYPE);
   if (mime == NULL)
     mime = GNUNET_strdup (_("unknown"));
   if (GNUNET_ECRS_uri_test_chk (fi->uri))
@@ -387,7 +387,7 @@ addNamespaceContentToModel (void *cls,
                       IN_NAMESPACE_PUB_DATE_STRING, date,
                       IN_NAMESPACE_URI, GNUNET_ECRS_uri_duplicate (fi->uri),
                       IN_NAMESPACE_META,
-                      GNUNET_ECRS_meta_data_duplicate (fi->meta), -1);
+                      GNUNET_meta_data_duplicate (fi->meta), -1);
   GNUNET_free (size_h);
   GNUNET_free (filename);
   GNUNET_free (uriString);
@@ -405,7 +405,7 @@ addNamespaceContentToModel (void *cls,
 int
 addTabForNamespace (void *unused,
                     const GNUNET_HashCode * namespaceId,
-                    const struct GNUNET_ECRS_MetaData *md, int rating)
+                    const struct GNUNET_MetaData *md, int rating)
 {
   NamespaceList *list;
   GtkWidget *label;
@@ -416,12 +416,12 @@ addTabForNamespace (void *unused,
   if (GNUNET_OK != GNUNET_ECRS_namespace_test_exists (NULL, cfg, namespaceId))
     return GNUNET_OK;
   GNUNET_GTK_DEBUG_BEGIN ();
-  namespaceName = GNUNET_PSEUDO_id_to_name (ectx, cfg, namespaceId);
+  namespaceName = GNUNET_pseudonym_id_to_name (ectx, cfg, namespaceId);
   label = gtk_label_new (namespaceName);
   list = GNUNET_malloc (sizeof (NamespaceList));
   list->name = GNUNET_strdup (namespaceName);
   list->id = *namespaceId;
-  list->meta = GNUNET_ECRS_meta_data_duplicate (md);
+  list->meta = GNUNET_meta_data_duplicate (md);
   makeNamespaceFrame (list);
   list->next = head;
   head = list;
@@ -452,7 +452,7 @@ frame_destroy (GtkWidget * tree)
 {
   GtkTreeIter iter;
   struct GNUNET_ECRS_URI *u;
-  struct GNUNET_ECRS_MetaData *m;
+  struct GNUNET_MetaData *m;
   NamespaceList *prev;
   NamespaceList *pos;
   NamespaceList *next;
@@ -478,7 +478,7 @@ frame_destroy (GtkWidget * tree)
   else
     prev->next = pos->next;
   GNUNET_free (pos->name);
-  GNUNET_ECRS_meta_data_destroy (pos->meta);
+  GNUNET_meta_data_destroy (pos->meta);
   if (gtk_tree_model_get_iter_first (pos->model, &iter))
     {
       do
@@ -494,7 +494,7 @@ frame_destroy (GtkWidget * tree)
           if (u != NULL)
             GNUNET_ECRS_uri_destroy (u);
           if (m != NULL)
-            GNUNET_ECRS_meta_data_destroy (m);
+            GNUNET_meta_data_destroy (m);
         }
       while (gtk_tree_model_iter_next (pos->model, &iter));
     }
@@ -591,7 +591,7 @@ addToNamespaceCB (GtkTreeModel * model,
   IUC *cls = data;
   struct GNUNET_ECRS_URI *resultURI;
   struct GNUNET_ECRS_URI *dst;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
   NamespaceList *list;
   GNUNET_ECRS_FileInfo fi;
 
@@ -992,8 +992,8 @@ fs_namespace_start ()
                                       (GTK_TREE_VIEW (contentList), col - 1),
                                       TRUE);
   GNUNET_URITRACK_register_track_callback (ectx, cfg, &updateViewSave, NULL);
-  GNUNET_PSEUDO_list_all (ectx, cfg, &addTabForNamespace, NULL);
-  GNUNET_PSEUDO_register_discovery_callback (ectx, cfg,
+  GNUNET_pseudonym_list_all (ectx, cfg, &addTabForNamespace, NULL);
+  GNUNET_pseudonym_register_discovery_callback (ectx, cfg,
                                              &namespace_discovered_cb, NULL);
   GNUNET_GTK_DEBUG_END ();
 }
@@ -1002,7 +1002,7 @@ fs_namespace_start ()
 void
 fs_namespace_stop ()
 {
-  GNUNET_PSEUDO_unregister_discovery_callback (&namespace_discovered_cb,
+  GNUNET_pseudonym_unregister_discovery_callback (&namespace_discovered_cb,
                                                NULL);
   while (head != NULL)
     frame_destroy (head->treeview);
diff --git a/src/plugins/fs/namespace.h b/src/plugins/fs/namespace.h
index 880f82a8..0b7663f9 100644
--- a/src/plugins/fs/namespace.h
+++ b/src/plugins/fs/namespace.h
@@ -32,7 +32,7 @@
  */
 int addTabForNamespace (void *unused,
                         const GNUNET_HashCode * namespaceId,
-                        const struct GNUNET_ECRS_MetaData *md, int rating);
+                        const struct GNUNET_MetaData *md, int rating);
 
 
 void fs_namespace_start (void);
diff --git a/src/plugins/fs/namespace_create.c b/src/plugins/fs/namespace_create.c
index 802c7096..b89f3ebd 100644
--- a/src/plugins/fs/namespace_create.c
+++ b/src/plugins/fs/namespace_create.c
@@ -197,7 +197,7 @@ create_namespace_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   GtkWidget *nameLine;
   GtkWidget *dialog;
   GtkWidget *spin;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
   struct GNUNET_ECRS_URI *keywordURI;
   struct GNUNET_ECRS_URI *root;
   GNUNET_HashCode namespaceId;
@@ -276,7 +276,7 @@ create_namespace_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
           gtk_dialog_run (GTK_DIALOG (dialog));
           gtk_widget_destroy (dialog);
         }
-      GNUNET_ECRS_meta_data_destroy (meta);
+      GNUNET_meta_data_destroy (meta);
       GNUNET_ECRS_uri_destroy (keywordURI);
     }
   gtk_widget_destroy (dialog);
diff --git a/src/plugins/fs/namespace_search.c b/src/plugins/fs/namespace_search.c
index 964e6ede..4bd9c842 100644
--- a/src/plugins/fs/namespace_search.c
+++ b/src/plugins/fs/namespace_search.c
@@ -82,7 +82,7 @@ on_namespaceRatingSpinButton_changed_fs (GtkWidget * dummy,
             {
               GNUNET_enc_to_hash (encStr, &nsid);
               newrating = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin));
-              rating = GNUNET_PSEUDO_rank (ectx,
+              rating = GNUNET_pseudonym_rank (ectx,
                                            cfg, &nsid, newrating - rating);
               if (rating != newrating)
                 {
@@ -193,7 +193,7 @@ struct NewNamespaceInfo
 {
   char *namespaceName;
   const GNUNET_HashCode *namespaceId;
-  const struct GNUNET_ECRS_MetaData *md;
+  const struct GNUNET_MetaData *md;
   int rating;
 };
 
@@ -206,7 +206,7 @@ saveDiscovery (void *cls)
   GtkTreeIter iter;
   GNUNET_EncName enc;
   char *name;
-  struct GNUNET_ECRS_MetaData *dmd;
+  struct GNUNET_MetaData *dmd;
   GtkWidget *ncbe;
   char *desc;
   size_t n;
@@ -226,8 +226,8 @@ saveDiscovery (void *cls)
     }
   else
     {
-      dmd = GNUNET_ECRS_meta_data_duplicate (nni->md);
-      desc = GNUNET_ECRS_meta_data_get_first_by_types (dmd,
+      dmd = GNUNET_meta_data_duplicate (nni->md);
+      desc = GNUNET_meta_data_get_first_by_types (dmd,
                                                        EXTRACTOR_DESCRIPTION,
                                                        EXTRACTOR_TITLE,
                                                        EXTRACTOR_AUTHOR,
@@ -297,11 +297,11 @@ saveDiscovery (void *cls)
 int
 namespace_discovered_cb (void *cls,
                          const GNUNET_HashCode * namespaceId,
-                         const struct GNUNET_ECRS_MetaData *md, int rating)
+                         const struct GNUNET_MetaData *md, int rating)
 {
   struct NewNamespaceInfo nni;
 
-  nni.namespaceName = GNUNET_PSEUDO_id_to_name (ectx, cfg, namespaceId);
+  nni.namespaceName = GNUNET_pseudonym_id_to_name (ectx, cfg, namespaceId);
   nni.namespaceId = namespaceId;
   nni.md = md;
   nni.rating = rating;
diff --git a/src/plugins/fs/namespace_search.h b/src/plugins/fs/namespace_search.h
index 2afbd1f3..2b42c5b1 100644
--- a/src/plugins/fs/namespace_search.h
+++ b/src/plugins/fs/namespace_search.h
@@ -38,7 +38,7 @@
  */
 int namespace_discovered_cb (void *cls,
                              const GNUNET_HashCode * namespaceId,
-                             const struct GNUNET_ECRS_MetaData *md,
+                             const struct GNUNET_MetaData *md,
                              int rating);
 
 
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index d924b26b..3f070ae2 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -223,7 +223,7 @@ addEntryToSearchTree (SearchList * searchContext,
                       mime, SEARCH_DESC, desc, SEARCH_PIXBUF, pixbuf,
                       SEARCH_URI, GNUNET_ECRS_uri_duplicate (info->uri),
                       SEARCH_META,
-                      GNUNET_ECRS_meta_data_duplicate (info->meta),
+                      GNUNET_meta_data_duplicate (info->meta),
                       SEARCH_CELL_BG_COLOR, getColorCode (state),
                       SEARCH_CELL_FG_COLOR, "black", SEARCH_INTERNAL,
                       searchContext, SEARCH_INTERNAL_PARENT, downloadParent,
@@ -356,7 +356,7 @@ on_search_display_metadata_activate (void *cls, GtkWidget * searchEntry)
   GtkTreePath *path;
   GtkTreeIter iter;
   struct GNUNET_ECRS_URI *uri;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
   char *str;
   GladeXML *xml;
   GtkWidget *dialog;
@@ -479,7 +479,7 @@ on_save_search_activate (void *cls, GtkWidget * searchEntry)
   unsigned long long dir_len;
   unsigned int fis_size;
   GNUNET_ECRS_FileInfo *fis;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
   GtkTreeModel *model;
   GtkTreeIter iter;
   unsigned int pos;
@@ -509,23 +509,23 @@ on_save_search_activate (void *cls, GtkWidget * searchEntry)
       pos++;
     }
   while (gtk_tree_model_iter_next (model, &iter));
-  meta = GNUNET_ECRS_meta_data_create ();
-  GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_KEYWORDS, list->searchString);
-  GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_DESCRIPTION,
+  meta = GNUNET_meta_data_create ();
+  GNUNET_meta_data_insert (meta, EXTRACTOR_KEYWORDS, list->searchString);
+  GNUNET_meta_data_insert (meta, EXTRACTOR_DESCRIPTION,
                                 _("Saved search results"));
-  GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_SOFTWARE, "gnunet-gtk");
+  GNUNET_meta_data_insert (meta, EXTRACTOR_SOFTWARE, "gnunet-gtk");
   if (GNUNET_OK != GNUNET_ECRS_directory_create (NULL,
                                                  &directory, &dir_len,
                                                  fis_size, fis, meta))
     {
       GNUNET_GTK_add_log_entry (_("Internal error."));
       GNUNET_GE_BREAK (NULL, 0);
-      GNUNET_ECRS_meta_data_destroy (meta);
+      GNUNET_meta_data_destroy (meta);
       GNUNET_array_grow (fis, fis_size, 0);
       GNUNET_free (name);
       return FALSE;
     }
-  GNUNET_ECRS_meta_data_destroy (meta);
+  GNUNET_meta_data_destroy (meta);
   GNUNET_array_grow (fis, fis_size, 0);
   if (GNUNET_OK !=
       GNUNET_disk_file_write (NULL, name, directory, dir_len, "644"))
@@ -892,7 +892,7 @@ freeIterSubtree (GtkTreeModel * tree, GtkTreeIter * iter)
 {
   GtkTreeIter child;
   struct GNUNET_ECRS_URI *uri;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
 
   do
     {
@@ -903,7 +903,7 @@ freeIterSubtree (GtkTreeModel * tree, GtkTreeIter * iter)
       if (uri != NULL)
         GNUNET_ECRS_uri_destroy (uri);
       if (meta != NULL)
-        GNUNET_ECRS_meta_data_destroy (meta);
+        GNUNET_meta_data_destroy (meta);
       gtk_tree_store_set (GTK_TREE_STORE (tree),
                           iter, SEARCH_URI, NULL, SEARCH_META, NULL, -1);
       if (gtk_tree_model_iter_children (tree, &child, iter))
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index f718f456..0796c7f3 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -397,7 +397,7 @@ typedef struct
   int extract;
   int deep_index;
   GNUNET_CronTime expire;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
   struct GNUNET_ECRS_URI *gkeywordURI;
   struct GNUNET_ECRS_URI *keywordURI;
 } FSUC;
@@ -426,7 +426,7 @@ on_fsinsertuploadbutton_clicked_fs (gpointer dummy, GtkWidget * uploadButton)
   GtkWidget *dialog;
   EXTRACTOR_ExtractorList *extractors;
   char *config;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
   struct GNUNET_ECRS_URI *keywordURI;
 
   extractors = EXTRACTOR_loadDefaultLibraries ();
@@ -444,18 +444,18 @@ on_fsinsertuploadbutton_clicked_fs (gpointer dummy, GtkWidget * uploadButton)
                    PACKAGE_NAME);
   GNUNET_GTK_connect_glade_with_plugins (metaXML);
   dialog = glade_xml_get_widget (metaXML, "metaDataDialog");
-  meta = GNUNET_ECRS_meta_data_create ();
-  GNUNET_ECRS_meta_data_extract_from_file (ectx, meta, filename, extractors);
+  meta = GNUNET_meta_data_create ();
+  GNUNET_meta_data_extract_from_file (ectx, meta, filename, extractors);
   EXTRACTOR_removeAll (extractors);
   filenamerest = &filename[strlen (filename) - 1];
   while ((filenamerest > filename) && (filenamerest[-1] != DIR_SEPARATOR))
     filenamerest--;
-  GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_FILENAME, filenamerest);
+  GNUNET_meta_data_insert (meta, EXTRACTOR_FILENAME, filenamerest);
   createMetaDataListTreeView (metaXML,
                               "metaDataDialogMetaDataList",
                               "previewImage", meta);
-  keywordURI = GNUNET_ECRS_meta_data_to_uri (meta);
-  GNUNET_ECRS_meta_data_destroy (meta);
+  keywordURI = GNUNET_meta_data_to_uri (meta);
+  GNUNET_meta_data_destroy (meta);
   createKeywordListTreeView (metaXML,
                              "metaDataDialogKeywordList", keywordURI);
   GNUNET_ECRS_uri_destroy (keywordURI);
@@ -502,7 +502,7 @@ on_fsinsertuploadbutton_clicked_fs (gpointer dummy, GtkWidget * uploadButton)
       fsuc.filename = GNUNET_strdup (filename);
       GNUNET_GTK_run_with_save_calls (&start_upload_helper, &fsuc);
       GNUNET_free (fsuc.filename);
-      GNUNET_ECRS_meta_data_destroy (fsuc.meta);
+      GNUNET_meta_data_destroy (fsuc.meta);
       GNUNET_ECRS_uri_destroy (fsuc.gkeywordURI);
       GNUNET_ECRS_uri_destroy (fsuc.keywordURI);
     }