Rename project to telepathy-rakia

For the curious, these are the commands you need:

git clean -d

git mv tpsip-extensions extensions
git mv tpsip rakia

sed -i \
    -e 's/libtpsip-extensions.la/librakia-extensions.la/g' \
    -e 's/libtpsip_extensions_la/librakia_extensions_la/g' \
    -e 's/tpsip-extensions/extensions/g' \
    -e 's/sofiasip/rakia/g' \
    -e 's/tpsip/rakia/g' \
    -e 's/Tpsip/Rakia/g' \
    -e 's/SOFIASIP/RAKIA/g' \
    */*.[ch] .gitignore configure.ac $(find -name 'Makefile.am' ;
        find -name '*.py' ; find -name '*.in')

git mv ./docs/telepathy-sofiasip.8.in ./docs/telepathy-rakia.8.in
git mv ./src/telepathy-sofiasip.c ./src/telepathy-rakia.c
git mv ./data/org.freedesktop.Telepathy.ConnectionManager.sofiasip.service.in \
    ./data/org.freedesktop.Telepathy.ConnectionManager.rakia.service.in
git mv ./tests/twisted/tools/sofiasip.service.in \
    ./tests/twisted/tools/rakia.service.in

./autogen.sh && make distcheck

12 files changed, 318 insertions, 318 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index f6082b8..7b37144 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Makefile.am for telepathy-sofiasip/src
+# Makefile.am for telepathy-rakia/src
 #
 # Copyright (C) 2006-2009 Nokia Corporation
 # Contact: Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
@@ -17,7 +17,7 @@ managerdir = $(datadir)/telepathy/managers
 AM_CPPFLAGS = $(DBUS_CFLAGS) $(GLIB_CFLAGS) $(SOFIA_SIP_UA_CFLAGS) \
 	$(TELEPATHY_GLIB_CFLAGS) $(IPHB_CFLAGS) \
 	-I$(top_builddir) -I$(top_srcdir) \
-	-DG_LOG_DOMAIN=\"tpsip\"
+	-DG_LOG_DOMAIN=\"rakia\"
 AM_CFLAGS = $(ERROR_CFLAGS) $(COVERAGE_CFLAGS)
 ALL_LIBS = $(DBUS_LIBS) $(GLIB_LIBS) $(SOFIA_SIP_UA_LIBS) \
 	$(TELEPATHY_GLIB_LIBS) $(IPHB_LIBS)
@@ -25,10 +25,10 @@ ALL_LIBS = $(DBUS_LIBS) $(GLIB_LIBS) $(SOFIA_SIP_UA_LIBS) \
 # ----------------------------------------------------------------------
 # Build targets
 
-libexec_PROGRAMS = telepathy-sofiasip
-manager_DATA = sofiasip.manager
+libexec_PROGRAMS = telepathy-rakia
+manager_DATA = rakia.manager
 noinst_PROGRAMS = write-mgr-file
-noinst_LTLIBRARIES = libtpsip-convenience.la
+noinst_LTLIBRARIES = librakia-convenience.la
 
 # ----------------------------------------------------------------------
 # Tests
@@ -54,7 +54,7 @@ noinst_LTLIBRARIES = libtpsip-convenience.la
 	--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
 	$< > $@ || rm -f $@
 
-sofiasip.manager: write-mgr-file
+rakia.manager: write-mgr-file
 	if ./write-mgr-file > $@.tmp; then \
 		mv -f $@.tmp $@;\
 	else \
@@ -65,7 +65,7 @@ BUILT_SOURCES = \
 		sip-connection-enumtypes.h \
 		sip-connection-enumtypes.c
 
-libtpsip_convenience_la_SOURCES = \
+librakia_convenience_la_SOURCES = \
     sip-connection.h \
     sip-connection.c \
     sip-connection-manager.h \
@@ -76,22 +76,22 @@ libtpsip_convenience_la_SOURCES = \
     sip-connection-helpers.c \
     sip-connection-private.h
 
-nodist_libtpsip_convenience_la_SOURCES = \
+nodist_librakia_convenience_la_SOURCES = \
     $(BUILT_SOURCES)
 
-libtpsip_convenience_la_LIBADD = \
-    $(top_builddir)/tpsip/libtpsip.la \
-    $(top_builddir)/tpsip-extensions/libtpsip-extensions.la
+librakia_convenience_la_LIBADD = \
+    $(top_builddir)/rakia/librakia.la \
+    $(top_builddir)/extensions/librakia-extensions.la
 
-telepathy_sofiasip_SOURCES = \
-    telepathy-sofiasip.c 
+telepathy_rakia_SOURCES = \
+    telepathy-rakia.c 
 
-telepathy_sofiasip_LDADD = libtpsip-convenience.la $(ALL_LIBS)
+telepathy_rakia_LDADD = librakia-convenience.la $(ALL_LIBS)
 
 write_mgr_file_SOURCES = \
     write-mgr-file.c 
 
-write_mgr_file_LDADD = libtpsip-convenience.la $(ALL_LIBS)
+write_mgr_file_LDADD = librakia-convenience.la $(ALL_LIBS)
 
 # ----------------------------------------------------------------------
 # Install and distribution rules
diff --git a/src/protocol.c b/src/protocol.c
index be17538..44bbd4d 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -1,5 +1,5 @@
 /*
- * protocol.c - source for TpsipProtocol
+ * protocol.c - source for RakiaProtocol
  * Copyright (C) 2007-2010 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
@@ -25,14 +25,14 @@
 #include <dbus/dbus-protocol.h>
 #include <dbus/dbus-glib.h>
 
-#include <tpsip/sofia-decls.h>
-#include <tpsip/handles.h>
-#include <tpsip/media-manager.h>
-#include <tpsip/text-manager.h>
+#include <rakia/sofia-decls.h>
+#include <rakia/handles.h>
+#include <rakia/media-manager.h>
+#include <rakia/text-manager.h>
 #include <sofia-sip/su_glib.h>
 
 #define DEBUG_FLAG TPSIP_DEBUG_CONNECTION
-#include "tpsip/debug.h"
+#include "rakia/debug.h"
 #include "sip-connection.h"
 #include "sip-connection-helpers.h"
 
@@ -41,15 +41,15 @@
 #define VCARD_FIELD_NAME "x-" PROTOCOL_NAME
 #define ENGLISH_NAME "SIP"
 
-G_DEFINE_TYPE (TpsipProtocol,
-    tpsip_protocol,
+G_DEFINE_TYPE (RakiaProtocol,
+    rakia_protocol,
     TP_TYPE_BASE_PROTOCOL)
 
 enum {
     PROP_SOFIA_ROOT = 1,
 };
 
-struct _TpsipProtocolPrivate
+struct _RakiaProtocolPrivate
 {
   su_root_t *sofia_root;
 };
@@ -61,7 +61,7 @@ enum {
     PARAM_SET_SEPARATELY
 };
 
-static TpCMParamSpec tpsip_params[] = {
+static TpCMParamSpec rakia_params[] = {
     /* Account (a sip: URI)
      *
      * FIXME: validate account SIP URI properly, using appropriate RFCs */
@@ -150,19 +150,19 @@ static TpCMParamSpec tpsip_params[] = {
 };
 
 static void
-tpsip_protocol_init (TpsipProtocol *self)
+rakia_protocol_init (RakiaProtocol *self)
 {
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, TPSIP_TYPE_PROTOCOL,
-      TpsipProtocolPrivate);
+      RakiaProtocolPrivate);
 }
 
 static const TpCMParamSpec *
 get_parameters (TpBaseProtocol *self G_GNUC_UNUSED)
 {
-  return tpsip_params;
+  return rakia_params;
 }
 
