-another renaming fest for GNUNET_NAMESTORE_ to GNUNET_GNSRECORD_ symbols that were moved

18 files changed, 103 insertions, 103 deletions

diff --git a/src/gns/gns.h b/src/gns/gns.h
index 17a7c7323..b3cd10304 100644
--- a/src/gns/gns.h
+++ b/src/gns/gns.h
@@ -109,7 +109,7 @@ struct GNUNET_GNS_ClientLookupResultMessage
    */
   uint32_t rd_count GNUNET_PACKED;
 
-  /* followed by rd_count GNUNET_NAMESTORE_RecordData structs*/
+  /* followed by rd_count GNUNET_GNSRECORD_Data structs*/
 
 };
 
diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c
index 3d58922ad..95c2d54b3 100644
--- a/src/gns/gns_api.c
+++ b/src/gns/gns_api.c
@@ -366,7 +366,7 @@ process_lookup_reply (struct GNUNET_GNS_LookupRequest *qe,
   struct GNUNET_GNS_Handle *handle = qe->gns_handle;
   struct PendingMessage *p = (struct PendingMessage *) &qe[1];
   uint32_t rd_count = ntohl (msg->rd_count);
-  struct GNUNET_NAMESTORE_RecordData rd[rd_count];
+  struct GNUNET_GNSRECORD_Data rd[rd_count];
   size_t mlen;
 
   if (GNUNET_YES != p->transmitted)
@@ -378,7 +378,7 @@ process_lookup_reply (struct GNUNET_GNS_LookupRequest *qe,
   }
   mlen = ntohs (msg->header.size);
   mlen -= sizeof (struct GNUNET_GNS_ClientLookupResultMessage);
-  if (GNUNET_SYSERR == GNUNET_NAMESTORE_records_deserialize (mlen,
+  if (GNUNET_SYSERR == GNUNET_GNSRECORD_records_deserialize (mlen,
                                                              (const char*) &msg[1],
                                                              rd_count,
                                                              rd))
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index 6b7afdb59..3d55bc045 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -296,7 +296,7 @@ dns_result_processor (void *cls,
 static void
 result_processor (void *cls,
                   uint32_t rd_count,
-                  const struct GNUNET_NAMESTORE_RecordData *rd)
+                  const struct GNUNET_GNSRECORD_Data *rd)
 {
   struct Request *request = cls;
   struct GNUNET_DNSPARSER_Packet *packet;
@@ -316,7 +316,7 @@ result_processor (void *cls,
   //packet->flags.opcode = GNUNET_TUN_DNS_OPCODE_STATUS; // ???
   for (i=0;i<rd_count;i++)
     {
-      // FIXME: do we need to hanlde #GNUNET_NAMESTORE_RF_SHADOW_RECORD
+      // FIXME: do we need to hanlde #GNUNET_GNSRECORD_RF_SHADOW_RECORD
       // here? Or should we do this in libgnunetgns?
       rec.expiration_time.abs_value_us = rd[i].expiration_time;
       switch (rd[i].record_type)
diff --git a/src/gns/gnunet-gns-helper-service-w32.c b/src/gns/gnunet-gns-helper-service-w32.c
index 78eb1e0a3..02afa7ac2 100644
--- a/src/gns/gnunet-gns-helper-service-w32.c
+++ b/src/gns/gnunet-gns-helper-service-w32.c
@@ -244,7 +244,7 @@ MarshallWSAQUERYSETW (WSAQUERYSETW *qs, GUID *sc)
 static void
 process_ip_lookup_result (void* cls,
                           uint32_t rd_count,
-                          const struct GNUNET_NAMESTORE_RecordData *rd)
+                          const struct GNUNET_GNSRECORD_Data *rd)
 {
   int i, j, csanum;
   struct request *rq = (struct request *) cls;
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 93f33218b..f41d820eb 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -2208,11 +2208,11 @@ signal_socks_success (struct Socks5Request *s5r)
 static void
 handle_gns_result (void *cls,
                    uint32_t rd_count,
-                   const struct GNUNET_NAMESTORE_RecordData *rd)
+                   const struct GNUNET_GNSRECORD_Data *rd)
 {
   struct Socks5Request *s5r = cls;
   uint32_t i;
-  const struct GNUNET_NAMESTORE_RecordData *r;
+  const struct GNUNET_GNSRECORD_Data *r;
   int got_ip;
 
   s5r->gns_lookup = NULL;
diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c
index 736fb8af2..864d1d0ad 100644
--- a/src/gns/gnunet-gns.c
+++ b/src/gns/gnunet-gns.c
@@ -138,7 +138,7 @@ do_shutdown (void *cls,
  */
 static void
 process_lookup_result (void *cls, uint32_t rd_count,
-                       const struct GNUNET_NAMESTORE_RecordData *rd)
+                       const struct GNUNET_GNSRECORD_Data *rd)
 {
   const char *name = cls;
   uint32_t i;
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index d3728ee00..ff574c3a1 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -321,14 +321,14 @@ put_gns_record (void *cls,
                 const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
                 const char *name,
                 unsigned int rd_count,
-                const struct GNUNET_NAMESTORE_RecordData *rd)
+                const struct GNUNET_GNSRECORD_Data *rd)
 {
-  struct GNUNET_NAMESTORE_Block *block;
+  struct GNUNET_GNSRECORD_Block *block;
   struct GNUNET_HashCode query;
   struct GNUNET_TIME_Absolute expire;
   struct GNUNET_TIME_Absolute now;
   size_t block_size;
-  struct GNUNET_NAMESTORE_RecordData rd_public[rd_count];
+  struct GNUNET_GNSRECORD_Data rd_public[rd_count];
   unsigned int rd_public_count;
   unsigned int i;
 
@@ -387,13 +387,13 @@ put_gns_record (void *cls,
   rd_public_count = 0;
   now = GNUNET_TIME_absolute_get ();
   for (i=0;i<rd_count;i++)
-    if (0 == (rd[i].flags & (GNUNET_NAMESTORE_RF_PRIVATE |
-                             GNUNET_NAMESTORE_RF_PENDING)))
+    if (0 == (rd[i].flags & (GNUNET_GNSRECORD_RF_PRIVATE |
+                             GNUNET_GNSRECORD_RF_PENDING)))
     {
       rd_public[rd_public_count] = rd[i];
-      if (0 != (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION))
+      if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))
       {
-        rd_public[rd_public_count].flags &= ~GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION;
+        rd_public[rd_public_count].flags &= ~GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
         rd_public[rd_public_count].expiration_time += now.abs_value_us;
       }
       rd_public_count++;
@@ -406,9 +406,9 @@ put_gns_record (void *cls,
                                                    NULL);
     return;
   }
-  expire = GNUNET_NAMESTORE_record_get_expiration_time (rd_public_count,
+  expire = GNUNET_GNSRECORD_record_get_expiration_time (rd_public_count,
                                                         rd_public);
-  block = GNUNET_NAMESTORE_block_create (key,
+  block = GNUNET_GNSRECORD_block_create (key,
                                          expire,
                                          name,
                                          rd_public,
@@ -416,7 +416,7 @@ put_gns_record (void *cls,
   block_size = ntohl (block->purpose.size)
     + sizeof (struct GNUNET_CRYPTO_EcdsaSignature)
     + sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
-  GNUNET_NAMESTORE_query_from_private_key (key,
+  GNUNET_GNSRECORD_query_from_private_key (key,
                                            name,
                                            &query);
 
@@ -475,7 +475,7 @@ publish_zone_dht_start (void *cls,
 static void
 send_lookup_response (void* cls,
                       uint32_t rd_count,
-                      const struct GNUNET_NAMESTORE_RecordData *rd)
+                      const struct GNUNET_GNSRECORD_Data *rd)
 {
   struct ClientLookupHandle *clh = cls;
   struct GNUNET_GNS_ClientLookupResultMessage *rmsg;
@@ -486,13 +486,13 @@ send_lookup_response (void* cls,
               "LOOKUP_RESULT",
               rd_count);
 
-  len = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
+  len = GNUNET_GNSRECORD_records_get_size (rd_count, rd);
   rmsg = GNUNET_malloc (len + sizeof (struct GNUNET_GNS_ClientLookupResultMessage));
   rmsg->header.type = htons (GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT);
   rmsg->header.size = htons (len + sizeof(struct GNUNET_GNS_ClientLookupResultMessage));
   rmsg->id = clh->request_id;
   rmsg->rd_count = htonl (rd_count);
-  GNUNET_NAMESTORE_records_serialize (rd_count, rd, len,
+  GNUNET_GNSRECORD_records_serialize (rd_count, rd, len,
                                       (char*) &rmsg[1]);
   GNUNET_SERVER_notification_context_unicast (nc,
                                               clh->client,
diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/gns/gnunet-service-gns_interceptor.c
index 61568c438..efa6e49bb 100644
--- a/src/gns/gnunet-service-gns_interceptor.c
+++ b/src/gns/gnunet-service-gns_interceptor.c
@@ -97,7 +97,7 @@ static struct InterceptLookupHandle *ilh_tail;
  */
 static void
 reply_to_dns (void *cls, uint32_t rd_count,
-              const struct GNUNET_NAMESTORE_RecordData *rd)
+              const struct GNUNET_GNSRECORD_Data *rd)
 {
   struct InterceptLookupHandle *ilh = cls;
   struct GNUNET_DNSPARSER_Packet *packet = ilh->packet;
@@ -125,7 +125,7 @@ reply_to_dns (void *cls, uint32_t rd_count,
 
     packet->answers = answer_records;
     packet->additional_records = additional_records;
-    /* FIXME: need to handle #GNUNET_NAMESTORE_RF_SHADOW_RECORD option
+    /* FIXME: need to handle #GNUNET_GNSRECORD_RF_SHADOW_RECORD option
        (by ignoring records where this flag is set if there is any
        other record of that type in the result set) */
     for (i=0; i < rd_count; i++)
@@ -183,7 +183,7 @@ reply_to_dns (void *cls, uint32_t rd_count,
           answer_records[i - skip_answers].data.raw.data = (char*)rd[i].data;
           break;
         }
-        GNUNET_break (0 == (rd[i - skip_answers].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
+        GNUNET_break (0 == (rd[i - skip_answers].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION));
         answer_records[i - skip_answers].expiration_time.abs_value_us = rd[i].expiration_time;
         answer_records[i - skip_answers].dns_traffic_class = GNUNET_TUN_DNS_CLASS_INTERNET;
       }
@@ -240,7 +240,7 @@ reply_to_dns (void *cls, uint32_t rd_count,
           additional_records[i - skip_additional].data.raw.data = (char*)rd[i].data;
           break;
         }
-        GNUNET_break (0 == (rd[i - skip_additional].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
+        GNUNET_break (0 == (rd[i - skip_additional].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION));
         additional_records[i - skip_additional].expiration_time.abs_value_us = rd[i].expiration_time;
         additional_records[i - skip_additional].dns_traffic_class = GNUNET_TUN_DNS_CLASS_INTERNET;
       }
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index ad256430c..e0d395a55 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -504,7 +504,7 @@ translate_dot_plus (struct GNS_ResolverHandle *rh,
                    "%.*s.%s",
                    (int) (s_len - 2),
                    name,
-                   GNUNET_NAMESTORE_pkey_to_zkey (&rh->ac_tail->authority_info.gns_authority));
+                   GNUNET_GNSRECORD_pkey_to_zkey (&rh->ac_tail->authority_info.gns_authority));
   GNUNET_free (name);
   return ret;
 }
@@ -598,7 +598,7 @@ transmit_lookup_dns_result (struct GNS_ResolverHandle *rh)
   for (pos = rh->dns_result_head; NULL != pos; pos = pos->next)
     n++;
   {
-    struct GNUNET_NAMESTORE_RecordData rd[n];
+    struct GNUNET_GNSRECORD_Data rd[n];
 
     i = 0;
     for (pos = rh->dns_result_head; NULL != pos; pos = pos->next)
@@ -608,12 +608,12 @@ transmit_lookup_dns_result (struct GNS_ResolverHandle *rh)
       rd[i].record_type = pos->record_type;
       if (0 == pos->expiration_time)
       {
-        rd[i].flags = GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION;
+        rd[i].flags = GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
         rd[i].expiration_time = 0;
       }
       else
       {
-        rd[i].flags = GNUNET_NAMESTORE_RF_NONE;
+        rd[i].flags = GNUNET_GNSRECORD_RF_NONE;
         rd[i].expiration_time = pos->expiration_time;
       }
       i++;
@@ -785,7 +785,7 @@ dns_result_parser (void *cls,
   /* convert from (parsed) DNS to (binary) GNS format! */
   rd_count = p->num_answers + p->num_authority_records + p->num_additional_records;
   {
-    struct GNUNET_NAMESTORE_RecordData rd[rd_count];
+    struct GNUNET_GNSRECORD_Data rd[rd_count];
     unsigned int skip;
     char buf[UINT16_MAX];
     size_t buf_off;
@@ -1064,7 +1064,7 @@ handle_gns_cname_result (struct GNS_ResolverHandle *rh,
 static void
 handle_gns_resolution_result (void *cls,
                               unsigned int rd_count,
-                              const struct GNUNET_NAMESTORE_RecordData *rd);
+                              const struct GNUNET_GNSRECORD_Data *rd);
 
 
 /**
@@ -1088,13 +1088,13 @@ vpn_allocation_cb (void *cls,
 {
   struct VpnContext *vpn_ctx = cls;
   struct GNS_ResolverHandle *rh = vpn_ctx->rh;
-  struct GNUNET_NAMESTORE_RecordData rd[vpn_ctx->rd_count];
+  struct GNUNET_GNSRECORD_Data rd[vpn_ctx->rd_count];
   unsigned int i;
 
   vpn_ctx->vpn_request = NULL;
   rh->vpn_ctx = NULL;
   GNUNET_assert (GNUNET_OK ==
-                 GNUNET_NAMESTORE_records_deserialize (vpn_ctx->rd_data_size,
+                 GNUNET_GNSRECORD_records_deserialize (vpn_ctx->rd_data_size,
                                                        vpn_ctx->rd_data,
                                                        vpn_ctx->rd_count,
                                                        rd));
@@ -1143,7 +1143,7 @@ vpn_allocation_cb (void *cls,
 static void
 handle_gns_resolution_result (void *cls,
                               unsigned int rd_count,
-                              const struct GNUNET_NAMESTORE_RecordData *rd)
+                              const struct GNUNET_GNSRECORD_Data *rd)
 {
   struct GNS_ResolverHandle *rh = cls;
   struct AuthorityChain *ac;
@@ -1163,13 +1163,13 @@ handle_gns_resolution_result (void *cls,
   size_t scratch_off;
   size_t scratch_start;
   size_t off;
-  struct GNUNET_NAMESTORE_RecordData rd_new[rd_count];
+  struct GNUNET_GNSRECORD_Data rd_new[rd_count];
   unsigned int rd_off;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Resolution succeeded for `%s' in zone %s, got %u records\n",
               rh->ac_tail->label,
-              GNUNET_NAMESTORE_z2s (&rh->ac_tail->authority_info.gns_authority),
+              GNUNET_GNSRECORD_z2s (&rh->ac_tail->authority_info.gns_authority),
               rd_count);
   if (0 == rh->name_resolution_pos)
   {
@@ -1230,10 +1230,10 @@ handle_gns_resolution_result (void *cls,
             vpn_ctx = GNUNET_new (struct VpnContext);
             rh->vpn_ctx = vpn_ctx;
             vpn_ctx->rh = rh;
-            vpn_ctx->rd_data_size = GNUNET_NAMESTORE_records_get_size (rd_count,
+            vpn_ctx->rd_data_size = GNUNET_GNSRECORD_records_get_size (rd_count,
                                                                        rd);
             vpn_ctx->rd_data = GNUNET_malloc (vpn_ctx->rd_data_size);
-            (void) GNUNET_NAMESTORE_records_serialize (rd_count,
+            (void) GNUNET_GNSRECORD_records_serialize (rd_count,
                                                        rd,
                                                        vpn_ctx->rd_data_size,
                                                        vpn_ctx->rd_data);
@@ -1720,7 +1720,7 @@ handle_dht_response (void *cls,
 {
   struct GNS_ResolverHandle *rh = cls;
   struct AuthorityChain *ac = rh->ac_tail;
-  const struct GNUNET_NAMESTORE_Block *block;
+  const struct GNUNET_GNSRECORD_Block *block;
   struct CacheOps *co;
 
   GNUNET_DHT_get_stop (rh->get_handle);
@@ -1729,7 +1729,7 @@ handle_dht_response (void *cls,
   rh->dht_heap_node = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Handling response from the DHT\n");
-  if (size < sizeof (struct GNUNET_NAMESTORE_Block))
+  if (size < sizeof (struct GNUNET_GNSRECORD_Block))
   {
     /* how did this pass DHT block validation!? */
     GNUNET_break (0);
@@ -1750,7 +1750,7 @@ handle_dht_response (void *cls,
     return;
   }
   if (GNUNET_OK !=
-      GNUNET_NAMESTORE_block_decrypt (block,
+      GNUNET_GNSRECORD_block_decrypt (block,
                                       &ac->authority_info.gns_authority,
                                       ac->label,
                                       &handle_gns_resolution_result,
@@ -1783,7 +1783,7 @@ handle_dht_response (void *cls,
  */
 static void
 handle_namestore_block_response (void *cls,
-                                 const struct GNUNET_NAMESTORE_Block *block)
+                                 const struct GNUNET_GNSRECORD_Block *block)
 {
   struct GNS_ResolverHandle *rh = cls;
   struct GNS_ResolverHandle *rx;
@@ -1792,7 +1792,7 @@ handle_namestore_block_response (void *cls,
   const struct GNUNET_CRYPTO_EcdsaPublicKey *auth = &ac->authority_info.gns_authority;
   struct GNUNET_HashCode query;
 
-  GNUNET_NAMESTORE_query_from_public_key (auth,
+  GNUNET_GNSRECORD_query_from_public_key (auth,
                                           label,
                                           &query);
   GNUNET_assert (NULL != rh->namestore_qe);
@@ -1805,7 +1805,7 @@ handle_namestore_block_response (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Starting DHT lookup for `%s' in zone %s\n",
                 ac->label,
-                GNUNET_NAMESTORE_z2s (&ac->authority_info.gns_authority));
+                GNUNET_GNSRECORD_z2s (&ac->authority_info.gns_authority));
     GNUNET_assert (NULL == rh->get_handle);
     rh->get_handle = GNUNET_DHT_get_start (dht_handle,
                                            GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
@@ -1834,7 +1834,7 @@ handle_namestore_block_response (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Resolution failed for `%s' in zone %s (DHT lookup not permitted by configuration)\n",
                 ac->label,
-                GNUNET_NAMESTORE_z2s (&ac->authority_info.gns_authority));
+                GNUNET_GNSRECORD_z2s (&ac->authority_info.gns_authority));
     rh->proc (rh->proc_cls, 0, NULL);
     GNS_resolver_lookup_cancel (rh);
     return;
@@ -1842,7 +1842,7 @@ handle_namestore_block_response (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Decrypting block from the namestore\n");
   if (GNUNET_OK !=
-      GNUNET_NAMESTORE_block_decrypt (block,
+      GNUNET_GNSRECORD_block_decrypt (block,
                                       auth,
                                       label,
                                       &handle_gns_resolution_result,
@@ -1870,8 +1870,8 @@ recursive_gns_resolution_namestore (struct GNS_ResolverHandle *rh)
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Starting GNS resolution for `%s' in zone %s\n",
               ac->label,
-              GNUNET_NAMESTORE_z2s (&ac->authority_info.gns_authority));
-  GNUNET_NAMESTORE_query_from_public_key (&ac->authority_info.gns_authority,
+              GNUNET_GNSRECORD_z2s (&ac->authority_info.gns_authority));
+  GNUNET_GNSRECORD_query_from_public_key (&ac->authority_info.gns_authority,
                                           ac->label,
                                           &query);
   rh->namestore_qe = GNUNET_NAMESTORE_lookup_block (namestore_handle,
diff --git a/src/gns/gnunet-service-gns_resolver.h b/src/gns/gnunet-service-gns_resolver.h
index 06273766a..12d2eec11 100644
--- a/src/gns/gnunet-service-gns_resolver.h
+++ b/src/gns/gnunet-service-gns_resolver.h
@@ -66,7 +66,7 @@ struct GNS_ResolverHandle;
  */
 typedef void (*GNS_ResultProcessor)(void *cls,
                                     uint32_t rd_count,
-                                    const struct GNUNET_NAMESTORE_RecordData *rd);
+                                    const struct GNUNET_GNSRECORD_Data *rd);
 
 
 /**
diff --git a/src/gns/gnunet-service-gns_shorten.c b/src/gns/gnunet-service-gns_shorten.c
index 3ec03a5ef..3e612e862 100644
--- a/src/gns/gnunet-service-gns_shorten.c
+++ b/src/gns/gnunet-service-gns_shorten.c
@@ -181,7 +181,7 @@ create_pkey_cont (void* cls,
 static void
 process_pseu_lookup_ns (void *cls,
                         unsigned int rd_count,
-                        const struct GNUNET_NAMESTORE_RecordData *rd);
+                        const struct GNUNET_GNSRECORD_Data *rd);
 
 
 /**
@@ -193,7 +193,7 @@ process_pseu_lookup_ns (void *cls,
  */
 static void
 process_pseu_block_ns (void *cls,
-                       const struct GNUNET_NAMESTORE_Block *block)
+                       const struct GNUNET_GNSRECORD_Block *block)
 {
   struct GetPseuAuthorityHandle *gph = cls;
   struct GNUNET_CRYPTO_EcdsaPublicKey pub;
@@ -207,7 +207,7 @@ process_pseu_block_ns (void *cls,
   GNUNET_CRYPTO_ecdsa_key_get_public (&gph->shorten_zone_key,
                                     &pub);
   if (GNUNET_OK !=
-      GNUNET_NAMESTORE_block_decrypt (block,
+      GNUNET_GNSRECORD_block_decrypt (block,
                                       &pub,
                                       gph->current_label,
                                       &process_pseu_lookup_ns,
@@ -237,7 +237,7 @@ perform_pseu_lookup (struct GetPseuAuthorityHandle *gph,
                                     &pub);
   GNUNET_free_non_null (gph->current_label);
   gph->current_label = GNUNET_strdup (label);
-  GNUNET_NAMESTORE_query_from_public_key (&pub,
+  GNUNET_GNSRECORD_query_from_public_key (&pub,
                                           label,
                                           &query);
   gph->namestore_task = GNUNET_NAMESTORE_lookup_block (namestore_handle,
@@ -258,10 +258,10 @@ perform_pseu_lookup (struct GetPseuAuthorityHandle *gph,
 static void
 process_pseu_lookup_ns (void *cls,
                         unsigned int rd_count,
-                        const struct GNUNET_NAMESTORE_RecordData *rd)
+                        const struct GNUNET_GNSRECORD_Data *rd)
 {
   struct GetPseuAuthorityHandle *gph = cls;
-  struct GNUNET_NAMESTORE_RecordData new_pkey;
+  struct GNUNET_GNSRECORD_Data new_pkey;
 
   gph->namestore_task = NULL;
   if (rd_count > 0)
@@ -285,15 +285,15 @@ process_pseu_lookup_ns (void *cls,
   /* name is available */
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Shortening `%s' to `%s'\n",
-              GNUNET_NAMESTORE_z2s (&gph->target_zone),
+              GNUNET_GNSRECORD_z2s (&gph->target_zone),
               gph->current_label);
   new_pkey.expiration_time = UINT64_MAX;
   new_pkey.data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
   new_pkey.data = &gph->target_zone;
   new_pkey.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
-  new_pkey.flags = GNUNET_NAMESTORE_RF_NONE
-                 | GNUNET_NAMESTORE_RF_PRIVATE
-                 | GNUNET_NAMESTORE_RF_PENDING;
+  new_pkey.flags = GNUNET_GNSRECORD_RF_NONE
+                 | GNUNET_GNSRECORD_RF_PRIVATE
+                 | GNUNET_GNSRECORD_RF_PENDING;
   gph->namestore_task
     = GNUNET_NAMESTORE_records_store (namestore_handle,
                                       &gph->shorten_zone_key,
@@ -358,7 +358,7 @@ handle_auth_discovery_timeout (void *cls,
 static void
 process_auth_records (void *cls,
                       unsigned int rd_count,
-                      const struct GNUNET_NAMESTORE_RecordData *rd)
+                      const struct GNUNET_GNSRECORD_Data *rd)
 {
   struct GetPseuAuthorityHandle *gph = cls;
   unsigned int i;
@@ -412,7 +412,7 @@ process_auth_discovery_dht_result (void* cls,
                                    const void *data)
 {
   struct GetPseuAuthorityHandle *gph = cls;
-  const struct GNUNET_NAMESTORE_Block *block;
+  const struct GNUNET_GNSRECORD_Block *block;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Got DHT result for PSEU request\n");
@@ -428,7 +428,7 @@ process_auth_discovery_dht_result (void* cls,
     process_pseu_result (gph, NULL);
     return;
   }
-  if (size < sizeof (struct GNUNET_NAMESTORE_Block))
+  if (size < sizeof (struct GNUNET_GNSRECORD_Block))
   {
     /* how did this pass DHT block validation!? */
     GNUNET_break (0);
@@ -447,7 +447,7 @@ process_auth_discovery_dht_result (void* cls,
     return;
   }
   if (GNUNET_OK !=
-      GNUNET_NAMESTORE_block_decrypt (block,
+      GNUNET_GNSRECORD_block_decrypt (block,
                                       &gph->target_zone,
                                       GNUNET_GNS_TLD_PLUS,
                                       &process_auth_records,
@@ -476,7 +476,7 @@ process_zone_to_name_discover (void *cls,
                                const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
                                const char *name,
                                unsigned int rd_len,
-                               const struct GNUNET_NAMESTORE_RecordData *rd)
+                               const struct GNUNET_GNSRECORD_Data *rd)
 {
   struct GetPseuAuthorityHandle* gph = cls;
   struct GNUNET_HashCode lookup_key;
@@ -492,7 +492,7 @@ process_zone_to_name_discover (void *cls,
     return;
   }
   /* record does not yet exist, go into DHT to find PSEU record */
-  GNUNET_NAMESTORE_query_from_public_key (&gph->target_zone,
+  GNUNET_GNSRECORD_query_from_public_key (&gph->target_zone,
                                           GNUNET_GNS_TLD_PLUS,
                                           &lookup_key);
   gph->timeout_task = GNUNET_SCHEDULER_add_delayed (DHT_LOOKUP_TIMEOUT,
@@ -533,7 +533,7 @@ GNS_shorten_start (const char *original_label,
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Starting shortening process for `%s' with old label `%s'\n",
-              GNUNET_NAMESTORE_z2s (pub),
+              GNUNET_GNSRECORD_z2s (pub),
               original_label);
   gph = GNUNET_new (struct GetPseuAuthorityHandle);
   gph->shorten_zone_key = *shorten_zone;
diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c
index ad2e6594e..65cf69f72 100644
--- a/src/gns/plugin_block_gns.c
+++ b/src/gns/plugin_block_gns.c
@@ -61,7 +61,7 @@ block_plugin_gns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
                           size_t xquery_size, const void *reply_block,
                           size_t reply_block_size)
 {
-  const struct GNUNET_NAMESTORE_Block *block;
+  const struct GNUNET_GNSRECORD_Block *block;
   struct GNUNET_HashCode h;
   struct GNUNET_HashCode chash;
   struct GNUNET_HashCode mhash;
@@ -79,7 +79,7 @@ block_plugin_gns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
   }
 
   /* this is a reply */
-  if (reply_block_size < sizeof (struct GNUNET_NAMESTORE_Block))
+  if (reply_block_size < sizeof (struct GNUNET_GNSRECORD_Block))
     {
       GNUNET_break_op (0);
       return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
@@ -100,7 +100,7 @@ block_plugin_gns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
       return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
     }
   if (GNUNET_OK !=
-      GNUNET_NAMESTORE_block_verify (block))
+      GNUNET_GNSRECORD_block_verify (block))
     {
       GNUNET_break_op (0);
       return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
@@ -140,11 +140,11 @@ block_plugin_gns_get_key (void *cls, enum GNUNET_BLOCK_Type type,
                          const void *reply_block, size_t reply_block_size,
                          struct GNUNET_HashCode *key)
 {
-  const struct GNUNET_NAMESTORE_Block *block;
+  const struct GNUNET_GNSRECORD_Block *block;
 
   if (type != GNUNET_BLOCK_TYPE_GNS_NAMERECORD)
     return GNUNET_SYSERR;
-  if (reply_block_size < sizeof (struct GNUNET_NAMESTORE_Block))
+  if (reply_block_size < sizeof (struct GNUNET_GNSRECORD_Block))
     {
       GNUNET_break_op (0);
       return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c
index 25127d747..eac9e4449 100644
--- a/src/gns/test_gns_proxy.c
+++ b/src/gns/test_gns_proxy.c
@@ -365,7 +365,7 @@ run (void *cls,
 {
   enum MHD_FLAG flags;
   struct GNUNET_CRYPTO_EcdsaPrivateKey *host_key;
-  struct GNUNET_NAMESTORE_RecordData rd;
+  struct GNUNET_GNSRECORD_Data rd;
   char *zone_keyfile;
 
   namestore = GNUNET_NAMESTORE_connect (cfg);
diff --git a/src/gns/test_gns_pseu_shorten.c b/src/gns/test_gns_pseu_shorten.c
index 6bcc18999..5214db8f8 100644
--- a/src/gns/test_gns_pseu_shorten.c
+++ b/src/gns/test_gns_pseu_shorten.c
@@ -181,7 +181,7 @@ process_shorten_result (void* cls, const char* sname)
 
 static void
 on_lookup_result (void *cls, uint32_t rd_count,
-                  const struct GNUNET_NAMESTORE_RecordData *rd)
+                  const struct GNUNET_GNSRECORD_Data *rd)
 {
   struct in_addr a;
   int i;
@@ -266,9 +266,9 @@ put_pseu_dht (void *cls, int success)
   uint32_t rd_payload_length;
   char* nrb_data = NULL;
   struct GNUNET_CRYPTO_EcdsaSignature *sig;
-  struct GNUNET_NAMESTORE_RecordData rd;
+  struct GNUNET_GNSRECORD_Data rd;
 
-  memset (&rd, 0, sizeof (struct GNUNET_NAMESTORE_RecordData));
+  memset (&rd, 0, sizeof (struct GNUNET_GNSRECORD_Data));
   rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
   rd.data_size = strlen(TEST_PSEU_ALICE)+1;
   rd.data = TEST_PSEU_ALICE;
@@ -288,7 +288,7 @@ put_pseu_dht (void *cls, int success)
                                                                  1,
                                                                  &rd,
                                                                  sig));
-  rd_payload_length = GNUNET_NAMESTORE_records_get_size (1, &rd);
+  rd_payload_length = GNUNET_GNSRECORD_records_get_size (1, &rd);
   nrb = GNUNET_malloc(rd_payload_length + strlen(GNUNET_GNS_MASTERZONE_STR) + 1
                       + sizeof(struct GNSNameRecordBlock));
   nrb->signature = *sig;
@@ -299,7 +299,7 @@ put_pseu_dht (void *cls, int success)
   nrb_data = (char*)&nrb[1];
   nrb_data += strlen(GNUNET_GNS_MASTERZONE_STR) + 1;
 
-  if (-1 == GNUNET_NAMESTORE_records_serialize (1,
+  if (-1 == GNUNET_GNSRECORD_records_serialize (1,
                                                 &rd,
                                                 rd_payload_length,
                                                 nrb_data))
@@ -354,7 +354,7 @@ put_www_dht (void *cls, int success)
   uint32_t rd_payload_length;
   char* nrb_data = NULL;
   struct GNUNET_CRYPTO_EcdsaSignature *sig;
-  struct GNUNET_NAMESTORE_RecordData rd;
+  struct GNUNET_GNSRECORD_Data rd;
   char* ip = TEST_IP;
   struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr));
 
@@ -363,7 +363,7 @@ put_www_dht (void *cls, int success)
   rd.data_size = sizeof(struct in_addr);
   rd.data = web;
   rd.record_type = GNUNET_DNSPARSER_TYPE_A;
-  rd.flags = GNUNET_NAMESTORE_RF_NONE;
+  rd.flags = GNUNET_GNSRECORD_RF_NONE;
 
   sig = GNUNET_NAMESTORE_create_signature(alice_key,
                                           GNUNET_TIME_UNIT_FOREVER_ABS,
@@ -376,7 +376,7 @@ put_www_dht (void *cls, int success)
                                                                  1,
                                                                  &rd,
                                                                  sig));
-  rd_payload_length = GNUNET_NAMESTORE_records_get_size (1, &rd);
+  rd_payload_length = GNUNET_GNSRECORD_records_get_size (1, &rd);
   nrb = GNUNET_malloc(rd_payload_length + strlen(TEST_RECORD_NAME) + 1
                       + sizeof(struct GNSNameRecordBlock));
   nrb->signature = *sig;
@@ -387,7 +387,7 @@ put_www_dht (void *cls, int success)
   nrb_data = (char*)&nrb[1];
   nrb_data += strlen(TEST_RECORD_NAME) + 1;
 
-  if (-1 == GNUNET_NAMESTORE_records_serialize (1,
+  if (-1 == GNUNET_GNSRECORD_records_serialize (1,
                                                 &rd,
                                                 rd_payload_length,
                                                 nrb_data))
@@ -442,13 +442,13 @@ put_pkey_dht (void *cls, int32_t success, const char *emsg)
   uint32_t rd_payload_length;
   char* nrb_data = NULL;
   struct GNUNET_CRYPTO_EcdsaSignature *sig;
-  struct GNUNET_NAMESTORE_RecordData rd;
+  struct GNUNET_GNSRECORD_Data rd;
 
   rd.expiration_time = UINT64_MAX;
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &alice_hash;
   rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
-  rd.flags = GNUNET_NAMESTORE_RF_NONE;
+  rd.flags = GNUNET_GNSRECORD_RF_NONE;
 
   sig = GNUNET_NAMESTORE_create_signature (bob_key,
                                            GNUNET_TIME_UNIT_FOREVER_ABS,
@@ -456,7 +456,7 @@ put_pkey_dht (void *cls, int32_t success, const char *emsg)
                                            &rd,
                                            1);
 
-  rd_payload_length = GNUNET_NAMESTORE_records_get_size (1, &rd);
+  rd_payload_length = GNUNET_GNSRECORD_records_get_size (1, &rd);
   nrb = GNUNET_malloc(rd_payload_length + strlen(TEST_AUTHORITY_ALICE) + 1
                       + sizeof(struct GNSNameRecordBlock));
   nrb->signature = *sig;
@@ -467,7 +467,7 @@ put_pkey_dht (void *cls, int32_t success, const char *emsg)
   nrb_data = (char*)&nrb[1];
   nrb_data += strlen(TEST_AUTHORITY_ALICE) + 1;
 
-  if (-1 == GNUNET_NAMESTORE_records_serialize (1,
+  if (-1 == GNUNET_GNSRECORD_records_serialize (1,
                                                 &rd,
                                                 rd_payload_length,
                                                 nrb_data))
@@ -514,12 +514,12 @@ put_pkey_dht (void *cls, int32_t success, const char *emsg)
 static void
 fin_init_zone (void *cls, int32_t success, const char *emsg)
 {
-  struct GNUNET_NAMESTORE_RecordData rd;
+  struct GNUNET_GNSRECORD_Data rd;
   rd.expiration_time = UINT64_MAX;
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &bob_hash;
   rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
-  rd.flags = GNUNET_NAMESTORE_RF_NONE;
+  rd.flags = GNUNET_GNSRECORD_RF_NONE;
 
   GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
                                             our_key,
@@ -534,13 +534,13 @@ static void
 cont_init_zone (void *cls, int32_t success, const char *emsg)
 {
 
-  struct GNUNET_NAMESTORE_RecordData rd;
+  struct GNUNET_GNSRECORD_Data rd;
 
   rd.expiration_time = UINT64_MAX;
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &short_zone;
   rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
-  rd.flags = GNUNET_NAMESTORE_RF_NONE;
+  rd.flags = GNUNET_GNSRECORD_RF_NONE;
 
   GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
                                             priv_key,
@@ -559,7 +559,7 @@ do_check (void *cls,
   char *private_keyfile;
   char *shorten_keyfile;
   char *our_keyfile;
-  struct GNUNET_NAMESTORE_RecordData rd;
+  struct GNUNET_GNSRECORD_Data rd;
 
   cfg = ccfg;
   die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
@@ -641,7 +641,7 @@ do_check (void *cls,
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &priv_zone;
   rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
-  rd.flags = GNUNET_NAMESTORE_RF_NONE;
+  rd.flags = GNUNET_GNSRECORD_RF_NONE;
 
   GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
                                             our_key,
diff --git a/src/gns/test_gns_revocation.c b/src/gns/test_gns_revocation.c
index 555e44a20..738bda318 100644
--- a/src/gns/test_gns_revocation.c
+++ b/src/gns/test_gns_revocation.c
@@ -104,7 +104,7 @@ shutdown_task (void *cls,
 
 static void
 on_lookup_result(void *cls, uint32_t rd_count,
-                 const struct GNUNET_NAMESTORE_RecordData *rd)
+                 const struct GNUNET_GNSRECORD_Data *rd)
 {
   struct in_addr a;
   int i;
@@ -216,7 +216,7 @@ do_check (void *cls,
   GNUNET_CRYPTO_ecdsa_key_get_public (alice_key, &alice_pkey);
   GNUNET_CRYPTO_ecdsa_key_get_public (bob_key, &bob_pkey);
 
-  struct GNUNET_NAMESTORE_RecordData rd;
+  struct GNUNET_GNSRECORD_Data rd;
   char* ip = TEST_IP;
   struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr));
   rd.expiration_time = UINT64_MAX;
@@ -227,7 +227,7 @@ do_check (void *cls,
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &bob_hash;
   rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
-  rd.flags = GNUNET_NAMESTORE_RF_NONE;
+  rd.flags = GNUNET_GNSRECORD_RF_NONE;
 
   GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
                                             alice_key,
diff --git a/src/gns/test_gns_simple_shorten.c b/src/gns/test_gns_simple_shorten.c
index 2b4543f4e..74fe77446 100644
--- a/src/gns/test_gns_simple_shorten.c
+++ b/src/gns/test_gns_simple_shorten.c
@@ -246,7 +246,7 @@ void do_check (void *cls,
   GNUNET_CRYPTO_short_hash(&priv_pkey, sizeof(priv_pkey), &priv_zone);
   GNUNET_CRYPTO_short_hash(&short_pkey, sizeof(short_pkey), &short_zone);
 
-  struct GNUNET_NAMESTORE_RecordData rd;
+  struct GNUNET_GNSRECORD_Data rd;
   char* ip = TEST_IP;
   struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr));
   rd.expiration_time = UINT64_MAX;
@@ -257,7 +257,7 @@ void do_check (void *cls,
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &bob_hash;
   rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
-  rd.flags = GNUNET_NAMESTORE_RF_NONE;
+  rd.flags = GNUNET_GNSRECORD_RF_NONE;
 
   /* put bob into our zone */
   GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
diff --git a/src/gns/test_gns_simple_srv_lookup.c b/src/gns/test_gns_simple_srv_lookup.c
index 162e9dc93..ce8478d7d 100644
--- a/src/gns/test_gns_simple_srv_lookup.c
+++ b/src/gns/test_gns_simple_srv_lookup.c
@@ -104,7 +104,7 @@ static void shutdown_task (void *cls,
 
 static void
 on_lookup_result(void *cls, uint32_t rd_count,
-                 const struct GNUNET_NAMESTORE_RecordData *rd)
+                 const struct GNUNET_GNSRECORD_Data *rd)
 {
   int i;
   uint16_t *srv_data;
@@ -219,7 +219,7 @@ do_check (void *cls,
   GNUNET_CRYPTO_ecdsa_key_get_public (alice_key, &alice_pkey);
   GNUNET_CRYPTO_ecdsa_key_get_public (bob_key, &bob_pkey);
 
-  struct GNUNET_NAMESTORE_RecordData rd;
+  struct GNUNET_GNSRECORD_Data rd;
   char* ip = TEST_IP;
   struct in_addr *sipserver = GNUNET_malloc (sizeof (struct in_addr));
   srv_data = GNUNET_malloc (sizeof (struct GNUNET_TUN_DnsSrvRecord) + strlen (TEST_SRV_NAME) + 1);
@@ -235,7 +235,7 @@ do_check (void *cls,
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &bob_hash;
   rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
-  rd.flags = GNUNET_NAMESTORE_RF_NONE;
+  rd.flags = GNUNET_GNSRECORD_RF_NONE;
 
   GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
                                             alice_key,
diff --git a/src/gns/test_gns_simple_zkey_lookup.c b/src/gns/test_gns_simple_zkey_lookup.c
index 6e8ec9ff4..6907362b8 100644
--- a/src/gns/test_gns_simple_zkey_lookup.c
+++ b/src/gns/test_gns_simple_zkey_lookup.c
@@ -105,7 +105,7 @@ shutdown_task (void *cls,
 
 static void
 on_lookup_result(void *cls, uint32_t rd_count,
-                 const struct GNUNET_NAMESTORE_RecordData *rd)
+                 const struct GNUNET_GNSRECORD_Data *rd)
 {
   struct in_addr a;
   int i;
@@ -233,7 +233,7 @@ do_check (void *cls,
   GNUNET_CRYPTO_ecdsa_key_get_public (alice_key, &alice_pkey);
   GNUNET_CRYPTO_ecdsa_key_get_public (bob_key, &bob_pkey);
 
-  struct GNUNET_NAMESTORE_RecordData rd;
+  struct GNUNET_GNSRECORD_Data rd;
   char* ip = TEST_IP;
   struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr));
   rd.expiration_time = UINT64_MAX;
@@ -244,7 +244,7 @@ do_check (void *cls,
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &bob_hash;
   rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
-  rd.flags = GNUNET_NAMESTORE_RF_NONE;
+  rd.flags = GNUNET_GNSRECORD_RF_NONE;
 
   GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
                                             alice_key,