-rename fest for symbols moved from GNUNET_NAMESTORE_ to new GNUNET_GNSRECORD_ library

19 files changed, 67 insertions, 67 deletions

diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c
index aca0155c8..7ee303866 100644
--- a/src/conversation/conversation_api.c
+++ b/src/conversation/conversation_api.c
@@ -457,7 +457,7 @@ GNUNET_CONVERSATION_phone_get_record (struct GNUNET_CONVERSATION_Phone *phone,
   rd->data = &phone->my_record;
   rd->expiration_time = 0;
   rd->data_size = sizeof (struct GNUNET_CONVERSATION_PhoneRecord);
-  rd->record_type = GNUNET_NAMESTORE_TYPE_PHONE;
+  rd->record_type = GNUNET_GNSRECORD_TYPE_PHONE;
   rd->flags = GNUNET_NAMESTORE_RF_NONE;
 }
 
@@ -914,7 +914,7 @@ handle_gns_response (void *cls,
   call->gns_lookup = NULL;
   for (i=0;i<rd_count;i++)
   {
-    if (GNUNET_NAMESTORE_TYPE_PHONE == rd[i].record_type)
+    if (GNUNET_GNSRECORD_TYPE_PHONE == rd[i].record_type)
     {
       if (rd[i].data_size != sizeof (struct GNUNET_CONVERSATION_PhoneRecord))
       {
@@ -1017,7 +1017,7 @@ reconnect_call (struct GNUNET_CONVERSATION_Call *call)
   call->gns_lookup = GNUNET_GNS_lookup (call->gns,
                                         call->callee,
                                         &my_zone,
-                                        GNUNET_NAMESTORE_TYPE_PHONE,
+                                        GNUNET_GNSRECORD_TYPE_PHONE,
                                         GNUNET_NO,
                                         NULL /* FIXME: add shortening support */,
                                         &handle_gns_response, call);
diff --git a/src/conversation/gnunet-conversation.c b/src/conversation/gnunet-conversation.c
index d2122d104..5acdb3812 100644
--- a/src/conversation/gnunet-conversation.c
+++ b/src/conversation/gnunet-conversation.c
@@ -244,7 +244,7 @@ start_phone ()
     GNUNET_CONVERSATION_phone_get_record (phone,
                                           &rd);
     GNUNET_free_non_null (address);
-    address = GNUNET_NAMESTORE_value_to_string (rd.record_type,
+    address = GNUNET_GNSRECORD_value_to_string (rd.record_type,
                                                 rd.data,
                                                 rd.data_size);
     if (verbose)
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 7265b9621..93f33218b 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -2275,10 +2275,10 @@ handle_gns_result (void *cls,
 #endif
       }
       break;
-    case GNUNET_NAMESTORE_TYPE_VPN:
+    case GNUNET_GNSRECORD_TYPE_VPN:
       GNUNET_break (0); /* should have been translated within GNS */
       break;
-    case GNUNET_NAMESTORE_TYPE_LEHO:
+    case GNUNET_GNSRECORD_TYPE_LEHO:
       GNUNET_free_non_null (s5r->leho);
       s5r->leho = GNUNET_strndup (r->data,
                                   r->data_size);
diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c
index 6772844b8..736fb8af2 100644
--- a/src/gns/gnunet-gns.c
+++ b/src/gns/gnunet-gns.c
@@ -157,10 +157,10 @@ process_lookup_result (void *cls, uint32_t rd_count,
   for (i=0; i<rd_count; i++)
   {
     if ( (rd[i].record_type != rtype) &&
-         (GNUNET_NAMESTORE_TYPE_ANY != rtype) )
+         (GNUNET_GNSRECORD_TYPE_ANY != rtype) )
       continue;
-    typename = GNUNET_NAMESTORE_number_to_typename (rd[i].record_type);
-    string_val = GNUNET_NAMESTORE_value_to_string (rd[i].record_type,
+    typename = GNUNET_GNSRECORD_number_to_typename (rd[i].record_type);
+    string_val = GNUNET_GNSRECORD_value_to_string (rd[i].record_type,
                                                    rd[i].data,
                                                    rd[i].data_size);
     if (NULL == string_val)
@@ -196,7 +196,7 @@ lookup_with_keys (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey,
                   const struct GNUNET_CRYPTO_EcdsaPrivateKey *shorten_key)
 {
   if (NULL != lookup_type)
-    rtype = GNUNET_NAMESTORE_typename_to_number (lookup_type);
+    rtype = GNUNET_GNSRECORD_typename_to_number (lookup_type);
   else
     rtype = GNUNET_DNSPARSER_TYPE_A;
 
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index f8b7e1a42..9b55dfcfc 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -1100,7 +1100,7 @@ vpn_allocation_cb (void *cls,
                                                        rd));
   for (i=0;i<vpn_ctx->rd_count;i++)
   {
-    if (GNUNET_NAMESTORE_TYPE_VPN == rd[i].record_type)
+    if (GNUNET_GNSRECORD_TYPE_VPN == rd[i].record_type)
     {
       switch (af)
       {
@@ -1204,7 +1204,7 @@ handle_gns_resolution_result (void *cls,
       {
         switch (rd[i].record_type)
         {
-        case GNUNET_NAMESTORE_TYPE_VPN:
+        case GNUNET_GNSRECORD_TYPE_VPN:
           {
             af = (GNUNET_DNSPARSER_TYPE_A == rh->record_type) ? AF_INET : AF_INET6;
             if (sizeof (struct GNUNET_TUN_GnsVpnRecord) <
@@ -1247,7 +1247,7 @@ handle_gns_resolution_result (void *cls,
                                                                 rh);
             return;
           }
-        case GNUNET_NAMESTORE_TYPE_GNS2DNS:
+        case GNUNET_GNSRECORD_TYPE_GNS2DNS:
           {
             /* delegation to DNS */
             goto do_recurse;
@@ -1418,7 +1418,7 @@ handle_gns_resolution_result (void *cls,
             GNUNET_DNSPARSER_free_srv (srv);
         }
         break;
-      case GNUNET_NAMESTORE_TYPE_PKEY:
+      case GNUNET_GNSRECORD_TYPE_PKEY:
         /* tigger shortening */
         if (NULL != rh->shorten_key)
         {
@@ -1453,7 +1453,7 @@ handle_gns_resolution_result (void *cls,
   {
     switch (rd[i].record_type)
     {
-    case GNUNET_NAMESTORE_TYPE_PKEY:
+    case GNUNET_GNSRECORD_TYPE_PKEY:
       /* delegation to another zone */
       if (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) !=
           rd[i].data_size)
@@ -1484,7 +1484,7 @@ handle_gns_resolution_result (void *cls,
       rh->task_id = GNUNET_SCHEDULER_add_now (&recursive_resolution,
                                               rh);
       return;
-    case GNUNET_NAMESTORE_TYPE_GNS2DNS:
+    case GNUNET_GNSRECORD_TYPE_GNS2DNS:
       {
         char *ns;
         /* resolution continues within DNS */
diff --git a/src/gns/gnunet-service-gns_shorten.c b/src/gns/gnunet-service-gns_shorten.c
index 3d3ac0094..3ec03a5ef 100644
--- a/src/gns/gnunet-service-gns_shorten.c
+++ b/src/gns/gnunet-service-gns_shorten.c
@@ -290,7 +290,7 @@ process_pseu_lookup_ns (void *cls,
   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_NAMESTORE_TYPE_PKEY;
+  new_pkey.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
   new_pkey.flags = GNUNET_NAMESTORE_RF_NONE
                  | GNUNET_NAMESTORE_RF_PRIVATE
                  | GNUNET_NAMESTORE_RF_PENDING;
@@ -365,7 +365,7 @@ process_auth_records (void *cls,
 
   for (i=0; i < rd_count; i++)
   {
-    if (GNUNET_NAMESTORE_TYPE_PSEU == rd[i].record_type)
+    if (GNUNET_GNSRECORD_TYPE_PSEU == rd[i].record_type)
     {
       char pseu[rd[i].data_size + 1];
 
diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c
index 66a2eb091..25127d747 100644
--- a/src/gns/test_gns_proxy.c
+++ b/src/gns/test_gns_proxy.c
@@ -423,7 +423,7 @@ run (void *cls,
 
   host_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (zone_keyfile);
   rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
-  GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_string_to_value (GNUNET_DNSPARSER_TYPE_A,
+  GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_string_to_value (GNUNET_DNSPARSER_TYPE_A,
                                                                "127.0.0.1",
                                                                (void**)&rd.data,
                                                                &rd.data_size));
diff --git a/src/gns/test_gns_pseu_shorten.c b/src/gns/test_gns_pseu_shorten.c
index f4c628cb0..6bcc18999 100644
--- a/src/gns/test_gns_pseu_shorten.c
+++ b/src/gns/test_gns_pseu_shorten.c
@@ -272,7 +272,7 @@ put_pseu_dht (void *cls, int success)
   rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
   rd.data_size = strlen(TEST_PSEU_ALICE)+1;
   rd.data = TEST_PSEU_ALICE;
-  rd.record_type = GNUNET_NAMESTORE_TYPE_PSEU;
+  rd.record_type = GNUNET_GNSRECORD_TYPE_PSEU;
   rd.flags = 0;
 
   sig = GNUNET_NAMESTORE_create_signature(alice_key,
@@ -447,7 +447,7 @@ put_pkey_dht (void *cls, int32_t success, const char *emsg)
   rd.expiration_time = UINT64_MAX;
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &alice_hash;
-  rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+  rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
   rd.flags = GNUNET_NAMESTORE_RF_NONE;
 
   sig = GNUNET_NAMESTORE_create_signature (bob_key,
@@ -518,7 +518,7 @@ fin_init_zone (void *cls, int32_t success, const char *emsg)
   rd.expiration_time = UINT64_MAX;
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &bob_hash;
-  rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+  rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
   rd.flags = GNUNET_NAMESTORE_RF_NONE;
 
   GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
@@ -539,7 +539,7 @@ cont_init_zone (void *cls, int32_t success, const char *emsg)
   rd.expiration_time = UINT64_MAX;
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &short_zone;
-  rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+  rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
   rd.flags = GNUNET_NAMESTORE_RF_NONE;
 
   GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
@@ -640,7 +640,7 @@ do_check (void *cls,
   rd.expiration_time = UINT64_MAX;
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &priv_zone;
-  rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+  rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
   rd.flags = GNUNET_NAMESTORE_RF_NONE;
 
   GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
diff --git a/src/gns/test_gns_revocation.c b/src/gns/test_gns_revocation.c
index 5be15759a..555e44a20 100644
--- a/src/gns/test_gns_revocation.c
+++ b/src/gns/test_gns_revocation.c
@@ -226,7 +226,7 @@ do_check (void *cls,
 
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &bob_hash;
-  rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+  rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
   rd.flags = GNUNET_NAMESTORE_RF_NONE;
 
   GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
@@ -254,7 +254,7 @@ do_check (void *cls,
                                NULL,
                                NULL);
   rd.data_size = 0;
-  rd.record_type = GNUNET_NAMESTORE_TYPE_REV;
+  rd.record_type = GNUNET_GNSRECORD_TYPE_REV;
 
   GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
                                             bob_key,
diff --git a/src/gns/test_gns_simple_shorten.c b/src/gns/test_gns_simple_shorten.c
index a4cfa26dc..2b4543f4e 100644
--- a/src/gns/test_gns_simple_shorten.c
+++ b/src/gns/test_gns_simple_shorten.c
@@ -256,7 +256,7 @@ void do_check (void *cls,
 
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &bob_hash;
-  rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+  rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
   rd.flags = GNUNET_NAMESTORE_RF_NONE;
 
   /* put bob into our zone */
@@ -308,7 +308,7 @@ void do_check (void *cls,
 
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &alice_hash;
-  rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+  rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
   GNUNET_free(sig);
 
   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 f31ae6daa..162e9dc93 100644
--- a/src/gns/test_gns_simple_srv_lookup.c
+++ b/src/gns/test_gns_simple_srv_lookup.c
@@ -234,7 +234,7 @@ do_check (void *cls,
 
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &bob_hash;
-  rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+  rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
   rd.flags = GNUNET_NAMESTORE_RF_NONE;
 
   GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
diff --git a/src/gns/test_gns_simple_zkey_lookup.c b/src/gns/test_gns_simple_zkey_lookup.c
index a808d2d9d..6e8ec9ff4 100644
--- a/src/gns/test_gns_simple_zkey_lookup.c
+++ b/src/gns/test_gns_simple_zkey_lookup.c
@@ -243,7 +243,7 @@ do_check (void *cls,
 
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &bob_hash;
-  rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+  rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
   rd.flags = GNUNET_NAMESTORE_RF_NONE;
 
   GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
diff --git a/src/gnsrecord/gnsrecord.c b/src/gnsrecord/gnsrecord.c
index da098ab66..68e4f23ba 100644
--- a/src/gnsrecord/gnsrecord.c
+++ b/src/gnsrecord/gnsrecord.c
@@ -47,7 +47,7 @@
  * @return NULL on error, otherwise human-readable representation of the value
  */
 char *
-GNUNET_NAMESTORE_value_to_string (uint32_t type,
+GNUNET_GNSRECORD_value_to_string (uint32_t type,
                                   const void *data,
                                   size_t data_size)
 {
@@ -176,11 +176,11 @@ GNUNET_NAMESTORE_value_to_string (uint32_t type,
     if (NULL == inet_ntop (AF_INET6, data, tmp, sizeof (tmp)))
       return NULL;
     return GNUNET_strdup (tmp);
-  case GNUNET_NAMESTORE_TYPE_PKEY:
+  case GNUNET_GNSRECORD_TYPE_PKEY:
     if (data_size != sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey))
       return NULL;
     return GNUNET_CRYPTO_ecdsa_public_key_to_string (data);
-  case GNUNET_NAMESTORE_TYPE_PHONE:
+  case GNUNET_GNSRECORD_TYPE_PHONE:
     {
       const struct GNUNET_CONVERSATION_PhoneRecord *pr;
       char *ret;
@@ -199,11 +199,11 @@ GNUNET_NAMESTORE_value_to_string (uint32_t type,
       GNUNET_free (pkey);
       return ret;
     }
-  case GNUNET_NAMESTORE_TYPE_PSEU:
+  case GNUNET_GNSRECORD_TYPE_PSEU:
     return GNUNET_strndup (data, data_size);
-  case GNUNET_NAMESTORE_TYPE_LEHO:
+  case GNUNET_GNSRECORD_TYPE_LEHO:
     return GNUNET_strndup (data, data_size);
-  case GNUNET_NAMESTORE_TYPE_VPN:
+  case GNUNET_GNSRECORD_TYPE_VPN:
     {
       const struct GNUNET_TUN_GnsVpnRecord *vpn;
       char* vpn_str;
@@ -223,7 +223,7 @@ GNUNET_NAMESTORE_value_to_string (uint32_t type,
       }
       return vpn_str;
     }
-  case GNUNET_NAMESTORE_TYPE_GNS2DNS:
+  case GNUNET_GNSRECORD_TYPE_GNS2DNS:
     {
       char *ns;
       size_t off;
@@ -309,7 +309,7 @@ GNUNET_NAMESTORE_value_to_string (uint32_t type,
  * @return #GNUNET_OK on success
  */
 int
-GNUNET_NAMESTORE_string_to_value (uint32_t type,
+GNUNET_GNSRECORD_string_to_value (uint32_t type,
                                   const char *s,
                                   void **data,
                                   size_t *data_size)
@@ -509,7 +509,7 @@ GNUNET_NAMESTORE_string_to_value (uint32_t type,
     *data_size = sizeof (struct in6_addr);
     memcpy (*data, &value_aaaa, sizeof (value_aaaa));
     return GNUNET_OK;
-  case GNUNET_NAMESTORE_TYPE_PKEY:
+  case GNUNET_GNSRECORD_TYPE_PKEY:
     if (GNUNET_OK !=
         GNUNET_CRYPTO_ecdsa_public_key_from_string (s, strlen (s), &pkey))
     {
@@ -522,7 +522,7 @@ GNUNET_NAMESTORE_string_to_value (uint32_t type,
     memcpy (*data, &pkey, sizeof (pkey));
     *data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
     return GNUNET_OK;
-  case GNUNET_NAMESTORE_TYPE_PHONE:
+  case GNUNET_GNSRECORD_TYPE_PHONE:
     {
       struct GNUNET_CONVERSATION_PhoneRecord *pr;
       unsigned int line;
@@ -549,15 +549,15 @@ GNUNET_NAMESTORE_string_to_value (uint32_t type,
       *data_size = sizeof (struct GNUNET_CONVERSATION_PhoneRecord);
       return GNUNET_OK;
     }
-  case GNUNET_NAMESTORE_TYPE_PSEU:
+  case GNUNET_GNSRECORD_TYPE_PSEU:
     *data = GNUNET_strdup (s);
     *data_size = strlen (s);
     return GNUNET_OK;
-  case GNUNET_NAMESTORE_TYPE_LEHO:
+  case GNUNET_GNSRECORD_TYPE_LEHO:
     *data = GNUNET_strdup (s);
     *data_size = strlen (s);
     return GNUNET_OK;
-  case GNUNET_NAMESTORE_TYPE_VPN:
+  case GNUNET_GNSRECORD_TYPE_VPN:
     if (3 != SSCANF (s,"%u %103s %253s",
                      &proto, s_peer, s_serv))
     {
@@ -579,7 +579,7 @@ GNUNET_NAMESTORE_string_to_value (uint32_t type,
     vpn->proto = htons ((uint16_t) proto);
     strcpy ((char*)&vpn[1], s_serv);
     return GNUNET_OK;
-  case GNUNET_NAMESTORE_TYPE_GNS2DNS:
+  case GNUNET_GNSRECORD_TYPE_GNS2DNS:
     {
       char nsbuf[256];
       size_t off;
@@ -643,12 +643,12 @@ static struct {
   { "MX", GNUNET_DNSPARSER_TYPE_MX },
   { "TXT", GNUNET_DNSPARSER_TYPE_TXT },
   { "AAAA", GNUNET_DNSPARSER_TYPE_AAAA },
-  { "PKEY",  GNUNET_NAMESTORE_TYPE_PKEY },
-  { "PSEU",  GNUNET_NAMESTORE_TYPE_PSEU },
-  { "LEHO",  GNUNET_NAMESTORE_TYPE_LEHO },
-  { "VPN", GNUNET_NAMESTORE_TYPE_VPN },
-  { "GNS2DNS", GNUNET_NAMESTORE_TYPE_GNS2DNS },
-  { "PHONE", GNUNET_NAMESTORE_TYPE_PHONE },
+  { "PKEY",  GNUNET_GNSRECORD_TYPE_PKEY },
+  { "PSEU",  GNUNET_GNSRECORD_TYPE_PSEU },
+  { "LEHO",  GNUNET_GNSRECORD_TYPE_LEHO },
+  { "VPN", GNUNET_GNSRECORD_TYPE_VPN },
+  { "GNS2DNS", GNUNET_GNSRECORD_TYPE_GNS2DNS },
+  { "PHONE", GNUNET_GNSRECORD_TYPE_PHONE },
   { "TLSA", GNUNET_DNSPARSER_TYPE_TLSA },
   { NULL, UINT32_MAX }
 };
@@ -661,7 +661,7 @@ static struct {
  * @return corresponding number, UINT32_MAX on error
  */
 uint32_t
-GNUNET_NAMESTORE_typename_to_number (const char *dns_typename)
+GNUNET_GNSRECORD_typename_to_number (const char *dns_typename)
 {
   unsigned int i;
 
@@ -680,7 +680,7 @@ GNUNET_NAMESTORE_typename_to_number (const char *dns_typename)
  * @return corresponding typestring, NULL on error
  */
 const char *
-GNUNET_NAMESTORE_number_to_typename (uint32_t type)
+GNUNET_GNSRECORD_number_to_typename (uint32_t type)
 {
   unsigned int i;
 
diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c
index 14f95c911..701cdd558 100644
--- a/src/namestore/gnunet-namestore-fcfsd.c
+++ b/src/namestore/gnunet-namestore-fcfsd.c
@@ -287,14 +287,14 @@ iterate_cb (void *cls,
     return;
   }
 
-  if (GNUNET_NAMESTORE_TYPE_PKEY != rd->record_type)
+  if (GNUNET_GNSRECORD_TYPE_PKEY != rd->record_type)
   {
     GNUNET_NAMESTORE_zone_iterator_next (zr->list_it);
     return;
   }
 
   bytes_free = zr->buf_len - zr->write_offset;
-  pkey = GNUNET_NAMESTORE_value_to_string (rd->record_type,
+  pkey = GNUNET_GNSRECORD_value_to_string (rd->record_type,
                                            rd->data,
                                            rd->data_size);
 
@@ -529,7 +529,7 @@ zone_to_name_cb (void *cls,
   r.data = &pub;
   r.data_size = sizeof (pub);
   r.expiration_time = UINT64_MAX;
-  r.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+  r.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
   r.flags = GNUNET_NAMESTORE_RF_NONE;
   request->qe = GNUNET_NAMESTORE_records_store (ns,
                                                 &fcfs_zone_pkey,
diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c
index e4cd856d0..1ed203f1d 100644
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -358,8 +358,8 @@ display_record (void *cls,
            name);
   for (i=0;i<rd_len;i++)
   {
-    typestring = GNUNET_NAMESTORE_number_to_typename (rd[i].record_type);
-    s = GNUNET_NAMESTORE_value_to_string (rd[i].record_type,
+    typestring = GNUNET_GNSRECORD_number_to_typename (rd[i].record_type);
+    s = GNUNET_GNSRECORD_value_to_string (rd[i].record_type,
                                           rd[i].data,
                                           rd[i].data_size);
     if (NULL == s)
@@ -495,8 +495,8 @@ display_records_from_block (void *cls,
            name);
   for (i=0;i<rd_len;i++)
   {
-    typestring = GNUNET_NAMESTORE_number_to_typename (rd[i].record_type);
-    s = GNUNET_NAMESTORE_value_to_string (rd[i].record_type,
+    typestring = GNUNET_GNSRECORD_number_to_typename (rd[i].record_type);
+    s = GNUNET_GNSRECORD_value_to_string (rd[i].record_type,
                                           rd[i].data,
                                           rd[i].data_size);
     if (NULL == s)
@@ -639,7 +639,7 @@ testservice_task (void *cls,
       ret = 1;
       return;
     }
-    type = GNUNET_NAMESTORE_typename_to_number (typestring);
+    type = GNUNET_GNSRECORD_typename_to_number (typestring);
     if (UINT32_MAX == type)
     {
       fprintf (stderr, _("Unsupported type `%s'\n"), typestring);
@@ -657,7 +657,7 @@ testservice_task (void *cls,
       return;
     }
     if (GNUNET_OK !=
-        GNUNET_NAMESTORE_string_to_value (type,
+        GNUNET_GNSRECORD_string_to_value (type,
                                           value,
                                           &data,
                                           &data_size))
@@ -795,7 +795,7 @@ testservice_task (void *cls,
     memset (&rd, 0, sizeof (rd));
     rd.data = &pkey;
     rd.data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
-    rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+    rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
     if (GNUNET_YES == etime_is_rel)
     {
       rd.expiration_time = etime_rel.rel_value_us;
diff --git a/src/namestore/plugin_namestore_postgres.c b/src/namestore/plugin_namestore_postgres.c
index 0f2721771..0a8f0fbe8 100644
--- a/src/namestore/plugin_namestore_postgres.c
+++ b/src/namestore/plugin_namestore_postgres.c
@@ -476,7 +476,7 @@ namestore_postgres_store_records (void *cls,
 
   memset (&pkey, 0, sizeof (pkey));
   for (i=0;i<rd_count;i++)
-    if (GNUNET_NAMESTORE_TYPE_PKEY == rd[i].record_type)
+    if (GNUNET_GNSRECORD_TYPE_PKEY == rd[i].record_type)
     {
       GNUNET_break (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) == rd[i].data_size);
       memcpy (&pkey,
diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c
index 9e303a427..06c2a7639 100644
--- a/src/namestore/plugin_namestore_sqlite.c
+++ b/src/namestore/plugin_namestore_sqlite.c
@@ -671,7 +671,7 @@ namestore_sqlite_store_records (void *cls,
 
   memset (&pkey, 0, sizeof (pkey));
   for (i=0;i<rd_count;i++)
-    if (GNUNET_NAMESTORE_TYPE_PKEY == rd[i].record_type)
+    if (GNUNET_GNSRECORD_TYPE_PKEY == rd[i].record_type)
     {
       GNUNET_break (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) == rd[i].data_size);
       memcpy (&pkey,
diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c
index 973cc18a0..177c6479b 100644
--- a/src/namestore/test_namestore_api_zone_to_name.c
+++ b/src/namestore/test_namestore_api_zone_to_name.c
@@ -186,7 +186,7 @@ run (void *cls,
 
   struct GNUNET_NAMESTORE_RecordData rd;
   rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
-  rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+  rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
   rd.data_size = sizeof (struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_ShortHashCode));
   memcpy ((char *) rd.data, &s_zone_value, sizeof (struct GNUNET_CRYPTO_ShortHashCode));
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c
index c98f97933..3f10819ab 100644
--- a/src/pt/test_gns_vpn.c
+++ b/src/pt/test_gns_vpn.c
@@ -395,11 +395,11 @@ run (void *cls,
   host_key = GNUNET_CRYPTO_eddsa_key_create_from_file (zone_keyfile);
   rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
   GNUNET_asprintf (&rd_string, "6 %s %s", (char*)&peername, "www.gnu.");
-  GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_string_to_value (GNUNET_NAMESTORE_TYPE_VPN,
+  GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_string_to_value (GNUNET_GNSRECORD_TYPE_VPN,
                                                                rd_string,
                                                                (void**)&rd.data,
                                                                &rd.data_size));
-  rd.record_type = GNUNET_NAMESTORE_TYPE_VPN;
+  rd.record_type = GNUNET_GNSRECORD_TYPE_VPN;
 
   GNUNET_NAMESTORE_records_store (namestore,
                                   host_key,