-static TpsipConnectionKeepaliveMechanism
+static RakiaConnectionKeepaliveMechanism
 priv_parse_keepalive (const gchar *str)
 {
   if (str == NULL || strcmp (str, "auto") == 0)
@@ -267,15 +267,15 @@ new_connection (TpBaseProtocol *protocol,
                 GHashTable *params,
                 GError **error)
 {
-  TpsipProtocol *self = TPSIP_PROTOCOL (protocol);
-  TpsipConnection *conn;
+  RakiaProtocol *self = TPSIP_PROTOCOL (protocol);
+  RakiaConnection *conn;
   guint i;
   const gchar *account;
   const gchar *transport;
   const gchar *proxy_host;
   guint16 port;
   gchar *proxy;
-  TpsipConnectionKeepaliveMechanism keepalive_mechanism;
+  RakiaConnectionKeepaliveMechanism keepalive_mechanism;
 
   account = tp_asv_get_string (params, "account");
   transport = tp_asv_get_string (params, "transport");
@@ -310,26 +310,26 @@ new_connection (TpBaseProtocol *protocol,
         "transport", transport,
         NULL);
 
-  for (i = 0; tpsip_params[i].name != NULL; i++)
+  for (i = 0; rakia_params[i].name != NULL; i++)
     {
-      if (tpsip_params[i].offset == PARAM_SET_SEPARATELY)
+      if (rakia_params[i].offset == PARAM_SET_SEPARATELY)
         {
-          DEBUG ("Parameter %s is handled specially", tpsip_params[i].name);
+          DEBUG ("Parameter %s is handled specially", rakia_params[i].name);
           continue;
         }
 
-      g_assert (tpsip_params[i].offset == PARAM_EASY);
+      g_assert (rakia_params[i].offset == PARAM_EASY);
 
-      switch (tpsip_params[i].gtype)
+      switch (rakia_params[i].gtype)
         {
           case G_TYPE_STRING:
               {
                 const gchar *s = tp_asv_get_string (params,
-                    tpsip_params[i].name);
+                    rakia_params[i].name);
 
                 if (!tp_str_empty (s))
                   g_object_set (conn,
-                      tpsip_params[i].name, s,
+                      rakia_params[i].name, s,
                       NULL);
               }
             break;
@@ -338,11 +338,11 @@ new_connection (TpBaseProtocol *protocol,
               {
                 gboolean valid = FALSE;
                 guint u = tp_asv_get_uint32 (params,
-                    tpsip_params[i].name, &valid);
+                    rakia_params[i].name, &valid);
 
                 if (valid)
                   g_object_set (conn,
-                      tpsip_params[i].name, u,
+                      rakia_params[i].name, u,
                       NULL);
               }
             break;
@@ -350,12 +350,12 @@ new_connection (TpBaseProtocol *protocol,
           case G_TYPE_BOOLEAN:
               {
                 gboolean valid = FALSE;
-                gboolean b = tp_asv_get_boolean (params, tpsip_params[i].name,
+                gboolean b = tp_asv_get_boolean (params, rakia_params[i].name,
                     &valid);
 
                 if (valid)
                   g_object_set (conn,
-                      tpsip_params[i].name, b,
+                      rakia_params[i].name, b,
                       NULL);
               }
             break;
@@ -380,7 +380,7 @@ normalize_contact (TpBaseProtocol *self G_GNUC_UNUSED,
                    const gchar *contact,
                    GError **error)
 {
-  return tpsip_normalize_contact (contact, NULL, NULL, error);
+  return rakia_normalize_contact (contact, NULL, NULL, error);
 }
 
 static gchar *
@@ -411,7 +411,7 @@ get_connection_details (TpBaseProtocol *self,
   if (connection_interfaces != NULL)
     {
       *connection_interfaces = g_strdupv (
-          (GStrv) tpsip_connection_get_implemented_interfaces ());
+          (GStrv) rakia_connection_get_implemented_interfaces ());
     }
 
   if (channel_managers != NULL)
@@ -452,12 +452,12 @@ dup_authentication_types (TpBaseProtocol *base)
 }
 
 static void
-tpsip_protocol_get_property (GObject *object,
+rakia_protocol_get_property (GObject *object,
     guint property_id,
     GValue *value,
     GParamSpec *pspec)
 {
-  TpsipProtocol *self = TPSIP_PROTOCOL (object);
+  RakiaProtocol *self = TPSIP_PROTOCOL (object);
 
   switch (property_id)
     {
@@ -472,12 +472,12 @@ tpsip_protocol_get_property (GObject *object,
 }
 
 static void
-tpsip_protocol_set_property (GObject *object,
+rakia_protocol_set_property (GObject *object,
     guint property_id,
     const GValue *value,
     GParamSpec *pspec)
 {
-  TpsipProtocol *self = TPSIP_PROTOCOL (object);
+  RakiaProtocol *self = TPSIP_PROTOCOL (object);
 
   switch (property_id)
     {
@@ -492,13 +492,13 @@ tpsip_protocol_set_property (GObject *object,
 }
 
 static void
-tpsip_protocol_class_init (TpsipProtocolClass *klass)
+rakia_protocol_class_init (RakiaProtocolClass *klass)
 {
   TpBaseProtocolClass *base_class = (TpBaseProtocolClass *) klass;
   GObjectClass *object_class = (GObjectClass *) klass;
   GParamSpec *param_spec;
 
-  g_type_class_add_private (klass, sizeof (TpsipProtocolPrivate));
+  g_type_class_add_private (klass, sizeof (RakiaProtocolPrivate));
 
   base_class->get_parameters = get_parameters;
   base_class->new_connection = new_connection;
@@ -508,8 +508,8 @@ tpsip_protocol_class_init (TpsipProtocolClass *klass)
   base_class->get_connection_details = get_connection_details;
   base_class->dup_authentication_types = dup_authentication_types;
 
-  object_class->get_property = tpsip_protocol_get_property;
-  object_class->set_property = tpsip_protocol_set_property;
+  object_class->get_property = rakia_protocol_get_property;
+  object_class->set_property = rakia_protocol_set_property;
 
   param_spec = g_param_spec_pointer ("sofia-root", "Sofia-SIP root",
       "the root object for Sofia-SIP",
@@ -519,7 +519,7 @@ tpsip_protocol_class_init (TpsipProtocolClass *klass)
 }
 
 TpBaseProtocol *
-tpsip_protocol_new (su_root_t *sofia_root)
+rakia_protocol_new (su_root_t *sofia_root)
 {
   return g_object_new (TPSIP_TYPE_PROTOCOL,
       "name", PROTOCOL_NAME,
diff --git a/src/protocol.h b/src/protocol.h
index 7470af1..c7506ba 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -1,5 +1,5 @@
 /*
- * protocol.h - header for TpsipProtocol
+ * protocol.h - header for RakiaProtocol
  * Copyright (C) 2007-2010 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
@@ -23,52 +23,52 @@
 #include <glib-object.h>
 #include <telepathy-glib/base-protocol.h>
 
-#include <tpsip/sofia-decls.h>
+#include <rakia/sofia-decls.h>
 #include <sofia-sip/su_glib.h>
 
 G_BEGIN_DECLS
 
-typedef struct _TpsipProtocol TpsipProtocol;
-typedef struct _TpsipProtocolPrivate TpsipProtocolPrivate;
-typedef struct _TpsipProtocolClass TpsipProtocolClass;
-typedef struct _TpsipProtocolClassPrivate TpsipProtocolClassPrivate;
+typedef struct _RakiaProtocol RakiaProtocol;
+typedef struct _RakiaProtocolPrivate RakiaProtocolPrivate;
+typedef struct _RakiaProtocolClass RakiaProtocolClass;
+typedef struct _RakiaProtocolClassPrivate RakiaProtocolClassPrivate;
 
-struct _TpsipProtocolClass {
+struct _RakiaProtocolClass {
     TpBaseProtocolClass parent_class;
 
-    TpsipProtocolClassPrivate *priv;
+    RakiaProtocolClassPrivate *priv;
 };
 
-struct _TpsipProtocol {
+struct _RakiaProtocol {
     TpBaseProtocol parent;
 
-    TpsipProtocolPrivate *priv;
+    RakiaProtocolPrivate *priv;
 };
 
-GType tpsip_protocol_get_type (void);
+GType rakia_protocol_get_type (void);
 
 #define TPSIP_TYPE_PROTOCOL \
-    (tpsip_protocol_get_type ())
+    (rakia_protocol_get_type ())
 #define TPSIP_PROTOCOL(obj) \
     (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
         TPSIP_TYPE_PROTOCOL, \
-        TpsipProtocol))
+        RakiaProtocol))
 #define TPSIP_PROTOCOL_CLASS(klass) \
     (G_TYPE_CHECK_CLASS_CAST ((klass), \
         TPSIP_TYPE_PROTOCOL, \
-        TpsipProtocolClass))
+        RakiaProtocolClass))
 #define TPSIP_IS_PROTOCOL_CLASS(klass) \
     (G_TYPE_CHECK_CLASS_TYPE ((klass), \
         TPSIP_TYPE_PROTOCOL))
 #define TPSIP_PROTOCOL_GET_CLASS(klass) \
     (G_TYPE_INSTANCE_GET_CLASS ((obj), \
         TPSIP_TYPE_PROTOCOL, \
-        TpsipProtocolClass))
+        RakiaProtocolClass))
 
-gchar *tpsip_protocol_normalize_contact (const gchar *id,
+gchar *rakia_protocol_normalize_contact (const gchar *id,
     GError **error);
 
-TpBaseProtocol *tpsip_protocol_new (su_root_t *sofia_root);
+TpBaseProtocol *rakia_protocol_new (su_root_t *sofia_root);
 
 G_END_DECLS
 
diff --git a/src/sip-connection-helpers.c b/src/sip-connection-helpers.c
index 95de5ba..9fab39f 100644
--- a/src/sip-connection-helpers.c
+++ b/src/sip-connection-helpers.c
@@ -1,5 +1,5 @@
 /*
- * sip-connection-helpers.c - Helper routines used by TpsipConnection
+ * sip-connection-helpers.c - Helper routines used by RakiaConnection
  * Copyright (C) 2005 Collabora Ltd.
  * Copyright (C) 2006-2009 Nokia Corporation
  *
@@ -30,8 +30,8 @@
 #include <telepathy-glib/interfaces.h>
 #include <telepathy-glib/svc-connection.h>
 
-#include <tpsip/util.h>
-#include <tpsip/handles.h>
+#include <rakia/util.h>
+#include <rakia/handles.h>
 
 #include "sip-connection-helpers.h"
 
@@ -42,7 +42,7 @@
 #include "sip-connection-private.h"
 
 #define DEBUG_FLAG TPSIP_DEBUG_CONNECTION
-#include "tpsip/debug.h"
+#include "rakia/debug.h"
 
 /* Default keepalive timeout in seconds,
  * a value obtained from Sofia-SIP documentation */
@@ -58,21 +58,21 @@
 #define TPSIP_CONNECTION_MINIMUM_KEEPALIVE_INTERVAL_REGISTER 50
 
 static sip_to_t *
-priv_sip_to_url_make (TpsipConnection *conn,
+priv_sip_to_url_make (RakiaConnection *conn,
                       su_home_t *home,
                       TpHandle contact)
 {
   const url_t *url;
 
-  url = tpsip_handle_inspect_uri (TP_BASE_CONNECTION (conn), contact);
+  url = rakia_handle_inspect_uri (TP_BASE_CONNECTION (conn), contact);
   return sip_to_create (home, (const url_string_t *) url);
 }
 
 static sip_from_t *
-priv_sip_from_url_make (TpsipConnection *conn,
+priv_sip_from_url_make (RakiaConnection *conn,
                         su_home_t *home)
 {
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
   sip_from_t *from;
   gchar *alias = NULL;
 
@@ -89,7 +89,7 @@ priv_sip_from_url_make (TpsipConnection *conn,
       /* Make the alias into a quoted string, escaping all characters
        * that cannot go verbatim into a quoted string */
 
-      alias_quoted = tpsip_quote_string (alias);
+      alias_quoted = rakia_quote_string (alias);
 
       g_free (alias);
 
@@ -103,10 +103,10 @@ priv_sip_from_url_make (TpsipConnection *conn,
 
 
 nua_handle_t *
-tpsip_conn_create_register_handle (TpsipConnection *conn,
+rakia_conn_create_register_handle (RakiaConnection *conn,
                                  TpHandle contact)
 {
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
   nua_handle_t *result = NULL;
   su_home_t temphome[1] = { SU_HOME_INIT(temphome) };
   sip_to_t *to;
@@ -125,10 +125,10 @@ tpsip_conn_create_register_handle (TpsipConnection *conn,
 }
 
 nua_handle_t *
-tpsip_conn_create_request_handle (TpsipConnection *conn,
+rakia_conn_create_request_handle (RakiaConnection *conn,
                                   TpHandle contact)
 {
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
   nua_handle_t *result = NULL;
   su_home_t temphome[1] = { SU_HOME_INIT(temphome) };
   sip_from_t *from;
@@ -153,9 +153,9 @@ tpsip_conn_create_request_handle (TpsipConnection *conn,
 }
 
 void
-tpsip_conn_update_proxy_and_transport (TpsipConnection *conn)
+rakia_conn_update_proxy_and_transport (RakiaConnection *conn)
 {
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
 
   if (priv->proxy_url != NULL)
     {
@@ -195,9 +195,9 @@ tpsip_conn_update_proxy_and_transport (TpsipConnection *conn)
 }
 
 const url_t *
-tpsip_conn_get_local_url (TpsipConnection *conn)
+rakia_conn_get_local_url (RakiaConnection *conn)
 {
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
   url_t *url;
 
   url = url_make (priv->sofia_home, "sip:*:*");
@@ -338,9 +338,9 @@ priv_nua_set_outbound_options (nua_t* nua, GHashTable* option_table)
 }
 
 void
-tpsip_conn_update_nua_outbound (TpsipConnection *conn)
+rakia_conn_update_nua_outbound (RakiaConnection *conn)
 {
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
   GHashTable *option_table;
 
   g_return_if_fail (priv->sofia_nua != NULL);
@@ -388,7 +388,7 @@ tpsip_conn_update_nua_outbound (TpsipConnection *conn)
 }
 
 static void
-priv_sanitize_keepalive_interval (TpsipConnectionPrivate *priv)
+priv_sanitize_keepalive_interval (RakiaConnectionPrivate *priv)
 {
   guint minimum_interval;
   if (priv->keepalive_interval != 0)
@@ -406,9 +406,9 @@ priv_sanitize_keepalive_interval (TpsipConnectionPrivate *priv)
 }
 
 void
-tpsip_conn_update_nua_keepalive_interval (TpsipConnection *conn)
+rakia_conn_update_nua_keepalive_interval (RakiaConnection *conn)
 {
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
   long keepalive_interval;
 
   if (!priv->keepalive_interval_specified)
@@ -432,9 +432,9 @@ tpsip_conn_update_nua_keepalive_interval (TpsipConnection *conn)
 }
 
 void
-tpsip_conn_update_nua_contact_features (TpsipConnection *conn)
+rakia_conn_update_nua_contact_features (RakiaConnection *conn)
 {
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
   char *contact_features;
   guint timeout;
 
@@ -456,9 +456,9 @@ tpsip_conn_update_nua_contact_features (TpsipConnection *conn)
 }
 
 static void
-tpsip_conn_set_stun_server_address (TpsipConnection *conn, const gchar *address)
+rakia_conn_set_stun_server_address (RakiaConnection *conn, const gchar *address)
 {
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
   g_return_if_fail (priv->media_manager != NULL);
   g_object_set (priv->media_manager,
                 "stun-server", address,
@@ -469,8 +469,8 @@ tpsip_conn_set_stun_server_address (TpsipConnection *conn, const gchar *address)
 static void
 priv_stun_resolver_cb (sres_context_t *ctx, sres_query_t *query, sres_record_t **answers)
 {
-  TpsipConnection *conn = TPSIP_CONNECTION (ctx);
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
+  RakiaConnection *conn = TPSIP_CONNECTION (ctx);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
   sres_a_record_t *ans = NULL;
 
   if (NULL != answers)
@@ -496,7 +496,7 @@ priv_stun_resolver_cb (sres_context_t *ctx, sres_query_t *query, sres_record_t *
     }
 
   if (NULL != ans)
-    tpsip_conn_set_stun_server_address (conn,
+    rakia_conn_set_stun_server_address (conn,
                                         inet_ntoa (ans->a_addr));
   else
     DEBUG ("Couldn't resolv STUN server address, ignoring.");
@@ -505,20 +505,20 @@ priv_stun_resolver_cb (sres_context_t *ctx, sres_query_t *query, sres_record_t *
 }
 
 void
-tpsip_conn_resolv_stun_server (TpsipConnection *conn, const gchar *stun_host)
+rakia_conn_resolv_stun_server (RakiaConnection *conn, const gchar *stun_host)
 {
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
   struct in_addr test_addr;
 
   if (stun_host == NULL)
     {
-      tpsip_conn_set_stun_server_address (conn, NULL);
+      rakia_conn_set_stun_server_address (conn, NULL);
       return;
     }
 
   if (inet_aton (stun_host, &test_addr))
     {
-      tpsip_conn_set_stun_server_address (conn, stun_host);
+      rakia_conn_set_stun_server_address (conn, stun_host);
       return;
     }
 
@@ -547,8 +547,8 @@ priv_stun_discover_cb (sres_context_t *ctx,
                        sres_query_t *query,
                        sres_record_t **answers)
 {
-  TpsipConnection *conn = TPSIP_CONNECTION (ctx);
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
+  RakiaConnection *conn = TPSIP_CONNECTION (ctx);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
   sres_srv_record_t *sel = NULL;
   int n_sel_items = 0;
   int i;
@@ -633,16 +633,16 @@ priv_stun_discover_cb (sres_context_t *ctx,
       DEBUG ("discovery got STUN server %s:%u",
              sel->srv_target, sel->srv_port);
       priv->stun_port = sel->srv_port;
-      tpsip_conn_resolv_stun_server (conn, sel->srv_target);
+      rakia_conn_resolv_stun_server (conn, sel->srv_target);
     }
 
   sres_free_answers (priv->sofia_resolver, answers);
 }
 
 void
-tpsip_conn_discover_stun_server (TpsipConnection *conn)
+rakia_conn_discover_stun_server (RakiaConnection *conn)
 {
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
   char *srv_domain;
 
   if ((NULL == priv->account_url) || (NULL == priv->account_url->url_host))
@@ -675,15 +675,15 @@ tpsip_conn_discover_stun_server (TpsipConnection *conn)
 }
 
 gchar *
-tpsip_handle_normalize (TpHandleRepoIface *repo,
+rakia_handle_normalize (TpHandleRepoIface *repo,
                         const gchar *sipuri,
                         gpointer context,
                         GError **error)
 {
-  TpsipConnection *conn = TPSIP_CONNECTION (context);
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
+  RakiaConnection *conn = TPSIP_CONNECTION (context);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
 
-  return tpsip_normalize_contact (sipuri, priv->account_url, priv->transport,
+  return rakia_normalize_contact (sipuri, priv->account_url, priv->transport,
       error);
 }
 
@@ -694,8 +694,8 @@ heartbeat_wakeup (su_root_magic_t *foo,
                   su_wait_t *wait,
                   void *user_data)
 {
-  TpsipConnection *self = (TpsipConnection *) user_data;
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
+  RakiaConnection *self = (RakiaConnection *) user_data;
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
   gint keepalive_earliest; 
 
   DEBUG("tick");
@@ -705,7 +705,7 @@ heartbeat_wakeup (su_root_magic_t *foo,
   if ((wait->revents & (SU_WAIT_IN | SU_WAIT_HUP | SU_WAIT_ERR)) != SU_WAIT_IN)
     {
       WARNING ("heartbeat descriptor invalidated prematurely with event mask %hd", wait->revents);
-      tpsip_conn_heartbeat_shutdown (self);
+      rakia_conn_heartbeat_shutdown (self);
       return 0;
     }
 
@@ -719,7 +719,7 @@ heartbeat_wakeup (su_root_magic_t *foo,
         0) < 0)
     {
       WARNING ("iphb_wait failed");
-      tpsip_conn_heartbeat_shutdown (self);
+      rakia_conn_heartbeat_shutdown (self);
       return 0;
     }
 
@@ -729,10 +729,10 @@ heartbeat_wakeup (su_root_magic_t *foo,
 #endif /* HAVE_LIBIPHB */
 
 void
-tpsip_conn_heartbeat_init (TpsipConnection *self)
+rakia_conn_heartbeat_init (RakiaConnection *self)
 {
 #ifdef HAVE_LIBIPHB
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
   int wait_id;
   int reference_interval = 0;
   su_root_t *root = NULL;
@@ -753,7 +753,7 @@ tpsip_conn_heartbeat_init (TpsipConnection *self)
   if (su_wait_create (priv->heartbeat_wait,
                       iphb_get_fd (priv->heartbeat),
                       SU_WAIT_IN) != 0)
-    tpsip_log (DEBUG_FLAG, G_LOG_LEVEL_CRITICAL,
+    rakia_log (DEBUG_FLAG, G_LOG_LEVEL_CRITICAL,
         "could not create a wait object");
 
   g_object_get (self, "sofia-root", &root, NULL);
@@ -771,17 +771,17 @@ tpsip_conn_heartbeat_init (TpsipConnection *self)
         0, (gushort) MIN(priv->keepalive_interval, G_MAXUSHORT), 0) < 0)
     {
       WARNING ("iphb_wait failed");
-      tpsip_conn_heartbeat_shutdown (self);
+      rakia_conn_heartbeat_shutdown (self);
     }
 
 #endif /* HAVE_LIBIPHB */
 }
 
 void
-tpsip_conn_heartbeat_shutdown (TpsipConnection *self)
+rakia_conn_heartbeat_shutdown (RakiaConnection *self)
 {
 #ifdef HAVE_LIBIPHB
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
   su_root_t *root = NULL;
 
   if (priv->heartbeat_wait_id == 0)
diff --git a/src/sip-connection-helpers.h b/src/sip-connection-helpers.h
index 97896b9..29ed642 100644
--- a/src/sip-connection-helpers.h
+++ b/src/sip-connection-helpers.h
@@ -1,5 +1,5 @@
 /*
- * sip-connection-helpers.h - Helper routines used by TpsipConnection
+ * sip-connection-helpers.h - Helper routines used by RakiaConnection
  * Copyright (C) 2005 Collabora Ltd.
  * Copyright (C) 2005-2009 Nokia Corporation
  *
@@ -24,7 +24,7 @@
 #include <glib.h>
 
 #include "sip-connection.h"
-#include <tpsip/sofia-decls.h>
+#include <rakia/sofia-decls.h>
 
 G_BEGIN_DECLS
 
@@ -32,30 +32,30 @@ G_BEGIN_DECLS
  * Functions for accessing Sofia-SIP interface handles
  ***********************************************************************/
 
-nua_handle_t *tpsip_conn_create_register_handle (TpsipConnection *conn,
+nua_handle_t *rakia_conn_create_register_handle (RakiaConnection *conn,
     TpHandle contact);
-nua_handle_t *tpsip_conn_create_request_handle (TpsipConnection *conn,
+nua_handle_t *rakia_conn_create_request_handle (RakiaConnection *conn,
     TpHandle contact);
 
 /***********************************************************************
  * Functions for managing NUA outbound/keepalive parameters and STUN settings
  ***********************************************************************/
 
-const url_t * tpsip_conn_get_local_url (TpsipConnection *conn);
-void tpsip_conn_update_proxy_and_transport (TpsipConnection *conn);
-void tpsip_conn_update_nua_outbound (TpsipConnection *conn);
-void tpsip_conn_update_nua_keepalive_interval (TpsipConnection *conn);
-void tpsip_conn_update_nua_contact_features (TpsipConnection *conn);
-void tpsip_conn_update_stun_server (TpsipConnection *conn);
-void tpsip_conn_resolv_stun_server (TpsipConnection *conn, const gchar *stun_host);
-void tpsip_conn_discover_stun_server (TpsipConnection *conn);
+const url_t * rakia_conn_get_local_url (RakiaConnection *conn);
+void rakia_conn_update_proxy_and_transport (RakiaConnection *conn);
+void rakia_conn_update_nua_outbound (RakiaConnection *conn);
+void rakia_conn_update_nua_keepalive_interval (RakiaConnection *conn);
+void rakia_conn_update_nua_contact_features (RakiaConnection *conn);
+void rakia_conn_update_stun_server (RakiaConnection *conn);
+void rakia_conn_resolv_stun_server (RakiaConnection *conn, const gchar *stun_host);
+void rakia_conn_discover_stun_server (RakiaConnection *conn);
 
 /***********************************************************************
  * Heartbeat management for keepalives
  ***********************************************************************/
 
-void tpsip_conn_heartbeat_init (TpsipConnection *self);
-void tpsip_conn_heartbeat_shutdown (TpsipConnection *self);
+void rakia_conn_heartbeat_init (RakiaConnection *self);
+void rakia_conn_heartbeat_shutdown (RakiaConnection *self);
 
 G_END_DECLS
 
diff --git a/src/sip-connection-manager.c b/src/sip-connection-manager.c
index cf8e954..9ae2e4f 100644
--- a/src/sip-connection-manager.c
+++ b/src/sip-connection-manager.c
@@ -1,5 +1,5 @@
 /*
- * sip-connection-manager.c - Source for TpsipConnectionManager
+ * sip-connection-manager.c - Source for RakiaConnectionManager
  * Copyright (C) 2005-2007 Collabora Ltd.
  * Copyright (C) 2005-2009 Nokia Corporation
  *   @author Kai Vehmanen <first.surname@nokia.com>
@@ -35,7 +35,7 @@
 #include <telepathy-glib/errors.h>
 #include <telepathy-glib/svc-connection-manager.h>
 
-#include <tpsip/sofia-decls.h>
+#include <rakia/sofia-decls.h>
 #include <sofia-sip/su_glib.h>
 
 #include "protocol.h"
@@ -43,13 +43,13 @@
 #include "sip-connection.h"
 
 #define DEBUG_FLAG TPSIP_DEBUG_CONNECTION
-#include "tpsip/debug.h"
+#include "rakia/debug.h"
 
 
-G_DEFINE_TYPE(TpsipConnectionManager, tpsip_connection_manager,
+G_DEFINE_TYPE(RakiaConnectionManager, rakia_connection_manager,
     TP_TYPE_BASE_CONNECTION_MANAGER)
 
-struct _TpsipConnectionManagerPrivate
+struct _RakiaConnectionManagerPrivate
 {
   su_root_t *sofia_root;
   TpDebugSender *debug_sender;
@@ -58,10 +58,10 @@ struct _TpsipConnectionManagerPrivate
 #define TPSIP_CONNECTION_MANAGER_GET_PRIVATE(obj) ((obj)->priv)
 
 static void
-tpsip_connection_manager_init (TpsipConnectionManager *obj)
+rakia_connection_manager_init (RakiaConnectionManager *obj)
 {
-  TpsipConnectionManagerPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (obj,
-        TPSIP_TYPE_CONNECTION_MANAGER, TpsipConnectionManagerPrivate);
+  RakiaConnectionManagerPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (obj,
+        TPSIP_TYPE_CONNECTION_MANAGER, RakiaConnectionManagerPrivate);
   GSource *source;
 
   obj->priv = priv;
@@ -80,44 +80,44 @@ tpsip_connection_manager_init (TpsipConnectionManager *obj)
 }
 
 static void
-tpsip_connection_manager_constructed (GObject *object)
+rakia_connection_manager_constructed (GObject *object)
 {
-  TpsipConnectionManager *self = TPSIP_CONNECTION_MANAGER (object);
+  RakiaConnectionManager *self = TPSIP_CONNECTION_MANAGER (object);
   TpBaseConnectionManager *base = (TpBaseConnectionManager *) self;
   void (*constructed) (GObject *) =
-      ((GObjectClass *) tpsip_connection_manager_parent_class)->constructed;
+      ((GObjectClass *) rakia_connection_manager_parent_class)->constructed;
   TpBaseProtocol *protocol;
 
   if (constructed != NULL)
     constructed (object);
 
-  protocol = tpsip_protocol_new (self->priv->sofia_root);
+  protocol = rakia_protocol_new (self->priv->sofia_root);
   tp_base_connection_manager_add_protocol (base, protocol);
   g_object_unref (protocol);
 }
 
-static void tpsip_connection_manager_finalize (GObject *object);
+static void rakia_connection_manager_finalize (GObject *object);
 
 static void
-tpsip_connection_manager_class_init (TpsipConnectionManagerClass *klass)
+rakia_connection_manager_class_init (RakiaConnectionManagerClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   TpBaseConnectionManagerClass *base_class = 
     (TpBaseConnectionManagerClass *)klass;
 
-  g_type_class_add_private (klass, sizeof (TpsipConnectionManagerPrivate));
+  g_type_class_add_private (klass, sizeof (RakiaConnectionManagerPrivate));
 
-  object_class->constructed = tpsip_connection_manager_constructed;
-  object_class->finalize = tpsip_connection_manager_finalize;
+  object_class->constructed = rakia_connection_manager_constructed;
+  object_class->finalize = rakia_connection_manager_finalize;
 
-  base_class->cm_dbus_name = "sofiasip";
+  base_class->cm_dbus_name = "rakia";
 }
 
 void
-tpsip_connection_manager_finalize (GObject *object)
+rakia_connection_manager_finalize (GObject *object)
 {
-  TpsipConnectionManager *self = TPSIP_CONNECTION_MANAGER (object);
-  TpsipConnectionManagerPrivate *priv = TPSIP_CONNECTION_MANAGER_GET_PRIVATE (self);
+  RakiaConnectionManager *self = TPSIP_CONNECTION_MANAGER (object);
+  RakiaConnectionManagerPrivate *priv = TPSIP_CONNECTION_MANAGER_GET_PRIVATE (self);
   GSource *source;
 
   source = su_root_gsource(priv->sofia_root);
@@ -130,7 +130,7 @@ tpsip_connection_manager_finalize (GObject *object)
       priv->debug_sender = NULL;
     }
 
-  tpsip_debug_free ();
+  rakia_debug_free ();
 
-  G_OBJECT_CLASS (tpsip_connection_manager_parent_class)->finalize (object);
+  G_OBJECT_CLASS (rakia_connection_manager_parent_class)->finalize (object);
 }
diff --git a/src/sip-connection-manager.h b/src/sip-connection-manager.h
index 9d49228..1def40a 100644
--- a/src/sip-connection-manager.h
+++ b/src/sip-connection-manager.h
@@ -1,5 +1,5 @@
 /*
- * sip-connection-manager.h - Header for TpsipConnectionManager
+ * sip-connection-manager.h - Header for RakiaConnectionManager
  * Copyright (C) 2005 Collabora Ltd.
  * Copyright (C) 2005-2008 Nokia Corporation
  *
@@ -27,36 +27,36 @@
 
 G_BEGIN_DECLS
 
-typedef struct _TpsipConnectionManager TpsipConnectionManager;
-typedef struct _TpsipConnectionManagerClass TpsipConnectionManagerClass;
-typedef struct _TpsipConnectionManagerPrivate TpsipConnectionManagerPrivate;
+typedef struct _RakiaConnectionManager RakiaConnectionManager;
+typedef struct _RakiaConnectionManagerClass RakiaConnectionManagerClass;
+typedef struct _RakiaConnectionManagerPrivate RakiaConnectionManagerPrivate;
 
-struct _TpsipConnectionManagerClass {
+struct _RakiaConnectionManagerClass {
     TpBaseConnectionManagerClass parent_class;
 };
 
-struct _TpsipConnectionManager {
+struct _RakiaConnectionManager {
     TpBaseConnectionManager parent;
-    TpsipConnectionManagerPrivate *priv;
+    RakiaConnectionManagerPrivate *priv;
 };
 
-GType tpsip_connection_manager_get_type(void);
+GType rakia_connection_manager_get_type(void);
 
 /* TYPE MACROS */
 #define TPSIP_TYPE_CONNECTION_MANAGER \
-  (tpsip_connection_manager_get_type())
+  (rakia_connection_manager_get_type())
 #define TPSIP_CONNECTION_MANAGER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), TPSIP_TYPE_CONNECTION_MANAGER, TpsipConnectionManager))
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), TPSIP_TYPE_CONNECTION_MANAGER, RakiaConnectionManager))
 #define TPSIP_CONNECTION_MANAGER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), TPSIP_TYPE_CONNECTION_MANAGER, TpsipConnectionManagerClass))
+  (G_TYPE_CHECK_CLASS_CAST((klass), TPSIP_TYPE_CONNECTION_MANAGER, RakiaConnectionManagerClass))
 #define TPSIP_IS_CONNECTION_MANAGER(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE((obj), TPSIP_TYPE_CONNECTION_MANAGER))
 #define TPSIP_IS_CONNECTION_MANAGER_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE((klass), TPSIP_TYPE_CONNECTION_MANAGER))
 #define TPSIP_CONNECTION_MANAGER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), TPSIP_TYPE_CONNECTION_MANAGER, TpsipConnectionManagerClass))
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), TPSIP_TYPE_CONNECTION_MANAGER, RakiaConnectionManagerClass))
 
-extern const TpCMProtocolSpec tpsip_protocols[];
+extern const TpCMProtocolSpec rakia_protocols[];
 
 G_END_DECLS
 
diff --git a/src/sip-connection-private.h b/src/sip-connection-private.h
index dbe30c4..5641b65 100644
--- a/src/sip-connection-private.h
+++ b/src/sip-connection-private.h
@@ -1,5 +1,5 @@
 /*
- * sip-connection-private.h - Private structures for TpsipConnection
+ * sip-connection-private.h - Private structures for RakiaConnection
  * Copyright (C) 2005-2007 Collabora Ltd.
  * Copyright (C) 2005-2009 Nokia Corporation
  *
@@ -23,8 +23,8 @@
 
 #include "config.h"
 
-#include <tpsip/media-manager.h>
-#include <tpsip/sofia-decls.h>
+#include <rakia/media-manager.h>
+#include <rakia/sofia-decls.h>
 #include <sofia-sip/sresolv.h>
 
 #include <telepathy-glib/simple-password-manager.h>
@@ -33,7 +33,7 @@
 #include <libiphb.h>
 #endif
 
-struct _TpsipConnectionPrivate
+struct _RakiaConnectionPrivate
 {
   nua_t  *sofia_nua;
   su_home_t *sofia_home;
@@ -51,7 +51,7 @@ struct _TpsipConnectionPrivate
 
   gchar *registrar_realm;
 
-  TpsipMediaManager *media_manager;
+  RakiaMediaManager *media_manager;
   TpSimplePasswordManager *password_manager;
 
   gchar *address;
@@ -59,7 +59,7 @@ struct _TpsipConnectionPrivate
   gchar *password;
   gchar *alias;
   gchar *transport;
-  TpsipConnectionKeepaliveMechanism keepalive_mechanism;
+  RakiaConnectionKeepaliveMechanism keepalive_mechanism;
   guint keepalive_interval;
   gboolean discover_stun;
   gchar *stun_host;
@@ -79,6 +79,6 @@ struct _TpsipConnectionPrivate
 
 /* #define TPSIP_PROTOCOL_STRING               "sip" */
 
-#define TPSIP_CONNECTION_GET_PRIVATE(o)     (G_TYPE_INSTANCE_GET_PRIVATE ((o), TPSIP_TYPE_CONNECTION, TpsipConnectionPrivate))
+#define TPSIP_CONNECTION_GET_PRIVATE(o)     (G_TYPE_INSTANCE_GET_PRIVATE ((o), TPSIP_TYPE_CONNECTION, RakiaConnectionPrivate))
 
 #endif /*__TPSIP_CONNECTION_PRIVATE_H__*/
diff --git a/src/sip-connection.c b/src/sip-connection.c
index 1e1ef89..bf93bc4 100644
--- a/src/sip-connection.c
+++ b/src/sip-connection.c
@@ -1,5 +1,5 @@
 /*
- * sip-connection.c - Source for TpsipConnection
+ * sip-connection.c - Source for RakiaConnection
  * Copyright (C) 2005-2007 Collabora Ltd.
  * Copyright (C) 2005-2009 Nokia Corporation
  *   @author Kai Vehmanen <first.surname@nokia.com>
@@ -35,11 +35,11 @@
 #include <telepathy-glib/svc-connection.h>
 #include <telepathy-glib/svc-generic.h>
 
-#include <tpsip/event-target.h>
-#include <tpsip/handles.h>
-#include <tpsip/connection-aliasing.h>
-#include <tpsip/media-manager.h>
-#include <tpsip/text-manager.h>
+#include <rakia/event-target.h>
+#include <rakia/handles.h>
+#include <rakia/connection-aliasing.h>
+#include <rakia/media-manager.h>
+#include <rakia/text-manager.h>
 
 #include "sip-connection.h"
 
@@ -50,14 +50,14 @@
 #include <sofia-sip/msg_header.h>
 
 #define DEBUG_FLAG TPSIP_DEBUG_CONNECTION
-#include "tpsip/debug.h"
+#include "rakia/debug.h"
 
-G_DEFINE_TYPE_WITH_CODE (TpsipConnection, tpsip_connection,
+G_DEFINE_TYPE_WITH_CODE (RakiaConnection, rakia_connection,
     TPSIP_TYPE_BASE_CONNECTION,
     G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_DBUS_PROPERTIES,
         tp_dbus_properties_mixin_iface_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING,
-        tpsip_connection_aliasing_svc_iface_init);
+        rakia_connection_aliasing_svc_iface_init);
     G_IMPLEMENT_INTERFACE (TPSIP_TYPE_CONNECTION_ALIASING, NULL);
 );
 
@@ -74,7 +74,7 @@ enum
   PROP_PROXY,            /**< outbound SIP proxy (SIP URI) */
   PROP_REGISTRAR,        /**< SIP registrar (SIP URI) */
   PROP_LOOSE_ROUTING,       /**< enable loose routing behavior */
-  PROP_KEEPALIVE_MECHANISM, /**< keepalive mechanism as defined by TpsipConnectionKeepaliveMechanism */
+  PROP_KEEPALIVE_MECHANISM, /**< keepalive mechanism as defined by RakiaConnectionKeepaliveMechanism */
   PROP_KEEPALIVE_INTERVAL, /**< keepalive interval in seconds */
   PROP_DISCOVER_BINDING,   /**< enable discovery of public binding */
   PROP_DISCOVER_STUN,      /**< Discover STUN server name using DNS SRV lookup */
@@ -118,22 +118,22 @@ priv_url_from_string_value (su_home_t *home, const GValue *value)
 }
 
 static void
-tpsip_create_handle_repos (TpBaseConnection *conn,
+rakia_create_handle_repos (TpBaseConnection *conn,
                            TpHandleRepoIface *repos[NUM_TP_HANDLE_TYPES])
 {
   repos[TP_HANDLE_TYPE_CONTACT] =
       (TpHandleRepoIface *)g_object_new (TP_TYPE_DYNAMIC_HANDLE_REPO,
           "handle-type", TP_HANDLE_TYPE_CONTACT,
-          "normalize-function", tpsip_handle_normalize,
+          "normalize-function", rakia_handle_normalize,
           "default-normalize-context", conn,
           NULL);
 }
 
 static GPtrArray *
-tpsip_connection_create_channel_managers (TpBaseConnection *conn)
+rakia_connection_create_channel_managers (TpBaseConnection *conn)
 {
-  TpsipConnection *self = TPSIP_CONNECTION (conn);
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
+  RakiaConnection *self = TPSIP_CONNECTION (conn);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
   GPtrArray *channel_managers = g_ptr_array_sized_new (2);
 
   g_ptr_array_add (channel_managers,
@@ -152,23 +152,23 @@ tpsip_connection_create_channel_managers (TpBaseConnection *conn)
 }
 
 static void
-tpsip_connection_init (TpsipConnection *self)
+rakia_connection_init (RakiaConnection *self)
 {
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
 
   priv->sofia_home = su_home_new(sizeof (su_home_t));
 
-  tpsip_connection_aliasing_init (self);
+  rakia_connection_aliasing_init (self);
 }
 
 static void
-tpsip_connection_set_property (GObject      *object,
+rakia_connection_set_property (GObject      *object,
                                guint         property_id,
                                const GValue *value,
                                GParamSpec   *pspec)
 {
-  TpsipConnection *self = (TpsipConnection*) object;
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
+  RakiaConnection *self = (RakiaConnection*) object;
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
 
   switch (property_id) {
   case PROP_ADDRESS: {
@@ -213,7 +213,7 @@ tpsip_connection_set_property (GObject      *object,
     break;
   }
   case PROP_KEEPALIVE_MECHANISM: {
-    TpsipConnectionKeepaliveMechanism mech = g_value_get_enum (value);
+    RakiaConnectionKeepaliveMechanism mech = g_value_get_enum (value);
     if (priv->keepalive_interval_specified && priv->keepalive_interval == 0)
       {
         if (mech != TPSIP_CONNECTION_KEEPALIVE_NONE
@@ -225,8 +225,8 @@ tpsip_connection_set_property (GObject      *object,
         priv->keepalive_mechanism = mech;
         if (priv->sofia_nua != NULL)
           {
-            tpsip_conn_update_nua_outbound (self);
-            tpsip_conn_update_nua_keepalive_interval (self);
+            rakia_conn_update_nua_outbound (self);
+            rakia_conn_update_nua_keepalive_interval (self);
           }
       }
     break;
@@ -238,18 +238,18 @@ tpsip_connection_set_property (GObject      *object,
       {
         priv->keepalive_mechanism = TPSIP_CONNECTION_KEEPALIVE_NONE;
         if (priv->sofia_nua != NULL)
-          tpsip_conn_update_nua_outbound (self);
+          rakia_conn_update_nua_outbound (self);
       }
     if (priv->sofia_nua)
       {
-        tpsip_conn_update_nua_keepalive_interval(self);
+        rakia_conn_update_nua_keepalive_interval(self);
       }
     break;
   }
   case PROP_DISCOVER_BINDING: {
     priv->discover_binding = g_value_get_boolean (value);
     if (priv->sofia_nua)
-      tpsip_conn_update_nua_outbound (self);
+      rakia_conn_update_nua_outbound (self);
     break;
   }
   case PROP_DISCOVER_STUN:
@@ -294,13 +294,13 @@ tpsip_connection_set_property (GObject      *object,
 }
 
 static void
-tpsip_connection_get_property (GObject      *object,
+rakia_connection_get_property (GObject      *object,
                              guint         property_id,
                              GValue       *value,
                              GParamSpec   *pspec)
 {
-  TpsipConnection *self = (TpsipConnection *) object;
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
+  RakiaConnection *self = (RakiaConnection *) object;
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
 
   switch (property_id) {
   case PROP_ADDRESS: {
@@ -382,23 +382,23 @@ tpsip_connection_get_property (GObject      *object,
   }
 }
 
-static void tpsip_connection_dispose (GObject *object);
-static void tpsip_connection_finalize (GObject *object);
+static void rakia_connection_dispose (GObject *object);
+static void rakia_connection_finalize (GObject *object);
 
 static gchar *
-tpsip_connection_unique_name (TpBaseConnection *base)
+rakia_connection_unique_name (TpBaseConnection *base)
 {
-  TpsipConnection *conn = TPSIP_CONNECTION (base);
-  TpsipConnectionPrivate *priv;
+  RakiaConnection *conn = TPSIP_CONNECTION (base);
+  RakiaConnectionPrivate *priv;
 
   g_assert (TPSIP_IS_CONNECTION (conn));
   priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
   return g_strdup (priv->address);
 }
 
-static void tpsip_connection_disconnected (TpBaseConnection *base);
-static void tpsip_connection_shut_down (TpBaseConnection *base);
-static gboolean tpsip_connection_start_connecting (TpBaseConnection *base,
+static void rakia_connection_disconnected (TpBaseConnection *base);
+static void rakia_connection_shut_down (TpBaseConnection *base);
+static gboolean rakia_connection_start_connecting (TpBaseConnection *base,
     GError **error);
 
 static const gchar *interfaces_always_present[] = {
@@ -408,46 +408,46 @@ static const gchar *interfaces_always_present[] = {
     NULL };
 
 const gchar **
-tpsip_connection_get_implemented_interfaces (void)
+rakia_connection_get_implemented_interfaces (void)
 {
   /* we don't have any conditionally-implemented interfaces */
   return interfaces_always_present;
 }
 
-static nua_handle_t *tpsip_connection_create_nua_handle (TpsipBaseConnection *,
+static nua_handle_t *rakia_connection_create_nua_handle (RakiaBaseConnection *,
     TpHandle);
-static void tpsip_connection_add_auth_handler (TpsipBaseConnection *,
-    TpsipEventTarget *);
+static void rakia_connection_add_auth_handler (RakiaBaseConnection *,
+    RakiaEventTarget *);
 
 static void
-tpsip_connection_class_init (TpsipConnectionClass *klass)
+rakia_connection_class_init (RakiaConnectionClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   TpBaseConnectionClass *base_class = TP_BASE_CONNECTION_CLASS (klass);
-  TpsipBaseConnectionClass *sip_class = TPSIP_BASE_CONNECTION_CLASS (klass);
+  RakiaBaseConnectionClass *sip_class = TPSIP_BASE_CONNECTION_CLASS (klass);
   GParamSpec *param_spec;
 
   /* Implement pure-virtual methods */
-  sip_class->create_handle = tpsip_connection_create_nua_handle;
-  sip_class->add_auth_handler = tpsip_connection_add_auth_handler;
+  sip_class->create_handle = rakia_connection_create_nua_handle;
+  sip_class->add_auth_handler = rakia_connection_add_auth_handler;
 
-  base_class->create_handle_repos = tpsip_create_handle_repos;
-  base_class->get_unique_connection_name = tpsip_connection_unique_name;
+  base_class->create_handle_repos = rakia_create_handle_repos;
+  base_class->get_unique_connection_name = rakia_connection_unique_name;
   base_class->create_channel_managers =
-      tpsip_connection_create_channel_managers;
+      rakia_connection_create_channel_managers;
   base_class->create_channel_factories = NULL;
-  base_class->disconnected = tpsip_connection_disconnected;
-  base_class->start_connecting = tpsip_connection_start_connecting;
-  base_class->shut_down = tpsip_connection_shut_down;
+  base_class->disconnected = rakia_connection_disconnected;
+  base_class->start_connecting = rakia_connection_start_connecting;
+  base_class->shut_down = rakia_connection_shut_down;
   base_class->interfaces_always_present = interfaces_always_present;
 
-  g_type_class_add_private (klass, sizeof (TpsipConnectionPrivate));
+  g_type_class_add_private (klass, sizeof (RakiaConnectionPrivate));
 
-  object_class->dispose = tpsip_connection_dispose;
-  object_class->finalize = tpsip_connection_finalize;
+  object_class->dispose = rakia_connection_dispose;
+  object_class->finalize = rakia_connection_finalize;
 
-  object_class->set_property = tpsip_connection_set_property;
-  object_class->get_property = tpsip_connection_get_property;
+  object_class->set_property = rakia_connection_set_property;
+  object_class->get_property = rakia_connection_get_property;
 
 #define INST_PROP(x) \
   g_object_class_install_property (object_class,  x, param_spec)
@@ -501,7 +501,7 @@ tpsip_connection_class_init (TpsipConnectionClass *klass)
 
   param_spec = g_param_spec_enum ("keepalive-mechanism", "Keepalive mechanism",
       "Keepalive mechanism for SIP registration",
-      tpsip_connection_keepalive_mechanism_get_type (),
+      rakia_connection_keepalive_mechanism_get_type (),
       TPSIP_CONNECTION_KEEPALIVE_AUTO, /*default value*/
       G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   INST_PROP(PROP_KEEPALIVE_MECHANISM);
@@ -574,11 +574,11 @@ tpsip_connection_class_init (TpsipConnectionClass *klass)
 #undef INST_PROP
 
   tp_dbus_properties_mixin_class_init (object_class,
-      G_STRUCT_OFFSET (TpsipConnectionClass, properties_class));
+      G_STRUCT_OFFSET (RakiaConnectionClass, properties_class));
 }
 
 typedef struct {
-  TpsipConnection* self;
+  RakiaConnection* self;
   nua_handle_t *nh;
   gchar *method;
   gchar *realm;
@@ -586,7 +586,7 @@ typedef struct {
 } PrivHandleAuthData;
 
 static PrivHandleAuthData *
-priv_handle_auth_data_new (TpsipConnection* self,
+priv_handle_auth_data_new (RakiaConnection* self,
                            nua_handle_t *nh,
                            const gchar *method,
                            const gchar *realm,
@@ -618,7 +618,7 @@ priv_handle_auth_data_free (PrivHandleAuthData *data)
 static void priv_password_manager_prompt_cb (GObject *source_object,
                                              GAsyncResult *result,
                                              gpointer user_data);
-static void priv_handle_auth_continue (TpsipConnection* self,
+static void priv_handle_auth_continue (RakiaConnection* self,
                                        nua_handle_t *nh,
                                        const gchar *method,
                                        const gchar *realm,
@@ -626,13 +626,13 @@ static void priv_handle_auth_continue (TpsipConnection* self,
                                        const gchar *password);
 
 static gboolean
-priv_handle_auth (TpsipConnection* self,
+priv_handle_auth (RakiaConnection* self,
                   int status,
                   nua_handle_t *nh,
                   const sip_t *sip,
                   gboolean home_realm)
 {
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
   sip_www_authenticate_t const *wa;
   sip_proxy_authenticate_t const *pa;
   const char *method = NULL;
@@ -768,7 +768,7 @@ priv_password_manager_prompt_cb (GObject *source_object,
     }
   else
     {
-      TpsipConnectionPrivate *priv =
+      RakiaConnectionPrivate *priv =
           TPSIP_CONNECTION_GET_PRIVATE (data->self);
 
       password = password_string->str;
@@ -784,7 +784,7 @@ priv_password_manager_prompt_cb (GObject *source_object,
 }
 
 static void
-priv_handle_auth_continue (TpsipConnection* self,
+priv_handle_auth_continue (RakiaConnection* self,
     nua_handle_t *nh,
     const gchar *method,
     const gchar *realm,
@@ -816,10 +816,10 @@ priv_handle_auth_continue (TpsipConnection* self,
 }
 
 static gboolean
-tpsip_connection_auth_cb (TpsipEventTarget *target,
-                          const TpsipNuaEvent *ev,
+rakia_connection_auth_cb (RakiaEventTarget *target,
+                          const RakiaNuaEvent *ev,
                           tagi_t            tags[],
-                          TpsipConnection  *self)
+                          RakiaConnection  *self)
 {
   return priv_handle_auth (self,
                            ev->status,
@@ -829,25 +829,25 @@ tpsip_connection_auth_cb (TpsipEventTarget *target,
 }
 
 static void
-tpsip_connection_add_auth_handler (TpsipBaseConnection *self,
-                                   TpsipEventTarget *target)
+rakia_connection_add_auth_handler (RakiaBaseConnection *self,
+                                   RakiaEventTarget *target)
 {
   g_signal_connect_object (target,
                            "nua-event",
-                           G_CALLBACK (tpsip_connection_auth_cb),
+                           G_CALLBACK (rakia_connection_auth_cb),
                            self,
                            0);
 }
 
 static nua_handle_t *
-tpsip_connection_create_nua_handle (TpsipBaseConnection *base, TpHandle handle)
+rakia_connection_create_nua_handle (RakiaBaseConnection *base, TpHandle handle)
 {
-  return tpsip_conn_create_request_handle (TPSIP_CONNECTION (base), handle);
+  return rakia_conn_create_request_handle (TPSIP_CONNECTION (base), handle);
 }
 
 static gboolean
-tpsip_connection_nua_r_register_cb (TpsipConnection     *self,
-                                    const TpsipNuaEvent *ev,
+rakia_connection_nua_r_register_cb (RakiaConnection     *self,
+                                    const RakiaNuaEvent *ev,
                                     tagi_t               tags[],
                                     gpointer             foo)
 {
@@ -887,7 +887,7 @@ tpsip_connection_nua_r_register_cb (TpsipConnection     *self,
           conn_status = TP_CONNECTION_STATUS_CONNECTED;
           reason = TP_CONNECTION_STATUS_REASON_REQUESTED;
 
-          tpsip_conn_heartbeat_init (self);
+          rakia_conn_heartbeat_init (self);
         }
     }
 
@@ -897,10 +897,10 @@ tpsip_connection_nua_r_register_cb (TpsipConnection     *self,
 }
 
 static void
-tpsip_connection_shut_down (TpBaseConnection *base)
+rakia_connection_shut_down (TpBaseConnection *base)
 {
-  TpsipConnection *self = TPSIP_CONNECTION (base);
-  TpsipConnectionPrivate *priv;
+  RakiaConnection *self = TPSIP_CONNECTION (base);
+  RakiaConnectionPrivate *priv;
 
   DEBUG ("enter");
 
@@ -909,7 +909,7 @@ tpsip_connection_shut_down (TpBaseConnection *base)
   /* We disposed of the REGISTER handle in the disconnected method */
   g_assert (priv->register_op == NULL);
 
-  tpsip_conn_heartbeat_shutdown (self);
+  rakia_conn_heartbeat_shutdown (self);
 
   if (priv->sofia_nua != NULL)
     nua_shutdown (priv->sofia_nua);
@@ -920,11 +920,11 @@ tpsip_connection_shut_down (TpBaseConnection *base)
 }
 
 void
-tpsip_connection_dispose (GObject *object)
+rakia_connection_dispose (GObject *object)
 {
-  TpsipConnection *self = TPSIP_CONNECTION (object);
+  RakiaConnection *self = TPSIP_CONNECTION (object);
   TpBaseConnection *base = (TpBaseConnection *)self;
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
 
   if (priv->dispose_has_run)
     return;
@@ -933,7 +933,7 @@ tpsip_connection_dispose (GObject *object)
 
   /* release any references held by the object here */
 
-  DEBUG("disposing of TpsipConnection %p", self);
+  DEBUG("disposing of RakiaConnection %p", self);
 
   /* the base class is responsible for unreffing the self handle when we
    * disconnect */
@@ -944,15 +944,15 @@ tpsip_connection_dispose (GObject *object)
    * here we just nullify the references */
   priv->media_manager = NULL;
 
-  if (G_OBJECT_CLASS (tpsip_connection_parent_class)->dispose)
-    G_OBJECT_CLASS (tpsip_connection_parent_class)->dispose (object);
+  if (G_OBJECT_CLASS (rakia_connection_parent_class)->dispose)
+    G_OBJECT_CLASS (rakia_connection_parent_class)->dispose (object);
 }
 
 void
-tpsip_connection_finalize (GObject *obj)
+rakia_connection_finalize (GObject *obj)
 {
-  TpsipConnection *self = TPSIP_CONNECTION (obj);
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
+  RakiaConnection *self = TPSIP_CONNECTION (obj);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
 
   /* free any data held directly by the object here */
 
@@ -981,15 +981,15 @@ tpsip_connection_finalize (GObject *obj)
 
   tp_contacts_mixin_finalize (obj);
 
-  G_OBJECT_CLASS (tpsip_connection_parent_class)->finalize (obj);
+  G_OBJECT_CLASS (rakia_connection_parent_class)->finalize (obj);
 }
 
 static gboolean
-tpsip_connection_start_connecting (TpBaseConnection *base,
+rakia_connection_start_connecting (TpBaseConnection *base,
                                    GError **error)
 {
-  TpsipConnection *self = TPSIP_CONNECTION (base);
-  TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
+  RakiaConnection *self = TPSIP_CONNECTION (base);
+  RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (self);
   TpHandleRepoIface *contact_repo;
   const gchar *sip_address;
   const url_t *local_url;
@@ -1014,7 +1014,7 @@ tpsip_connection_start_connecting (TpBaseConnection *base,
 
   DEBUG("self_handle = %d, sip_address = %s", base->self_handle, sip_address);
 
-  priv->account_url = tpsip_handle_inspect_uri (base, base->self_handle);
+  priv->account_url = rakia_handle_inspect_uri (base, base->self_handle);
   if (priv->account_url == NULL)
     {
       g_set_error (error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE,
@@ -1022,11 +1022,11 @@ tpsip_connection_start_connecting (TpBaseConnection *base,
       return FALSE;
     }
 
-  local_url = tpsip_conn_get_local_url (self);
+  local_url = rakia_conn_get_local_url (self);
 
   /* step: create stack instance */
   priv->sofia_nua = nua_create (root,
-      tpsip_base_connection_sofia_callback,
+      rakia_base_connection_sofia_callback,
       TPSIP_BASE_CONNECTION (self),
       SOATAG_AF(SOA_AF_IP4_IP6),
       SIPTAG_FROM_STR(sip_address),
@@ -1050,15 +1050,15 @@ tpsip_connection_start_connecting (TpBaseConnection *base,
     }
 
   /* Set configuration-dependent tags */
-  tpsip_conn_update_proxy_and_transport (self);
-  tpsip_conn_update_nua_outbound (self);
-  tpsip_conn_update_nua_keepalive_interval (self);
-  tpsip_conn_update_nua_contact_features (self);
+  rakia_conn_update_proxy_and_transport (self);
+  rakia_conn_update_nua_outbound (self);
+  rakia_conn_update_nua_keepalive_interval (self);
+  rakia_conn_update_nua_contact_features (self);
 
   if (priv->stun_host != NULL)
-    tpsip_conn_resolv_stun_server (self, priv->stun_host);
+    rakia_conn_resolv_stun_server (self, priv->stun_host);
   else if (priv->discover_stun)
-    tpsip_conn_discover_stun_server (self);
+    rakia_conn_discover_stun_server (self);
 
   DEBUG("initialized a Sofia-SIP NUA at address %p", priv->sofia_nua);
 
@@ -1068,10 +1068,10 @@ tpsip_connection_start_connecting (TpBaseConnection *base,
 
   g_signal_connect (self,
                     "nua-event::nua_r_register",
-                    G_CALLBACK (tpsip_connection_nua_r_register_cb),
+                    G_CALLBACK (rakia_connection_nua_r_register_cb),
                     NULL);
 
-  priv->register_op = tpsip_conn_create_register_handle (self,
+  priv->register_op = rakia_conn_create_register_handle (self,
                                                          base->self_handle);
   if (priv->register_op == NULL)
     {
@@ -1080,7 +1080,7 @@ tpsip_connection_start_connecting (TpBaseConnection *base,
       return FALSE;
     }
 
-  tpsip_event_target_attach (priv->register_op, (GObject *) self);
+  rakia_event_target_attach (priv->register_op, (GObject *) self);
 
   nua_register (priv->register_op, TAG_NULL());
 
@@ -1089,15 +1089,15 @@ tpsip_connection_start_connecting (TpBaseConnection *base,
 
 
 /**
- * tpsip_connection_disconnected
+ * rakia_connection_disconnected
  *
  * Called after the connection becomes disconnected.
  */
 static void
-tpsip_connection_disconnected (TpBaseConnection *base)
+rakia_connection_disconnected (TpBaseConnection *base)
 {
-  TpsipConnection *obj = TPSIP_CONNECTION (base);
-  TpsipConnectionPrivate *priv;
+  RakiaConnection *obj = TPSIP_CONNECTION (base);
+  RakiaConnectionPrivate *priv;
 
   priv = TPSIP_CONNECTION_GET_PRIVATE (obj);
 
diff --git a/src/sip-connection.h b/src/sip-connection.h
index dffbf6f..5e79773 100644
--- a/src/sip-connection.h
+++ b/src/sip-connection.h
@@ -1,5 +1,5 @@
 /*
- * sip-connection.h - Header for TpsipConnection
+ * sip-connection.h - Header for RakiaConnection
  * Copyright (C) 2005 Collabora Ltd.
  * Copyright (C) 2005-2009 Nokia Corporation
  *
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <tpsip/base-connection.h>
+#include <rakia/base-connection.h>
 #include <telepathy-glib/dbus-properties-mixin.h>
 
 G_BEGIN_DECLS
@@ -35,41 +35,41 @@ typedef enum
   TPSIP_CONNECTION_KEEPALIVE_REGISTER,	/** Maintain registration with REGISTER requests */
   TPSIP_CONNECTION_KEEPALIVE_OPTIONS,	/** Maintain registration with OPTIONS requests */
   TPSIP_CONNECTION_KEEPALIVE_STUN,	/** Maintain registration with STUN as described in IETF draft-sip-outbound */
-} TpsipConnectionKeepaliveMechanism;
+} RakiaConnectionKeepaliveMechanism;
 
-typedef struct _TpsipConnection TpsipConnection;
-typedef struct _TpsipConnectionClass TpsipConnectionClass;
-typedef struct _TpsipConnectionPrivate TpsipConnectionPrivate;
+typedef struct _RakiaConnection RakiaConnection;
+typedef struct _RakiaConnectionClass RakiaConnectionClass;
+typedef struct _RakiaConnectionPrivate RakiaConnectionPrivate;
 
-struct _TpsipConnectionClass {
-    TpsipBaseConnectionClass parent_class;
+struct _RakiaConnectionClass {
+    RakiaBaseConnectionClass parent_class;
     TpDBusPropertiesMixinClass properties_class;
 };
 
-struct _TpsipConnection {
-    TpsipBaseConnection parent;
+struct _RakiaConnection {
+    RakiaBaseConnection parent;
 };
 
 /* TYPE MACROS */
 #define TPSIP_TYPE_CONNECTION \
-  (tpsip_connection_get_type())
+  (rakia_connection_get_type())
 #define TPSIP_CONNECTION(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), TPSIP_TYPE_CONNECTION, TpsipConnection))
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), TPSIP_TYPE_CONNECTION, RakiaConnection))
 #define TPSIP_CONNECTION_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), TPSIP_TYPE_CONNECTION, TpsipConnectionClass))
+  (G_TYPE_CHECK_CLASS_CAST((klass), TPSIP_TYPE_CONNECTION, RakiaConnectionClass))
 #define TPSIP_IS_CONNECTION(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE((obj), TPSIP_TYPE_CONNECTION))
 #define TPSIP_IS_CONNECTION_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE((klass), TPSIP_TYPE_CONNECTION))
 #define TPSIP_CONNECTION_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), TPSIP_TYPE_CONNECTION, TpsipConnectionClass))
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), TPSIP_TYPE_CONNECTION, RakiaConnectionClass))
 
-GType tpsip_connection_get_type (void) G_GNUC_CONST;
+GType rakia_connection_get_type (void) G_GNUC_CONST;
 
-void tpsip_connection_connect_auth_handler (TpsipConnection *self,
-                                            TpsipEventTarget *target);
+void rakia_connection_connect_auth_handler (RakiaConnection *self,
+                                            RakiaEventTarget *target);
 
-const gchar **tpsip_connection_get_implemented_interfaces (void);
+const gchar **rakia_connection_get_implemented_interfaces (void);
 
 G_END_DECLS
 
diff --git a/src/telepathy-sofiasip.c b/src/telepathy-rakia.c
index e3cc812..76dffe7 100644
--- a/src/telepathy-sofiasip.c
+++ b/src/telepathy-rakia.c
@@ -1,5 +1,5 @@
 /*
- * sip-connection.c - Source for TpsipConnection
+ * sip-connection.c - Source for RakiaConnection
  * Copyright (C) 2005 Collabora Ltd.
  * Copyright (C) 2005-2008, 2010 Nokia Corporation
  *   @author Kai Vehmanen <first.surname@nokia.com>
@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#include "tpsip/debug.h"
+#include "rakia/debug.h"
 
 #include "sip-connection-manager.h"
 #include <telepathy-glib/run.h>
@@ -52,22 +52,22 @@ main (int argc, char** argv)
   g_log_set_always_fatal (fatal_mask);  
 
 #ifdef ENABLE_DEBUG
-  tpsip_debug_set_flags_from_env ();
+  rakia_debug_set_flags_from_env ();
 #endif
 
-  if (g_getenv ("TPSIP_PERSIST") || g_getenv ("SOFIASIP_PERSIST"))
+  if (g_getenv ("TPSIP_PERSIST") || g_getenv ("RAKIA_PERSIST"))
     {
       tp_debug_set_persistent (TRUE);
     }
 
   tp_debug_divert_messages (g_getenv ("TPSIP_LOGFILE"));
 
-  logdata = tpsip_sofia_log_init ();
+  logdata = rakia_sofia_log_init ();
 
-  status = tp_run_connection_manager ("telepathy-sofiasip", VERSION,
+  status = tp_run_connection_manager ("telepathy-rakia", VERSION,
                                       construct_cm, argc, argv);
 
-  tpsip_sofia_log_finalize (logdata);
+  rakia_sofia_log_finalize (logdata);
 
   return status;
 }
diff --git a/src/write-mgr-file.c b/src/write-mgr-file.c
index 402e89e..468fc7a 100644
--- a/src/write-mgr-file.c
+++ b/src/write-mgr-file.c
@@ -336,10 +336,10 @@ main (void)
   dbus_g_type_specialized_init ();
 
   protocols = g_slist_prepend (protocols,
-    tpsip_protocol_new (NULL));
+    rakia_protocol_new (NULL));
 
-  s = mgr_file_contents (TP_CM_BUS_NAME_BASE "sofiasip",
-      TP_CM_OBJECT_PATH_BASE "sofiasip",
+  s = mgr_file_contents (TP_CM_BUS_NAME_BASE "rakia",
+      TP_CM_OBJECT_PATH_BASE "rakia",
       protocols, &error);
 
   g_object_unref (protocols->data);