16 files changed, 67 insertions, 68 deletions

diff --git a/src/ats/ats.h b/src/ats/ats.h
index bef63553e..fbc6ca712 100644
--- a/src/ats/ats.h
+++ b/src/ats/ats.h
@@ -77,7 +77,7 @@ struct AddressUpdateMessage
   uint32_t session_id GNUNET_PACKED;
 
   /* followed by:
-     - struct GNUNET_TRANSPORT_ATS_Information [ats_count];
+     - struct GNUNET_ATS_Information [ats_count];
      - char address[address_length]
      - char plugin_name[plugin_name_length] (including '\0'-termination).
   */
@@ -126,7 +126,7 @@ struct AddressSuggestionMessage
   struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in;
 
   /* followed by:
-     - struct GNUNET_TRANSPORT_ATS_Information [ats_count];
+     - struct GNUNET_ATS_Information [ats_count];
      - char address[address_length]
      - char plugin_name[plugin_name_length] (including '\0'-termination).
   */
@@ -151,7 +151,7 @@ struct PeerInformationMessage
   struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in;
 
   /* followed by: 
-     - struct GNUNET_TRANSPORT_ATS_Information [ats_count];
+     - struct GNUNET_ATS_Information [ats_count];
      - char address[address_length]
      - char plugin_name[plugin_name_length] (including '\0'-termination).
   */
diff --git a/src/ats/ats_api.c b/src/ats/ats_api.c
index 29a273e3e..61d3895d2 100644
--- a/src/ats/ats_api.c
+++ b/src/ats/ats_api.c
@@ -523,7 +523,7 @@ update_session (void *cls, const GNUNET_HashCode * key, void *value)
 static struct AllocationRecord *
 create_allocation_record (const char *plugin_name, struct Session *session,
                           const void *plugin_addr, size_t plugin_addr_len,
-                          const struct GNUNET_TRANSPORT_ATS_Information *ats,
+                          const struct GNUNET_ATS_Information *ats,
                           uint32_t ats_count)
 {
   struct AllocationRecord *ar;
@@ -539,7 +539,7 @@ create_allocation_record (const char *plugin_name, struct Session *session,
   GNUNET_assert (ats_count > 0);
   GNUNET_array_grow (ar->ats, ar->ats_count, ats_count);
   memcpy (ar->ats, ats,
-          ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information));
+          ats_count * sizeof (struct GNUNET_ATS_Information));
   ar->connected = GNUNET_SYSERR; /* aka: not known / no change */
   return ar;
 }
