94 files changed, 156 insertions, 156 deletions

diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index 2967e62b7..a61343833 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -474,7 +474,7 @@ reconnect_arm (struct GNUNET_ARM_Handle *h)
   if (NULL != h->mq)
     return GNUNET_OK;
   GNUNET_assert (GNUNET_NO == h->currently_up);
-  h->mq = GNUNET_CLIENT_connecT (h->cfg,
+  h->mq = GNUNET_CLIENT_connect (h->cfg,
                                  "arm",
                                  handlers,
                                  &mq_error_handler,
diff --git a/src/arm/arm_monitor_api.c b/src/arm/arm_monitor_api.c
index 471393c7e..b4dc6cb6a 100644
--- a/src/arm/arm_monitor_api.c
+++ b/src/arm/arm_monitor_api.c
@@ -209,7 +209,7 @@ reconnect_arm_monitor (struct GNUNET_ARM_MonitorHandle *h)
   struct GNUNET_MQ_Envelope *env;
 
   GNUNET_assert (NULL == h->mq);
-  h->mq = GNUNET_CLIENT_connecT (h->cfg,
+  h->mq = GNUNET_CLIENT_connect (h->cfg,
                                  "arm",
                                  handlers,
                                  &mq_error_handler,
diff --git a/src/arm/test_exponential_backoff.c b/src/arm/test_exponential_backoff.c
index ab47ff635..0905f145d 100644
--- a/src/arm/test_exponential_backoff.c
+++ b/src/arm/test_exponential_backoff.c
@@ -151,7 +151,7 @@ kill_task (void *cbData)
     GNUNET_free (shutdown_ctx);
     return;
   }
-  shutdown_ctx->mq = GNUNET_CLIENT_connecT (cfg,
+  shutdown_ctx->mq = GNUNET_CLIENT_connect (cfg,
                                             SERVICE,
                                             handlers,
                                             &mq_error_handler,
diff --git a/src/ats-tests/ats-testing.c b/src/ats-tests/ats-testing.c
index 1bcef5806..326d3bdd4 100644
--- a/src/ats-tests/ats-testing.c
+++ b/src/ats-tests/ats-testing.c
@@ -384,7 +384,7 @@ core_connect_adapter (void *cls,
     GNUNET_MQ_handler_end ()
   };
 
-  me->ch = GNUNET_CORE_connecT (cfg,
+  me->ch = GNUNET_CORE_connect (cfg,
                                 me,
                                 NULL,
                                 &comm_connect_cb,
@@ -403,7 +403,7 @@ core_disconnect_adapter (void *cls,
 {
   struct BenchmarkPeer *me = cls;
 
-  GNUNET_CORE_disconnecT (me->ch);
+  GNUNET_CORE_disconnect (me->ch);
   me->ch = NULL;
 }
 
diff --git a/src/ats/ats_api_connectivity.c b/src/ats/ats_api_connectivity.c
index 241e5f93c..d551aacd4 100644
--- a/src/ats/ats_api_connectivity.c
+++ b/src/ats/ats_api_connectivity.c
@@ -195,7 +195,7 @@ reconnect (struct GNUNET_ATS_ConnectivityHandle *ch)
   struct ClientStartMessage *init;
 
   GNUNET_assert (NULL == ch->mq);
-  ch->mq = GNUNET_CLIENT_connecT (ch->cfg,
+  ch->mq = GNUNET_CLIENT_connect (ch->cfg,
                                   "ats",
                                   handlers,
                                   &error_handler,
diff --git a/src/ats/ats_api_performance.c b/src/ats/ats_api_performance.c
index dd8666d4c..cd67583d1 100644
--- a/src/ats/ats_api_performance.c
+++ b/src/ats/ats_api_performance.c
@@ -585,7 +585,7 @@ reconnect (struct GNUNET_ATS_PerformanceHandle *ph)
   struct ClientStartMessage *init;
 
   GNUNET_assert (NULL == ph->mq);
-  ph->mq = GNUNET_CLIENT_connecT (ph->cfg,
+  ph->mq = GNUNET_CLIENT_connect (ph->cfg,
                                   "ats",
                                   handlers,
                                   &mq_error_handler,
diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c
index 4a872b90a..faeeb6081 100644
--- a/src/ats/ats_api_scheduling.c
+++ b/src/ats/ats_api_scheduling.c
@@ -532,7 +532,7 @@ reconnect (struct GNUNET_ATS_SchedulingHandle *sh)
   struct GNUNET_ATS_AddressRecord *ar;
 
   GNUNET_assert (NULL == sh->mq);
-  sh->mq = GNUNET_CLIENT_connecT (sh->cfg,
+  sh->mq = GNUNET_CLIENT_connect (sh->cfg,
                                   "ats",
                                   handlers,
                                   &error_handler,
diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c
index d75815588..23305d8a9 100644
--- a/src/cadet/cadet_api.c
+++ b/src/cadet/cadet_api.c
@@ -1282,7 +1282,7 @@ do_reconnect (struct GNUNET_CADET_Handle *h)
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Connecting to CADET\n");
 
   GNUNET_assert (NULL == h->mq);
-  h->mq = GNUNET_CLIENT_connecT (h->cfg,
+  h->mq = GNUNET_CLIENT_connect (h->cfg,
                                  "cadet",
                                  handlers,
                                  &handle_mq_error,
diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c
index 918bf4e0c..c1e2d3224 100644
--- a/src/cadet/gnunet-service-cadet_peer.c
+++ b/src/cadet/gnunet-service-cadet_peer.c
@@ -655,7 +655,7 @@ connect_to_core (const struct GNUNET_CONFIGURATION_Handle *c)
                                NULL),
         GNUNET_MQ_handler_end ()
     };
-    core_handle = GNUNET_CORE_connecT (c, NULL,
+    core_handle = GNUNET_CORE_connect (c, NULL,
                                        &core_init_notify,
                                        &core_connect_handler,
                                        &core_disconnect_handler,
@@ -686,7 +686,7 @@ core_init_notify (void *cls,
         LOG (GNUNET_ERROR_TYPE_ERROR, _("Wrong CORE service\n"));
         LOG (GNUNET_ERROR_TYPE_ERROR, " core id %s\n", GNUNET_i2s (core_identity));
         LOG (GNUNET_ERROR_TYPE_ERROR, " my id %s\n", GNUNET_i2s (&my_full_id));
-        GNUNET_CORE_disconnecT (core_handle);
+        GNUNET_CORE_disconnect (core_handle);
         connect_to_core (c);
         return;
     }
@@ -1325,12 +1325,12 @@ GCP_shutdown (void)
     in_shutdown = GNUNET_YES;
     if (NULL != core_handle)
     {
-        GNUNET_CORE_disconnecT (core_handle);
+        GNUNET_CORE_disconnect (core_handle);
         core_handle = NULL;
     }
     GNUNET_PEER_change_rc (myid, -1);
     /* With MQ API, CORE calls the disconnect handler for every peer
-     * after calling GNUNET_CORE_disconnecT, shutdown must occur *after* that.
+     * after calling GNUNET_CORE_disconnect, shutdown must occur *after* that.
      */
     GNUNET_CONTAINER_multipeermap_iterate (peers,
                                            &shutdown_peer,
diff --git a/src/consensus/consensus_api.c b/src/consensus/consensus_api.c
index 18898bebd..d5ed8db80 100644
--- a/src/consensus/consensus_api.c
+++ b/src/consensus/consensus_api.c
@@ -222,7 +222,7 @@ GNUNET_CONSENSUS_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
   consensus->new_element_cb = new_element_cb;
   consensus->new_element_cls = new_element_cls;
   consensus->session_id = *session_id;
-  consensus->mq = GNUNET_CLIENT_connecT (cfg,
+  consensus->mq = GNUNET_CLIENT_connect (cfg,
                                          "consensus",
                                          mq_handlers,
                                          &mq_error_handler,
diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c
index 8a74f0ca6..0b3920633 100644
--- a/src/conversation/conversation_api.c
+++ b/src/conversation/conversation_api.c
@@ -584,7 +584,7 @@ reconnect_phone (struct GNUNET_CONVERSATION_Phone *phone)
     phone->mq = NULL;
   }
   phone->state = PS_REGISTER;
-  phone->mq = GNUNET_CLIENT_connecT (phone->cfg,
+  phone->mq = GNUNET_CLIENT_connect (phone->cfg,
                                      "conversation",
                                      handlers,
                                      &phone_error_handler,
diff --git a/src/conversation/conversation_api_call.c b/src/conversation/conversation_api_call.c
index 17e26465e..a6bc506bc 100644
--- a/src/conversation/conversation_api_call.c
+++ b/src/conversation/conversation_api_call.c
@@ -570,7 +570,7 @@ GNUNET_CONVERSATION_call_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
   };
   struct GNUNET_CRYPTO_EcdsaPublicKey my_zone;
 
-  call->mq = GNUNET_CLIENT_connecT (cfg,
+  call->mq = GNUNET_CLIENT_connect (cfg,
                                     "conversation",
                                     handlers,
                                     &call_error_handler,
diff --git a/src/core/core_api.c b/src/core/core_api.c
index cf7924a0d..ace80b952 100644
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -97,12 +97,12 @@ struct GNUNET_CORE_Handle
   /**
    * Function to call whenever we're notified about a peer connecting.
    */
-  GNUNET_CORE_ConnecTEventHandler connects;
+  GNUNET_CORE_ConnectEventHandler connects;
 
   /**
    * Function to call whenever we're notified about a peer disconnecting.
    */
-  GNUNET_CORE_DisconnecTEventHandler disconnects;
+  GNUNET_CORE_DisconnectEventHandler disconnects;
 
   /**
    * Function handlers for messages of particular type.
@@ -734,7 +734,7 @@ reconnect (struct GNUNET_CORE_Handle *h)
   uint16_t *ts;
 
   GNUNET_assert (NULL == h->mq);
-  h->mq = GNUNET_CLIENT_connecT (h->cfg,
+  h->mq = GNUNET_CLIENT_connect (h->cfg,
                                  "core",
                                  handlers,
                                  &handle_mq_error,
@@ -773,11 +773,11 @@ reconnect (struct GNUNET_CORE_Handle *h)
  *                NULL on error (in this case, init is never called)
  */
 struct GNUNET_CORE_Handle *
-GNUNET_CORE_connecT (const struct GNUNET_CONFIGURATION_Handle *cfg,
+GNUNET_CORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
                      void *cls,
                      GNUNET_CORE_StartupCallback init,
-                     GNUNET_CORE_ConnecTEventHandler connects,
-                     GNUNET_CORE_DisconnecTEventHandler disconnects,
+                     GNUNET_CORE_ConnectEventHandler connects,
+                     GNUNET_CORE_DisconnectEventHandler disconnects,
                      const struct GNUNET_MQ_MessageHandler *handlers)
 {
   struct GNUNET_CORE_Handle *h;
@@ -810,7 +810,7 @@ GNUNET_CORE_connecT (const struct GNUNET_CONFIGURATION_Handle *cfg,
   reconnect (h);
   if (NULL == h->mq)
   {
-    GNUNET_CORE_disconnecT (h);
+    GNUNET_CORE_disconnect (h);
     return NULL;
   }
   return h;
@@ -823,7 +823,7 @@ GNUNET_CORE_connecT (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param handle connection to core to disconnect
  */
 void
-GNUNET_CORE_disconnecT (struct GNUNET_CORE_Handle *handle)
+GNUNET_CORE_disconnect (struct GNUNET_CORE_Handle *handle)
 {
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Disconnecting from CORE service\n");
diff --git a/src/core/core_api_monitor_peers.c b/src/core/core_api_monitor_peers.c
index 1455eb2b0..796fdb9d5 100644
--- a/src/core/core_api_monitor_peers.c
+++ b/src/core/core_api_monitor_peers.c
@@ -127,7 +127,7 @@ reconnect (struct GNUNET_CORE_MonitorHandle *mh)
   if (NULL != mh->mq)
     GNUNET_MQ_destroy (mh->mq);
   /* FIXME: use backoff? */
-  mh->mq = GNUNET_CLIENT_connecT (mh->cfg,
+  mh->mq = GNUNET_CLIENT_connect (mh->cfg,
                                   "core",
                                   handlers,
                                   &handle_mq_error,
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c
index e6a113b52..847ba6e75 100644
--- a/src/core/test_core_api.c
+++ b/src/core/test_core_api.c
@@ -92,7 +92,7 @@ terminate_peer (struct PeerContext *p)
 {
   if (NULL != p->ch)
   {
-    GNUNET_CORE_disconnecT (p->ch);
+    GNUNET_CORE_disconnect (p->ch);
     p->ch = NULL;
   }
   if (NULL != p->ghh)
@@ -243,7 +243,7 @@ init_notify (void *cls,
     GNUNET_assert (ok == 2);
     OKPP;
     /* connect p2 */
-    p2.ch = GNUNET_CORE_connecT (p2.cfg,
+    p2.ch = GNUNET_CORE_connect (p2.cfg,
                                  &p2,
                                  &init_notify,
                                  &connect_notify,
@@ -317,7 +317,7 @@ run (void *cls,
                                     (GNUNET_TIME_UNIT_SECONDS, 300),
                                     &terminate_task_error, NULL);
   p1.ch =
-      GNUNET_CORE_connecT (p1.cfg,
+      GNUNET_CORE_connect (p1.cfg,
                            &p1,
                            &init_notify,
                            &connect_notify,
diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c
index cd2bcad83..900c9f732 100644
--- a/src/core/test_core_api_reliability.c
+++ b/src/core/test_core_api_reliability.c
@@ -103,7 +103,7 @@ terminate_peer (struct PeerContext *p)
 {
   if (NULL != p->ch)
   {
-    GNUNET_CORE_disconnecT (p->ch);
+    GNUNET_CORE_disconnect (p->ch);
     p->ch = NULL;
   }
   if (NULL != p->ghh)
@@ -341,7 +341,7 @@ init_notify (void *cls,
     OKPP;
     /* connect p2 */
     GNUNET_assert (NULL !=
-                   (p2.ch = GNUNET_CORE_connecT (p2.cfg,
+                   (p2.ch = GNUNET_CORE_connect (p2.cfg,
                                                  &p2,
                                                  &init_notify,
                                                  &connect_notify,
@@ -464,7 +464,7 @@ run (void *cls,
                                  NULL);
 
   GNUNET_assert (NULL !=
-                 (p1.ch = GNUNET_CORE_connecT (p1.cfg,
+                 (p1.ch = GNUNET_CORE_connect (p1.cfg,
                                                &p1,
                                                &init_notify,
                                                &connect_notify,
diff --git a/src/core/test_core_api_send_to_self.c b/src/core/test_core_api_send_to_self.c
index d29da651b..5cfc8b35f 100644
--- a/src/core/test_core_api_send_to_self.c
+++ b/src/core/test_core_api_send_to_self.c
@@ -65,7 +65,7 @@ cleanup (void *cls)
   }
   if (NULL != core)
   {
-    GNUNET_CORE_disconnecT (core);
+    GNUNET_CORE_disconnect (core);
     core = NULL;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -159,7 +159,7 @@ run (void *cls,
   };
 
   core =
-    GNUNET_CORE_connecT (cfg,
+    GNUNET_CORE_connect (cfg,
                          NULL,
                          &init,
                          &connect_cb,
diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c
index 6abc3cc89..31e300b14 100644
--- a/src/core/test_core_api_start_only.c
+++ b/src/core/test_core_api_start_only.c
@@ -74,9 +74,9 @@ static struct GNUNET_MQ_MessageHandler handlers[] = {
 static void
 shutdown_task (void *cls)
 {
-  GNUNET_CORE_disconnecT (p1.ch);
+  GNUNET_CORE_disconnect (p1.ch);
   p1.ch = NULL;
-  GNUNET_CORE_disconnecT (p2.ch);
+  GNUNET_CORE_disconnect (p2.ch);
   p2.ch = NULL;
   ok = 0;
 }
@@ -91,7 +91,7 @@ init_notify (void *cls,
   if (p == &p1)
   {
     /* connect p2 */
-    p2.ch = GNUNET_CORE_connecT (p2.cfg,
+    p2.ch = GNUNET_CORE_connect (p2.cfg,
                                  &p2,
                                  &init_notify,
                                  &connect_notify,
@@ -140,12 +140,12 @@ timeout_task (void *cls)
            "Timeout.\n");
   if (NULL != p1.ch)
   {
-    GNUNET_CORE_disconnecT (p1.ch);
+    GNUNET_CORE_disconnect (p1.ch);
     p1.ch = NULL;
   }
   if (NULL != p2.ch)
   {
-    GNUNET_CORE_disconnecT (p2.ch);
+    GNUNET_CORE_disconnect (p2.ch);
     p2.ch = NULL;
   }
   ok = 42;
@@ -168,7 +168,7 @@ run (void *cls,
                                      TIMEOUT),
                                     &timeout_task,
                                     NULL);
-  p1.ch = GNUNET_CORE_connecT (p1.cfg,
+  p1.ch = GNUNET_CORE_connect (p1.cfg,
                                &p1,
                                &init_notify,
                                &connect_notify,
diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c
index 4dee958f2..dcc33288d 100644
--- a/src/core/test_core_quota_compliance.c
+++ b/src/core/test_core_quota_compliance.c
@@ -117,7 +117,7 @@ terminate_peer (struct PeerContext *p)
 {
   if (NULL != p->ch)
   {
-    GNUNET_CORE_disconnecT (p->ch);
+    GNUNET_CORE_disconnect (p->ch);
     p->ch = NULL;
   }
   if (NULL != p->ghh)
@@ -480,7 +480,7 @@ init_notify (void *cls,
     GNUNET_assert (ok == 2);
     OKPP;
     /* connect p2 */
-    p2.ch = GNUNET_CORE_connecT (p2.cfg,
+    p2.ch = GNUNET_CORE_connect (p2.cfg,
                                  &p2,
                                  &init_notify,
                                  &connect_notify,
@@ -653,7 +653,7 @@ run (void *cls,
                                                       "WAN_QUOTA_OUT",
                                                       &current_quota_p2_out));
 
-  p1.ch = GNUNET_CORE_connecT (p1.cfg,
+  p1.ch = GNUNET_CORE_connect (p1.cfg,
                                &p1,
                                &init_notify,
                                &connect_notify,
diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c
index d75a58552..db485364e 100644
--- a/src/datastore/datastore_api.c
+++ b/src/datastore/datastore_api.c
@@ -443,7 +443,7 @@ GNUNET_DATASTORE_disconnect (struct GNUNET_DATASTORE_Handle *h,
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Re-connecting to issue DROP!\n");
     GNUNET_assert (NULL == h->mq);
-    h->mq = GNUNET_CLIENT_connecT (h->cfg,
+    h->mq = GNUNET_CLIENT_connect (h->cfg,
                                    "datastore",
                                    NULL,
                                    &disconnect_on_mq_error,
@@ -868,7 +868,7 @@ try_reconnect (void *cls)
   h->retry_time = GNUNET_TIME_STD_BACKOFF (h->retry_time);
   h->reconnect_task = NULL;
   GNUNET_assert (NULL == h->mq);
-  h->mq = GNUNET_CLIENT_connecT (h->cfg,
+  h->mq = GNUNET_CLIENT_connect (h->cfg,
                                  "datastore",
                                  handlers,
                                  &mq_error_handler,
diff --git a/src/dht/dht_api.c b/src/dht/dht_api.c
index 57880165e..66eaf1064 100644
--- a/src/dht/dht_api.c
+++ b/src/dht/dht_api.c
@@ -867,7 +867,7 @@ try_connect (struct GNUNET_DHT_Handle *h)
   };
   if (NULL != h->mq)
     return GNUNET_OK;
-  h->mq = GNUNET_CLIENT_connecT (h->cfg,
+  h->mq = GNUNET_CLIENT_connect (h->cfg,
                                  "dht",
                                  handlers,
                                  &mq_error_handler,
diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c
index 0d3594d1a..20bdc0ce4 100644
--- a/src/dht/gnunet-service-dht_neighbours.c
+++ b/src/dht/gnunet-service-dht_neighbours.c
@@ -2381,7 +2381,7 @@ GDS_NEIGHBOURS_init ()
   log_route_details_stderr =
     (NULL != getenv("GNUNET_DHT_ROUTE_DEBUG")) ? GNUNET_YES : GNUNET_NO;
   ats_ch = GNUNET_ATS_connectivity_init (GDS_cfg);
-  core_api = GNUNET_CORE_connecT (GDS_cfg,
+  core_api = GNUNET_CORE_connect (GDS_cfg,
                                   NULL,
                                   &core_init,
                                   &handle_core_connect,
@@ -2405,7 +2405,7 @@ GDS_NEIGHBOURS_done ()
 {
   if (NULL == core_api)
     return;
-  GNUNET_CORE_disconnecT (core_api);
+  GNUNET_CORE_disconnect (core_api);
   core_api = NULL;
   GNUNET_assert (0 ==
                  GNUNET_CONTAINER_multipeermap_size (all_connected_peers));
diff --git a/src/dht/gnunet-service-wdht_neighbours.c b/src/dht/gnunet-service-wdht_neighbours.c
index d3b92585b..78a04d66d 100644
--- a/src/dht/gnunet-service-wdht_neighbours.c
+++ b/src/dht/gnunet-service-wdht_neighbours.c
@@ -1712,7 +1712,7 @@ GDS_NEIGHBOURS_init (void)
     GNUNET_MQ_handler_end ()
   };
 
-  core_api = GNUNET_CORE_connecT (GDS_cfg, NULL,
+  core_api = GNUNET_CORE_connect (GDS_cfg, NULL,
                                   &core_init,
                                   &handle_core_connect,
                                   &handle_core_disconnect,
@@ -1736,7 +1736,7 @@ GDS_NEIGHBOURS_done (void)
 {
   if (NULL == core_api)
     return;
-  GNUNET_CORE_disconnecT (core_api);
+  GNUNET_CORE_disconnect (core_api);
   core_api = NULL;
   GNUNET_assert (0 == GNUNET_CONTAINER_multipeermap_size (friends_peermap));
   GNUNET_CONTAINER_multipeermap_destroy (friends_peermap);
diff --git a/src/dht/gnunet-service-xdht_neighbours.c b/src/dht/gnunet-service-xdht_neighbours.c
index e3462f618..d41eb1900 100644
--- a/src/dht/gnunet-service-xdht_neighbours.c
+++ b/src/dht/gnunet-service-xdht_neighbours.c
@@ -6150,7 +6150,7 @@ GDS_NEIGHBOURS_init (void)
     GNUNET_MQ_handler_end ()
   };
 
-  core_api = GNUNET_CORE_connecT (GDS_cfg,
+  core_api = GNUNET_CORE_connect (GDS_cfg,
                                   NULL,
                                   &core_init,
                                   &handle_core_connect,
@@ -6212,7 +6212,7 @@ GDS_NEIGHBOURS_done (void)
   if (NULL == core_api)
     return;
 
-  GNUNET_CORE_disconnecT (core_api);
+  GNUNET_CORE_disconnect (core_api);
   core_api = NULL;
 
   delete_finger_table_entries();
diff --git a/src/dns/dns_api.c b/src/dns/dns_api.c
index 4803fe3fc..e7450a1d4 100644
--- a/src/dns/dns_api.c
+++ b/src/dns/dns_api.c
@@ -217,7 +217,7 @@ reconnect (void *cls)
   struct GNUNET_DNS_Register *msg;
 
   dh->reconnect_task = NULL;
-  dh->mq = GNUNET_CLIENT_connecT (dh->cfg,
+  dh->mq = GNUNET_CLIENT_connect (dh->cfg,
                                   "dns",
                                   handlers,
                                   &mq_error_handler,
diff --git a/src/dv/dv_api.c b/src/dv/dv_api.c
index 43b6c7db1..062f9a95f 100644
--- a/src/dv/dv_api.c
+++ b/src/dv/dv_api.c
@@ -346,7 +346,7 @@ reconnect (struct GNUNET_DV_ServiceHandle *sh)
                                          sh);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Connecting to DV service\n");
-  sh->mq = GNUNET_CLIENT_connecT (sh->cfg,
+  sh->mq = GNUNET_CLIENT_connect (sh->cfg,
                                   "dv",
                                   handlers,
                                   &mq_error_handler,
diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c
index fdd871bbd..6adaa04d9 100644
--- a/src/dv/gnunet-service-dv.c
+++ b/src/dv/gnunet-service-dv.c
@@ -1936,7 +1936,7 @@ shutdown_task (void *cls)
 
   in_shutdown = GNUNET_YES;
   GNUNET_assert (NULL != core_api);
-  GNUNET_CORE_disconnecT (core_api);
+  GNUNET_CORE_disconnect (core_api);
   core_api = NULL;
   GNUNET_ATS_performance_done (ats);
   ats = NULL;
@@ -2059,7 +2059,7 @@ run (void *cls,
                                                            GNUNET_NO);
   all_routes = GNUNET_CONTAINER_multipeermap_create (65536,
                                                      GNUNET_NO);
-  core_api = GNUNET_CORE_connecT (cfg,
+  core_api = GNUNET_CORE_connect (cfg,
                                   NULL,
                                   &core_init,
                                   &handle_core_connect,
@@ -2073,7 +2073,7 @@ run (void *cls,
                                      NULL);
   if (NULL == ats)
   {
-    GNUNET_CORE_disconnecT (core_api);
+    GNUNET_CORE_disconnect (core_api);
     core_api = NULL;
     return;
   }
diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c
index eacc3c2df..53b836f22 100644
--- a/src/fs/fs_download.c
+++ b/src/fs/fs_download.c
@@ -1335,7 +1335,7 @@ do_reconnect (void *cls)
   };
 
   dc->task = NULL;
-  dc->mq = GNUNET_CLIENT_connecT (dc->h->cfg,
+  dc->mq = GNUNET_CLIENT_connect (dc->h->cfg,
                                   "fs",
                                   handlers,
                                   &download_mq_error_handler,
diff --git a/src/fs/fs_list_indexed.c b/src/fs/fs_list_indexed.c
index 67183fce2..eec125a10 100644
--- a/src/fs/fs_list_indexed.c
+++ b/src/fs/fs_list_indexed.c
@@ -185,7 +185,7 @@ GNUNET_FS_get_indexed_files (struct GNUNET_FS_Handle *h,
   struct GNUNET_MQ_Envelope *env;
   struct GNUNET_MessageHeader *msg;
 
-  gic->mq = GNUNET_CLIENT_connecT (h->cfg,
+  gic->mq = GNUNET_CLIENT_connect (h->cfg,
                                    "fs",
                                    handlers,
                                    &mq_error_handler,
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index 5820c3d0c..86a58a58b 100644
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -863,7 +863,7 @@ hash_for_index_cb (void *cls,
     GNUNET_free (fn);
     return;
   }
-  pc->mq = GNUNET_CLIENT_connecT (pc->h->cfg,
+  pc->mq = GNUNET_CLIENT_connect (pc->h->cfg,
                                   "fs",
                                   handlers,
                                   &index_mq_error_handler,
@@ -1016,7 +1016,7 @@ create_loc_uri (struct GNUNET_FS_PublishContext *pc)
 
   if (NULL != pc->mq)
     GNUNET_MQ_destroy (pc->mq);
-  pc->mq = GNUNET_CLIENT_connecT (pc->h->cfg,
+  pc->mq = GNUNET_CLIENT_connect (pc->h->cfg,
                                   "fs",
                                   handlers,
                                   &loc_mq_error_handler,
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c
index 198577b08..75ce4b54f 100644
--- a/src/fs/fs_search.c
+++ b/src/fs/fs_search.c
@@ -1244,7 +1244,7 @@ do_reconnect (void *cls)
   };
 
   sc->task = NULL;
-  sc->mq = GNUNET_CLIENT_connecT (sc->h->cfg,
+  sc->mq = GNUNET_CLIENT_connect (sc->h->cfg,
                                   "fs",
                                   handlers,
                                   &search_mq_error_handler,
diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c
index 2a024ecbb..a672b84d5 100644
--- a/src/fs/fs_unindex.c
+++ b/src/fs/fs_unindex.c
@@ -316,7 +316,7 @@ unindex_finish (struct GNUNET_FS_UnindexContext *uc)
   uc->seen_dh = NULL;
   uc->state = UNINDEX_STATE_FS_NOTIFY;
   GNUNET_FS_unindex_sync_ (uc);
-  uc->mq = GNUNET_CLIENT_connecT (uc->h->cfg,
+  uc->mq = GNUNET_CLIENT_connect (uc->h->cfg,
                                   "fs",
                                   handlers,
                                   &unindex_mq_error_handler,
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index c83d73555..e38fdb032 100644
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -1181,7 +1181,7 @@ shutdown_task (void *cls)
   GSF_cadet_stop_server ();
   if (NULL != GSF_core)
   {
-    GNUNET_CORE_disconnecT (GSF_core);
+    GNUNET_CORE_disconnect (GSF_core);
     GSF_core = NULL;
   }
   if (NULL != GSF_ats)
@@ -1219,7 +1219,7 @@ shutdown_task (void *cls)
 
 
 /**
- * Function called after GNUNET_CORE_connecT has succeeded
+ * Function called after GNUNET_CORE_connect has succeeded
  * (or failed for good).  Note that the private key of the
  * peer is intentionally not exposed here; if you need it,
  * your process should try to read the private key file
@@ -1299,7 +1299,7 @@ main_init (const struct GNUNET_CONFIGURATION_Handle *c)
               "I am peer %s\n",
               GNUNET_i2s (&GSF_my_id));
   GSF_core
-    = GNUNET_CORE_connecT (GSF_cfg,
+    = GNUNET_CORE_connect (GSF_cfg,
                            NULL,
                            &peer_init_handler,
                            &GSF_peer_connect_handler,
diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c
index 3f6425b42..5d6158bd4 100644
--- a/src/gns/gns_api.c
+++ b/src/gns/gns_api.c
@@ -394,7 +394,7 @@ reconnect (struct GNUNET_GNS_Handle *handle)
   GNUNET_assert (NULL == handle->mq);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Trying to connect to GNS\n");
-  handle->mq = GNUNET_CLIENT_connecT (handle->cfg,
+  handle->mq = GNUNET_CLIENT_connect (handle->cfg,
                                       "gns",
                                       handlers,
                                       &mq_error_handler,
diff --git a/src/hostlist/gnunet-daemon-hostlist.c b/src/hostlist/gnunet-daemon-hostlist.c
index 7181a913b..a83d46e07 100644
--- a/src/hostlist/gnunet-daemon-hostlist.c
+++ b/src/hostlist/gnunet-daemon-hostlist.c
@@ -47,7 +47,7 @@ static int provide_hostlist;
 /**
  * Handle to hostlist server's connect handler
  */
-static GNUNET_CORE_ConnecTEventHandler server_ch;
+static GNUNET_CORE_ConnectEventHandler server_ch;
 
 #endif
 
@@ -81,12 +81,12 @@ static GNUNET_HOSTLIST_UriHandler client_adv_handler;
 /**
  * Handle to hostlist client's connect handler
  */
-static GNUNET_CORE_ConnecTEventHandler client_ch;
+static GNUNET_CORE_ConnectEventHandler client_ch;
 
 /**
  * Handle to hostlist client's disconnect handler
  */
-static GNUNET_CORE_DisconnecTEventHandler client_dh;
+static GNUNET_CORE_DisconnectEventHandler client_dh;
 
 GNUNET_NETWORK_STRUCT_BEGIN
 
@@ -260,7 +260,7 @@ cleaning_task (void *cls)
               "Hostlist daemon is shutting down\n");
   if (NULL != core)
   {
-    GNUNET_CORE_disconnecT (core);
+    GNUNET_CORE_disconnect (core);
     core = NULL;
   }
   if (bootstrapping)
@@ -330,7 +330,7 @@ run (void *cls,
                                   &client_adv_handler,
                                   learning);
   core =
-    GNUNET_CORE_connecT (cfg,
+    GNUNET_CORE_connect (cfg,
                          NULL,
                          &core_init,
                          &connect_handler,
diff --git a/src/hostlist/gnunet-daemon-hostlist_client.c b/src/hostlist/gnunet-daemon-hostlist_client.c
index c1a2c2721..a973fcc28 100644
--- a/src/hostlist/gnunet-daemon-hostlist_client.c
+++ b/src/hostlist/gnunet-daemon-hostlist_client.c
@@ -1548,8 +1548,8 @@ save_hostlist_file (int shutdown)
 int
 GNUNET_HOSTLIST_client_start (const struct GNUNET_CONFIGURATION_Handle *c,
                               struct GNUNET_STATISTICS_Handle *st,
-                              GNUNET_CORE_ConnecTEventHandler *ch,
-                              GNUNET_CORE_DisconnecTEventHandler *dh,
+                              GNUNET_CORE_ConnectEventHandler *ch,
+                              GNUNET_CORE_DisconnectEventHandler *dh,
                               GNUNET_HOSTLIST_UriHandler *msgh,
                               int learn)
 {
diff --git a/src/hostlist/gnunet-daemon-hostlist_client.h b/src/hostlist/gnunet-daemon-hostlist_client.h
index dd80d4a48..e41b90876 100644
--- a/src/hostlist/gnunet-daemon-hostlist_client.h
+++ b/src/hostlist/gnunet-daemon-hostlist_client.h
@@ -53,8 +53,8 @@ typedef void
 int
 GNUNET_HOSTLIST_client_start (const struct GNUNET_CONFIGURATION_Handle *c,
                               struct GNUNET_STATISTICS_Handle *st,
-                              GNUNET_CORE_ConnecTEventHandler *ch,
-                              GNUNET_CORE_DisconnecTEventHandler *dh,
+                              GNUNET_CORE_ConnectEventHandler *ch,
+                              GNUNET_CORE_DisconnectEventHandler *dh,
                               GNUNET_HOSTLIST_UriHandler *msgh,
                               int learn);
 
diff --git a/src/hostlist/gnunet-daemon-hostlist_server.c b/src/hostlist/gnunet-daemon-hostlist_server.c
index b01dbc09e..48c1a5622 100644
--- a/src/hostlist/gnunet-daemon-hostlist_server.c
+++ b/src/hostlist/gnunet-daemon-hostlist_server.c
@@ -644,7 +644,7 @@ int
 GNUNET_HOSTLIST_server_start (const struct GNUNET_CONFIGURATION_Handle *c,
                               struct GNUNET_STATISTICS_Handle *st,
                               struct GNUNET_CORE_Handle *co,
-                              GNUNET_CORE_ConnecTEventHandler *server_ch,
+                              GNUNET_CORE_ConnectEventHandler *server_ch,
                               int advertise)
 {
   unsigned long long port;
diff --git a/src/hostlist/gnunet-daemon-hostlist_server.h b/src/hostlist/gnunet-daemon-hostlist_server.h
index f18ad0ca2..d9f778a4b 100644
--- a/src/hostlist/gnunet-daemon-hostlist_server.h
+++ b/src/hostlist/gnunet-daemon-hostlist_server.h
@@ -46,7 +46,7 @@ int
 GNUNET_HOSTLIST_server_start (const struct GNUNET_CONFIGURATION_Handle *c,
                               struct GNUNET_STATISTICS_Handle *st,
                               struct GNUNET_CORE_Handle *core,
-                              GNUNET_CORE_ConnecTEventHandler *server_ch,
+                              GNUNET_CORE_ConnectEventHandler *server_ch,
                               int advertise);
 
 
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
index 48689e259..88ad22a1a 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -125,12 +125,12 @@ shutdown_testcase ()
   }
   if (NULL != adv_peer.core)
   {
-    GNUNET_CORE_disconnecT (adv_peer.core);
+    GNUNET_CORE_disconnect (adv_peer.core);
     adv_peer.core = NULL;
   }
   if (NULL != learn_peer.core)
   {
-    GNUNET_CORE_disconnecT (learn_peer.core);
+    GNUNET_CORE_disconnect (learn_peer.core);
     learn_peer.core = NULL;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -432,7 +432,7 @@ setup_learn_peer (struct PeerContext *p,
     }
     GNUNET_free (filename);
   }
-  p->core = GNUNET_CORE_connecT (p->cfg,
+  p->core = GNUNET_CORE_connect (p->cfg,
                                  NULL,
                                  NULL,
                                  NULL,
diff --git a/src/identity-provider/identity_provider_api.c b/src/identity-provider/identity_provider_api.c
index 28ff90fc4..32c3cb703 100644
--- a/src/identity-provider/identity_provider_api.c
+++ b/src/identity-provider/identity_provider_api.c
@@ -380,7 +380,7 @@ reconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *h)
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Connecting to identity provider service.\n");
 
-  h->mq = GNUNET_CLIENT_connecT (h->cfg,
+  h->mq = GNUNET_CLIENT_connect (h->cfg,
                                  "identity-provider",
                                  handlers,
                                  &mq_error_handler,
diff --git a/src/identity/identity_api.c b/src/identity/identity_api.c
index 10a64d1ba..905b3fd8b 100644
--- a/src/identity/identity_api.c
+++ b/src/identity/identity_api.c
@@ -575,7 +575,7 @@ reconnect (void *cls)
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Connecting to identity service.\n");
   GNUNET_assert (NULL == h->mq);
-  h->mq = GNUNET_CLIENT_connecT (h->cfg,
+  h->mq = GNUNET_CLIENT_connect (h->cfg,
                                  "identity",
                                  handlers,
                                  &mq_error_handler,
diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h
index f98620dfa..613349fdd 100644
--- a/src/include/gnunet_client_lib.h
+++ b/src/include/gnunet_client_lib.h
@@ -57,7 +57,7 @@ extern "C"
  * @return the message queue, NULL on error
  */
 struct GNUNET_MQ_Handle *
-GNUNET_CLIENT_connecT (const struct GNUNET_CONFIGURATION_Handle *cfg,
+GNUNET_CLIENT_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
                        const char *service_name,
                        const struct GNUNET_MQ_MessageHandler *handlers,
                        GNUNET_MQ_ErrorHandler error_handler,
diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h
index 6ec486b26..6b082601b 100644
--- a/src/include/gnunet_core_service.h
+++ b/src/include/gnunet_core_service.h
@@ -114,7 +114,7 @@ typedef void
  * @param peer peer identity this notification is about
  */
 typedef void *
-(*GNUNET_CORE_ConnecTEventHandler) (void *cls,
+(*GNUNET_CORE_ConnectEventHandler) (void *cls,
                                     const struct GNUNET_PeerIdentity *peer,
                                     struct GNUNET_MQ_Handle *mq);
 
@@ -126,7 +126,7 @@ typedef void *
  * @param peer peer identity this notification is about
  */
 typedef void
-(*GNUNET_CORE_DisconnecTEventHandler) (void *cls,
+(*GNUNET_CORE_DisconnectEventHandler) (void *cls,
                                        const struct GNUNET_PeerIdentity *peer,
                                        void *peer_cls);
 
@@ -283,11 +283,11 @@ GNUNET_CORE_disconnect (struct GNUNET_CORE_Handle *handle);
  *           NULL on error (in this case, init is never called)
  */
 struct GNUNET_CORE_Handle *
-GNUNET_CORE_connecT (const struct GNUNET_CONFIGURATION_Handle *cfg,
+GNUNET_CORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
                      void *cls,
                      GNUNET_CORE_StartupCallback init,
-                     GNUNET_CORE_ConnecTEventHandler connects,
-                     GNUNET_CORE_DisconnecTEventHandler disconnects,
+                     GNUNET_CORE_ConnectEventHandler connects,
+                     GNUNET_CORE_DisconnectEventHandler disconnects,
                      const struct GNUNET_MQ_MessageHandler *handlers);
 
 
@@ -297,7 +297,7 @@ GNUNET_CORE_connecT (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param handle connection to core to disconnect
  */
 void
-GNUNET_CORE_disconnecT (struct GNUNET_CORE_Handle *handle);
+GNUNET_CORE_disconnect (struct GNUNET_CORE_Handle *handle);
 
 
 /**
diff --git a/src/multicast/multicast_api.c b/src/multicast/multicast_api.c
index 7cfe70835..6e5402b28 100644
--- a/src/multicast/multicast_api.c
+++ b/src/multicast/multicast_api.c
@@ -786,7 +786,7 @@ origin_connect (struct GNUNET_MULTICAST_Origin *orig)
     GNUNET_MQ_handler_end ()
   };
 
-  grp->mq = GNUNET_CLIENT_connecT (grp->cfg, "multicast",
+  grp->mq = GNUNET_CLIENT_connect (grp->cfg, "multicast",
                                    handlers, origin_disconnected, orig);
   GNUNET_assert (NULL != grp->mq);
   GNUNET_MQ_send_copy (grp->mq, grp->connect_env);
@@ -1076,7 +1076,7 @@ member_connect (struct GNUNET_MULTICAST_Member *mem)
     GNUNET_MQ_handler_end ()
   };
 
-  grp->mq = GNUNET_CLIENT_connecT (grp->cfg, "multicast",
+  grp->mq = GNUNET_CLIENT_connect (grp->cfg, "multicast",
                                    handlers, member_disconnected, mem);
   GNUNET_assert (NULL != grp->mq);
   GNUNET_MQ_send_copy (grp->mq, grp->connect_env);
diff --git a/src/namecache/namecache_api.c b/src/namecache/namecache_api.c
index 9ccb91bc8..c12dacd4c 100644
--- a/src/namecache/namecache_api.c
+++ b/src/namecache/namecache_api.c
@@ -336,7 +336,7 @@ reconnect (struct GNUNET_NAMECACHE_Handle *h)
     GNUNET_MQ_handler_end ()
   };
   GNUNET_assert (NULL == h->mq);
-  h->mq = GNUNET_CLIENT_connecT (h->cfg,
+  h->mq = GNUNET_CLIENT_connect (h->cfg,
                                  "namecache",
                                  handlers,
                                  &mq_error_handler,
diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c
index fd232de81..933ba7b95 100644
--- a/src/namestore/namestore_api.c
+++ b/src/namestore/namestore_api.c
@@ -806,7 +806,7 @@ reconnect (struct GNUNET_NAMESTORE_Handle *h)
   struct GNUNET_NAMESTORE_QueueEntry *qe;
 
   GNUNET_assert (NULL == h->mq);
-  h->mq = GNUNET_CLIENT_connecT (h->cfg,
+  h->mq = GNUNET_CLIENT_connect (h->cfg,
                                  "namestore",
                                  handlers,
                                  &mq_error_handler,
diff --git a/src/namestore/namestore_api_monitor.c b/src/namestore/namestore_api_monitor.c
index 00f0887d4..cd7c7dadb 100644
--- a/src/namestore/namestore_api_monitor.c
+++ b/src/namestore/namestore_api_monitor.c
@@ -262,7 +262,7 @@ reconnect (struct GNUNET_NAMESTORE_ZoneMonitor *zm)
     GNUNET_MQ_destroy (zm->mq);
     zm->error_cb (zm->error_cb_cls);
   }
-  zm->mq = GNUNET_CLIENT_connecT (zm->cfg,
+  zm->mq = GNUNET_CLIENT_connect (zm->cfg,
                                   "namestore",
                                   handlers,
                                   &mq_error_handler,
diff --git a/src/nat-auto/gnunet-nat-auto_legacy.c b/src/nat-auto/gnunet-nat-auto_legacy.c
index 803ff23e3..32f40c037 100644
--- a/src/nat-auto/gnunet-nat-auto_legacy.c
+++ b/src/nat-auto/gnunet-nat-auto_legacy.c
@@ -391,7 +391,7 @@ addr_cb (void *cls,
 
   ca = GNUNET_new (struct ClientActivity);
   ca->h = h;
-  ca->mq = GNUNET_CLIENT_connecT (h->cfg,
+  ca->mq = GNUNET_CLIENT_connect (h->cfg,
                                   "gnunet-nat-server",
                                   NULL,
                                   &mq_error_handler,
diff --git a/src/nat-auto/gnunet-service-nat-auto_legacy.c b/src/nat-auto/gnunet-service-nat-auto_legacy.c
index 061d0cbe6..bcfa4b92b 100644
--- a/src/nat-auto/gnunet-service-nat-auto_legacy.c
+++ b/src/nat-auto/gnunet-service-nat-auto_legacy.c
@@ -670,7 +670,7 @@ test_nat_punched (struct GNUNET_NAT_AutoHandle *ah)
   LOG (GNUNET_ERROR_TYPE_INFO,
        "Asking gnunet-nat-server to connect to `%s'\n",
        ah->stun_ip);
-  ah->mq = GNUNET_CLIENT_connecT (ah->cfg,
+  ah->mq = GNUNET_CLIENT_connect (ah->cfg,
                                   "gnunet-nat-server",
                                   NULL,
                                   &mq_error_handler,
diff --git a/src/nat-auto/nat_auto_api.c b/src/nat-auto/nat_auto_api.c
index 632561097..a5b41ac49 100644
--- a/src/nat-auto/nat_auto_api.c
+++ b/src/nat-auto/nat_auto_api.c
@@ -233,7 +233,7 @@ GNUNET_NAT_AUTO_autoconfig_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
   }
   ah->arc = cb;
   ah->arc_cls = cb_cls;
-  ah->mq = GNUNET_CLIENT_connecT (cfg,
+  ah->mq = GNUNET_CLIENT_connect (cfg,
                                   "nat",
                                   handlers,
                                   &ah_error_handler,
diff --git a/src/nat-auto/nat_auto_api_test.c b/src/nat-auto/nat_auto_api_test.c
index df2d9fed3..8359e3cb5 100644
--- a/src/nat-auto/nat_auto_api_test.c
+++ b/src/nat-auto/nat_auto_api_test.c
@@ -390,7 +390,7 @@ addr_cb (void *cls,
 
   ca = GNUNET_new (struct ClientActivity);
   ca->h = h;
-  ca->mq = GNUNET_CLIENT_connecT (h->cfg,
+  ca->mq = GNUNET_CLIENT_connect (h->cfg,
                                   "gnunet-nat-server",
                                   NULL,
                                   &mq_error_handler,
diff --git a/src/nat/nat_api.c b/src/nat/nat_api.c
index 810d35649..eec5d3968 100644
--- a/src/nat/nat_api.c
+++ b/src/nat/nat_api.c
@@ -343,7 +343,7 @@ do_connect (void *cls)
   struct GNUNET_MQ_Envelope *env;
 
   nh->reconnect_task = NULL;
-  nh->mq = GNUNET_CLIENT_connecT (nh->cfg,
+  nh->mq = GNUNET_CLIENT_connect (nh->cfg,
                                   "nat",
                                   handlers,
                                   &mq_error_handler,
diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c
index 511f95514..4d54a740b 100644
--- a/src/nse/gnunet-service-nse.c
+++ b/src/nse/gnunet-service-nse.c
@@ -1346,7 +1346,7 @@ shutdown_task (void *cls)
   }
   if (NULL != core_api)
   {
-    GNUNET_CORE_disconnecT (core_api);
+    GNUNET_CORE_disconnect (core_api);
     core_api = NULL;
   }
   if (NULL != stats)
@@ -1607,7 +1607,7 @@ run (void *cls,
                                                 GNUNET_YES);
   nc = GNUNET_notification_context_create (1);
   /* Connect to core service and register core handlers */
-  core_api = GNUNET_CORE_connecT (cfg,   /* Main configuration */
+  core_api = GNUNET_CORE_connect (cfg,   /* Main configuration */
                                   NULL,       /* Closure passed to functions */
                                   &core_init,    /* Call core_init once connected */
                                   &handle_core_connect,  /* Handle connects */
diff --git a/src/nse/nse_api.c b/src/nse/nse_api.c
index cfe5482eb..d50b0214a 100644
--- a/src/nse/nse_api.c
+++ b/src/nse/nse_api.c
@@ -150,7 +150,7 @@ reconnect (void *cls)
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Connecting to network size estimation service.\n");
   GNUNET_assert (NULL == h->mq);
-  h->mq = GNUNET_CLIENT_connecT (h->cfg,
+  h->mq = GNUNET_CLIENT_connect (h->cfg,
                                  "nse",
                                  handlers,
                                  &mq_error_handler,
diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c
index 3080fb503..10729f3d0 100644
--- a/src/peerinfo/peerinfo_api.c
+++ b/src/peerinfo/peerinfo_api.c
@@ -462,7 +462,7 @@ reconnect (struct GNUNET_PEERINFO_Handle *h)
     GNUNET_MQ_destroy (h->mq);
     h->mq = NULL;
   }
-  h->mq = GNUNET_CLIENT_connecT (h->cfg,
+  h->mq = GNUNET_CLIENT_connect (h->cfg,
                                  "peerinfo",
                                  handlers,
                                  &mq_error_handler,
diff --git a/src/peerinfo/peerinfo_api_notify.c b/src/peerinfo/peerinfo_api_notify.c
index e707a911e..ce226d96e 100644
--- a/src/peerinfo/peerinfo_api_notify.c
+++ b/src/peerinfo/peerinfo_api_notify.c
@@ -212,7 +212,7 @@ reconnect (void *cls)
   struct NotifyMessage *nm;
 
   nc->task = NULL;
-  nc->mq = GNUNET_CLIENT_connecT (nc->cfg,
+  nc->mq = GNUNET_CLIENT_connect (nc->cfg,
                                   "peerinfo",
                                   handlers,
                                   &mq_error_handler,
diff --git a/src/peerstore/peerstore_api.c b/src/peerstore/peerstore_api.c
index 47bf7775e..c9fcd17ab 100644
--- a/src/peerstore/peerstore_api.c
+++ b/src/peerstore/peerstore_api.c
@@ -829,7 +829,7 @@ reconnect (struct GNUNET_PEERSTORE_Handle *h)
     GNUNET_MQ_destroy (h->mq);
     h->mq = NULL;
   }
-  h->mq = GNUNET_CLIENT_connecT (h->cfg,
+  h->mq = GNUNET_CLIENT_connect (h->cfg,
                                  "peerstore",
                                  mq_handlers,
                                  &handle_client_error,
diff --git a/src/psyc/psyc_api.c b/src/psyc/psyc_api.c
index 9769bb853..d744e7d08 100644
--- a/src/psyc/psyc_api.c
+++ b/src/psyc/psyc_api.c
@@ -694,7 +694,7 @@ master_connect (struct GNUNET_PSYC_Master *mst)
     GNUNET_MQ_handler_end ()
   };
 
-  chn->mq = GNUNET_CLIENT_connecT (chn->cfg, "psyc",
+  chn->mq = GNUNET_CLIENT_connect (chn->cfg, "psyc",
                                    handlers, master_disconnected, mst);
   GNUNET_assert (NULL != chn->mq);
   chn->tmit = GNUNET_PSYC_transmit_create (chn->mq);
@@ -993,7 +993,7 @@ slave_connect (struct GNUNET_PSYC_Slave *slv)
     GNUNET_MQ_handler_end ()
   };
 
-  chn->mq = GNUNET_CLIENT_connecT (chn->cfg, "psyc",
+  chn->mq = GNUNET_CLIENT_connect (chn->cfg, "psyc",
                                    handlers, slave_disconnected, slv);
   GNUNET_assert (NULL != chn->mq);
   chn->tmit = GNUNET_PSYC_transmit_create (chn->mq);
diff --git a/src/psycstore/psycstore_api.c b/src/psycstore/psycstore_api.c
index 480d594fc..40322662e 100644
--- a/src/psycstore/psycstore_api.c
+++ b/src/psycstore/psycstore_api.c
@@ -348,7 +348,7 @@ do_connect (struct GNUNET_PSYCSTORE_Handle *h)
 
   h->op = GNUNET_OP_create ();
   GNUNET_assert (NULL == h->mq);
-  h->mq = GNUNET_CLIENT_connecT (h->cfg, "psycstore",
+  h->mq = GNUNET_CLIENT_connect (h->cfg, "psycstore",
                                  handlers, disconnected, h);
   GNUNET_assert (NULL != h->mq);
 }
diff --git a/src/regex/regex_api_announce.c b/src/regex/regex_api_announce.c
index 8fded96d2..70bf34bc8 100644
--- a/src/regex/regex_api_announce.c
+++ b/src/regex/regex_api_announce.c
@@ -104,7 +104,7 @@ announce_reconnect (struct GNUNET_REGEX_Announcement *a)
   struct AnnounceMessage *am;
   size_t slen;
 
-  a->mq = GNUNET_CLIENT_connecT (a->cfg,
+  a->mq = GNUNET_CLIENT_connect (a->cfg,
                                  "regex",
                                  NULL,
                                  &announce_mq_error_handler,
diff --git a/src/regex/regex_api_search.c b/src/regex/regex_api_search.c
index ff85f5748..b7a015f87 100644
--- a/src/regex/regex_api_search.c
+++ b/src/regex/regex_api_search.c
@@ -167,7 +167,7 @@ search_reconnect (struct GNUNET_REGEX_Search *s)
   struct RegexSearchMessage *rsm;
 
   GNUNET_assert (NULL == s->mq);
-  s->mq = GNUNET_CLIENT_connecT (s->cfg,
+  s->mq = GNUNET_CLIENT_connect (s->cfg,
                                  "regex",
                                  handlers,
                                  &mq_error_handler,
diff --git a/src/revocation/gnunet-service-revocation.c b/src/revocation/gnunet-service-revocation.c
index ad3253548..2965808fa 100644
--- a/src/revocation/gnunet-service-revocation.c
+++ b/src/revocation/gnunet-service-revocation.c
@@ -670,7 +670,7 @@ shutdown_task (void *cls)
   }
   if (NULL != core_api)
   {
-    GNUNET_CORE_disconnecT (core_api);
+    GNUNET_CORE_disconnect (core_api);
     core_api = NULL;
   }
   if (NULL != stats)
@@ -894,7 +894,7 @@ run (void *cls,
   peers = GNUNET_CONTAINER_multipeermap_create (128,
                                                 GNUNET_YES);
   /* Connect to core service and register core handlers */
-  core_api = GNUNET_CORE_connecT (cfg,   /* Main configuration */
+  core_api = GNUNET_CORE_connect (cfg,   /* Main configuration */
                                   NULL,       /* Closure passed to functions */
                                   &core_init,    /* Call core_init once connected */
                                   &handle_core_connect,  /* Handle connects */
diff --git a/src/revocation/revocation_api.c b/src/revocation/revocation_api.c
index 8c00ac2ae..fde0296a4 100644
--- a/src/revocation/revocation_api.c
+++ b/src/revocation/revocation_api.c
@@ -125,7 +125,7 @@ GNUNET_REVOCATION_query (const struct GNUNET_CONFIGURATION_Handle *cfg,
   struct QueryMessage *qm;
   struct GNUNET_MQ_Envelope *env;
 
-  q->mq = GNUNET_CLIENT_connecT (cfg,
+  q->mq = GNUNET_CLIENT_connect (cfg,
                                  "revocation",
                                  handlers,
                                  &query_mq_error_handler,
@@ -283,7 +283,7 @@ GNUNET_REVOCATION_revoke (const struct GNUNET_CONFIGURATION_Handle *cfg,
     return NULL;
   }
 
-  h->mq = GNUNET_CLIENT_connecT (cfg,
+  h->mq = GNUNET_CLIENT_connect (cfg,
                                  "revocation",
                                  handlers,
                                  &revocation_mq_error_handler,
diff --git a/src/revocation/test_revocation.c b/src/revocation/test_revocation.c
index ba659d9d8..d3bbb879a 100644
--- a/src/revocation/test_revocation.c
+++ b/src/revocation/test_revocation.c
@@ -337,7 +337,7 @@ core_connect_adapter (void *cls,
   struct TestPeer *me = cls;
 
   me->cfg = cfg;
-  me->ch = GNUNET_CORE_connecT (cfg,
+  me->ch = GNUNET_CORE_connect (cfg,
                                 me,
                                 NULL,
                                 &connect_cb,
@@ -356,7 +356,7 @@ core_disconnect_adapter (void *cls,
 {
   struct TestPeer *me = cls;
 
-  GNUNET_CORE_disconnecT (me->ch);
+  GNUNET_CORE_disconnect (me->ch);
   me->ch = NULL;
 }
 
diff --git a/src/rps/rps_api.c b/src/rps/rps_api.c
index 3d2f37359..504f28b92 100644
--- a/src/rps/rps_api.c
+++ b/src/rps/rps_api.c
@@ -286,7 +286,7 @@ reconnect (struct GNUNET_RPS_Handle *h)
 
   if (NULL != h->mq)
     GNUNET_MQ_destroy (h->mq);
-  h->mq = GNUNET_CLIENT_connecT (h->cfg,
+  h->mq = GNUNET_CLIENT_connect (h->cfg,
                                  "rps",
                                  mq_handlers,
                                  &mq_error_handler,
diff --git a/src/scalarproduct/scalarproduct_api.c b/src/scalarproduct/scalarproduct_api.c
index 9606851c8..df9f8d196 100644
--- a/src/scalarproduct/scalarproduct_api.c
+++ b/src/scalarproduct/scalarproduct_api.c
@@ -256,7 +256,7 @@ GNUNET_SCALARPRODUCT_accept_computation (const struct GNUNET_CONFIGURATION_Handl
   h->response_proc = &process_status_message;
   h->cfg = cfg;
   h->key = *session_key;
-  h->mq = GNUNET_CLIENT_connecT (cfg,
+  h->mq = GNUNET_CLIENT_connect (cfg,
                                  "scalarproduct-bob",
                                  handlers,
                                  &mq_error_handler,
@@ -408,7 +408,7 @@ GNUNET_SCALARPRODUCT_start_computation (const struct GNUNET_CONFIGURATION_Handle
   if (GNUNET_SYSERR == check_unique (elements,
                                      element_count))
     return NULL;
-  h->mq = GNUNET_CLIENT_connecT (cfg,
+  h->mq = GNUNET_CLIENT_connect (cfg,
                                  "scalarproduct-alice",
                                  handlers,
                                  &mq_error_handler,
diff --git a/src/secretsharing/secretsharing_api.c b/src/secretsharing/secretsharing_api.c
index 78167b671..85df66c13 100644
--- a/src/secretsharing/secretsharing_api.c
+++ b/src/secretsharing/secretsharing_api.c
@@ -261,7 +261,7 @@ GNUNET_SECRETSHARING_create_session (const struct GNUNET_CONFIGURATION_Handle *c
   struct GNUNET_MQ_Envelope *ev;
   struct GNUNET_SECRETSHARING_CreateMessage *msg;
 
-  s->mq = GNUNET_CLIENT_connecT (cfg,
+  s->mq = GNUNET_CLIENT_connect (cfg,
                                  "secretsharing",
                                  mq_handlers,
                                  &handle_session_client_error,
@@ -348,7 +348,7 @@ GNUNET_SECRETSHARING_decrypt (const struct GNUNET_CONFIGURATION_Handle *cfg,
 
   s->decrypt_cb = decrypt_cb;
   s->decrypt_cls = decrypt_cb_cls;
-  s->mq = GNUNET_CLIENT_connecT (cfg,
+  s->mq = GNUNET_CLIENT_connect (cfg,
                                  "secretsharing",
                                  mq_handlers,
                                  &handle_decrypt_client_error,
diff --git a/src/set/set_api.c b/src/set/set_api.c
index 7a33b86ea..7a7267a33 100644
--- a/src/set/set_api.c
+++ b/src/set/set_api.c
@@ -586,7 +586,7 @@ create_internal (const struct GNUNET_CONFIGURATION_Handle *cfg,
   struct GNUNET_SET_CopyLazyConnectMessage *copy_msg;
 
   set->cfg = cfg;
-  set->mq = GNUNET_CLIENT_connecT (cfg,
+  set->mq = GNUNET_CLIENT_connect (cfg,
                                    "set",
                                    mq_handlers,
                                    &handle_client_set_error,
@@ -914,7 +914,7 @@ listen_connect (void *cls)
 
   lh->reconnect_task = NULL;
   GNUNET_assert (NULL == lh->mq);
-  lh->mq = GNUNET_CLIENT_connecT (lh->cfg,
+  lh->mq = GNUNET_CLIENT_connect (lh->cfg,
                                   "set",
                                   mq_handlers,
                                   &handle_client_listener_error,
diff --git a/src/social/social_api.c b/src/social/social_api.c
index f78cb9a85..d96c93d8f 100644
--- a/src/social/social_api.c
+++ b/src/social/social_api.c
@@ -1195,7 +1195,7 @@ host_connect (struct GNUNET_SOCIAL_Host *hst)
     GNUNET_MQ_handler_end ()
   };
 
-  plc->mq = GNUNET_CLIENT_connecT (plc->cfg, "social",
+  plc->mq = GNUNET_CLIENT_connect (plc->cfg, "social",
                                    handlers, host_disconnected, hst);
   GNUNET_assert (NULL != plc->mq);
   plc->tmit = GNUNET_PSYC_transmit_create (plc->mq);
@@ -1697,7 +1697,7 @@ guest_connect (struct GNUNET_SOCIAL_Guest *gst)
     GNUNET_MQ_handler_end ()
   };
 
-  plc->mq = GNUNET_CLIENT_connecT (plc->cfg, "social",
+  plc->mq = GNUNET_CLIENT_connect (plc->cfg, "social",
                                    handlers, guest_disconnected, gst);
   GNUNET_assert (NULL != plc->mq);
   plc->tmit = GNUNET_PSYC_transmit_create (plc->mq);
@@ -2597,7 +2597,7 @@ app_connect (struct GNUNET_SOCIAL_App *app)
     GNUNET_MQ_handler_end ()
   };
 
-  app->mq = GNUNET_CLIENT_connecT (app->cfg, "social",
+  app->mq = GNUNET_CLIENT_connect (app->cfg, "social",
                                    handlers, app_disconnected, app);
   GNUNET_assert (NULL != app->mq);
   GNUNET_MQ_send_copy (app->mq, app->connect_env);
diff --git a/src/statistics/statistics_api.c b/src/statistics/statistics_api.c
index bfa2da3b4..ad4453b2a 100644
--- a/src/statistics/statistics_api.c
+++ b/src/statistics/statistics_api.c
@@ -678,7 +678,7 @@ try_connect (struct GNUNET_STATISTICS_Handle *h)
     return GNUNET_NO;
   if (NULL != h->mq)
     return GNUNET_YES;
-  h->mq = GNUNET_CLIENT_connecT (h->cfg,
+  h->mq = GNUNET_CLIENT_connect (h->cfg,
                                  "statistics",
                                  handlers,
                                  &mq_error_handler,
diff --git a/src/testbed-logger/testbed_logger_api.c b/src/testbed-logger/testbed_logger_api.c
index 19a5d9b50..25494aed0 100644
--- a/src/testbed-logger/testbed_logger_api.c
+++ b/src/testbed-logger/testbed_logger_api.c
@@ -224,7 +224,7 @@ GNUNET_TESTBED_LOGGER_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
   struct GNUNET_TESTBED_LOGGER_Handle *h;
 
   h = GNUNET_new (struct GNUNET_TESTBED_LOGGER_Handle);
-  h->mq = GNUNET_CLIENT_connecT (cfg,
+  h->mq = GNUNET_CLIENT_connect (cfg,
                                  "testbed-logger",
                                  NULL,
                                  &mq_error_handler,
diff --git a/src/testbed/gnunet-service-testbed_connectionpool.c b/src/testbed/gnunet-service-testbed_connectionpool.c
index b0e369c6a..6bc744ba8 100644
--- a/src/testbed/gnunet-service-testbed_connectionpool.c
+++ b/src/testbed/gnunet-service-testbed_connectionpool.c
@@ -623,12 +623,12 @@ core_peer_connect_cb (void *cls,
 
 
 /**
- * Function called after #GNUNET_CORE_connecT() has succeeded (or failed
+ * Function called after #GNUNET_CORE_connect() has succeeded (or failed
  * for good).  Note that the private key of the peer is intentionally
  * not exposed here; if you need it, your process should try to read
  * the private key file directly (which should work if you are
  * authorized...).  Implementations of this function must not call
- * #GNUNET_CORE_disconnecT() (other than by scheduling a new task to
+ * #GNUNET_CORE_disconnect() (other than by scheduling a new task to
  * do this later).
  *
  * @param cls the #PooledConnection object
@@ -675,7 +675,7 @@ opstart_get_handle_core (void *cls)
   LOG_DEBUG ("Opening a CORE connection to peer %u\n",
              entry->index);
   entry->handle_core
-    = GNUNET_CORE_connecT (entry->cfg,
+    = GNUNET_CORE_connect (entry->cfg,
                            entry,        /* closure */
                            &core_startup_cb, /* core startup notify */
                            &core_peer_connect_cb,    /* peer connect notify */
@@ -697,7 +697,7 @@ oprelease_get_handle_core (void *cls)
 
   if (NULL == entry->handle_core)
     return;
-  GNUNET_CORE_disconnecT (entry->handle_core);
+  GNUNET_CORE_disconnect (entry->handle_core);
   entry->handle_core = NULL;
   GNUNET_free_non_null (entry->peer_identity);
   entry->peer_identity = NULL;
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index ae40948b3..0e0a5da9c 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -1646,7 +1646,7 @@ GNUNET_TESTBED_controller_connect (struct GNUNET_TESTBED_Host *host,
   controller->cc_cls = cc_cls;
   controller->event_mask = event_mask;
   controller->cfg = GNUNET_CONFIGURATION_dup (cfg);
-  controller->mq = GNUNET_CLIENT_connecT (controller->cfg,
+  controller->mq = GNUNET_CLIENT_connect (controller->cfg,
                                           "testbed",
                                           handlers,
                                           &mq_error_handler,
diff --git a/src/testbed/testbed_api_barriers.c b/src/testbed/testbed_api_barriers.c
index 1679756a1..93698d4b7 100644
--- a/src/testbed/testbed_api_barriers.c
+++ b/src/testbed/testbed_api_barriers.c
@@ -215,7 +215,7 @@ GNUNET_TESTBED_barrier_wait (const char *name,
   h->name = GNUNET_strdup (name);
   h->cb = cb;
   h->cb_cls = cb_cls;
-  h->mq = GNUNET_CLIENT_connecT (h->cfg,
+  h->mq = GNUNET_CLIENT_connect (h->cfg,
                                  "testbed-barrier",
                                  handlers,
                                  &mq_error_handler,
diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c
index 69f01e043..d48f07e71 100644
--- a/src/topology/gnunet-daemon-topology.c
+++ b/src/topology/gnunet-daemon-topology.c
@@ -902,7 +902,7 @@ process_peer (void *cls,
 
 
 /**
- * Function called after #GNUNET_CORE_connecT has succeeded
+ * Function called after #GNUNET_CORE_connect has succeeded
  * (or failed for good).
  *
  * @param cls closure
@@ -1101,7 +1101,7 @@ cleaning_task (void *cls)
   }
   if (NULL != handle)
   {
-    GNUNET_CORE_disconnecT (handle);
+    GNUNET_CORE_disconnect (handle);
     handle = NULL;
   }
   whitelist_peers ();
@@ -1189,7 +1189,7 @@ run (void *cls,
                                             &blacklist_check,
                                             NULL);
   ats = GNUNET_ATS_connectivity_init (cfg);
-  handle = GNUNET_CORE_connecT (cfg,
+  handle = GNUNET_CORE_connect (cfg,
                                 NULL,
                                 &core_init,
                                 &connect_notify,
diff --git a/src/transport/transport_api_address_to_string.c b/src/transport/transport_api_address_to_string.c
index fd30230f7..b9c72dcb3 100644
--- a/src/transport/transport_api_address_to_string.c
+++ b/src/transport/transport_api_address_to_string.c
@@ -210,7 +210,7 @@ GNUNET_TRANSPORT_address_to_string (const struct GNUNET_CONFIGURATION_Handle *cf
   }
   alc->cb = aluc;
   alc->cb_cls = aluc_cls;
-  alc->mq = GNUNET_CLIENT_connecT (cfg,
+  alc->mq = GNUNET_CLIENT_connect (cfg,
                                    "transport",
                                    handlers,
                                    &mq_error_handler,
diff --git a/src/transport/transport_api_blacklist.c b/src/transport/transport_api_blacklist.c
index 4b758f9dc..7b1bf526e 100644
--- a/src/transport/transport_api_blacklist.c
+++ b/src/transport/transport_api_blacklist.c
@@ -132,7 +132,7 @@ reconnect (struct GNUNET_TRANSPORT_Blacklist *br)
 
   if (NULL != br->mq)
     GNUNET_MQ_destroy (br->mq);
-  br->mq = GNUNET_CLIENT_connecT (br->cfg,
+  br->mq = GNUNET_CLIENT_connect (br->cfg,
                                   "transport",
                                   handlers,
                                   &mq_error_handler,
diff --git a/src/transport/transport_api_core.c b/src/transport/transport_api_core.c
index de18a140c..a693cb889 100644
--- a/src/transport/transport_api_core.c
+++ b/src/transport/transport_api_core.c
@@ -805,7 +805,7 @@ reconnect (void *cls)
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Connecting to transport service.\n");
   GNUNET_assert (NULL == h->mq);
-  h->mq = GNUNET_CLIENT_connecT (h->cfg,
+  h->mq = GNUNET_CLIENT_connect (h->cfg,
                                  "transport",
                                  handlers,
                                  &mq_error_handler,
diff --git a/src/transport/transport_api_hello_get.c b/src/transport/transport_api_hello_get.c
index 9c3a3e786..c53dd7a9a 100644
--- a/src/transport/transport_api_hello_get.c
+++ b/src/transport/transport_api_hello_get.c
@@ -182,7 +182,7 @@ reconnect (void *cls)
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Connecting to transport service.\n");
   GNUNET_assert (NULL == ghh->mq);
-  ghh->mq = GNUNET_CLIENT_connecT (ghh->cfg,
+  ghh->mq = GNUNET_CLIENT_connect (ghh->cfg,
                                    "transport",
                                    handlers,
                                    &mq_error_handler,
diff --git a/src/transport/transport_api_manipulation.c b/src/transport/transport_api_manipulation.c
index 6325354cb..fd5849a7e 100644
--- a/src/transport/transport_api_manipulation.c
+++ b/src/transport/transport_api_manipulation.c
@@ -121,7 +121,7 @@ reconnect (void *cls)
        "Connecting to transport service.\n");
   GNUNET_assert (NULL == h->mq);
   h->reconnecting = GNUNET_NO;
-  h->mq = GNUNET_CLIENT_connecT (h->cfg,
+  h->mq = GNUNET_CLIENT_connect (h->cfg,
                                  "transport",
                                  handlers,
                                  &mq_error_handler,
diff --git a/src/transport/transport_api_monitor_peers.c b/src/transport/transport_api_monitor_peers.c
index 345f2ad60..38e6e0d7c 100644
--- a/src/transport/transport_api_monitor_peers.c
+++ b/src/transport/transport_api_monitor_peers.c
@@ -360,7 +360,7 @@ do_peer_connect (void *cls)
   struct GNUNET_MQ_Envelope *env;
 
   pal_ctx->reconnect_task = NULL;
-  pal_ctx->mq = GNUNET_CLIENT_connecT (pal_ctx->cfg,
+  pal_ctx->mq = GNUNET_CLIENT_connect (pal_ctx->cfg,
                                        "transport",
                                        handlers,
                                        &mq_error_handler,
diff --git a/src/transport/transport_api_monitor_plugins.c b/src/transport/transport_api_monitor_plugins.c
index 7547a3402..e81664c41 100644
--- a/src/transport/transport_api_monitor_plugins.c
+++ b/src/transport/transport_api_monitor_plugins.c
@@ -388,7 +388,7 @@ do_plugin_connect (void *cls)
   struct GNUNET_MQ_Envelope *env;
 
   pm->reconnect_task = NULL;
-  pm->mq = GNUNET_CLIENT_connecT (pm->cfg,
+  pm->mq = GNUNET_CLIENT_connect (pm->cfg,
                                   "transport",
                                   handlers,
                                   &mq_error_handler,
diff --git a/src/transport/transport_api_offer_hello.c b/src/transport/transport_api_offer_hello.c
index 951ab9ba4..e1dca14e3 100644
--- a/src/transport/transport_api_offer_hello.c
+++ b/src/transport/transport_api_offer_hello.c
@@ -104,7 +104,7 @@ GNUNET_TRANSPORT_offer_hello (const struct GNUNET_CONFIGURATION_Handle *cfg,
     GNUNET_free (ohh);
     return NULL;
   }
-  ohh->mq = GNUNET_CLIENT_connecT (cfg,
+  ohh->mq = GNUNET_CLIENT_connect (cfg,
                                    "transport",
                                    NULL,
                                    NULL,
diff --git a/src/util/client.c b/src/util/client.c
index 337d06734..d06547daf 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -821,7 +821,7 @@ connection_client_cancel_impl (struct GNUNET_MQ_Handle *mq,
  * @return the message queue, NULL on error
  */
 struct GNUNET_MQ_Handle *
-GNUNET_CLIENT_connecT (const struct GNUNET_CONFIGURATION_Handle *cfg,
+GNUNET_CLIENT_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
                        const char *service_name,
                        const struct GNUNET_MQ_MessageHandler *handlers,
                        GNUNET_MQ_ErrorHandler error_handler,
diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c
index 481e99157..fdeaed006 100644
--- a/src/util/resolver_api.c
+++ b/src/util/resolver_api.c
@@ -735,7 +735,7 @@ reconnect_task (void *cls)
     return;                     /* no work pending */
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Trying to connect to DNS service\n");
-  mq = GNUNET_CLIENT_connecT (resolver_cfg,
+  mq = GNUNET_CLIENT_connect (resolver_cfg,
                               "resolver",
                               handlers,
                               &mq_error_handler,
diff --git a/src/util/test_client.c b/src/util/test_client.c
index aa4d84495..f60e5b7f7 100644
--- a/src/util/test_client.c
+++ b/src/util/test_client.c
@@ -98,12 +98,12 @@ task (void *cls,
 
   /* test that ill-configured client fails instantly */
   GNUNET_assert (NULL ==
-                 GNUNET_CLIENT_connecT (cfg,
+                 GNUNET_CLIENT_connect (cfg,
                                         "invalid-service",
                                         NULL,
                                         &mq_error_handler,
                                         NULL));
-  client_mq = GNUNET_CLIENT_connecT (cfg,
+  client_mq = GNUNET_CLIENT_connect (cfg,
                                      "test_client",
                                      chandlers,
                                      &mq_error_handler,
diff --git a/src/util/test_server.c b/src/util/test_server.c
index eac45fc69..8003adbf4 100644
--- a/src/util/test_server.c
+++ b/src/util/test_server.c
@@ -267,7 +267,7 @@ task (void *cls)
                                          "resolver",
                                          "HOSTNAME",
                                          "localhost");
-  mq = GNUNET_CLIENT_connecT (cfg,
+  mq = GNUNET_CLIENT_connect (cfg,
                               "test-server",
                               chandlers,
                               &mq_error_handler,
diff --git a/src/util/test_server_disconnect.c b/src/util/test_server_disconnect.c
index de9c4722d..c3d003e90 100644
--- a/src/util/test_server_disconnect.c
+++ b/src/util/test_server_disconnect.c
@@ -125,7 +125,7 @@ task (void *cls)
                                          "localhost");
   GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME",
                                          "localhost");
-  mq = GNUNET_CLIENT_connecT (cfg,
+  mq = GNUNET_CLIENT_connect (cfg,
                               "test-server",
                               NULL,
                               NULL,
diff --git a/src/util/test_server_with_client.c b/src/util/test_server_with_client.c
index 59f9b6afd..63bfda00c 100644
--- a/src/util/test_server_with_client.c
+++ b/src/util/test_server_with_client.c
@@ -166,7 +166,7 @@ task (void *cls)
   GNUNET_CONFIGURATION_set_value_string (cfg, "test", "HOSTNAME", "localhost");
   GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME",
                                          "localhost");
-  mq = GNUNET_CLIENT_connecT (cfg,
+  mq = GNUNET_CLIENT_connect (cfg,
                               "test",
                               NULL,
                               NULL,
diff --git a/src/util/test_server_with_client_unix.c b/src/util/test_server_with_client_unix.c
index ef48aabce..d240f1a88 100644
--- a/src/util/test_server_with_client_unix.c
+++ b/src/util/test_server_with_client_unix.c
@@ -144,7 +144,7 @@ task (void *cls)
   GNUNET_CONFIGURATION_set_value_string (cfg, "test", "UNIXPATH", unixpath);
   GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME",
                                          "localhost");
-  mq = GNUNET_CLIENT_connecT (cfg,
+  mq = GNUNET_CLIENT_connect (cfg,
                               "test",
                               NULL,
                               NULL,
diff --git a/src/util/test_service.c b/src/util/test_service.c
index dc9d16ed9..d2136b42f 100644
--- a/src/util/test_service.c
+++ b/src/util/test_service.c
@@ -107,7 +107,7 @@ service_init (void *cls,
   struct GNUNET_MQ_Envelope *env;
   struct GNUNET_MessageHeader *msg;
   
-  mq = GNUNET_CLIENT_connecT (cfg,
+  mq = GNUNET_CLIENT_connect (cfg,
                               service_name,
                               NULL,
                               NULL,
diff --git a/src/util/test_socks.c b/src/util/test_socks.c
index 416f32f62..cb70f916f 100644
--- a/src/util/test_socks.c
+++ b/src/util/test_socks.c
@@ -160,7 +160,7 @@ task (void *cls)
   handlers[0].callback_cls = cls;
   handlers[1].callback_cls = cls;
   GNUNET_SERVER_add_handlers (server, handlers);
-  mq = GNUNET_CLIENT_connecT (cfg,
+  mq = GNUNET_CLIENT_connect (cfg,
                               MYNAME,
                               chandlers,
                               &mq_error_handler,
diff --git a/src/vpn/vpn_api.c b/src/vpn/vpn_api.c
index 4add41ce4..bc77865a8 100644
--- a/src/vpn/vpn_api.c
+++ b/src/vpn/vpn_api.c
@@ -324,7 +324,7 @@ connect_task (void *cls)
   struct GNUNET_VPN_RedirectionRequest *rr;
 
   vh->rt = NULL;
-  vh->mq = GNUNET_CLIENT_connecT (vh->cfg,
+  vh->mq = GNUNET_CLIENT_connect (vh->cfg,
                                   "vpn",
                                   handlers,
                                   &mq_error_handler,