@@ -587,7 +587,7 @@ GNUNET_ATS_peer_connect (struct GNUNET_ATS_SchedulingHandle *atc,
                          const struct GNUNET_PeerIdentity *peer,
                          const char *plugin_name, struct Session *session,
                          const void *plugin_addr, size_t plugin_addr_len,
-                         const struct GNUNET_TRANSPORT_ATS_Information *ats,
+                         const struct GNUNET_ATS_Information *ats,
                          uint32_t ats_count)
 {
   struct AllocationRecord *ar;
@@ -761,7 +761,7 @@ GNUNET_ATS_address_update (struct GNUNET_ATS_SchedulingHandle *atc,
                            struct GNUNET_TIME_Absolute valid_until,
                            const char *plugin_name, struct Session *session,
                            const void *plugin_addr, size_t plugin_addr_len,
-                           const struct GNUNET_TRANSPORT_ATS_Information *ats,
+                           const struct GNUNET_ATS_Information *ats,
                            uint32_t ats_count)
 {
   struct AllocationRecord *ar;
diff --git a/src/ats/ats_api.h b/src/ats/ats_api.h
index 2c98194be..a10607817 100644
--- a/src/ats/ats_api.h
+++ b/src/ats/ats_api.h
@@ -37,7 +37,7 @@ struct AllocationRecord
   /**
    * Performance information associated with this address (array).
    */
-  struct GNUNET_TRANSPORT_ATS_Information *ats;
+  struct GNUNET_ATS_Information *ats;
 
   /**
    * Name of the plugin
diff --git a/src/ats/ats_api_performance.c b/src/ats/ats_api_performance.c
index 2cae8a51f..c3a5d2bed 100644
--- a/src/ats/ats_api_performance.c
+++ b/src/ats/ats_api_performance.c
@@ -250,7 +250,7 @@ process_pi_message (struct GNUNET_ATS_PerformanceHandle *ph,
                     const struct GNUNET_MessageHeader *msg)
 {
   const struct PeerInformationMessage *pi;
-  const struct GNUNET_TRANSPORT_ATS_Information *atsi;
+  const struct GNUNET_ATS_Information *atsi;
   const char *address;
   const char *plugin_name;
   uint16_t address_length;
@@ -271,14 +271,14 @@ process_pi_message (struct GNUNET_ATS_PerformanceHandle *ph,
   ats_count = ntohl (pi->ats_count);
   address_length = ntohs (pi->address_length);
   plugin_name_length = ntohs (pi->plugin_name_length);
-  atsi = (const struct GNUNET_TRANSPORT_ATS_Information*) &pi[1];
+  atsi = (const struct GNUNET_ATS_Information*) &pi[1];
   address = (const char*) &atsi[ats_count];
   plugin_name = &address[address_length];
   if ( (address_length +
         plugin_name_length +
-        ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information) +
+        ats_count * sizeof (struct GNUNET_ATS_Information) +
         sizeof (struct PeerInformationMessage) != ntohs (msg->size))  ||
-       (ats_count > GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_TRANSPORT_ATS_Information)) ||
+       (ats_count > GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_ATS_Information)) ||
        (plugin_name[plugin_name_length - 1] != '\0') )
   {
     GNUNET_break (0);
diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c
index 53a21f996..4855efadb 100644
--- a/src/ats/ats_api_scheduling.c
+++ b/src/ats/ats_api_scheduling.c
@@ -317,7 +317,7 @@ process_ats_message (void *cls,
 {
   struct GNUNET_ATS_SchedulingHandle *sh = cls;
   const struct AddressSuggestionMessage *m;
-  const struct GNUNET_TRANSPORT_ATS_Information *atsi;
+  const struct GNUNET_ATS_Information *atsi;
   const char *address;
   const char *plugin_name;
   uint16_t address_length;
@@ -345,15 +345,15 @@ process_ats_message (void *cls,
   m = (const struct AddressSuggestionMessage*) msg;
   ats_count = ntohl (m->ats_count);
   address_length = ntohs (m->address_length);
-  atsi = (const struct GNUNET_TRANSPORT_ATS_Information*) &m[1];
+  atsi = (const struct GNUNET_ATS_Information*) &m[1];
   address = (const char*) &atsi[ats_count];
   plugin_name = &address[address_length];
   plugin_name_length = ntohs (m->plugin_name_length);
   if ( (address_length +
         plugin_name_length +
-        ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information) +
+        ats_count * sizeof (struct GNUNET_ATS_Information) +
         sizeof (struct AddressSuggestionMessage) != ntohs (msg->size))  ||
-       (ats_count > GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_TRANSPORT_ATS_Information)) ||
+       (ats_count > GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_ATS_Information)) ||
        (plugin_name[plugin_name_length - 1] != '\0') )
   {
     GNUNET_break (0);
@@ -525,23 +525,23 @@ GNUNET_ATS_address_update (struct GNUNET_ATS_SchedulingHandle *sh,
                            const char *plugin_name,
                            const void *plugin_addr, size_t plugin_addr_len,
                            struct Session *session,
-                           const struct GNUNET_TRANSPORT_ATS_Information *ats,
+                           const struct GNUNET_ATS_Information *ats,
                            uint32_t ats_count)
 {
   struct PendingMessage *p;
   struct AddressUpdateMessage *m;
-  struct GNUNET_TRANSPORT_ATS_Information *am;
+  struct GNUNET_ATS_Information *am;
   char *pm;
   size_t namelen;
   size_t msize;
 
   namelen = (plugin_name == NULL) ? 0 : strlen (plugin_name) + 1;                                               
   msize = sizeof (struct AddressUpdateMessage) + plugin_addr_len + 
-    ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information) + namelen;
+    ats_count * sizeof (struct GNUNET_ATS_Information) + namelen;
   if ( (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE) ||
        (plugin_addr_len  >= GNUNET_SERVER_MAX_MESSAGE_SIZE) ||
        (namelen  >= GNUNET_SERVER_MAX_MESSAGE_SIZE) ||
-       (ats_count >= GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_TRANSPORT_ATS_Information)) )
+       (ats_count >= GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_ATS_Information)) )
   {
     GNUNET_break (0);
     return;
@@ -557,8 +557,8 @@ GNUNET_ATS_address_update (struct GNUNET_ATS_SchedulingHandle *sh,
   m->address_length = htons (plugin_addr_len);
   m->plugin_name_length = htons (namelen);
   m->session_id = htonl (get_session_id (sh, session));
-  am = (struct GNUNET_TRANSPORT_ATS_Information*) &m[1];
-  memcpy (am, ats, ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information));
+  am = (struct GNUNET_ATS_Information*) &m[1];
+  memcpy (am, ats, ats_count * sizeof (struct GNUNET_ATS_Information));
   pm = (char *) &am[ats_count];
   memcpy (pm, plugin_addr, plugin_addr_len);
   memcpy (&pm[plugin_addr_len], plugin_name, namelen);
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 9c504b26c..2bcb9913a 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -46,7 +46,7 @@ struct ATS_Address
 
   char * plugin;
 
-  struct GNUNET_TRANSPORT_ATS_Information * ats;
+  struct GNUNET_ATS_Information * ats;
 
   struct GNUNET_BANDWIDTH_Value32NBO bw_in;
 
@@ -144,18 +144,18 @@ GAS_address_update (const struct GNUNET_PeerIdentity *peer,
                     const void *plugin_addr, size_t plugin_addr_len,
                     struct GNUNET_SERVER_Client *session_client,
                     uint32_t session_id,
-                    const struct GNUNET_TRANSPORT_ATS_Information *atsi,
+                    const struct GNUNET_ATS_Information *atsi,
                     uint32_t atsi_count)
 {
   struct ATS_Address * aa;
   struct ATS_Address * old;
 
   aa = GNUNET_malloc (sizeof (struct ATS_Address) + plugin_addr_len);
-  aa->ats = GNUNET_malloc(atsi_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information));
+  aa->ats = GNUNET_malloc(atsi_count * sizeof (struct GNUNET_ATS_Information));
   aa->peer = *peer;
   aa->addr_len = plugin_addr_len;
   aa->ats_count = atsi_count;
-  memcpy (aa->ats, atsi, atsi_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information));
+  memcpy (aa->ats, atsi, atsi_count * sizeof (struct GNUNET_ATS_Information));
   aa->addr = &aa[1];
   memcpy (&aa[1], plugin_addr, plugin_addr_len);
   aa->plugin = GNUNET_strdup (plugin_name);
diff --git a/src/ats/gnunet-service-ats_addresses.h b/src/ats/gnunet-service-ats_addresses.h
index fdb3df678..335876720 100644
--- a/src/ats/gnunet-service-ats_addresses.h
+++ b/src/ats/gnunet-service-ats_addresses.h
@@ -28,7 +28,6 @@
 #define GNUNET_SERVICE_ATS_ADDRESSES_H
 
 #include "gnunet_util_lib.h"
-#include "gnunet_transport_service.h" // FIXME...
 #include "gnunet_ats_service.h" 
 #include "ats.h"
 
@@ -53,7 +52,7 @@ GAS_address_update (const struct GNUNET_PeerIdentity *peer,
                     const void *plugin_addr, size_t plugin_addr_len,
                     struct GNUNET_SERVER_Client *session_client,
                     uint32_t session_id,
-                    const struct GNUNET_TRANSPORT_ATS_Information *atsi,
+                    const struct GNUNET_ATS_Information *atsi,
                     uint32_t atsi_count);
 
 
diff --git a/src/ats/gnunet-service-ats_math.c b/src/ats/gnunet-service-ats_math.c
index 220fe522b..8d25e25c6 100644
--- a/src/ats/gnunet-service-ats_math.c
+++ b/src/ats/gnunet-service-ats_math.c
@@ -513,8 +513,8 @@ _dummy2 ()
 struct ATS_Handle *
 ats_init (double D, double U, double R, int v_b_min, int v_n_min,
           int max_iterations, struct GNUNET_TIME_Relative max_duration,
-          GNUNET_TRANSPORT_ATS_AddressNotification address_not,
-          GNUNET_TRANSPORT_ATS_ResultCallback res_cb)
+          GNUNET_ATS_AddressNotification address_not,
+          GNUNET_ATS_ResultCallback res_cb)
 {
   struct ATS_Handle *ats = NULL;
 
@@ -850,7 +850,7 @@ ats_create_problem (struct ATS_Handle *ats, struct ATS_internals *stat,
     {
       ia[array_index] = row_index;
       ja[array_index] = c2;
-      if (qm[c - 1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DELAY)
+      if (qm[c - 1].atis_index == GNUNET_ATS_QUALITY_NET_DELAY)
       {
         double v0 = 0, v1 = 0, v2 = 0;
 
@@ -866,7 +866,7 @@ ats_create_problem (struct ATS_Handle *ats, struct ATS_internals *stat,
         value = 100.0 / ((v0 + 2 * v1 + 3 * v2) / 6.0);
         value = 1;
       }
-      if (qm[c - 1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE)
+      if (qm[c - 1].atis_index == GNUNET_ATS_QUALITY_NET_DISTANCE)
       {
         double v0 = 0, v1 = 0, v2 = 0;
 
@@ -1243,7 +1243,7 @@ ats_update_problem_qm (struct ATS_Handle *ats)
       GNUNET_assert (ats->mechanisms[c2].addr != NULL);
       GNUNET_assert (ats->mechanisms[c2].peer != NULL);
 
-      if (qm[c - 1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DELAY)
+      if (qm[c - 1].atis_index == GNUNET_ATS_QUALITY_NET_DELAY)
       {
         double v0 = 0, v1 = 0, v2 = 0;
 
@@ -1259,7 +1259,7 @@ ats_update_problem_qm (struct ATS_Handle *ats)
         value = 100.0 / ((v0 + 2 * v1 + 3 * v2) / 6.0);
         //value = 1;
       }
-      if (qm[c - 1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE)
+      if (qm[c - 1].atis_index == GNUNET_ATS_QUALITY_NET_DISTANCE)
       {
         double v0 = 0, v1 = 0, v2 = 0;
 
diff --git a/src/ats/gnunet-service-ats_math.h b/src/ats/gnunet-service-ats_math.h
index 4af1bdc4c..1324c30d0 100644
--- a/src/ats/gnunet-service-ats_math.h
+++ b/src/ats/gnunet-service-ats_math.h
@@ -67,13 +67,13 @@
 struct ATS_mechanism;
 struct ATS_peer;
 
-typedef void (*GNUNET_TRANSPORT_ATS_AddressNotification) (struct ATS_peer **
+typedef void (*GNUNET_ATS_AddressNotification) (struct ATS_peer **
                                                           peers, int *c_p,
                                                           struct ATS_mechanism
                                                           ** mechanisms,
                                                           int *c_m);
 
-typedef void (*GNUNET_TRANSPORT_ATS_ResultCallback) (void);
+typedef void (*GNUNET_ATS_ResultCallback) (void);
 
 enum ATS_problem_state
 {
@@ -211,9 +211,9 @@ struct ATS_Handle
    *  Callback functions
    */
 
-  GNUNET_TRANSPORT_ATS_AddressNotification addr_notification;
+  GNUNET_ATS_AddressNotification addr_notification;
 
-  GNUNET_TRANSPORT_ATS_ResultCallback result_cb;
+  GNUNET_ATS_ResultCallback result_cb;
 
 
     /**
@@ -452,8 +452,8 @@ static struct ATS_quality_metric qm[] = {
 struct ATS_Handle *
 ats_init (double D, double U, double R, int v_b_min, int v_n_min,
           int max_iterations, struct GNUNET_TIME_Relative max_duration,
-          GNUNET_TRANSPORT_ATS_AddressNotification address_not,
-          GNUNET_TRANSPORT_ATS_ResultCallback res_cb);
+          GNUNET_ATS_AddressNotification address_not,
+          GNUNET_ATS_ResultCallback res_cb);
 
 void
 ats_shutdown (struct ATS_Handle *ats);
diff --git a/src/ats/gnunet-service-ats_performance.c b/src/ats/gnunet-service-ats_performance.c
index 3a4acc641..103040ea8 100644
--- a/src/ats/gnunet-service-ats_performance.c
+++ b/src/ats/gnunet-service-ats_performance.c
@@ -151,7 +151,7 @@ void
 GAS_performance_notify_clients (const struct GNUNET_PeerIdentity *peer,
                                 const char *plugin_name,
                                 const void *plugin_addr, size_t plugin_addr_len,
-                                const struct GNUNET_TRANSPORT_ATS_Information *atsi,
+                                const struct GNUNET_ATS_Information *atsi,
                                 uint32_t atsi_count,                            
                                 struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
                                 struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
@@ -159,14 +159,14 @@ GAS_performance_notify_clients (const struct GNUNET_PeerIdentity *peer,
   struct PerformanceClient *pc;
   struct PeerInformationMessage *msg;
   size_t plugin_name_length = strlen (plugin_name) + 1;
-  size_t msize = sizeof (struct PeerInformationMessage) + atsi_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information) 
+  size_t msize = sizeof (struct PeerInformationMessage) + atsi_count * sizeof (struct GNUNET_ATS_Information) 
     + plugin_addr_len + plugin_name_length;
   char buf[msize];
-  struct GNUNET_TRANSPORT_ATS_Information *atsp;
+  struct GNUNET_ATS_Information *atsp;
   char *addrp;
 
   GNUNET_assert (msize < GNUNET_SERVER_MAX_MESSAGE_SIZE);
-  GNUNET_assert (atsi_count < GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_TRANSPORT_ATS_Information));
+  GNUNET_assert (atsi_count < GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_ATS_Information));
   msg = (struct PeerInformationMessage*) buf;
   msg->header.size = htons (msize);
   msg->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_PEER_INFORMATION);
@@ -176,8 +176,8 @@ GAS_performance_notify_clients (const struct GNUNET_PeerIdentity *peer,
   msg->plugin_name_length = htons (plugin_name_length);
   msg->bandwidth_out = bandwidth_out;
   msg->bandwidth_in = bandwidth_in;
-  atsp = (struct GNUNET_TRANSPORT_ATS_Information* ) &msg[1];
-  memcpy (atsp, atsi, sizeof (struct GNUNET_TRANSPORT_ATS_Information) * atsi_count);
+  atsp = (struct GNUNET_ATS_Information* ) &msg[1];
+  memcpy (atsp, atsi, sizeof (struct GNUNET_ATS_Information) * atsi_count);
   addrp = (char*) &atsp[atsi_count];
   memcpy (addrp, plugin_addr, plugin_addr_len);
   strcpy (&addrp[plugin_addr_len], plugin_name);
diff --git a/src/ats/gnunet-service-ats_performance.h b/src/ats/gnunet-service-ats_performance.h
index 6dfd11202..5988bff44 100644
--- a/src/ats/gnunet-service-ats_performance.h
+++ b/src/ats/gnunet-service-ats_performance.h
@@ -28,7 +28,7 @@
 #define GNUNET_SERVICE_ATS_PERFORMANCE_H
 
 #include "gnunet_util_lib.h"
-#include "gnunet_transport_service.h" // FIXME
+#include "gnunet_ats_service.h"
 #include "ats.h"
 
 /**
@@ -69,7 +69,7 @@ void
 GAS_performance_notify_clients (const struct GNUNET_PeerIdentity *peer,
                                 const char *plugin_name,
                                 const void *plugin_addr, size_t plugin_addr_len,
-                                const struct GNUNET_TRANSPORT_ATS_Information *atsi,
+                                const struct GNUNET_ATS_Information *atsi,
                                 uint32_t atsi_count,                            
                                 struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
                                 struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in);
diff --git a/src/ats/gnunet-service-ats_scheduling.c b/src/ats/gnunet-service-ats_scheduling.c
index ca4e86ca4..825f00085 100644
--- a/src/ats/gnunet-service-ats_scheduling.c
+++ b/src/ats/gnunet-service-ats_scheduling.c
@@ -155,7 +155,7 @@ GAS_scheduling_transmit_address_suggestion (const struct GNUNET_PeerIdentity *pe
                                             const void *plugin_addr, size_t plugin_addr_len,
                                             struct GNUNET_SERVER_Client *session_client,
                                             uint32_t session_id,
-                                            const struct GNUNET_TRANSPORT_ATS_Information *atsi,
+                                            const struct GNUNET_ATS_Information *atsi,
                                             uint32_t atsi_count,                                
                                             struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
                                             struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
@@ -163,14 +163,14 @@ GAS_scheduling_transmit_address_suggestion (const struct GNUNET_PeerIdentity *pe
   struct SchedulingClient *sc;
   struct AddressSuggestionMessage *msg;
   size_t plugin_name_length = strlen (plugin_name) + 1;
-  size_t msize = sizeof (struct AddressSuggestionMessage) + atsi_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information) 
+  size_t msize = sizeof (struct AddressSuggestionMessage) + atsi_count * sizeof (struct GNUNET_ATS_Information) 
     + plugin_addr_len + plugin_name_length;
   char buf[msize];
-  struct GNUNET_TRANSPORT_ATS_Information *atsp;
+  struct GNUNET_ATS_Information *atsp;
   char *addrp;
 
   GNUNET_assert (msize < GNUNET_SERVER_MAX_MESSAGE_SIZE);
-  GNUNET_assert (atsi_count < GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_TRANSPORT_ATS_Information));
+  GNUNET_assert (atsi_count < GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_ATS_Information));
   msg = (struct AddressSuggestionMessage*) buf;
   msg->header.size = htons (msize);
   msg->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_ADDRESS_SUGGESTION);
@@ -181,8 +181,8 @@ GAS_scheduling_transmit_address_suggestion (const struct GNUNET_PeerIdentity *pe
   /* session ID is set only if 'client' is the same... */
   msg->bandwidth_out = bandwidth_out;
   msg->bandwidth_in = bandwidth_in;
-  atsp = (struct GNUNET_TRANSPORT_ATS_Information* ) &msg[1];
-  memcpy (atsp, atsi, sizeof (struct GNUNET_TRANSPORT_ATS_Information) * atsi_count);
+  atsp = (struct GNUNET_ATS_Information* ) &msg[1];
+  memcpy (atsp, atsi, sizeof (struct GNUNET_ATS_Information) * atsi_count);
   addrp = (char*) &atsp[atsi_count];
   memcpy (addrp, plugin_addr, plugin_addr_len);
   strcpy (&addrp[plugin_addr_len], plugin_name);
@@ -234,7 +234,7 @@ GAS_handle_address_update (void *cls, struct GNUNET_SERVER_Client *client,
 
 {
   const struct AddressUpdateMessage * m;
-  const struct GNUNET_TRANSPORT_ATS_Information *atsi;
+  const struct GNUNET_ATS_Information *atsi;
   const char *address;
   const char *plugin_name;
   uint16_t address_length;
@@ -256,7 +256,7 @@ GAS_handle_address_update (void *cls, struct GNUNET_SERVER_Client *client,
   ats_count = ntohl (m->ats_count);
   address_length = ntohs (m->address_length);
   plugin_name_length = ntohs (m->plugin_name_length);  
-  atsi = (const struct GNUNET_TRANSPORT_ATS_Information*) &m[1];
+  atsi = (const struct GNUNET_ATS_Information*) &m[1];
   address = (const char*) &atsi[ats_count];
   if (plugin_name_length != 0)
     plugin_name = &address[address_length];
@@ -264,9 +264,9 @@ GAS_handle_address_update (void *cls, struct GNUNET_SERVER_Client *client,
     plugin_name = "";
   if ( (address_length +
         plugin_name_length +
-        ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information) +
+        ats_count * sizeof (struct GNUNET_ATS_Information) +
         sizeof (struct AddressUpdateMessage) != ntohs (message->size))  ||
-       (ats_count > GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_TRANSPORT_ATS_Information)) ||
+       (ats_count > GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_ATS_Information)) ||
        (plugin_name[plugin_name_length - 1] != '\0') )
   {
     GNUNET_break (0);
diff --git a/src/ats/gnunet-service-ats_scheduling.h b/src/ats/gnunet-service-ats_scheduling.h
index 8d6fa977d..15eed7f85 100644
--- a/src/ats/gnunet-service-ats_scheduling.h
+++ b/src/ats/gnunet-service-ats_scheduling.h
@@ -70,7 +70,7 @@ GAS_scheduling_transmit_address_suggestion (const struct GNUNET_PeerIdentity *pe
                                             const void *plugin_addr, size_t plugin_addr_len,
                                             struct GNUNET_SERVER_Client *session_client,
                                             uint32_t session_id,
-                                            const struct GNUNET_TRANSPORT_ATS_Information *atsi,
+                                            const struct GNUNET_ATS_Information *atsi,
                                             uint32_t atsi_count,                                
                                             struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
                                             struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in);
diff --git a/src/ats/test_ats_api_bandwidth_consumption.c b/src/ats/test_ats_api_bandwidth_consumption.c
index 5952237f4..05a3e257a 100644
--- a/src/ats/test_ats_api_bandwidth_consumption.c
+++ b/src/ats/test_ats_api_bandwidth_consumption.c
@@ -62,7 +62,7 @@ struct Address
   void * addr;
   size_t addr_len;
 
-  struct GNUNET_TRANSPORT_ATS_Information * ats;
+  struct GNUNET_ATS_Information * ats;
   int ats_count;
 
   void  *session;
@@ -156,7 +156,7 @@ void performance_cb (void *cls,
                     GNUNET_BANDWIDTH_Value32NBO
                     bandwidth_in,
                     const struct
-                    GNUNET_TRANSPORT_ATS_Information
+                    GNUNET_ATS_Information
                     * ats,
                     uint32_t ats_count)
 {
@@ -207,7 +207,7 @@ address_suggest_cb (void *cls,
                     GNUNET_BANDWIDTH_Value32NBO
                     bandwidth_in,
                     const struct
-                    GNUNET_TRANSPORT_ATS_Information
+                    GNUNET_ATS_Information
                     * ats,
                     uint32_t ats_count)
 
diff --git a/src/ats/test_ats_api_scheduling.c b/src/ats/test_ats_api_scheduling.c
index dd4718c12..7dfd887fd 100644
--- a/src/ats/test_ats_api_scheduling.c
+++ b/src/ats/test_ats_api_scheduling.c
@@ -58,7 +58,7 @@ struct Address
   void * addr;
   size_t addr_len;
 
-  struct GNUNET_TRANSPORT_ATS_Information * ats;
+  struct GNUNET_ATS_Information * ats;
   int ats_count;
 
   void  *session;
@@ -73,7 +73,7 @@ struct PeerContext
 
 struct Address addr[2];
 struct PeerContext p[2];
-struct GNUNET_TRANSPORT_ATS_Information atsi[2];
+struct GNUNET_ATS_Information atsi[2];
 
 static void
 stop_arm ()
@@ -133,7 +133,7 @@ address_suggest_cb (void *cls,
                     GNUNET_BANDWIDTH_Value32NBO
                     bandwidth_in,
                     const struct
-                    GNUNET_TRANSPORT_ATS_Information
+                    GNUNET_ATS_Information
                     * ats,
                     uint32_t ats_count)
 
diff --git a/src/ats/test_ats_api_update_address.c b/src/ats/test_ats_api_update_address.c
index 54383c1d3..78011d492 100644
--- a/src/ats/test_ats_api_update_address.c
+++ b/src/ats/test_ats_api_update_address.c
@@ -73,7 +73,7 @@ struct AllocationRecord
   /**
    * Performance information associated with this address (array).
    */
-  struct GNUNET_TRANSPORT_ATS_Information *ats;
+  struct GNUNET_ATS_Information *ats;
 
   /**
    * Name of the plugin
@@ -121,7 +121,7 @@ suggest_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
             const char *plugin_name, const void *plugin_addr,
             size_t plugin_addr_len, struct Session *session,
             struct GNUNET_BANDWIDTH_Value32NBO bandwidth,
-            const struct GNUNET_TRANSPORT_ATS_Information *ats,
+            const struct GNUNET_ATS_Information *ats,
             uint32_t ats_count)
 {
   struct ExpectedValues *ex = cls;
@@ -179,7 +179,7 @@ check (void *cls, char *const *args, const char *cfgfile,
   ar->session = NULL;
   ar->plugin_addr = "address1";
   ar->plugin_addr_len = strlen (ar->plugin_addr) + 1;
-  ar->ats = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_ATS_Information));
+  ar->ats = GNUNET_malloc (sizeof (struct GNUNET_ATS_Information));
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Initial ATS information\n");
   ar->ats_count = 1;