s/TPSIP/RAKIA/g

How did we fail to spot this during 'Rename project to telepathy-rakia'
(8dcddb61752cfa140df30c94b54bd02684419323)? That's embarassing.

Also, fix whitespace in README

26 files changed, 495 insertions, 495 deletions

diff --git a/rakia/base-connection-sofia.c b/rakia/base-connection-sofia.c
index de68ea5..437fa82 100644
--- a/rakia/base-connection-sofia.c
+++ b/rakia/base-connection-sofia.c
@@ -25,7 +25,7 @@
 #include <rakia/base-connection.h>
 #include <sofia-sip/su_tag_io.h>
 
-#define DEBUG_FLAG TPSIP_DEBUG_EVENTS
+#define DEBUG_FLAG RAKIA_DEBUG_EVENTS
 #include "rakia/debug.h"
 
 static void
diff --git a/rakia/base-connection.c b/rakia/base-connection.c
index 597b5f5..d8fda06 100644
--- a/rakia/base-connection.c
+++ b/rakia/base-connection.c
@@ -55,7 +55,7 @@ G_DEFINE_TYPE_WITH_CODE (RakiaBaseConnection,
     rakia_base_connection, TP_TYPE_BASE_CONNECTION,
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACTS,
         tp_contacts_mixin_iface_init);
-    G_IMPLEMENT_INTERFACE (TPSIP_TYPE_EVENT_TARGET, event_target_iface_init);
+    G_IMPLEMENT_INTERFACE (RAKIA_TYPE_EVENT_TARGET, event_target_iface_init);
 );
 
 static void
@@ -64,7 +64,7 @@ rakia_base_connection_init (RakiaBaseConnection *self)
   GObject *object = G_OBJECT (self);
   TpBaseConnection *base = TP_BASE_CONNECTION (self);
 
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, TPSIP_TYPE_BASE_CONNECTION,
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, RAKIA_TYPE_BASE_CONNECTION,
       RakiaBaseConnectionPrivate);
 
   tp_contacts_mixin_init (object,
@@ -84,7 +84,7 @@ rakia_base_connection_constructed(GObject *object)
 static void
 rakia_base_connection_dispose(GObject *object)
 {
-  RakiaBaseConnection *self = TPSIP_BASE_CONNECTION(object);
+  RakiaBaseConnection *self = RAKIA_BASE_CONNECTION(object);
 
   if (self->priv->dispose_has_run)
     return;
@@ -105,7 +105,7 @@ rakia_base_connection_set_property (GObject *object,
                              const GValue *value,
                              GParamSpec *pspec)
 {
-  RakiaBaseConnection *self = TPSIP_BASE_CONNECTION (object);
+  RakiaBaseConnection *self = RAKIA_BASE_CONNECTION (object);
   RakiaBaseConnectionPrivate *priv = self->priv;
 
   switch (property_id)
@@ -126,7 +126,7 @@ rakia_base_connection_get_property (GObject *object,
                              GValue *value,
                              GParamSpec *pspec)
 {
-  RakiaBaseConnection *self = TPSIP_BASE_CONNECTION (object);
+  RakiaBaseConnection *self = RAKIA_BASE_CONNECTION (object);
   RakiaBaseConnectionPrivate *priv = self->priv;
 
   switch (property_id)
@@ -178,7 +178,7 @@ nua_handle_t *
 rakia_base_connection_create_handle (RakiaBaseConnection *self,
                                      TpHandle tphandle)
 {
-  RakiaBaseConnectionClass *cls = TPSIP_BASE_CONNECTION_GET_CLASS (self);
+  RakiaBaseConnectionClass *cls = RAKIA_BASE_CONNECTION_GET_CLASS (self);
 
   return cls->create_handle (self, tphandle);
 }
@@ -187,7 +187,7 @@ void
 rakia_base_connection_add_auth_handler (RakiaBaseConnection *self,
                                         RakiaEventTarget *target)
 {
-  RakiaBaseConnectionClass *cls = TPSIP_BASE_CONNECTION_GET_CLASS (self);
+  RakiaBaseConnectionClass *cls = RAKIA_BASE_CONNECTION_GET_CLASS (self);
 
   if (cls->add_auth_handler)
     cls->add_auth_handler (self, target);
diff --git a/rakia/base-connection.h b/rakia/base-connection.h
index dafb70f..0a2a047 100644
--- a/rakia/base-connection.h
+++ b/rakia/base-connection.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __TPSIP_BASE_CONNECTION_H__
-#define __TPSIP_BASE_CONNECTION_H__
+#ifndef __RAKIA_BASE_CONNECTION_H__
+#define __RAKIA_BASE_CONNECTION_H__
 
 #include <glib-object.h>
 
@@ -52,21 +52,21 @@ struct _RakiaBaseConnection {
 GType rakia_base_connection_get_type (void) G_GNUC_CONST;
 
 /* TYPE MACROS */
-#define TPSIP_TYPE_BASE_CONNECTION \
+#define RAKIA_TYPE_BASE_CONNECTION \
   (rakia_base_connection_get_type())
-#define TPSIP_BASE_CONNECTION(obj) \
+#define RAKIA_BASE_CONNECTION(obj) \
   (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-      TPSIP_TYPE_BASE_CONNECTION, RakiaBaseConnection))
-#define TPSIP_BASE_CONNECTION_CLASS(klass) \
+      RAKIA_TYPE_BASE_CONNECTION, RakiaBaseConnection))
+#define RAKIA_BASE_CONNECTION_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_CAST((klass), \
-      TPSIP_TYPE_BASE_CONNECTION, RakiaBaseConnectionClass))
-#define TPSIP_IS_BASE_CONNECTION(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), TPSIP_TYPE_BASE_CONNECTION))
-#define TPSIP_IS_BASE_CONNECTION_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), TPSIP_TYPE_BASE_CONNECTION))
-#define TPSIP_BASE_CONNECTION_GET_CLASS(obj) \
+      RAKIA_TYPE_BASE_CONNECTION, RakiaBaseConnectionClass))
+#define RAKIA_IS_BASE_CONNECTION(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), RAKIA_TYPE_BASE_CONNECTION))
+#define RAKIA_IS_BASE_CONNECTION_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), RAKIA_TYPE_BASE_CONNECTION))
+#define RAKIA_BASE_CONNECTION_GET_CLASS(obj) \
   (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-      TPSIP_TYPE_BASE_CONNECTION, RakiaBaseConnectionClass))
+      RAKIA_TYPE_BASE_CONNECTION, RakiaBaseConnectionClass))
 
 /***********************************************************************
  * Functions for accessing Sofia-SIP interface handles
@@ -89,4 +89,4 @@ void rakia_base_connection_sofia_callback (nua_event_t event,
 
 G_END_DECLS
 
-#endif /* #ifndef __TPSIP_BASE_CONNECTION_H__*/
+#endif /* #ifndef __RAKIA_BASE_CONNECTION_H__*/
diff --git a/rakia/codec-param-formats.h b/rakia/codec-param-formats.h
index f5a717f..feb0f86 100644
--- a/rakia/codec-param-formats.h
+++ b/rakia/codec-param-formats.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __TPSIP_CODEC_PARAM_FORMATS_H__
-#define __TPSIP_CODEC_PARAM_FORMATS_H__
+#ifndef __RAKIA_CODEC_PARAM_FORMATS_H__
+#define __RAKIA_CODEC_PARAM_FORMATS_H__
 
 #include <glib.h>
 
@@ -77,4 +77,4 @@ void rakia_codec_param_parse_generic (const gchar *str, GHashTable *out);
 
 G_END_DECLS
 
-#endif /* !__TPSIP_CODEC_PARAM_FORMATS_H__ */
+#endif /* !__RAKIA_CODEC_PARAM_FORMATS_H__ */
diff --git a/rakia/connection-aliasing.c b/rakia/connection-aliasing.c
index 403f55e..4162cf7 100644
--- a/rakia/connection-aliasing.c
+++ b/rakia/connection-aliasing.c
@@ -35,7 +35,7 @@
 
 #include <string.h>
 
-#define DEBUG_FLAG TPSIP_DEBUG_CONNECTION
+#define DEBUG_FLAG RAKIA_DEBUG_CONNECTION
 #include "rakia/debug.h"
 
 enum {
@@ -82,7 +82,7 @@ rakia_connection_aliasing_get_type (void)
       type = g_type_register_static (G_TYPE_INTERFACE,
           "RakiaConnectionAliasingInterface", &info, 0);
 
-      g_type_interface_add_prerequisite (type, TPSIP_TYPE_BASE_CONNECTION);
+      g_type_interface_add_prerequisite (type, RAKIA_TYPE_BASE_CONNECTION);
       g_type_interface_add_prerequisite (type,
           TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING);
     }
diff --git a/rakia/connection-aliasing.h b/rakia/connection-aliasing.h
index bc30565..b2482e4 100644
--- a/rakia/connection-aliasing.h
+++ b/rakia/connection-aliasing.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __TPSIP_CONNECTION_ALIASING_H__
-#define __TPSIP_CONNECTION_ALIASING_H__
+#ifndef __RAKIA_CONNECTION_ALIASING_H__
+#define __RAKIA_CONNECTION_ALIASING_H__
 
 #include <glib-object.h>
 
@@ -31,16 +31,16 @@ typedef struct _RakiaConnectionAliasingInterface
 RakiaConnectionAliasingInterface;
 
 /* TYPE MACROS */
-#define TPSIP_TYPE_CONNECTION_ALIASING \
+#define RAKIA_TYPE_CONNECTION_ALIASING \
   (rakia_connection_aliasing_get_type ())
-#define TPSIP_CONNECTION_ALIASING(obj) \
+#define RAKIA_CONNECTION_ALIASING(obj) \
   (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-      TPSIP_TYPE_CONNECTION_ALIASING, RakiaConnectionAliasing))
-#define TPSIP_IS_CONNECTION_ALIASING(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), TPSIP_TYPE_CONNECTION_ALIASING))
-#define TPSIP_CONNECTION_ALIASING_GET_INTERFACE(obj) \
+      RAKIA_TYPE_CONNECTION_ALIASING, RakiaConnectionAliasing))
+#define RAKIA_IS_CONNECTION_ALIASING(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), RAKIA_TYPE_CONNECTION_ALIASING))
+#define RAKIA_CONNECTION_ALIASING_GET_INTERFACE(obj) \
   (G_TYPE_INSTANCE_GET_INTERFACE((obj), \
-      TPSIP_TYPE_CONNECTION_ALIASING, RakiaConnectionAliasingInterface))
+      RAKIA_TYPE_CONNECTION_ALIASING, RakiaConnectionAliasingInterface))
 
 struct _RakiaConnectionAliasingInterface {
   GTypeInterface base_iface;
@@ -55,4 +55,4 @@ void rakia_connection_aliasing_svc_iface_init (gpointer g_iface,
 
 G_END_DECLS
 
-#endif /*__TPSIP_CONN_ALIASING_H__*/
+#endif /*__RAKIA_CONN_ALIASING_H__*/
diff --git a/rakia/debug.c b/rakia/debug.c
index 11f7b6a..05ca9e8 100644
--- a/rakia/debug.c
+++ b/rakia/debug.c
@@ -33,18 +33,18 @@
 static RakiaDebugFlags rakia_debug_flags = 0;
 
 static const GDebugKey rakia_debug_keys[] = {
-  { "media-channel", TPSIP_DEBUG_MEDIA },
-  { "connection",    TPSIP_DEBUG_CONNECTION },
-  { "im",            TPSIP_DEBUG_IM },
-  { "events",        TPSIP_DEBUG_EVENTS },
-  { "sofia",         TPSIP_DEBUG_SOFIA },
+  { "media-channel", RAKIA_DEBUG_MEDIA },
+  { "connection",    RAKIA_DEBUG_CONNECTION },
+  { "im",            RAKIA_DEBUG_IM },
+  { "events",        RAKIA_DEBUG_EVENTS },
+  { "sofia",         RAKIA_DEBUG_SOFIA },
 };
 
 void rakia_debug_set_flags_from_env ()
 {
   const gchar *flags_string;
 
-  flags_string = g_getenv ("TPSIP_DEBUG");
+  flags_string = g_getenv ("RAKIA_DEBUG");
   if (flags_string == NULL)
     flags_string = g_getenv ("RAKIA_DEBUG");
 
@@ -156,7 +156,7 @@ rakia_sofia_log_handler (void *logdata, const char *format, va_list args)
   if (buf->str[buf->len - 1] == '\n')
     {
       g_string_truncate (buf, buf->len - 1);
-      rakia_log (TPSIP_DEBUG_SOFIA, G_LOG_LEVEL_DEBUG, "%s", buf->str);
+      rakia_log (RAKIA_DEBUG_SOFIA, G_LOG_LEVEL_DEBUG, "%s", buf->str);
       g_string_truncate (buf, 0);
     }
 #endif
diff --git a/rakia/debug.h b/rakia/debug.h
index 58d7628..638363a 100644
--- a/rakia/debug.h
+++ b/rakia/debug.h
@@ -26,11 +26,11 @@ G_BEGIN_DECLS
 
 typedef enum
 {
-  TPSIP_DEBUG_CONNECTION    = 1 << 0,
-  TPSIP_DEBUG_MEDIA         = 1 << 1,
-  TPSIP_DEBUG_IM            = 1 << 2,
-  TPSIP_DEBUG_EVENTS        = 1 << 3,
-  TPSIP_DEBUG_SOFIA         = 1 << 4,
+  RAKIA_DEBUG_CONNECTION    = 1 << 0,
+  RAKIA_DEBUG_MEDIA         = 1 << 1,
+  RAKIA_DEBUG_IM            = 1 << 2,
+  RAKIA_DEBUG_EVENTS        = 1 << 3,
+  RAKIA_DEBUG_SOFIA         = 1 << 4,
 } RakiaDebugFlags;
 
 void rakia_debug_set_flags_from_env ();
diff --git a/rakia/event-target.c b/rakia/event-target.c
index 74bec43..777413b 100644
--- a/rakia/event-target.c
+++ b/rakia/event-target.c
@@ -22,10 +22,10 @@
 #include "signals-marshal.h"
 
 /* Define to the highest known nua_event_e enumeration member */
-#define TPSIP_NUA_EVENT_LAST nua_i_register
+#define RAKIA_NUA_EVENT_LAST nua_i_register
 
 /* Mapping of the event enumeration to signal detail quarks */
-static GQuark event_quarks[TPSIP_NUA_EVENT_LAST + 1] = {0};
+static GQuark event_quarks[RAKIA_NUA_EVENT_LAST + 1] = {0};
 
 /* Signals */
 enum {
@@ -70,7 +70,7 @@ rakia_event_target_base_init (gpointer klass)
             G_TYPE_POINTER,
             G_TYPE_POINTER);
 
-      for (i = 0; i <= TPSIP_NUA_EVENT_LAST; i++)
+      for (i = 0; i <= RAKIA_NUA_EVENT_LAST; i++)
         event_quarks[i] =
             g_quark_from_static_string (nua_event_name ((nua_event_t) i));
     }
@@ -136,7 +136,7 @@ rakia_event_target_attach (nua_handle_t *nh, GObject *obj)
 {
   g_assert (nh != NULL);
 
-  nua_handle_bind (nh, TPSIP_EVENT_TARGET (obj));
+  nua_handle_bind (nh, RAKIA_EVENT_TARGET (obj));
   nua_handle_ref (nh);
 
   g_object_weak_ref (obj, _rakia_event_target_finalized, nh);
@@ -184,11 +184,11 @@ rakia_event_target_emit_nua_event (gpointer             instance,
   gint nua_event;
   GQuark detail;
 
-  g_assert (TPSIP_IS_EVENT_TARGET (instance));
+  g_assert (RAKIA_IS_EVENT_TARGET (instance));
 
   nua_event = ev->nua_event;
 
-  detail = G_LIKELY (nua_event >= 0 && nua_event <= TPSIP_NUA_EVENT_LAST)
+  detail = G_LIKELY (nua_event >= 0 && nua_event <= RAKIA_NUA_EVENT_LAST)
            ? event_quarks[nua_event]
            : g_quark_from_static_string (nua_event_name (nua_event));
 
@@ -239,7 +239,7 @@ rakia_event_target_gone_iface_init (gpointer g_iface, gpointer iface_data)
 
 G_DEFINE_TYPE_WITH_CODE (RakiaEventTargetGone, rakia_event_target_gone,
     G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (TPSIP_TYPE_EVENT_TARGET, rakia_event_target_gone_iface_init))
+    G_IMPLEMENT_INTERFACE (RAKIA_TYPE_EVENT_TARGET, rakia_event_target_gone_iface_init))
 
 static void
 rakia_event_target_gone_class_init (RakiaEventTargetGoneClass *klass)
@@ -267,5 +267,5 @@ rakia_event_target_gone_instance ()
 
   g_once (&init_gone_once, _rakia_event_target_gone_new_instance, NULL);
 
-  return TPSIP_EVENT_TARGET (init_gone_once.retval);
+  return RAKIA_EVENT_TARGET (init_gone_once.retval);
 }
diff --git a/rakia/event-target.h b/rakia/event-target.h
index c6aae9c..f078708 100644
--- a/rakia/event-target.h
+++ b/rakia/event-target.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __TPSIP_EVENT_TARGET_H__
-#define __TPSIP_EVENT_TARGET_H__
+#ifndef __RAKIA_EVENT_TARGET_H__
+#define __RAKIA_EVENT_TARGET_H__
 
 #include <glib-object.h>
 #include <rakia/sofia-decls.h>
@@ -59,14 +59,14 @@ typedef struct _RakiaEventTarget RakiaEventTarget;
 typedef struct _RakiaEventTargetInterface RakiaEventTargetInterface;
 
 /* TYPE MACROS */
-#define TPSIP_TYPE_EVENT_TARGET \
+#define RAKIA_TYPE_EVENT_TARGET \
   (rakia_event_target_get_type ())
-#define TPSIP_EVENT_TARGET(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), TPSIP_TYPE_EVENT_TARGET, RakiaEventTarget))
-#define TPSIP_IS_EVENT_TARGET(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), TPSIP_TYPE_EVENT_TARGET))
-#define TPSIP_EVENT_TARGET_GET_INTERFACE(obj) \
-  (G_TYPE_INSTANCE_GET_INTERFACE((obj), TPSIP_TYPE_EVENT_TARGET, RakiaEventTargetInterface))
+#define RAKIA_EVENT_TARGET(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), RAKIA_TYPE_EVENT_TARGET, RakiaEventTarget))
+#define RAKIA_IS_EVENT_TARGET(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), RAKIA_TYPE_EVENT_TARGET))
+#define RAKIA_EVENT_TARGET_GET_INTERFACE(obj) \
+  (G_TYPE_INSTANCE_GET_INTERFACE((obj), RAKIA_TYPE_EVENT_TARGET, RakiaEventTargetInterface))
 
 struct _RakiaEventTargetInterface {
   GTypeInterface base_iface;
@@ -89,4 +89,4 @@ gboolean rakia_event_target_emit_nua_event (gpointer             instance,
 
 G_END_DECLS
 
-#endif /*__TPSIP_EVENT_TARGET_H__*/
+#endif /*__RAKIA_EVENT_TARGET_H__*/
diff --git a/rakia/handles.c b/rakia/handles.c
index 5031dd0..7fa7e99 100644
--- a/rakia/handles.c
+++ b/rakia/handles.c
@@ -25,7 +25,7 @@
 #include <rakia/handles.h>
 #include <sofia-sip/sip_header.h>
 
-#define DEBUG_FLAG TPSIP_DEBUG_CONNECTION
+#define DEBUG_FLAG RAKIA_DEBUG_CONNECTION
 #include "rakia/debug.h"
 
 static GQuark
@@ -240,7 +240,7 @@ priv_lowercase_url_part (su_home_t *home, const char *src)
   return (const char *) res;
 }
 
-#define TPSIP_RESERVED_CHARS_ALLOWED_IN_USERNAME "!*'()&=+$,;?/"
+#define RAKIA_RESERVED_CHARS_ALLOWED_IN_USERNAME "!*'()&=+$,;?/"
 
 gchar *
 rakia_normalize_contact (const gchar *sipuri,
@@ -274,7 +274,7 @@ rakia_normalize_contact (const gchar *sipuri,
       else
         {
           user = g_uri_escape_string (sipuri,
-              TPSIP_RESERVED_CHARS_ALLOWED_IN_USERNAME, FALSE);
+              RAKIA_RESERVED_CHARS_ALLOWED_IN_USERNAME, FALSE);
         }
 
       if (base_url->url_type == url_sips)
diff --git a/rakia/handles.h b/rakia/handles.h
index 914f167..c18f3fa 100644
--- a/rakia/handles.h
+++ b/rakia/handles.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef TPSIP_HANDLE_H
-#define TPSIP_HANDLE_H
+#ifndef RAKIA_HANDLE_H
+#define RAKIA_HANDLE_H
 
 #include <telepathy-glib/base-connection.h>
 #include <sofia-sip/sip.h>
@@ -44,4 +44,4 @@ gchar *rakia_normalize_contact (const gchar *sipuri,
 
 G_END_DECLS
 
-#endif /* !TPSIP_HANDLE_H */
+#endif /* !RAKIA_HANDLE_H */
diff --git a/rakia/media-channel.c b/rakia/media-channel.c
index 089b2b9..57b1823 100644
--- a/rakia/media-channel.c
+++ b/rakia/media-channel.c
@@ -39,13 +39,13 @@
 
 #include <rakia/event-target.h>
 
-#define DEBUG_FLAG TPSIP_DEBUG_MEDIA
+#define DEBUG_FLAG RAKIA_DEBUG_MEDIA
 #include "rakia/debug.h"
 
 #include <rakia/media-session.h>
 #include <rakia/base-connection.h>
 
-#define TPSIP_CHANNEL_CALL_STATE_PROCEEDING_MASK \
+#define RAKIA_CHANNEL_CALL_STATE_PROCEEDING_MASK \
     (TP_CHANNEL_CALL_STATE_RINGING | \
      TP_CHANNEL_CALL_STATE_QUEUED | \
      TP_CHANNEL_CALL_STATE_IN_PROGRESS)
@@ -60,7 +60,7 @@ static void hold_iface_init (gpointer, gpointer);
 
 G_DEFINE_TYPE_WITH_CODE (RakiaMediaChannel, rakia_media_channel,
     G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (TPSIP_TYPE_EVENT_TARGET, event_target_init);
+    G_IMPLEMENT_INTERFACE (RAKIA_TYPE_EVENT_TARGET, event_target_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
       tp_dbus_properties_mixin_iface_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_PROPERTIES_INTERFACE,
@@ -163,7 +163,7 @@ struct _RakiaMediaChannelPrivate
   gboolean dispose_has_run;
 };
 
-#define TPSIP_MEDIA_CHANNEL_GET_PRIVATE(o)     (G_TYPE_INSTANCE_GET_PRIVATE ((o), TPSIP_TYPE_MEDIA_CHANNEL, RakiaMediaChannelPrivate))
+#define RAKIA_MEDIA_CHANNEL_GET_PRIVATE(o)     (G_TYPE_INSTANCE_GET_PRIVATE ((o), RAKIA_TYPE_MEDIA_CHANNEL, RakiaMediaChannelPrivate))
 
 /***********************************************************************
  * Set: Gobject interface
@@ -172,7 +172,7 @@ struct _RakiaMediaChannelPrivate
 static void
 rakia_media_channel_init (RakiaMediaChannel *self)
 {
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
 
   /* allocate any data required by the object here */
   priv->call_states = g_hash_table_new (NULL, NULL);
@@ -186,8 +186,8 @@ rakia_media_channel_init (RakiaMediaChannel *self)
 static void
 rakia_media_channel_constructed (GObject *obj)
 {
-  RakiaMediaChannel *chan = TPSIP_MEDIA_CHANNEL (obj);
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (chan);
+  RakiaMediaChannel *chan = RAKIA_MEDIA_CHANNEL (obj);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (chan);
   TpBaseConnection *conn = (TpBaseConnection *)(priv->conn);
   GObjectClass *parent_object_class =
       G_OBJECT_CLASS (rakia_media_channel_parent_class);
@@ -324,7 +324,7 @@ rakia_media_channel_class_init (RakiaMediaChannelClass *klass)
 
   param_spec = g_param_spec_object ("connection", "RakiaConnection object",
       "SIP connection object that owns this SIP media channel object.",
-      TPSIP_TYPE_BASE_CONNECTION,
+      RAKIA_TYPE_BASE_CONNECTION,
       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_CONNECTION, param_spec);
 
@@ -430,8 +430,8 @@ rakia_media_channel_get_property (GObject    *object,
                                   GValue     *value,
                                   GParamSpec *pspec)
 {
-  RakiaMediaChannel *chan = TPSIP_MEDIA_CHANNEL (object);
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (chan);
+  RakiaMediaChannel *chan = RAKIA_MEDIA_CHANNEL (object);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (chan);
   TpBaseConnection *base_conn = TP_BASE_CONNECTION (priv->conn);
 
   switch (property_id) {
@@ -572,8 +572,8 @@ rakia_media_channel_set_property (GObject     *object,
 				const GValue *value,
 				GParamSpec   *pspec)
 {
-  RakiaMediaChannel *chan = TPSIP_MEDIA_CHANNEL (object);
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (chan);
+  RakiaMediaChannel *chan = RAKIA_MEDIA_CHANNEL (object);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (chan);
 
   switch (property_id) {
     case PROP_HANDLE_TYPE:
@@ -631,8 +631,8 @@ rakia_media_channel_set_property (GObject     *object,
 static void
 rakia_media_channel_dispose (GObject *object)
 {
-  RakiaMediaChannel *self = TPSIP_MEDIA_CHANNEL (object);
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  RakiaMediaChannel *self = RAKIA_MEDIA_CHANNEL (object);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
   TpHandleRepoIface *contact_handles;
 
   if (priv->dispose_has_run)
@@ -662,8 +662,8 @@ rakia_media_channel_dispose (GObject *object)
 static void
 rakia_media_channel_finalize (GObject *object)
 {
-  RakiaMediaChannel *self = TPSIP_MEDIA_CHANNEL (object);
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  RakiaMediaChannel *self = RAKIA_MEDIA_CHANNEL (object);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
 
   g_hash_table_destroy (priv->call_states);
 
@@ -694,7 +694,7 @@ static void
 rakia_media_channel_dbus_close (TpSvcChannel *iface,
                                 DBusGMethodInvocation *context)
 {
-  RakiaMediaChannel *self = TPSIP_MEDIA_CHANNEL (iface);
+  RakiaMediaChannel *self = RAKIA_MEDIA_CHANNEL (iface);
 
   rakia_media_channel_close (self);
   tp_svc_channel_return_from_close (context);
@@ -707,8 +707,8 @@ rakia_media_channel_close (RakiaMediaChannel *obj)
 
   DEBUG("enter");
 
-  g_assert (TPSIP_IS_MEDIA_CHANNEL (obj));
-  priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (obj);
+  g_assert (RAKIA_IS_MEDIA_CHANNEL (obj));
+  priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (obj);
 
   if (priv->closed)
     return;
@@ -750,8 +750,8 @@ static void
 rakia_media_channel_get_handle (TpSvcChannel *iface,
                               DBusGMethodInvocation *context)
 {
-  RakiaMediaChannel *self = TPSIP_MEDIA_CHANNEL (iface);
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  RakiaMediaChannel *self = RAKIA_MEDIA_CHANNEL (iface);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
 
   if (priv->handle != 0)
     tp_svc_channel_return_from_get_handle (context, TP_HANDLE_TYPE_CONTACT,
@@ -794,16 +794,16 @@ static void
 rakia_media_channel_get_session_handlers (TpSvcChannelInterfaceMediaSignalling *iface,
                                         DBusGMethodInvocation *context)
 {
-  RakiaMediaChannel *self = TPSIP_MEDIA_CHANNEL (iface);
+  RakiaMediaChannel *self = RAKIA_MEDIA_CHANNEL (iface);
   RakiaMediaChannelPrivate *priv;
   GPtrArray *ret;
   GValue handler = { 0 };
 
   DEBUG("enter");
 
-  g_assert (TPSIP_IS_MEDIA_CHANNEL (self));
+  g_assert (RAKIA_IS_MEDIA_CHANNEL (self));
 
-  priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
 
   ret = g_ptr_array_new ();
 
@@ -859,11 +859,11 @@ static void
 rakia_media_channel_list_streams (TpSvcChannelTypeStreamedMedia *iface,
                                 DBusGMethodInvocation *context)
 {
-  RakiaMediaChannel *self = TPSIP_MEDIA_CHANNEL (iface);
+  RakiaMediaChannel *self = RAKIA_MEDIA_CHANNEL (iface);
   RakiaMediaChannelPrivate *priv;
   GPtrArray *ret = NULL;
 
-  priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
 
   ret = g_ptr_array_new ();
 
@@ -886,11 +886,11 @@ rakia_media_channel_remove_streams (TpSvcChannelTypeStreamedMedia *iface,
                                   const GArray *streams,
                                   DBusGMethodInvocation *context)
 {
-  RakiaMediaChannel *self = TPSIP_MEDIA_CHANNEL (iface);
+  RakiaMediaChannel *self = RAKIA_MEDIA_CHANNEL (iface);
   RakiaMediaChannelPrivate *priv;
   GError *error = NULL;
 
-  priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
 
   if (priv->immutable_streams)
     {
@@ -931,11 +931,11 @@ rakia_media_channel_request_stream_direction (TpSvcChannelTypeStreamedMedia *ifa
                                             guint stream_direction,
                                             DBusGMethodInvocation *context)
 {
-  RakiaMediaChannel *self = TPSIP_MEDIA_CHANNEL (iface);
+  RakiaMediaChannel *self = RAKIA_MEDIA_CHANNEL (iface);
   RakiaMediaChannelPrivate *priv;
   GError *error = NULL;
 
-  priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
 
   if (priv->immutable_streams)
     {
@@ -982,7 +982,7 @@ rakia_media_channel_request_streams (TpSvcChannelTypeStreamedMedia *iface,
                                    const GArray *types,
                                    DBusGMethodInvocation *context)
 {
-  RakiaMediaChannel *self = TPSIP_MEDIA_CHANNEL (iface);
+  RakiaMediaChannel *self = RAKIA_MEDIA_CHANNEL (iface);
   GError *error = NULL;
   GPtrArray *ret = NULL;
   RakiaMediaChannelPrivate *priv;
@@ -990,7 +990,7 @@ rakia_media_channel_request_streams (TpSvcChannelTypeStreamedMedia *iface,
 
   DEBUG("enter");
 
-  priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
 
   if (priv->immutable_streams)
     {
@@ -1038,7 +1038,7 @@ rakia_media_channel_request_streams (TpSvcChannelTypeStreamedMedia *iface,
 void
 rakia_media_channel_create_initial_streams (RakiaMediaChannel *self)
 {
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
 
   g_assert (priv->initiator != priv->handle);
 
@@ -1074,7 +1074,7 @@ rakia_media_channel_handle_incoming_call (RakiaMediaChannel *self,
                                           nua_handle_t *nh,
                                           const sdp_session_t *sdp)
 {
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
   TpBaseConnection *conn = TP_BASE_CONNECTION (priv->conn);
 
   g_assert (priv->initiator != conn->self_handle);
@@ -1122,7 +1122,7 @@ priv_nua_i_invite_cb (RakiaMediaChannel *self,
                       tagi_t             tags[],
                       gpointer           foo)
 {
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
 
   /* nua_i_invite delivered for a bound handle means a re-INVITE */
 
@@ -1137,7 +1137,7 @@ static guint
 rakia_media_channel_get_call_state (RakiaMediaChannel *self,
                                     TpHandle peer)
 {
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
 
   return GPOINTER_TO_UINT (g_hash_table_lookup (priv->call_states,
       GUINT_TO_POINTER (peer)));
@@ -1169,7 +1169,7 @@ rakia_media_channel_peer_error (RakiaMediaChannel *self,
     case 404:
     case 480:
       reason = (rakia_media_channel_get_call_state (self, peer)
-             & TPSIP_CHANNEL_CALL_STATE_PROCEEDING_MASK)
+             & RAKIA_CHANNEL_CALL_STATE_PROCEEDING_MASK)
           ? TP_CHANNEL_GROUP_CHANGE_REASON_NO_ANSWER
           : TP_CHANNEL_GROUP_CHANGE_REASON_OFFLINE;
       break;
@@ -1201,7 +1201,7 @@ rakia_media_channel_change_call_state (RakiaMediaChannel *self,
                                        guint flags_add,
                                        guint flags_remove)
 {
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
   gpointer key = GUINT_TO_POINTER (peer);
   guint old_state;
   guint new_state;
@@ -1234,7 +1234,7 @@ priv_nua_i_bye_cb (RakiaMediaChannel *self,
                    tagi_t             tags[],
                    gpointer           foo)
 {
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
   TpGroupMixin *mixin = TP_GROUP_MIXIN (self);
   TpIntSet *remove;
   TpHandle peer;
@@ -1261,7 +1261,7 @@ priv_nua_i_cancel_cb (RakiaMediaChannel *self,
                       tagi_t             tags[],
                       gpointer           foo)
 {
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
   TpGroupMixin *mixin = TP_GROUP_MIXIN (self);
   TpIntSet *remove;
   TpHandle actor = 0;
@@ -1326,7 +1326,7 @@ priv_nua_i_state_cb (RakiaMediaChannel *self,
                      tagi_t             tags[],
                      gpointer           foo)
 {
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
   const sdp_session_t *r_sdp = NULL;
   int offer_recv = 0;
   int answer_recv = 0;
@@ -1393,7 +1393,7 @@ priv_nua_i_state_cb (RakiaMediaChannel *self,
 
       /* Clear any pre-establishment call states */
       rakia_media_channel_change_call_state (self, peer, 0,
-          TPSIP_CHANNEL_CALL_STATE_PROCEEDING_MASK);
+          RAKIA_CHANNEL_CALL_STATE_PROCEEDING_MASK);
 
       if (status < 300)
         {
@@ -1426,7 +1426,7 @@ priv_nua_i_state_cb (RakiaMediaChannel *self,
       /* In cases of self-inflicted termination,
        * we should have already gone through the moves */
       if (rakia_media_session_get_state (priv->session)
-          == TPSIP_MEDIA_SESSION_STATE_ENDED)
+          == RAKIA_MEDIA_SESSION_STATE_ENDED)
         break;
 
       if (status >= 300)
@@ -1436,7 +1436,7 @@ priv_nua_i_state_cb (RakiaMediaChannel *self,
         }
 
       rakia_media_session_change_state (priv->session,
-                                        TPSIP_MEDIA_SESSION_STATE_ENDED);
+                                        RAKIA_MEDIA_SESSION_STATE_ENDED);
       break;
 
     default:
@@ -1451,7 +1451,7 @@ static void priv_session_state_changed_cb (RakiaMediaSession *session,
                                            guint state,
 					   RakiaMediaChannel *channel)
 {
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (channel);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (channel);
   TpGroupMixin *mixin = TP_GROUP_MIXIN (channel);
   TpHandle self_handle;
   TpHandle peer;
@@ -1464,7 +1464,7 @@ static void priv_session_state_changed_cb (RakiaMediaSession *session,
 
   switch (state)
     {
-    case TPSIP_MEDIA_SESSION_STATE_INVITE_SENT:
+    case RAKIA_MEDIA_SESSION_STATE_INVITE_SENT:
       g_assert (priv->initiator == self_handle);
 
       /* add the peer to remote pending */
@@ -1484,7 +1484,7 @@ static void priv_session_state_changed_cb (RakiaMediaSession *session,
 
       break;
 
-    case TPSIP_MEDIA_SESSION_STATE_INVITE_RECEIVED:
+    case RAKIA_MEDIA_SESSION_STATE_INVITE_RECEIVED:
       /* add ourself to local pending */
       set = tp_intset_new_containing (self_handle);
       tp_group_mixin_change_members ((GObject *) channel, "",
@@ -1507,7 +1507,7 @@ static void priv_session_state_changed_cb (RakiaMediaSession *session,
 
       break;
 
-    case TPSIP_MEDIA_SESSION_STATE_ACTIVE:
+    case RAKIA_MEDIA_SESSION_STATE_ACTIVE:
       if (priv->initiator == self_handle)
         {
           if (!tp_handle_set_is_member (mixin->remote_pending, peer))
@@ -1546,7 +1546,7 @@ static void priv_session_state_changed_cb (RakiaMediaSession *session,
 
       break;
 
-    case TPSIP_MEDIA_SESSION_STATE_ENDED:
+    case RAKIA_MEDIA_SESSION_STATE_ENDED:
       set = tp_intset_new ();
 
       /* remove us and the peer from the member list */
@@ -1574,13 +1574,13 @@ void
 rakia_media_channel_attach_to_nua_handle (RakiaMediaChannel *self,
                                           nua_handle_t *nh)
 {
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
 
   rakia_event_target_attach (nh, (GObject *) self);
 
   /* have the connection handle authentication, before all other
    * response callbacks */
-  rakia_base_connection_add_auth_handler (priv->conn, TPSIP_EVENT_TARGET (self));
+  rakia_base_connection_add_auth_handler (priv->conn, RAKIA_EVENT_TARGET (self));
 
   g_signal_connect (self,
                     "nua-event::nua_i_invite",
@@ -1620,7 +1620,7 @@ priv_create_session (RakiaMediaChannel *channel,
 
   DEBUG("enter");
 
-  priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (channel);
+  priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (channel);
   conn = (TpBaseConnection *)(priv->conn);
   contact_repo = tp_base_connection_get_handles (conn,
       TP_HANDLE_TYPE_CONTACT);
@@ -1638,7 +1638,7 @@ priv_create_session (RakiaMediaChannel *channel,
                 "local-ip-address", &local_ip_address,
                 NULL);
 
-  session = g_object_new (TPSIP_TYPE_MEDIA_SESSION,
+  session = g_object_new (RAKIA_TYPE_MEDIA_SESSION,
                           "dbus-daemon",
                               tp_base_connection_get_dbus_daemon (conn),
                           "media-channel", channel,
@@ -1669,7 +1669,7 @@ priv_create_session (RakiaMediaChannel *channel,
 static void
 priv_destroy_session(RakiaMediaChannel *channel)
 {
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (channel);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (channel);
   RakiaMediaSession *session;
   TpBaseConnection *conn;
   TpHandleRepoIface *contact_repo;
@@ -1699,7 +1699,7 @@ static void
 priv_outbound_call (RakiaMediaChannel *channel,
                     TpHandle peer)
 {
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (channel);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (channel);
   nua_handle_t *nh;
 
   if (priv->session == NULL)
@@ -1726,8 +1726,8 @@ _rakia_media_channel_add_member (GObject *iface,
                                  const gchar *message,
                                  GError **error)
 {
-  RakiaMediaChannel *self = TPSIP_MEDIA_CHANNEL (iface);
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  RakiaMediaChannel *self = RAKIA_MEDIA_CHANNEL (iface);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
   TpGroupMixin *mixin = TP_GROUP_MIXIN (iface);
 
   DEBUG("mixin->self_handle=%d, handle=%d", mixin->self_handle, handle);
@@ -1811,8 +1811,8 @@ rakia_media_channel_remove_with_reason (GObject *obj,
                                         guint reason,
                                         GError **error)
 {
-  RakiaMediaChannel *self = TPSIP_MEDIA_CHANNEL (obj);
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  RakiaMediaChannel *self = RAKIA_MEDIA_CHANNEL (obj);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
   TpGroupMixin *mixin = TP_GROUP_MIXIN (obj);
   TpIntSet *set = NULL;
   TpHandle self_handle;
@@ -1867,7 +1867,7 @@ rakia_media_channel_remove_with_reason (GObject *obj,
       /* This session is effectively ended, prevent the nua_i_state handler
        * from useless work */
       rakia_media_session_change_state (priv->session,
-                                        TPSIP_MEDIA_SESSION_STATE_ENDED);
+                                        RAKIA_MEDIA_SESSION_STATE_ENDED);
     }
   else
     {
@@ -1883,8 +1883,8 @@ static void
 rakia_media_channel_get_call_states (TpSvcChannelInterfaceCallState *iface,
                                      DBusGMethodInvocation *context)
 {
-  RakiaMediaChannel *self = TPSIP_MEDIA_CHANNEL (iface);
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  RakiaMediaChannel *self = RAKIA_MEDIA_CHANNEL (iface);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
 
   tp_svc_channel_interface_call_state_return_from_get_call_states (
         context,
@@ -1895,8 +1895,8 @@ static void
 rakia_media_channel_get_hold_state (TpSvcChannelInterfaceHold *iface,
                                     DBusGMethodInvocation *context)
 {
-  RakiaMediaChannel *self = TPSIP_MEDIA_CHANNEL (iface);
-  RakiaMediaChannelPrivate *priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  RakiaMediaChannel *self = RAKIA_MEDIA_CHANNEL (iface);
+  RakiaMediaChannelPrivate *priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
   TpLocalHoldState hold_state = TP_LOCAL_HOLD_STATE_UNHELD;
   TpLocalHoldStateReason hold_reason = TP_LOCAL_HOLD_STATE_REASON_NONE;
 
@@ -1922,10 +1922,10 @@ rakia_media_channel_request_hold (TpSvcChannelInterfaceHold *iface,
                                   gboolean hold,
                                   DBusGMethodInvocation *context)
 {
-  RakiaMediaChannel *self = TPSIP_MEDIA_CHANNEL (iface);
+  RakiaMediaChannel *self = RAKIA_MEDIA_CHANNEL (iface);
   RakiaMediaChannelPrivate *priv;
 
-  priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
 
   if (priv->immutable_streams)
     {
@@ -1955,13 +1955,13 @@ rakia_media_channel_start_tone (TpSvcChannelInterfaceDTMF *iface,
                               guchar event,
                               DBusGMethodInvocation *context)
 {
-  RakiaMediaChannel *self = TPSIP_MEDIA_CHANNEL (iface);
+  RakiaMediaChannel *self = RAKIA_MEDIA_CHANNEL (iface);
   RakiaMediaChannelPrivate *priv;
   GError *error = NULL;
 
   DEBUG("enter");
 
-  g_assert (TPSIP_IS_MEDIA_CHANNEL (self));
+  g_assert (RAKIA_IS_MEDIA_CHANNEL (self));
 
   if (event >= NUM_TP_DTMF_EVENTS)
     {
@@ -1972,7 +1972,7 @@ rakia_media_channel_start_tone (TpSvcChannelInterfaceDTMF *iface,
       return;
     }
 
-  priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
 
   if (!rakia_media_session_start_telephony_event (priv->session,
                                                   stream_id,
@@ -1992,15 +1992,15 @@ rakia_media_channel_stop_tone (TpSvcChannelInterfaceDTMF *iface,
                              guint stream_id,
                              DBusGMethodInvocation *context)
 {
-  RakiaMediaChannel *self = TPSIP_MEDIA_CHANNEL (iface);
+  RakiaMediaChannel *self = RAKIA_MEDIA_CHANNEL (iface);
   RakiaMediaChannelPrivate *priv;
   GError *error = NULL;
 
   DEBUG("enter");
 
-  g_assert (TPSIP_IS_MEDIA_CHANNEL (self));
+  g_assert (RAKIA_IS_MEDIA_CHANNEL (self));
 
-  priv = TPSIP_MEDIA_CHANNEL_GET_PRIVATE (self);
+  priv = RAKIA_MEDIA_CHANNEL_GET_PRIVATE (self);
 
   if (!rakia_media_session_stop_telephony_event (priv->session,
                                                  stream_id,
diff --git a/rakia/media-channel.h b/rakia/media-channel.h
index 6b8b07d..6407832 100644
--- a/rakia/media-channel.h
+++ b/rakia/media-channel.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __TPSIP_MEDIA_CHANNEL_H__
-#define __TPSIP_MEDIA_CHANNEL_H__
+#ifndef __RAKIA_MEDIA_CHANNEL_H__
+#define __RAKIA_MEDIA_CHANNEL_H__
 
 #include <glib-object.h>
 #include <sofia-sip/sdp.h>
@@ -52,18 +52,18 @@ struct _RakiaMediaChannel {
 GType rakia_media_channel_get_type(void);
 
 /* TYPE MACROS */
-#define TPSIP_TYPE_MEDIA_CHANNEL \
+#define RAKIA_TYPE_MEDIA_CHANNEL \
   (rakia_media_channel_get_type())
-#define TPSIP_MEDIA_CHANNEL(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), TPSIP_TYPE_MEDIA_CHANNEL, RakiaMediaChannel))
-#define TPSIP_MEDIA_CHANNEL_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), TPSIP_TYPE_MEDIA_CHANNEL, RakiaMediaChannelClass))
-#define TPSIP_IS_MEDIA_CHANNEL(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), TPSIP_TYPE_MEDIA_CHANNEL))
-#define TPSIP_IS_MEDIA_CHANNEL_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), TPSIP_TYPE_MEDIA_CHANNEL))
-#define TPSIP_MEDIA_CHANNEL_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), TPSIP_TYPE_MEDIA_CHANNEL, RakiaMediaChannelClass))
+#define RAKIA_MEDIA_CHANNEL(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), RAKIA_TYPE_MEDIA_CHANNEL, RakiaMediaChannel))
+#define RAKIA_MEDIA_CHANNEL_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), RAKIA_TYPE_MEDIA_CHANNEL, RakiaMediaChannelClass))
+#define RAKIA_IS_MEDIA_CHANNEL(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), RAKIA_TYPE_MEDIA_CHANNEL))
+#define RAKIA_IS_MEDIA_CHANNEL_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), RAKIA_TYPE_MEDIA_CHANNEL))
+#define RAKIA_MEDIA_CHANNEL_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), RAKIA_TYPE_MEDIA_CHANNEL, RakiaMediaChannelClass))
 
 /***********************************************************************
  * Additional declarations (not based on generated templates)
@@ -89,4 +89,4 @@ rakia_media_channel_change_call_state (RakiaMediaChannel *self,
 
 G_END_DECLS
 
-#endif /* #ifndef __TPSIP_MEDIA_CHANNEL_H__*/
+#endif /* #ifndef __RAKIA_MEDIA_CHANNEL_H__*/
diff --git a/rakia/media-manager.c b/rakia/media-manager.c
index 57dd807..230ba3a 100644
--- a/rakia/media-manager.c
+++ b/rakia/media-manager.c
@@ -34,12 +34,12 @@
 
 #include <sofia-sip/sip_status.h>
 
-#define DEBUG_FLAG TPSIP_DEBUG_CONNECTION
+#define DEBUG_FLAG RAKIA_DEBUG_CONNECTION
 #include "rakia/debug.h"
 
 typedef enum {
-  TPSIP_MEDIA_CHANNEL_CREATE_WITH_AUDIO = 1 << 0,
-  TPSIP_MEDIA_CHANNEL_CREATE_WITH_VIDEO = 1 << 1,
+  RAKIA_MEDIA_CHANNEL_CREATE_WITH_AUDIO = 1 << 0,
+  RAKIA_MEDIA_CHANNEL_CREATE_WITH_VIDEO = 1 << 1,
 } RakiaMediaChannelCreationFlags;
 
 static void channel_manager_iface_init (gpointer, gpointer);
@@ -78,12 +78,12 @@ struct _RakiaMediaManagerPrivate
   gboolean dispose_has_run;
 };
 
-#define TPSIP_MEDIA_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TPSIP_TYPE_MEDIA_MANAGER, RakiaMediaManagerPrivate))
+#define RAKIA_MEDIA_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), RAKIA_TYPE_MEDIA_MANAGER, RakiaMediaManagerPrivate))
 
 static void
 rakia_media_manager_init (RakiaMediaManager *fac)
 {
-  RakiaMediaManagerPrivate *priv = TPSIP_MEDIA_MANAGER_GET_PRIVATE (fac);
+  RakiaMediaManagerPrivate *priv = RAKIA_MEDIA_MANAGER_GET_PRIVATE (fac);
 
   priv->conn = NULL;
   priv->channels = g_ptr_array_sized_new (1);
@@ -94,8 +94,8 @@ rakia_media_manager_init (RakiaMediaManager *fac)
 static void
 rakia_media_manager_dispose (GObject *object)
 {
-  RakiaMediaManager *fac = TPSIP_MEDIA_MANAGER (object);
-  RakiaMediaManagerPrivate *priv = TPSIP_MEDIA_MANAGER_GET_PRIVATE (fac);
+  RakiaMediaManager *fac = RAKIA_MEDIA_MANAGER (object);
+  RakiaMediaManagerPrivate *priv = RAKIA_MEDIA_MANAGER_GET_PRIVATE (fac);
 
   if (priv->dispose_has_run)
     return;
@@ -112,8 +112,8 @@ rakia_media_manager_dispose (GObject *object)
 static void
 rakia_media_manager_finalize (GObject *object)
 {
-  RakiaMediaManager *fac = TPSIP_MEDIA_MANAGER (object);
-  RakiaMediaManagerPrivate *priv = TPSIP_MEDIA_MANAGER_GET_PRIVATE (fac);
+  RakiaMediaManager *fac = RAKIA_MEDIA_MANAGER (object);
+  RakiaMediaManagerPrivate *priv = RAKIA_MEDIA_MANAGER_GET_PRIVATE (fac);
 
   g_free (priv->stun_server);
 }
@@ -124,8 +124,8 @@ rakia_media_manager_get_property (GObject *object,
                                GValue *value,
                                GParamSpec *pspec)
 {
-  RakiaMediaManager *fac = TPSIP_MEDIA_MANAGER (object);
-  RakiaMediaManagerPrivate *priv = TPSIP_MEDIA_MANAGER_GET_PRIVATE (fac);
+  RakiaMediaManager *fac = RAKIA_MEDIA_MANAGER (object);
+  RakiaMediaManagerPrivate *priv = RAKIA_MEDIA_MANAGER_GET_PRIVATE (fac);
 
   switch (property_id) {
     case PROP_CONNECTION:
@@ -149,8 +149,8 @@ rakia_media_manager_set_property (GObject *object,
                                const GValue *value,
                                GParamSpec *pspec)
 {
-  RakiaMediaManager *fac = TPSIP_MEDIA_MANAGER (object);
-  RakiaMediaManagerPrivate *priv = TPSIP_MEDIA_MANAGER_GET_PRIVATE (fac);
+  RakiaMediaManager *fac = RAKIA_MEDIA_MANAGER (object);
+  RakiaMediaManagerPrivate *priv = RAKIA_MEDIA_MANAGER_GET_PRIVATE (fac);
 
   switch (property_id) {
     case PROP_CONNECTION:
@@ -186,7 +186,7 @@ rakia_media_manager_class_init (RakiaMediaManagerClass *klass)
   param_spec = g_param_spec_object ("connection",
       "RakiaBaseConnection object",
       "SIP connection that owns this media channel manager",
-      TPSIP_TYPE_BASE_CONNECTION,
+      RAKIA_TYPE_BASE_CONNECTION,
       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_CONNECTION, param_spec);
 
@@ -199,7 +199,7 @@ rakia_media_manager_class_init (RakiaMediaManagerClass *klass)
   param_spec = g_param_spec_uint ("stun-port", "STUN port",
       "STUN port.",
       0, G_MAXUINT16,
-      TPSIP_DEFAULT_STUN_PORT,
+      RAKIA_DEFAULT_STUN_PORT,
       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_STUN_PORT, param_spec);
 }
@@ -207,7 +207,7 @@ rakia_media_manager_class_init (RakiaMediaManagerClass *klass)
 static void
 rakia_media_manager_close_all (RakiaMediaManager *fac)
 {
-  RakiaMediaManagerPrivate *priv = TPSIP_MEDIA_MANAGER_GET_PRIVATE (fac);
+  RakiaMediaManagerPrivate *priv = RAKIA_MEDIA_MANAGER_GET_PRIVATE (fac);
 
   if (priv->status_changed_id != 0)
     {
@@ -242,8 +242,8 @@ rakia_media_manager_close_all (RakiaMediaManager *fac)
 static void
 media_channel_closed_cb (RakiaMediaChannel *chan, gpointer user_data)
 {
-  RakiaMediaManager *fac = TPSIP_MEDIA_MANAGER (user_data);
-  RakiaMediaManagerPrivate *priv = TPSIP_MEDIA_MANAGER_GET_PRIVATE (fac);
+  RakiaMediaManager *fac = RAKIA_MEDIA_MANAGER (user_data);
+  RakiaMediaManagerPrivate *priv = RAKIA_MEDIA_MANAGER_GET_PRIVATE (fac);
 
   tp_channel_manager_emit_channel_closed_for_object (fac,
       TP_EXPORTABLE_CHANNEL (chan));
@@ -276,15 +276,15 @@ new_media_channel (RakiaMediaManager *fac,
 
   g_assert (initiator != 0);
 
-  priv = TPSIP_MEDIA_MANAGER_GET_PRIVATE (fac);
+  priv = RAKIA_MEDIA_MANAGER_GET_PRIVATE (fac);
 
   object_path = g_strdup_printf ("%s/MediaChannel%u", priv->conn->object_path,
       priv->channel_index++);
 
   DEBUG("channel object path %s", object_path);
 
-  initial_audio = ((flags & TPSIP_MEDIA_CHANNEL_CREATE_WITH_AUDIO) != 0);
-  initial_video = ((flags & TPSIP_MEDIA_CHANNEL_CREATE_WITH_VIDEO) != 0);
+  initial_audio = ((flags & RAKIA_MEDIA_CHANNEL_CREATE_WITH_AUDIO) != 0);
+  initial_video = ((flags & RAKIA_MEDIA_CHANNEL_CREATE_WITH_VIDEO) != 0);
 
   g_object_get (priv->conn,
       "immutable-streams", &immutable_streams,
@@ -295,7 +295,7 @@ new_media_channel (RakiaMediaManager *fac,
       nat_traversal = "stun";
     }
 
-  chan = g_object_new (TPSIP_TYPE_MEDIA_CHANNEL,
+  chan = g_object_new (RAKIA_TYPE_MEDIA_CHANNEL,
                        "connection", priv->conn,
                        "object-path", object_path,
                        "handle", maybe_peer,
@@ -382,7 +382,7 @@ connection_status_changed_cb (RakiaBaseConnection *conn,
                               guint reason,
                               RakiaMediaManager *self)
 {
-  RakiaMediaManagerPrivate *priv = TPSIP_MEDIA_MANAGER_GET_PRIVATE (self);
+  RakiaMediaManagerPrivate *priv = RAKIA_MEDIA_MANAGER_GET_PRIVATE (self);
 
   switch (status)
     {
@@ -412,8 +412,8 @@ connection_status_changed_cb (RakiaBaseConnection *conn,
 static void
 rakia_media_manager_constructed (GObject *object)
 {
-  RakiaMediaManager *self = TPSIP_MEDIA_MANAGER (object);
-  RakiaMediaManagerPrivate *priv = TPSIP_MEDIA_MANAGER_GET_PRIVATE (self);
+  RakiaMediaManager *self = RAKIA_MEDIA_MANAGER (object);
+  RakiaMediaManagerPrivate *priv = RAKIA_MEDIA_MANAGER_GET_PRIVATE (self);
   GObjectClass *parent_object_class =
       G_OBJECT_CLASS (rakia_media_manager_parent_class);
 
@@ -429,8 +429,8 @@ rakia_media_manager_foreach_channel (TpChannelManager *manager,
                                      TpExportableChannelFunc foreach,
                                      gpointer user_data)
 {
-  RakiaMediaManager *fac = TPSIP_MEDIA_MANAGER (manager);
-  RakiaMediaManagerPrivate *priv = TPSIP_MEDIA_MANAGER_GET_PRIVATE (fac);
+  RakiaMediaManager *fac = RAKIA_MEDIA_MANAGER (manager);
+  RakiaMediaManagerPrivate *priv = RAKIA_MEDIA_MANAGER_GET_PRIVATE (fac);
   guint i;
 
   for (i = 0; i < priv->channels->len; i++)
@@ -499,8 +499,8 @@ rakia_media_manager_requestotron (TpChannelManager *manager,
                                   GHashTable *request_properties,
                                   RequestMethod method)
 {
-  RakiaMediaManager *self = TPSIP_MEDIA_MANAGER (manager);
-  RakiaMediaManagerPrivate *priv = TPSIP_MEDIA_MANAGER_GET_PRIVATE (self);
+  RakiaMediaManager *self = RAKIA_MEDIA_MANAGER (manager);
+  RakiaMediaManagerPrivate *priv = RAKIA_MEDIA_MANAGER_GET_PRIVATE (self);
   TpBaseConnection *conn = (TpBaseConnection *) priv->conn;
   TpHandleType handle_type;
   TpHandle handle;
@@ -615,11 +615,11 @@ rakia_media_manager_requestotron (TpChannelManager *manager,
 
       if (tp_asv_get_boolean (request_properties,
             TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialAudio", NULL))
-        chan_flags |= TPSIP_MEDIA_CHANNEL_CREATE_WITH_AUDIO;
+        chan_flags |= RAKIA_MEDIA_CHANNEL_CREATE_WITH_AUDIO;
 
       if (tp_asv_get_boolean (request_properties,
             TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialVideo", NULL))
-        chan_flags |= TPSIP_MEDIA_CHANNEL_CREATE_WITH_VIDEO;
+        chan_flags |= RAKIA_MEDIA_CHANNEL_CREATE_WITH_VIDEO;
 
       channel = new_media_channel (self, conn->self_handle, handle, chan_flags);
 
diff --git a/rakia/media-manager.h b/rakia/media-manager.h
index 7b962be..ab8338c 100644
--- a/rakia/media-manager.h
+++ b/rakia/media-manager.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __TPSIP_MEDIA_MANAGER_H__
-#define __TPSIP_MEDIA_MANAGER_H__
+#ifndef __RAKIA_MEDIA_MANAGER_H__
+#define __RAKIA_MEDIA_MANAGER_H__
 
 #include <glib-object.h>
 
@@ -39,18 +39,18 @@ struct _RakiaMediaManager {
 GType rakia_media_manager_get_type(void);
 
 /* TYPE MACROS */
-#define TPSIP_TYPE_MEDIA_MANAGER \
+#define RAKIA_TYPE_MEDIA_MANAGER \
   (rakia_media_manager_get_type())
-#define TPSIP_MEDIA_MANAGER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), TPSIP_TYPE_MEDIA_MANAGER, RakiaMediaManager))
-#define TPSIP_MEDIA_MANAGER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), TPSIP_TYPE_MEDIA_MANAGER, RakiaMediaManagerClass))
-#define TPSIP_IS_MEDIA_MANAGER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), TPSIP_TYPE_MEDIA_MANAGER))
-#define TPSIP_IS_MEDIA_MANAGER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), TPSIP_TYPE_MEDIA_MANAGER))
-#define TPSIP_MEDIA_MANAGER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), TPSIP_TYPE_MEDIA_MANAGER, RakiaMediaManagerClass))
+#define RAKIA_MEDIA_MANAGER(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), RAKIA_TYPE_MEDIA_MANAGER, RakiaMediaManager))
+#define RAKIA_MEDIA_MANAGER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), RAKIA_TYPE_MEDIA_MANAGER, RakiaMediaManagerClass))
+#define RAKIA_IS_MEDIA_MANAGER(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), RAKIA_TYPE_MEDIA_MANAGER))
+#define RAKIA_IS_MEDIA_MANAGER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), RAKIA_TYPE_MEDIA_MANAGER))
+#define RAKIA_MEDIA_MANAGER_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), RAKIA_TYPE_MEDIA_MANAGER, RakiaMediaManagerClass))
 
 G_END_DECLS
 
diff --git a/rakia/media-session.c b/rakia/media-session.c
index a956229..b658990 100644
--- a/rakia/media-session.c
+++ b/rakia/media-session.c
@@ -49,13 +49,13 @@
 
 #include "signals-marshal.h"
 
-#define DEBUG_FLAG TPSIP_DEBUG_MEDIA
+#define DEBUG_FLAG RAKIA_DEBUG_MEDIA
 #include "rakia/debug.h"
 
 /* The timeout for outstanding re-INVITE transactions in seconds.
  * Chosen to match the allowed cancellation timeout for proxies
  * described in RFC 3261 Section 13.3.1.1 */
-#define TPSIP_REINVITE_TIMEOUT 180
+#define RAKIA_REINVITE_TIMEOUT 180
 
 static void session_handler_iface_init (gpointer, gpointer);
 
@@ -157,7 +157,7 @@ struct _RakiaMediaSessionPrivate
   gboolean dispose_has_run;
 };
 
-#define TPSIP_MEDIA_SESSION_GET_PRIVATE(o)     (G_TYPE_INSTANCE_GET_PRIVATE ((o), TPSIP_TYPE_MEDIA_SESSION, RakiaMediaSessionPrivate))
+#define RAKIA_MEDIA_SESSION_GET_PRIVATE(o)     (G_TYPE_INSTANCE_GET_PRIVATE ((o), RAKIA_TYPE_MEDIA_SESSION, RakiaMediaSessionPrivate))
 
 static void rakia_media_session_get_property (GObject    *object,
 					    guint       property_id,
@@ -183,9 +183,9 @@ static void priv_zap_event (RakiaMediaSession *self);
 
 static void rakia_media_session_init (RakiaMediaSession *obj)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (obj);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (obj);
 
-  priv->state = TPSIP_MEDIA_SESSION_STATE_CREATED;
+  priv->state = RAKIA_MEDIA_SESSION_STATE_CREATED;
   priv->hold_state = TP_LOCAL_HOLD_STATE_UNHELD;
   priv->hold_reason = TP_LOCAL_HOLD_STATE_REASON_NONE;
   priv->rtcp_enabled = TRUE;
@@ -203,7 +203,7 @@ rakia_media_session_constructor (GType type, guint n_props,
 
   obj = G_OBJECT_CLASS (rakia_media_session_parent_class)->
            constructor (type, n_props, props);
-  priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (TPSIP_MEDIA_SESSION (obj));
+  priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (RAKIA_MEDIA_SESSION (obj));
 
   g_assert (TP_IS_DBUS_DAEMON (priv->dbus_daemon));
   tp_dbus_daemon_register_object (priv->dbus_daemon, priv->object_path, obj);
@@ -216,8 +216,8 @@ static void rakia_media_session_get_property (GObject    *object,
 					    GValue     *value,
 					    GParamSpec *pspec)
 {
-  RakiaMediaSession *session = TPSIP_MEDIA_SESSION (object);
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSession *session = RAKIA_MEDIA_SESSION (object);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
 
   switch (property_id)
     {
@@ -260,7 +260,7 @@ static void rakia_media_session_get_property (GObject    *object,
          * At the moment, rawudp ignores all servers except the first one. */
         GPtrArray *servers;
         gchar *stun_server = NULL;
-        guint stun_port = TPSIP_DEFAULT_STUN_PORT;
+        guint stun_port = RAKIA_DEFAULT_STUN_PORT;
 
         g_return_if_fail (priv->channel != NULL);
 
@@ -304,8 +304,8 @@ static void rakia_media_session_set_property (GObject      *object,
 					    const GValue *value,
 					    GParamSpec   *pspec)
 {
-  RakiaMediaSession *session = TPSIP_MEDIA_SESSION (object);
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSession *session = RAKIA_MEDIA_SESSION (object);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
 
   switch (property_id)
     {
@@ -314,7 +314,7 @@ static void rakia_media_session_set_property (GObject      *object,
       priv->dbus_daemon = g_value_dup_object (value);
       break;
     case PROP_MEDIA_CHANNEL:
-      priv->channel = TPSIP_MEDIA_CHANNEL (g_value_get_object (value));
+      priv->channel = RAKIA_MEDIA_CHANNEL (g_value_get_object (value));
       break;
     case PROP_OBJECT_PATH:
       g_assert (priv->object_path == NULL);
@@ -367,7 +367,7 @@ rakia_media_session_class_init (RakiaMediaSessionClass *klass)
   param_spec = g_param_spec_object ("media-channel", "RakiaMediaChannel object",
       "SIP media channel object that owns this media session object"
       " (not reference counted).",
-      TPSIP_TYPE_MEDIA_CHANNEL,
+      RAKIA_TYPE_MEDIA_CHANNEL,
       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_MEDIA_CHANNEL, param_spec);
 
@@ -450,8 +450,8 @@ rakia_media_session_class_init (RakiaMediaSessionClass *klass)
 static void
 rakia_media_session_dispose (GObject *object)
 {
-  RakiaMediaSession *self = TPSIP_MEDIA_SESSION (object);
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (self);
+  RakiaMediaSession *self = RAKIA_MEDIA_SESSION (object);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (self);
 
   if (priv->dispose_has_run)
     return;
@@ -474,8 +474,8 @@ rakia_media_session_dispose (GObject *object)
 static void
 rakia_media_session_finalize (GObject *object)
 {
-  RakiaMediaSession *self = TPSIP_MEDIA_SESSION (object);
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (self);
+  RakiaMediaSession *self = RAKIA_MEDIA_SESSION (object);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (self);
   guint i;
 
   /* terminating the session should have discarded the NUA handle */
@@ -525,7 +525,7 @@ rakia_media_session_error (TpSvcMediaSessionHandler *iface,
                          const gchar *message,
                          DBusGMethodInvocation *context)
 {
-  RakiaMediaSession *obj = TPSIP_MEDIA_SESSION (iface);
+  RakiaMediaSession *obj = RAKIA_MEDIA_SESSION (iface);
 
   SESSION_DEBUG (obj, "Media.SessionHandler::Error called (%s), terminating session", message);
 
@@ -570,13 +570,13 @@ static void
 rakia_media_session_ready (TpSvcMediaSessionHandler *iface,
                          DBusGMethodInvocation *context)
 {
-  RakiaMediaSession *obj = TPSIP_MEDIA_SESSION (iface);
+  RakiaMediaSession *obj = RAKIA_MEDIA_SESSION (iface);
   RakiaMediaSessionPrivate *priv;
   guint i;
 
   DEBUG ("enter");
 
-  priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (obj);
+  priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (obj);
 
   if (!priv->se_ready)
     {
@@ -602,14 +602,14 @@ rakia_media_session_ready (TpSvcMediaSessionHandler *iface,
 TpHandle
 rakia_media_session_get_peer (RakiaMediaSession *session)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
   return priv->peer;
 }
 
 RakiaMediaSessionState
 rakia_media_session_get_state (RakiaMediaSession *session)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
   return priv->state;
 }
 
@@ -628,7 +628,7 @@ rakia_media_session_supports_media_type (guint media_type)
 static void
 priv_close_all_streams (RakiaMediaSession *session)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
   guint i;
   for (i = 0; i < priv->streams->len; i++)
     {
@@ -644,7 +644,7 @@ static void
 priv_apply_streams_pending_direction (RakiaMediaSession *session,
                                       guint pending_send_mask)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
   RakiaMediaStream *stream;
   guint i;
 
@@ -666,7 +666,7 @@ void
 rakia_media_session_change_state (RakiaMediaSession *session,
                                 RakiaMediaSessionState new_state)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
   guint old_state;
 
   if (priv->state == new_state)
@@ -681,22 +681,22 @@ rakia_media_session_change_state (RakiaMediaSession *session,
 
   switch (new_state)
     {
-    case TPSIP_MEDIA_SESSION_STATE_CREATED:
-    case TPSIP_MEDIA_SESSION_STATE_INVITE_RECEIVED:
-    case TPSIP_MEDIA_SESSION_STATE_REINVITE_RECEIVED:
-    case TPSIP_MEDIA_SESSION_STATE_INVITE_SENT:
-    case TPSIP_MEDIA_SESSION_STATE_REINVITE_SENT:
-    case TPSIP_MEDIA_SESSION_STATE_RESPONSE_RECEIVED:
-    case TPSIP_MEDIA_SESSION_STATE_REINVITE_PENDING:
+    case RAKIA_MEDIA_SESSION_STATE_CREATED:
+    case RAKIA_MEDIA_SESSION_STATE_INVITE_RECEIVED:
+    case RAKIA_MEDIA_SESSION_STATE_REINVITE_RECEIVED:
+    case RAKIA_MEDIA_SESSION_STATE_INVITE_SENT:
+    case RAKIA_MEDIA_SESSION_STATE_REINVITE_SENT:
+    case RAKIA_MEDIA_SESSION_STATE_RESPONSE_RECEIVED:
+    case RAKIA_MEDIA_SESSION_STATE_REINVITE_PENDING:
       break;
-    case TPSIP_MEDIA_SESSION_STATE_ACTIVE:
+    case RAKIA_MEDIA_SESSION_STATE_ACTIVE:
       /* Apply any pending remote send after outgoing INVITEs.
        * We don't want automatic removal of pending local send after
        * responding to incoming re-INVITEs, however */
       priv_apply_streams_pending_direction (session,
           TP_MEDIA_STREAM_PENDING_REMOTE_SEND);
       break;
-    case TPSIP_MEDIA_SESSION_STATE_ENDED:
+    case RAKIA_MEDIA_SESSION_STATE_ENDED:
       priv_close_all_streams (session);
       DEBUG("destroying the NUA handle %p", priv->nua_op);
       if (priv->nua_op != NULL)
@@ -712,7 +712,7 @@ rakia_media_session_change_state (RakiaMediaSession *session,
 
   g_signal_emit (session, signals[SIG_STATE_CHANGED], 0, old_state, new_state);
 
-  if (new_state == TPSIP_MEDIA_SESSION_STATE_ACTIVE && priv->pending_offer)
+  if (new_state == RAKIA_MEDIA_SESSION_STATE_ACTIVE && priv->pending_offer)
     priv_session_invite (session, TRUE);
 }
 
@@ -728,7 +728,7 @@ rakia_media_session_debug (RakiaMediaSession *session,
   if (!rakia_debug_flag_is_set (DEBUG_FLAG))
     return;
 
-  priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
 
   va_start (list, format);
 
@@ -743,11 +743,11 @@ rakia_media_session_debug (RakiaMediaSession *session,
 
 void rakia_media_session_terminate (RakiaMediaSession *session)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
 
   DEBUG ("enter");
 
-  if (priv->state == TPSIP_MEDIA_SESSION_STATE_ENDED)
+  if (priv->state == RAKIA_MEDIA_SESSION_STATE_ENDED)
     return;
 
   /* XXX: taken care of by the state change? */
@@ -759,22 +759,22 @@ void rakia_media_session_terminate (RakiaMediaSession *session)
        * (except freeing the saved event) upon nua_handle_destroy()? */
       switch (priv->state)
         {
-        case TPSIP_MEDIA_SESSION_STATE_ACTIVE:
-        case TPSIP_MEDIA_SESSION_STATE_RESPONSE_RECEIVED:
-        case TPSIP_MEDIA_SESSION_STATE_REINVITE_SENT:
-        case TPSIP_MEDIA_SESSION_STATE_REINVITE_PENDING:
+        case RAKIA_MEDIA_SESSION_STATE_ACTIVE:
+        case RAKIA_MEDIA_SESSION_STATE_RESPONSE_RECEIVED:
+        case RAKIA_MEDIA_SESSION_STATE_REINVITE_SENT:
+        case RAKIA_MEDIA_SESSION_STATE_REINVITE_PENDING:
           DEBUG("sending BYE");
           nua_bye (priv->nua_op, TAG_END());
           break;
-        case TPSIP_MEDIA_SESSION_STATE_INVITE_SENT:
+        case RAKIA_MEDIA_SESSION_STATE_INVITE_SENT:
           DEBUG("sending CANCEL");
           nua_cancel (priv->nua_op, TAG_END());
           break;
-        case TPSIP_MEDIA_SESSION_STATE_INVITE_RECEIVED:
+        case RAKIA_MEDIA_SESSION_STATE_INVITE_RECEIVED:
           DEBUG("sending the 480 response to an incoming INVITE");
           nua_respond (priv->nua_op, 480, "Terminated", TAG_END());
           break;
-        case TPSIP_MEDIA_SESSION_STATE_REINVITE_RECEIVED:
+        case RAKIA_MEDIA_SESSION_STATE_REINVITE_RECEIVED:
           if (priv->saved_event[0])
             {
               DEBUG("sending the 480 response to an incoming re-INVITE");
@@ -791,24 +791,24 @@ void rakia_media_session_terminate (RakiaMediaSession *session)
         }
     }
 
-  rakia_media_session_change_state (session, TPSIP_MEDIA_SESSION_STATE_ENDED);
+  rakia_media_session_change_state (session, RAKIA_MEDIA_SESSION_STATE_ENDED);
 }
 
 gboolean
 rakia_media_session_set_remote_media (RakiaMediaSession *session,
                                     const sdp_session_t* sdp)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
   gboolean authoritative;
 
   DEBUG ("enter");
 
-  if (priv->state == TPSIP_MEDIA_SESSION_STATE_INVITE_SENT
-      || priv->state == TPSIP_MEDIA_SESSION_STATE_REINVITE_SENT)
+  if (priv->state == RAKIA_MEDIA_SESSION_STATE_INVITE_SENT
+      || priv->state == RAKIA_MEDIA_SESSION_STATE_REINVITE_SENT)
     {
       rakia_media_session_change_state (
                 session,
-                TPSIP_MEDIA_SESSION_STATE_RESPONSE_RECEIVED);
+                RAKIA_MEDIA_SESSION_STATE_RESPONSE_RECEIVED);
     }
   else
     {
@@ -850,8 +850,8 @@ rakia_media_session_set_remote_media (RakiaMediaSession *session,
   priv->remote_sdp = sdp_session_dup (priv->home, sdp);
   g_return_val_if_fail (priv->remote_sdp != NULL, FALSE);
 
-  authoritative = (priv->state == TPSIP_MEDIA_SESSION_STATE_INVITE_RECEIVED
-                || priv->state == TPSIP_MEDIA_SESSION_STATE_REINVITE_RECEIVED);
+  authoritative = (priv->state == RAKIA_MEDIA_SESSION_STATE_INVITE_RECEIVED
+                || priv->state == RAKIA_MEDIA_SESSION_STATE_REINVITE_RECEIVED);
   if (!priv_update_remote_media (session, authoritative))
     return FALSE;
 
@@ -867,7 +867,7 @@ priv_add_stream_list_entry (GPtrArray *list,
                             RakiaMediaStream *stream,
                             RakiaMediaSession *session)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
   GValue entry = { 0 };
   GType stream_type;
   guint id;
@@ -978,7 +978,7 @@ rakia_media_session_remove_streams (RakiaMediaSession *self,
 void rakia_media_session_list_streams (RakiaMediaSession *session,
                                      GPtrArray *ret)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
   RakiaMediaStream *stream;
   guint i;
 
@@ -996,7 +996,7 @@ rakia_media_session_request_stream_direction (RakiaMediaSession *self,
                                               guint direction,
                                               GError **error)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (self);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (self);
   RakiaMediaStream *stream;
 
   stream = rakia_media_session_get_stream (self, stream_id, error);
@@ -1010,8 +1010,8 @@ rakia_media_session_request_stream_direction (RakiaMediaSession *self,
   SESSION_DEBUG (self, "direction %u requested for stream %u",
       direction, stream_id);
 
-  if (priv->state == TPSIP_MEDIA_SESSION_STATE_INVITE_RECEIVED
-      || priv->state == TPSIP_MEDIA_SESSION_STATE_REINVITE_RECEIVED)
+  if (priv->state == RAKIA_MEDIA_SESSION_STATE_INVITE_RECEIVED
+      || priv->state == RAKIA_MEDIA_SESSION_STATE_REINVITE_RECEIVED)
     {
       /* While processing a session offer, we can only mask out direction
        * requested by the remote peer */
@@ -1028,7 +1028,7 @@ rakia_media_session_request_stream_direction (RakiaMediaSession *self,
 static void
 priv_save_event (RakiaMediaSession *self)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (self);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (self);
   RakiaBaseConnection *conn = NULL;
 
   priv_zap_event (self);
@@ -1053,7 +1053,7 @@ priv_save_event (RakiaMediaSession *self)
 static void
 priv_zap_event (RakiaMediaSession *self)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (self);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (self);
 
   if (priv->saved_event[0])
     {
@@ -1067,30 +1067,30 @@ priv_zap_event (RakiaMediaSession *self)
 void
 rakia_media_session_receive_invite (RakiaMediaSession *self)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (self);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (self);
 
-  g_return_if_fail (priv->state == TPSIP_MEDIA_SESSION_STATE_CREATED);  
+  g_return_if_fail (priv->state == RAKIA_MEDIA_SESSION_STATE_CREATED);  
   g_return_if_fail (priv->nua_op != NULL);
 
   priv->remote_initiated = TRUE;
 
   nua_respond (priv->nua_op, SIP_180_RINGING, TAG_END());
 
-  rakia_media_session_change_state (self, TPSIP_MEDIA_SESSION_STATE_INVITE_RECEIVED);
+  rakia_media_session_change_state (self, RAKIA_MEDIA_SESSION_STATE_INVITE_RECEIVED);
 }
 
 void
 rakia_media_session_receive_reinvite (RakiaMediaSession *self)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (self);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (self);
 
   /* Check for permitted state transitions */
   switch (priv->state)
     {
-    case TPSIP_MEDIA_SESSION_STATE_ACTIVE:
-    case TPSIP_MEDIA_SESSION_STATE_RESPONSE_RECEIVED:
+    case RAKIA_MEDIA_SESSION_STATE_ACTIVE:
+    case RAKIA_MEDIA_SESSION_STATE_RESPONSE_RECEIVED:
       break;
-    case TPSIP_MEDIA_SESSION_STATE_REINVITE_PENDING:
+    case RAKIA_MEDIA_SESSION_STATE_REINVITE_PENDING:
       g_source_remove (priv->glare_timer_id);
       break;
     default:
@@ -1099,13 +1099,13 @@ rakia_media_session_receive_reinvite (RakiaMediaSession *self)
 
   priv_save_event (self);
 
-  rakia_media_session_change_state (self, TPSIP_MEDIA_SESSION_STATE_REINVITE_RECEIVED);
+  rakia_media_session_change_state (self, RAKIA_MEDIA_SESSION_STATE_REINVITE_RECEIVED);
 }
 
 void
 rakia_media_session_accept (RakiaMediaSession *self)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (self);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (self);
 
   if (priv->accepted)
     return;
@@ -1128,7 +1128,7 @@ rakia_media_session_respond (RakiaMediaSession *self,
                              gint status,
                              const char *message)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (self);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (self);
 
   SESSION_DEBUG (self, "responding: %03d %s", status, message ? message : "");
 
@@ -1141,7 +1141,7 @@ rakia_media_session_respond (RakiaMediaSession *self,
 
 gboolean rakia_media_session_is_accepted (RakiaMediaSession *self)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (self);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (self);
   return priv->accepted;
 }
 
@@ -1149,11 +1149,11 @@ static gboolean
 priv_glare_retry (gpointer session)
 {
   RakiaMediaSession *self = session;
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (self);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (self);
 
   SESSION_DEBUG (self, "glare resolution interval is over");
 
-  if (priv->state == TPSIP_MEDIA_SESSION_STATE_REINVITE_PENDING)
+  if (priv->state == RAKIA_MEDIA_SESSION_STATE_REINVITE_PENDING)
     priv_session_invite (self, TRUE);
 
   /* Reap the timer */
@@ -1164,10 +1164,10 @@ priv_glare_retry (gpointer session)
 void
 rakia_media_session_resolve_glare (RakiaMediaSession *self)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (self);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (self);
   guint interval;
 
-  if (priv->state != TPSIP_MEDIA_SESSION_STATE_REINVITE_SENT)
+  if (priv->state != RAKIA_MEDIA_SESSION_STATE_REINVITE_SENT)
     {
       SESSION_DEBUG (self, "glare resolution triggered in unexpected state");
       return;
@@ -1198,7 +1198,7 @@ rakia_media_session_resolve_glare (RakiaMediaSession *self)
   SESSION_DEBUG (self, "glare resolution interval %u msec", interval);
 
   rakia_media_session_change_state (
-        self, TPSIP_MEDIA_SESSION_STATE_REINVITE_PENDING);
+        self, RAKIA_MEDIA_SESSION_STATE_REINVITE_PENDING);
 }
 
 static RakiaMediaStream *
@@ -1206,7 +1206,7 @@ rakia_media_session_get_stream (RakiaMediaSession *self,
                                 guint stream_id,
                                 GError **error)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (self);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (self);
   RakiaMediaStream *stream;
 
   g_assert (priv->streams != NULL);
@@ -1233,14 +1233,14 @@ rakia_media_session_get_stream (RakiaMediaSession *self,
 TpLocalHoldState
 rakia_media_session_get_hold_state (RakiaMediaSession *self)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (self);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (self);
   return priv->hold_state;
 }
 
 static gboolean
 rakia_media_session_is_local_hold_ongoing (RakiaMediaSession *self)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (self);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (self);
   return (priv->hold_state == TP_LOCAL_HOLD_STATE_HELD
           || priv->hold_state == TP_LOCAL_HOLD_STATE_PENDING_HOLD);
 }
@@ -1250,7 +1250,7 @@ priv_initiate_hold (RakiaMediaSession *self,
                     gboolean hold,
                     TpLocalHoldStateReason reason)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (self);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (self);
   gboolean stream_hold_requested = FALSE;
   RakiaMediaStream *stream;
   guint i;
@@ -1305,7 +1305,7 @@ priv_initiate_hold (RakiaMediaSession *self,
 static void
 priv_finalize_hold (RakiaMediaSession *self)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (self);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (self);
   RakiaMediaStream *stream;
   TpLocalHoldState final_hold_state;
   guint hold_mask;
@@ -1437,7 +1437,7 @@ gint
 rakia_media_session_rate_native_transport (RakiaMediaSession *session,
                                          const GValue *transport)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
   gint result = 0;
   gchar *address = NULL;
   guint proto = TP_MEDIA_STREAM_BASE_PROTO_UDP;
@@ -1464,7 +1464,7 @@ rakia_media_session_rate_native_transport (RakiaMediaSession *session,
 static void
 priv_session_set_streams_playing (RakiaMediaSession *session, gboolean playing)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
   RakiaMediaStream *stream;
   guint i;
 
@@ -1479,16 +1479,16 @@ priv_session_set_streams_playing (RakiaMediaSession *session, gboolean playing)
 static void
 priv_local_media_changed (RakiaMediaSession *session)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
 
   switch (priv->state)
     {
-    case TPSIP_MEDIA_SESSION_STATE_CREATED:
+    case RAKIA_MEDIA_SESSION_STATE_CREATED:
       /* If all streams are ready, send an offer now */
       priv_request_response_step (session);
       break;
-    case TPSIP_MEDIA_SESSION_STATE_INVITE_RECEIVED:
-    case TPSIP_MEDIA_SESSION_STATE_REINVITE_RECEIVED:
+    case RAKIA_MEDIA_SESSION_STATE_INVITE_RECEIVED:
+    case RAKIA_MEDIA_SESSION_STATE_REINVITE_RECEIVED:
       /* The changes to existing streams will be included in the
        * eventual answer (FIXME: implement postponed direction changes,
        * which are applied after the remote offer has been processed).
@@ -1497,13 +1497,13 @@ priv_local_media_changed (RakiaMediaSession *session)
       if (priv->remote_stream_count < priv->streams->len)
         priv->pending_offer = TRUE;
       break;
-    case TPSIP_MEDIA_SESSION_STATE_INVITE_SENT:
-    case TPSIP_MEDIA_SESSION_STATE_REINVITE_SENT:
-    case TPSIP_MEDIA_SESSION_STATE_RESPONSE_RECEIVED:
+    case RAKIA_MEDIA_SESSION_STATE_INVITE_SENT:
+    case RAKIA_MEDIA_SESSION_STATE_REINVITE_SENT:
+    case RAKIA_MEDIA_SESSION_STATE_RESPONSE_RECEIVED:
       /* Cannot send another offer right now */
       priv->pending_offer = TRUE;
       break;
-    case TPSIP_MEDIA_SESSION_STATE_ACTIVE:
+    case RAKIA_MEDIA_SESSION_STATE_ACTIVE:
       /* Check if we are allowed to send re-INVITES */
       {
         gboolean immutable_streams = FALSE;
@@ -1516,7 +1516,7 @@ priv_local_media_changed (RakiaMediaSession *session)
         }
       }
       /* Fall through to the next case */
-    case TPSIP_MEDIA_SESSION_STATE_REINVITE_PENDING:
+    case RAKIA_MEDIA_SESSION_STATE_REINVITE_PENDING:
       if (priv->local_non_ready == 0)
         priv_session_invite (session, TRUE);
       else
@@ -1530,7 +1530,7 @@ priv_local_media_changed (RakiaMediaSession *session)
 static void
 priv_update_remote_hold (RakiaMediaSession *session)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
   RakiaMediaStream *stream;
   gboolean has_streams = FALSE;
   gboolean remote_held = TRUE;
@@ -1584,7 +1584,7 @@ rakia_sdp_get_string_attribute (const sdp_attribute_t *attrs, const char *name)
 static gboolean
 priv_update_remote_media (RakiaMediaSession *session, gboolean authoritative)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
   const sdp_session_t *sdp = priv->remote_sdp;
   const sdp_media_t *media;
   gboolean has_supported_media = FALSE;
@@ -1716,7 +1716,7 @@ priv_update_remote_media (RakiaMediaSession *session, gboolean authoritative)
 static void
 priv_session_rollback (RakiaMediaSession *session)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
 
   DEBUG("enter");
 
@@ -1755,14 +1755,14 @@ priv_session_rollback (RakiaMediaSession *session)
                    TAG_END());
     }
 
-  rakia_media_session_change_state (session, TPSIP_MEDIA_SESSION_STATE_ACTIVE);
+  rakia_media_session_change_state (session, RAKIA_MEDIA_SESSION_STATE_ACTIVE);
 }
 
 static GString *
 priv_session_generate_sdp (RakiaMediaSession *session,
                            gboolean authoritative)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
   GString *user_sdp;
   guint len;
   guint i;
@@ -1793,7 +1793,7 @@ priv_session_generate_sdp (RakiaMediaSession *session,
 static void
 priv_session_invite (RakiaMediaSession *session, gboolean reinvite)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
   GString *user_sdp;
 
   DEBUG("enter");
@@ -1805,7 +1805,7 @@ priv_session_invite (RakiaMediaSession *session, gboolean reinvite)
   g_return_if_fail (user_sdp != NULL);
 
   if (!reinvite
-      || priv->state == TPSIP_MEDIA_SESSION_STATE_REINVITE_PENDING
+      || priv->state == RAKIA_MEDIA_SESSION_STATE_REINVITE_PENDING
       || tp_strdiff (priv->local_sdp, user_sdp->str))
     {
       g_free (priv->local_sdp);
@@ -1821,14 +1821,14 @@ priv_session_invite (RakiaMediaSession *session, gboolean reinvite)
                   SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL),
                   NUTAG_AUTOANSWER(0),
                   TAG_IF(reinvite,
-                         NUTAG_INVITE_TIMER (TPSIP_REINVITE_TIMEOUT)),
+                         NUTAG_INVITE_TIMER (RAKIA_REINVITE_TIMEOUT)),
                   TAG_END());
       priv->pending_offer = FALSE;
 
       rakia_media_session_change_state (
                 session,
-                reinvite? TPSIP_MEDIA_SESSION_STATE_REINVITE_SENT
-                        : TPSIP_MEDIA_SESSION_STATE_INVITE_SENT);
+                reinvite? RAKIA_MEDIA_SESSION_STATE_REINVITE_SENT
+                        : RAKIA_MEDIA_SESSION_STATE_INVITE_SENT);
     }
   else
     {
@@ -1840,7 +1840,7 @@ priv_session_invite (RakiaMediaSession *session, gboolean reinvite)
 static void
 priv_session_respond (RakiaMediaSession *session)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
   msg_t *msg;
 
   g_return_if_fail (priv->nua_op != NULL);
@@ -1870,13 +1870,13 @@ priv_session_respond (RakiaMediaSession *session)
   if (priv->saved_event[0])
     nua_destroy_event (priv->saved_event);
 
-  rakia_media_session_change_state (session, TPSIP_MEDIA_SESSION_STATE_ACTIVE);
+  rakia_media_session_change_state (session, RAKIA_MEDIA_SESSION_STATE_ACTIVE);
 }
 
 static gboolean
 priv_is_codec_intersect_pending (RakiaMediaSession *session)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
   guint i;
 
   for (i = 0; i < priv->streams->len; i++)
@@ -1902,7 +1902,7 @@ priv_is_codec_intersect_pending (RakiaMediaSession *session)
 static void
 priv_request_response_step (RakiaMediaSession *session)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
 
   if (priv->local_non_ready != 0)
     {
@@ -1912,16 +1912,16 @@ priv_request_response_step (RakiaMediaSession *session)
 
   switch (priv->state)
     {
-    case TPSIP_MEDIA_SESSION_STATE_CREATED:
+    case RAKIA_MEDIA_SESSION_STATE_CREATED:
       priv_session_invite (session, FALSE);
       break;
-    case TPSIP_MEDIA_SESSION_STATE_RESPONSE_RECEIVED:
+    case RAKIA_MEDIA_SESSION_STATE_RESPONSE_RECEIVED:
       if (priv->accepted
           && !priv_is_codec_intersect_pending (session))
         rakia_media_session_change_state (session,
-                                        TPSIP_MEDIA_SESSION_STATE_ACTIVE);
+                                        RAKIA_MEDIA_SESSION_STATE_ACTIVE);
       break;
-    case TPSIP_MEDIA_SESSION_STATE_INVITE_RECEIVED:
+    case RAKIA_MEDIA_SESSION_STATE_INVITE_RECEIVED:
       /* TODO: if the call has not yet been accepted locally
        * and the remote endpoint supports 100rel, send them
        * an early session answer in a reliable 183 response */
@@ -1929,12 +1929,12 @@ priv_request_response_step (RakiaMediaSession *session)
           && !priv_is_codec_intersect_pending (session))
         priv_session_respond (session);
       break;
-    case TPSIP_MEDIA_SESSION_STATE_REINVITE_RECEIVED:
+    case RAKIA_MEDIA_SESSION_STATE_REINVITE_RECEIVED:
       if (!priv_is_codec_intersect_pending (session))
         priv_session_respond (session);
       break;
-    case TPSIP_MEDIA_SESSION_STATE_ACTIVE:
-    case TPSIP_MEDIA_SESSION_STATE_REINVITE_PENDING:
+    case RAKIA_MEDIA_SESSION_STATE_ACTIVE:
+    case RAKIA_MEDIA_SESSION_STATE_REINVITE_PENDING:
       if (priv->pending_offer)
         priv_session_invite (session, TRUE);
       break;
@@ -1952,7 +1952,7 @@ priv_stream_close_cb (RakiaMediaStream *stream,
 
   DEBUG("enter");
 
-  priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
 
   id = rakia_media_stream_get_id (stream);
   g_return_if_fail (g_ptr_array_index(priv->streams, id) == stream);
@@ -1978,7 +1978,7 @@ static void priv_stream_ready_cb (RakiaMediaStream *stream,
 
   DEBUG ("enter");
 
-  priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
 
   g_assert (priv->local_non_ready > 0);
   --priv->local_non_ready;
@@ -1992,7 +1992,7 @@ static void priv_stream_supported_codecs_cb (RakiaMediaStream *stream,
 {
   RakiaMediaSessionPrivate *priv;
 
-  priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
 
   g_assert (!rakia_media_stream_is_codec_intersect_pending (stream));
 
@@ -2001,21 +2001,21 @@ static void priv_stream_supported_codecs_cb (RakiaMediaStream *stream,
       /* This remote media description got no codec intersection. */
       switch (priv->state)
         {
-        case TPSIP_MEDIA_SESSION_STATE_RESPONSE_RECEIVED:
-        case TPSIP_MEDIA_SESSION_STATE_INVITE_RECEIVED:
+        case RAKIA_MEDIA_SESSION_STATE_RESPONSE_RECEIVED:
+        case RAKIA_MEDIA_SESSION_STATE_INVITE_RECEIVED:
           DEBUG("no codec intersection, closing the stream");
           rakia_media_stream_close (stream);
           break;
-        case TPSIP_MEDIA_SESSION_STATE_REINVITE_RECEIVED:
+        case RAKIA_MEDIA_SESSION_STATE_REINVITE_RECEIVED:
           /* In this case, we have the stream negotiated already,
            * and we don't want to close it just because the remote party
            * offers a different set of codecs.
            * Roll back the whole session to the previously negotiated state. */
           priv_session_rollback (session);
           return;
-        case TPSIP_MEDIA_SESSION_STATE_ACTIVE:
+        case RAKIA_MEDIA_SESSION_STATE_ACTIVE:
           /* We've most likely rolled back from
-           * TPSIP_MEDIA_SESSION_STATE_REINVITE_RECEIVED,
+           * RAKIA_MEDIA_SESSION_STATE_REINVITE_RECEIVED,
            * but we may receive more than one empty codec intersection
            * in the session, so we ignore the rest */
           return;
@@ -2032,7 +2032,7 @@ priv_stream_state_changed_cb (RakiaMediaStream *stream,
                               guint state,
                               RakiaMediaChannel *channel)
 {
-  g_assert (TPSIP_IS_MEDIA_CHANNEL (channel));
+  g_assert (RAKIA_IS_MEDIA_CHANNEL (channel));
   tp_svc_channel_type_streamed_media_emit_stream_state_changed(
         channel,
         rakia_media_stream_get_id (stream), state);
@@ -2044,7 +2044,7 @@ priv_stream_direction_changed_cb (RakiaMediaStream *stream,
                                   guint pending_send_flags,
                                   RakiaMediaChannel *channel)
 {
-  g_assert (TPSIP_IS_MEDIA_CHANNEL (channel));
+  g_assert (RAKIA_IS_MEDIA_CHANNEL (channel));
   tp_svc_channel_type_streamed_media_emit_stream_direction_changed (
         channel,
         rakia_media_stream_get_id (stream), direction, pending_send_flags);
@@ -2055,7 +2055,7 @@ priv_stream_hold_state_cb (RakiaMediaStream *stream,
                            GParamSpec *pspec,
                            RakiaMediaSession *session)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (session);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (session);
   gboolean hold;
   guint i;
 
@@ -2110,7 +2110,7 @@ rakia_media_session_add_stream (RakiaMediaSession *self,
                                 TpMediaStreamDirection direction,
                                 gboolean created_locally)
 {
-  RakiaMediaSessionPrivate *priv = TPSIP_MEDIA_SESSION_GET_PRIVATE (self);
+  RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (self);
   RakiaMediaStream *stream = NULL;
 
   DEBUG ("enter");
@@ -2134,7 +2134,7 @@ rakia_media_session_add_stream (RakiaMediaSession *self,
     if (rakia_media_session_is_local_hold_ongoing (self))
       direction &= ~TP_MEDIA_STREAM_DIRECTION_RECEIVE;
 
-    stream = g_object_new (TPSIP_TYPE_MEDIA_STREAM,
+    stream = g_object_new (RAKIA_TYPE_MEDIA_STREAM,
                            "dbus-daemon", priv->dbus_daemon,
 			   "media-session", self,
 			   "media-type", media_type,
diff --git a/rakia/media-session.h b/rakia/media-session.h
index 158e23b..222f663 100644
--- a/rakia/media-session.h
+++ b/rakia/media-session.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __TPSIP_MEDIA_SESSION_H__
-#define __TPSIP_MEDIA_SESSION_H__
+#ifndef __RAKIA_MEDIA_SESSION_H__
+#define __RAKIA_MEDIA_SESSION_H__
 
 #include <rakia/media-stream.h>
 
@@ -30,15 +30,15 @@
 G_BEGIN_DECLS
 
 typedef enum {
-    TPSIP_MEDIA_SESSION_STATE_CREATED = 0,
-    TPSIP_MEDIA_SESSION_STATE_INVITE_SENT,
-    TPSIP_MEDIA_SESSION_STATE_INVITE_RECEIVED,
-    TPSIP_MEDIA_SESSION_STATE_RESPONSE_RECEIVED,
-    TPSIP_MEDIA_SESSION_STATE_ACTIVE,
-    TPSIP_MEDIA_SESSION_STATE_REINVITE_SENT,
-    TPSIP_MEDIA_SESSION_STATE_REINVITE_RECEIVED,
-    TPSIP_MEDIA_SESSION_STATE_REINVITE_PENDING,
-    TPSIP_MEDIA_SESSION_STATE_ENDED
+    RAKIA_MEDIA_SESSION_STATE_CREATED = 0,
+    RAKIA_MEDIA_SESSION_STATE_INVITE_SENT,
+    RAKIA_MEDIA_SESSION_STATE_INVITE_RECEIVED,
+    RAKIA_MEDIA_SESSION_STATE_RESPONSE_RECEIVED,
+    RAKIA_MEDIA_SESSION_STATE_ACTIVE,
+    RAKIA_MEDIA_SESSION_STATE_REINVITE_SENT,
+    RAKIA_MEDIA_SESSION_STATE_REINVITE_RECEIVED,
+    RAKIA_MEDIA_SESSION_STATE_REINVITE_PENDING,
+    RAKIA_MEDIA_SESSION_STATE_ENDED
 } RakiaMediaSessionState;
 
 typedef struct _RakiaMediaSession RakiaMediaSession;
@@ -55,18 +55,18 @@ struct _RakiaMediaSession {
 GType rakia_media_session_get_type(void);
 
 /* TYPE MACROS */
-#define TPSIP_TYPE_MEDIA_SESSION \
+#define RAKIA_TYPE_MEDIA_SESSION \
   (rakia_media_session_get_type())
-#define TPSIP_MEDIA_SESSION(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), TPSIP_TYPE_MEDIA_SESSION, RakiaMediaSession))
-#define TPSIP_MEDIA_SESSION_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), TPSIP_TYPE_MEDIA_SESSION, RakiaMediaSessionClass))
-#define TPSIP_IS_MEDIA_SESSION(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), TPSIP_TYPE_MEDIA_SESSION))
-#define TPSIP_IS_MEDIA_SESSION_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), TPSIP_TYPE_MEDIA_SESSION))
-#define TPSIP_MEDIA_SESSION_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), TPSIP_TYPE_MEDIA_SESSION, RakiaMediaSessionClass))
+#define RAKIA_MEDIA_SESSION(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), RAKIA_TYPE_MEDIA_SESSION, RakiaMediaSession))
+#define RAKIA_MEDIA_SESSION_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), RAKIA_TYPE_MEDIA_SESSION, RakiaMediaSessionClass))
+#define RAKIA_IS_MEDIA_SESSION(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), RAKIA_TYPE_MEDIA_SESSION))
+#define RAKIA_IS_MEDIA_SESSION_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), RAKIA_TYPE_MEDIA_SESSION))
+#define RAKIA_MEDIA_SESSION_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), RAKIA_TYPE_MEDIA_SESSION, RakiaMediaSessionClass))
 
 /***********************************************************************
  * Additional declarations (not based on generated templates)
@@ -140,4 +140,4 @@ void rakia_media_session_debug (RakiaMediaSession *session,
 
 G_END_DECLS
 
-#endif /* #ifndef __TPSIP_MEDIA_SESSION_H__*/
+#endif /* #ifndef __RAKIA_MEDIA_SESSION_H__*/
diff --git a/rakia/media-stream.c b/rakia/media-stream.c
index 5448dda..3b77fbf 100644
--- a/rakia/media-stream.c
+++ b/rakia/media-stream.c
@@ -49,7 +49,7 @@
 
 #include "signals-marshal.h"
 
-#define DEBUG_FLAG TPSIP_DEBUG_MEDIA
+#define DEBUG_FLAG RAKIA_DEBUG_MEDIA
 #include "rakia/debug.h"
 
 
@@ -141,7 +141,7 @@ struct _RakiaMediaStreamPrivate
   gboolean dispose_has_run;
 };
 
-#define TPSIP_MEDIA_STREAM_GET_PRIVATE(stream) ((stream)->priv)
+#define RAKIA_MEDIA_STREAM_GET_PRIVATE(stream) ((stream)->priv)
 
 static void push_remote_codecs (RakiaMediaStream *stream);
 static void push_remote_candidates (RakiaMediaStream *stream);
@@ -161,7 +161,7 @@ static void
 rakia_media_stream_init (RakiaMediaStream *self)
 {
   RakiaMediaStreamPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE ((self),
-      TPSIP_TYPE_MEDIA_STREAM, RakiaMediaStreamPrivate);
+      RAKIA_TYPE_MEDIA_STREAM, RakiaMediaStreamPrivate);
 
   self->priv = priv;
 
@@ -177,8 +177,8 @@ rakia_media_stream_init (RakiaMediaStream *self)
 static void
 rakia_media_stream_constructed (GObject *obj)
 {
-  RakiaMediaStreamPrivate *priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (
-      TPSIP_MEDIA_STREAM (obj));
+  RakiaMediaStreamPrivate *priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (
+      RAKIA_MEDIA_STREAM (obj));
   GObjectClass *parent_object_class =
       G_OBJECT_CLASS (rakia_media_stream_parent_class);
 
@@ -210,8 +210,8 @@ rakia_media_stream_get_property (GObject    *object,
 			         GValue     *value,
 			         GParamSpec *pspec)
 {
-  RakiaMediaStream *stream = TPSIP_MEDIA_STREAM (object);
-  RakiaMediaStreamPrivate *priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (stream);
+  RakiaMediaStream *stream = RAKIA_MEDIA_STREAM (object);
+  RakiaMediaStreamPrivate *priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (stream);
 
   switch (property_id)
     {
@@ -266,8 +266,8 @@ rakia_media_stream_set_property (GObject      *object,
 			         const GValue *value,
 			         GParamSpec   *pspec)
 {
-  RakiaMediaStream *stream = TPSIP_MEDIA_STREAM (object);
-  RakiaMediaStreamPrivate *priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (stream);
+  RakiaMediaStream *stream = RAKIA_MEDIA_STREAM (object);
+  RakiaMediaStreamPrivate *priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (stream);
 
   switch (property_id)
     {
@@ -352,7 +352,7 @@ rakia_media_stream_class_init (RakiaMediaStreamClass *klass)
 
   param_spec = g_param_spec_object ("media-session", "RakiaMediaSession object",
       "SIP media session object that owns this media stream object.",
-      TPSIP_TYPE_MEDIA_SESSION,
+      RAKIA_TYPE_MEDIA_SESSION,
       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_MEDIA_SESSION, param_spec);
 
@@ -500,8 +500,8 @@ rakia_media_stream_class_init (RakiaMediaStreamClass *klass)
 void
 rakia_media_stream_dispose (GObject *object)
 {
-  RakiaMediaStream *self = TPSIP_MEDIA_STREAM (object);
-  RakiaMediaStreamPrivate *priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (self);
+  RakiaMediaStream *self = RAKIA_MEDIA_STREAM (object);
+  RakiaMediaStreamPrivate *priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (self);
 
   if (priv->dispose_has_run)
     return;
@@ -519,8 +519,8 @@ rakia_media_stream_dispose (GObject *object)
 void
 rakia_media_stream_finalize (GObject *object)
 {
-  RakiaMediaStream *self = TPSIP_MEDIA_STREAM (object);
-  RakiaMediaStreamPrivate *priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (self);
+  RakiaMediaStream *self = RAKIA_MEDIA_STREAM (object);
+  RakiaMediaStreamPrivate *priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (self);
 
   /* free any data held directly by the object here */
   g_free (priv->object_path);
@@ -573,7 +573,7 @@ rakia_media_stream_error (TpSvcMediaStreamHandler *iface,
 {
   DEBUG("StreamHandler.Error called: %u %s", errno, message);
 
-  rakia_media_stream_close (TPSIP_MEDIA_STREAM (iface));
+  rakia_media_stream_close (RAKIA_MEDIA_STREAM (iface));
 
   tp_svc_media_stream_handler_return_from_error (context);
 }
@@ -592,10 +592,10 @@ rakia_media_stream_native_candidates_prepared (TpSvcMediaStreamHandler *iface,
    *          have been discovered for the moment." 
    */
 
-  RakiaMediaStream *obj = TPSIP_MEDIA_STREAM (iface);
+  RakiaMediaStream *obj = RAKIA_MEDIA_STREAM (iface);
   RakiaMediaStreamPrivate *priv;
 
-  priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (obj);
+  priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (obj);
 
   DEBUG("enter");
 
@@ -622,10 +622,10 @@ rakia_media_stream_new_active_candidate_pair (TpSvcMediaStreamHandler *iface,
                                             const gchar *remote_candidate_id,
                                             DBusGMethodInvocation *context)
 {
-  RakiaMediaStream *obj = TPSIP_MEDIA_STREAM (iface);
+  RakiaMediaStream *obj = RAKIA_MEDIA_STREAM (iface);
   RakiaMediaStreamPrivate *priv;
 
-  priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (obj);
+  priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (obj);
 
   DEBUG("stream engine reported new active candidate pair %s-%s",
         native_candidate_id, remote_candidate_id);
@@ -659,14 +659,14 @@ rakia_media_stream_new_native_candidate (TpSvcMediaStreamHandler *iface,
                                        const GPtrArray *transports,
                                        DBusGMethodInvocation *context)
 {
-  RakiaMediaStream *obj = TPSIP_MEDIA_STREAM (iface);
+  RakiaMediaStream *obj = RAKIA_MEDIA_STREAM (iface);
   RakiaMediaStreamPrivate *priv;
   GPtrArray *candidates;
   GValue candidate = { 0, };
   GValue transport = { 0, };
   gint tr_goodness;
 
-  priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (obj);
+  priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (obj);
 
   g_return_if_fail (transports->len >= 1);
 
@@ -711,7 +711,7 @@ static void
 priv_set_local_codecs (RakiaMediaStream *self,
                        const GPtrArray *codecs)
 {
-  RakiaMediaStreamPrivate *priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (self);
+  RakiaMediaStreamPrivate *priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (self);
 
   SESSION_DEBUG(priv->session, "putting list of %u locally supported "
                 "codecs from stream-engine into cache", codecs->len);
@@ -727,8 +727,8 @@ rakia_media_stream_codecs_updated (TpSvcMediaStreamHandler *iface,
                                    const GPtrArray *codecs,
                                    DBusGMethodInvocation *context)
 {
-  RakiaMediaStream *self = TPSIP_MEDIA_STREAM (iface);
-  RakiaMediaStreamPrivate *priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (self);
+  RakiaMediaStream *self = RAKIA_MEDIA_STREAM (iface);
+  RakiaMediaStreamPrivate *priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (self);
 
   if (!priv->native_codecs_prepared)
     {
@@ -773,12 +773,12 @@ rakia_media_stream_ready (TpSvcMediaStreamHandler *iface,
    *   candidates first
    */
 
-  RakiaMediaStream *obj = TPSIP_MEDIA_STREAM (iface);
+  RakiaMediaStream *obj = RAKIA_MEDIA_STREAM (iface);
   RakiaMediaStreamPrivate *priv;
 
   DEBUG ("enter");
 
-  priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (obj);
+  priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (obj);
 
   if (priv->ready_received)
     {
@@ -821,7 +821,7 @@ rakia_media_stream_set_local_codecs (TpSvcMediaStreamHandler *iface,
                                      const GPtrArray *codecs,
                                      DBusGMethodInvocation *context)
 {
-  priv_set_local_codecs (TPSIP_MEDIA_STREAM (iface), codecs);
+  priv_set_local_codecs (RAKIA_MEDIA_STREAM (iface), codecs);
   tp_svc_media_stream_handler_return_from_set_local_codecs (context);
 }
 
@@ -842,9 +842,9 @@ rakia_media_stream_stream_state (TpSvcMediaStreamHandler *iface,
    * - set the stream state for session
    */
 
-  RakiaMediaStream *obj = TPSIP_MEDIA_STREAM (iface);
+  RakiaMediaStream *obj = RAKIA_MEDIA_STREAM (iface);
   RakiaMediaStreamPrivate *priv;
-  priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (obj);
+  priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (obj);
 
   if (priv->state != state)
     {
@@ -876,9 +876,9 @@ rakia_media_stream_supported_codecs (TpSvcMediaStreamHandler *iface,
    * - emit SupportedCodecs
    */ 
 
-  RakiaMediaStream *self = TPSIP_MEDIA_STREAM (iface);
+  RakiaMediaStream *self = RAKIA_MEDIA_STREAM (iface);
   RakiaMediaStreamPrivate *priv;
-  priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (self);
+  priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (self);
 
   DEBUG("got codec intersection containing %u codecs from stream-engine",
         codecs->len);
@@ -937,14 +937,14 @@ rakia_media_stream_unhold_failure (TpSvcMediaStreamHandler *self,
 guint
 rakia_media_stream_get_id (RakiaMediaStream *self)
 {
-  RakiaMediaStreamPrivate *priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (self);
+  RakiaMediaStreamPrivate *priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (self);
   return priv->id;
 }
 
 guint
 rakia_media_stream_get_media_type (RakiaMediaStream *self)
 {
-  RakiaMediaStreamPrivate *priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (self);
+  RakiaMediaStreamPrivate *priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (self);
   return priv->media_type;
 }
 
@@ -1021,7 +1021,7 @@ rakia_media_stream_set_remote_media (RakiaMediaStream *stream,
 
   DEBUG ("enter");
 
-  priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (stream);
+  priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (stream);
 
   /* Do sanity checks */
 
@@ -1154,7 +1154,7 @@ rakia_tp_media_type (sdp_media_e sip_mtype)
 void rakia_media_stream_set_playing (RakiaMediaStream *stream, gboolean playing)
 {
   RakiaMediaStreamPrivate *priv;
-  priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (stream);
+  priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (stream);
 
   if (same_boolean (priv->playing, playing))
     return;
@@ -1176,7 +1176,7 @@ void
 rakia_media_stream_set_sending (RakiaMediaStream *stream, gboolean sending)
 {
   RakiaMediaStreamPrivate *priv;
-  priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (stream);
+  priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (stream);
 
   if (same_boolean(priv->sending, sending))
     return;
@@ -1194,7 +1194,7 @@ static void
 priv_update_sending (RakiaMediaStream *stream,
                      TpMediaStreamDirection direction)
 {
-  RakiaMediaStreamPrivate *priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (stream);
+  RakiaMediaStreamPrivate *priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (stream);
   gboolean sending = TRUE;
 
   /* XXX: the pending send flag check is probably an overkill
@@ -1220,7 +1220,7 @@ rakia_media_stream_set_direction (RakiaMediaStream *stream,
   guint pending_send_flags;
   TpMediaStreamDirection old_sdp_direction;
 
-  priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (stream);
+  priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (stream);
   pending_send_flags = priv->pending_send_flags & pending_send_mask;
 
   if ((direction & ~priv->direction & TP_MEDIA_STREAM_DIRECTION_SEND) != 0)
@@ -1290,7 +1290,7 @@ void
 rakia_media_stream_apply_pending_direction (RakiaMediaStream *stream,
                                             guint pending_send_mask)
 {
-  RakiaMediaStreamPrivate *priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (stream);
+  RakiaMediaStreamPrivate *priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (stream);
   guint flags;
 
 
@@ -1326,7 +1326,7 @@ rakia_media_stream_apply_pending_direction (RakiaMediaStream *stream,
 TpMediaStreamDirection
 rakia_media_stream_get_requested_direction (RakiaMediaStream *self)
 {
-  return priv_get_requested_direction (TPSIP_MEDIA_STREAM_GET_PRIVATE (self));
+  return priv_get_requested_direction (RAKIA_MEDIA_STREAM_GET_PRIVATE (self));
 }
 
 /**
@@ -1343,7 +1343,7 @@ gboolean rakia_media_stream_is_local_ready (RakiaMediaStream *self)
 gboolean
 rakia_media_stream_is_codec_intersect_pending (RakiaMediaStream *self)
 {
-  RakiaMediaStreamPrivate *priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (self);
+  RakiaMediaStreamPrivate *priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (self);
   return priv->codec_intersect_pending;
 }
 
@@ -1364,7 +1364,7 @@ rakia_media_stream_stop_telephony_event  (RakiaMediaStream *self)
 gboolean
 rakia_media_stream_request_hold_state (RakiaMediaStream *self, gboolean hold)
 {
-  RakiaMediaStreamPrivate *priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (self);
+  RakiaMediaStreamPrivate *priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (self);
 
   if ((!priv->requested_hold_state) != (!hold))
     {
@@ -1402,7 +1402,7 @@ static void push_remote_codecs (RakiaMediaStream *stream)
 
   DEBUG ("enter");
 
-  priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (stream);
+  priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (stream);
 
   sdpmedia = priv->remote_media; 
   if (sdpmedia == NULL)
@@ -1519,7 +1519,7 @@ static void push_remote_candidates (RakiaMediaStream *stream)
 
   DEBUG("enter");
 
-  priv = TPSIP_MEDIA_STREAM_GET_PRIVATE (stream);
+  priv = RAKIA_MEDIA_STREAM_GET_PRIVATE (stream);
 
   media = priv->remote_media; 
   if (media == NULL)
diff --git a/rakia/media-stream.h b/rakia/media-stream.h
index d258a3c..7f1ab87 100644
--- a/rakia/media-stream.h
+++ b/rakia/media-stream.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __TPSIP_MEDIA_STREAM_H__
-#define __TPSIP_MEDIA_STREAM_H__
+#ifndef __RAKIA_MEDIA_STREAM_H__
+#define __RAKIA_MEDIA_STREAM_H__
 
 #include <glib-object.h>
 #include <telepathy-glib/dbus-properties-mixin.h>
@@ -45,18 +45,18 @@ struct _RakiaMediaStream {
 GType rakia_media_stream_get_type(void);
 
 /* TYPE MACROS */
-#define TPSIP_TYPE_MEDIA_STREAM \
+#define RAKIA_TYPE_MEDIA_STREAM \
   (rakia_media_stream_get_type())
-#define TPSIP_MEDIA_STREAM(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), TPSIP_TYPE_MEDIA_STREAM, RakiaMediaStream))
-#define TPSIP_MEDIA_STREAM_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), TPSIP_TYPE_MEDIA_STREAM, RakiaMediaStreamClass))
-#define TPSIP_IS_MEDIA_STREAM(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), TPSIP_TYPE_MEDIA_STREAM))
-#define TPSIP_IS_MEDIA_STREAM_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), TPSIP_TYPE_MEDIA_STREAM))
-#define TPSIP_MEDIA_STREAM_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), TPSIP_TYPE_MEDIA_STREAM, RakiaMediaStreamClass))
+#define RAKIA_MEDIA_STREAM(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), RAKIA_TYPE_MEDIA_STREAM, RakiaMediaStream))
+#define RAKIA_MEDIA_STREAM_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), RAKIA_TYPE_MEDIA_STREAM, RakiaMediaStreamClass))
+#define RAKIA_IS_MEDIA_STREAM(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), RAKIA_TYPE_MEDIA_STREAM))
+#define RAKIA_IS_MEDIA_STREAM_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), RAKIA_TYPE_MEDIA_STREAM))
+#define RAKIA_MEDIA_STREAM_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), RAKIA_TYPE_MEDIA_STREAM, RakiaMediaStreamClass))
 
 /***********************************************************************
  * Additional declarations (not based on generated templates)
@@ -91,4 +91,4 @@ TpMediaStreamDirection rakia_media_stream_direction_from_remote_media (
 
 G_END_DECLS
 
-#endif /* #ifndef __TPSIP_MEDIA_STREAM_H__*/
+#endif /* #ifndef __RAKIA_MEDIA_STREAM_H__*/
diff --git a/rakia/sofia-decls.h b/rakia/sofia-decls.h
index 7f04e24..565d798 100644
--- a/rakia/sofia-decls.h
+++ b/rakia/sofia-decls.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TPSIP_SOFIA_DECLS_H_
-#define _TPSIP_SOFIA_DECLS_H_
+#ifndef _RAKIA_SOFIA_DECLS_H_
+#define _RAKIA_SOFIA_DECLS_H_
 
 /* note: As one Sofia-SIP NUA instance is created per SIP connection,
  *       RakiaConnection is used as the context pointer.
@@ -39,12 +39,12 @@
 #define SU_TIMER_ARG_T   struct _RakiaBaseConnection
 #define SU_WAKEUP_ARG_T  void
 
-#define TPSIP_DEFAULT_STUN_PORT 3478
+#define RAKIA_DEFAULT_STUN_PORT 3478
 
 /* Maximum defer timeout for deferrable Sofia timers */
-#define TPSIP_DEFER_TIMEOUT 30
+#define RAKIA_DEFER_TIMEOUT 30
 
 #include <sofia-sip/nua.h>
 #include <sofia-sip/su.h>
 
-#endif /* _TPSIP_SOFIA_DECLS_H_*/
+#endif /* _RAKIA_SOFIA_DECLS_H_*/
diff --git a/rakia/text-channel.c b/rakia/text-channel.c
index 2d55c25..3728d11 100644
--- a/rakia/text-channel.c
+++ b/rakia/text-channel.c
@@ -46,7 +46,7 @@
 #include <sofia-sip/sip_protos.h>
 #include <sofia-sip/sip_status.h>
 
-#define DEBUG_FLAG TPSIP_DEBUG_IM
+#define DEBUG_FLAG RAKIA_DEBUG_IM
 #include "rakia/debug.h"
 
 static gboolean
@@ -59,7 +59,7 @@ static void channel_iface_init (gpointer, gpointer);
 static void destroyable_iface_init (gpointer, gpointer);
 
 G_DEFINE_TYPE_WITH_CODE (RakiaTextChannel, rakia_text_channel, G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (TPSIP_TYPE_EVENT_TARGET, NULL);
+    G_IMPLEMENT_INTERFACE (RAKIA_TYPE_EVENT_TARGET, NULL);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
       tp_dbus_properties_mixin_iface_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL, channel_iface_init);
@@ -129,7 +129,7 @@ struct _RakiaTextChannelPrivate
 #define _rakia_text_pending_new0() \
 	(g_slice_new0(RakiaTextPendingMessage))
 
-#define TPSIP_TEXT_CHANNEL_GET_PRIVATE(o)     (G_TYPE_INSTANCE_GET_PRIVATE ((o), TPSIP_TYPE_TEXT_CHANNEL, RakiaTextChannelPrivate))
+#define RAKIA_TEXT_CHANNEL_GET_PRIVATE(o)     (G_TYPE_INSTANCE_GET_PRIVATE ((o), RAKIA_TYPE_TEXT_CHANNEL, RakiaTextChannelPrivate))
 
 static void rakia_text_pending_free (RakiaTextPendingMessage *msg,
                                      TpHandleRepoIface *contact_handles)
@@ -145,7 +145,7 @@ static void rakia_text_pending_free (RakiaTextPendingMessage *msg,
 static void
 rakia_text_channel_init (RakiaTextChannel *obj)
 {
-  RakiaTextChannelPrivate *priv = TPSIP_TEXT_CHANNEL_GET_PRIVATE (obj);
+  RakiaTextChannelPrivate *priv = RAKIA_TEXT_CHANNEL_GET_PRIVATE (obj);
 
   DEBUG("enter");
 
@@ -176,7 +176,7 @@ rakia_text_channel_constructed (GObject *obj)
   if (parent_object_class->constructed != NULL)
     parent_object_class->constructed (obj);
 
-  priv = TPSIP_TEXT_CHANNEL_GET_PRIVATE(TPSIP_TEXT_CHANNEL(obj));
+  priv = RAKIA_TEXT_CHANNEL_GET_PRIVATE(RAKIA_TEXT_CHANNEL(obj));
   base_conn = (TpBaseConnection *) priv->conn;
   contact_handles = tp_base_connection_get_handles (base_conn,
       TP_HANDLE_TYPE_CONTACT);
@@ -186,7 +186,7 @@ rakia_text_channel_constructed (GObject *obj)
   g_assert (priv->initiator != 0);
   tp_handle_ref (contact_handles, priv->initiator);
 
-  rakia_base_connection_add_auth_handler (priv->conn, TPSIP_EVENT_TARGET (obj));
+  rakia_base_connection_add_auth_handler (priv->conn, RAKIA_EVENT_TARGET (obj));
 
   g_signal_connect (obj,
                     "nua-event::nua_r_message",
@@ -271,7 +271,7 @@ rakia_text_channel_class_init(RakiaTextChannelClass *klass)
 
   param_spec = g_param_spec_object("connection", "RakiaConnection object",
       "SIP connection object that owns this SIP media channel object.",
-      TPSIP_TYPE_BASE_CONNECTION,
+      RAKIA_TYPE_BASE_CONNECTION,
       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property(object_class, PROP_CONNECTION, param_spec);
 
@@ -320,8 +320,8 @@ rakia_text_channel_get_property(GObject *object,
 				GValue *value,
 				GParamSpec *pspec)
 {
-  RakiaTextChannel *chan = TPSIP_TEXT_CHANNEL(object);
-  RakiaTextChannelPrivate *priv = TPSIP_TEXT_CHANNEL_GET_PRIVATE(chan);
+  RakiaTextChannel *chan = RAKIA_TEXT_CHANNEL(object);
+  RakiaTextChannelPrivate *priv = RAKIA_TEXT_CHANNEL_GET_PRIVATE(chan);
   TpBaseConnection *base_conn = (TpBaseConnection *) priv->conn;
 
   switch (property_id)
@@ -411,8 +411,8 @@ rakia_text_channel_set_property(GObject *object,
 			        const GValue *value,
 			        GParamSpec *pspec)
 {
-  RakiaTextChannel *chan = TPSIP_TEXT_CHANNEL (object);
-  RakiaTextChannelPrivate *priv = TPSIP_TEXT_CHANNEL_GET_PRIVATE (chan);
+  RakiaTextChannel *chan = RAKIA_TEXT_CHANNEL (object);
+  RakiaTextChannelPrivate *priv = RAKIA_TEXT_CHANNEL_GET_PRIVATE (chan);
 
   switch (property_id)
     {
@@ -450,8 +450,8 @@ rakia_text_channel_set_property(GObject *object,
 static void
 rakia_text_channel_dispose(GObject *object)
 {
-  RakiaTextChannel *self = TPSIP_TEXT_CHANNEL (object);
-  RakiaTextChannelPrivate *priv = TPSIP_TEXT_CHANNEL_GET_PRIVATE (self);
+  RakiaTextChannel *self = RAKIA_TEXT_CHANNEL (object);
+  RakiaTextChannelPrivate *priv = RAKIA_TEXT_CHANNEL_GET_PRIVATE (self);
   TpHandleRepoIface *contact_handles;
 
   if (priv->dispose_has_run)
@@ -489,8 +489,8 @@ zap_pending_messages (GQueue *pending_messages,
 static void
 rakia_text_channel_finalize(GObject *object)
 {
-  RakiaTextChannel *self = TPSIP_TEXT_CHANNEL (object);
-  RakiaTextChannelPrivate *priv = TPSIP_TEXT_CHANNEL_GET_PRIVATE (self);
+  RakiaTextChannel *self = RAKIA_TEXT_CHANNEL (object);
+  RakiaTextChannelPrivate *priv = RAKIA_TEXT_CHANNEL_GET_PRIVATE (self);
   TpHandleRepoIface *contact_handles;
 
   contact_handles = tp_base_connection_get_handles (
@@ -526,8 +526,8 @@ static void
 rakia_text_channel_close (TpSvcChannel *iface,
                           DBusGMethodInvocation *context)
 {
-  RakiaTextChannel *self = TPSIP_TEXT_CHANNEL (iface);
-  RakiaTextChannelPrivate *priv = TPSIP_TEXT_CHANNEL_GET_PRIVATE(self);
+  RakiaTextChannel *self = RAKIA_TEXT_CHANNEL (iface);
+  RakiaTextChannelPrivate *priv = RAKIA_TEXT_CHANNEL_GET_PRIVATE(self);
 
   if (priv->closed)
     {
@@ -574,8 +574,8 @@ static void
 rakia_text_channel_destroy (TpSvcChannelInterfaceDestroyable *iface,
                             DBusGMethodInvocation *context)
 {
-  RakiaTextChannel *self = TPSIP_TEXT_CHANNEL (iface);
-  RakiaTextChannelPrivate *priv = TPSIP_TEXT_CHANNEL_GET_PRIVATE (self);
+  RakiaTextChannel *self = RAKIA_TEXT_CHANNEL (iface);
+  RakiaTextChannelPrivate *priv = RAKIA_TEXT_CHANNEL_GET_PRIVATE (self);
   TpHandleRepoIface *contact_handles;
 
   contact_handles = tp_base_connection_get_handles (
@@ -615,12 +615,12 @@ static void
 rakia_text_channel_get_handle (TpSvcChannel *iface,
                              DBusGMethodInvocation *context)
 {
-  RakiaTextChannel *obj = TPSIP_TEXT_CHANNEL (iface);
+  RakiaTextChannel *obj = RAKIA_TEXT_CHANNEL (iface);
   RakiaTextChannelPrivate *priv;
 
   DEBUG("enter");
 
-  priv = TPSIP_TEXT_CHANNEL_GET_PRIVATE(obj);
+  priv = RAKIA_TEXT_CHANNEL_GET_PRIVATE(obj);
 
   tp_svc_channel_return_from_get_handle (context, TP_HANDLE_TYPE_CONTACT,
       priv->handle);
@@ -647,8 +647,8 @@ rakia_text_channel_send_message (GObject *object,
     TpMessage *message,
     TpMessageSendingFlags flags)
 {
-  RakiaTextChannel *self = TPSIP_TEXT_CHANNEL(object);
-  RakiaTextChannelPrivate *priv = TPSIP_TEXT_CHANNEL_GET_PRIVATE (self);
+  RakiaTextChannel *self = RAKIA_TEXT_CHANNEL(object);
+  RakiaTextChannelPrivate *priv = RAKIA_TEXT_CHANNEL_GET_PRIVATE (self);
   RakiaTextPendingMessage *msg = NULL;
   nua_handle_t *msg_nh = NULL;
   GError *error = NULL;
@@ -760,7 +760,7 @@ delivery_report (RakiaTextChannel *self,
     TpDeliveryStatus status,
     TpChannelTextSendError send_error)
 {
-  RakiaTextChannelPrivate *priv = TPSIP_TEXT_CHANNEL_GET_PRIVATE (self);
+  RakiaTextChannelPrivate *priv = RAKIA_TEXT_CHANNEL_GET_PRIVATE (self);
   TpBaseConnection *base_conn;
   TpMessage *msg;
 
@@ -796,7 +796,7 @@ rakia_text_channel_nua_r_message_cb (RakiaTextChannel *self,
                                      tagi_t            tags[],
                                      gpointer          foo)
 {
-  RakiaTextChannelPrivate *priv = TPSIP_TEXT_CHANNEL_GET_PRIVATE (self);
+  RakiaTextChannelPrivate *priv = RAKIA_TEXT_CHANNEL_GET_PRIVATE (self);
   RakiaTextPendingMessage *msg;
   TpHandleRepoIface *contact_repo;
   TpChannelTextSendError send_error;
@@ -890,7 +890,7 @@ void rakia_text_channel_receive(RakiaTextChannel *chan,
                                 const char *text,
                                 gsize len)
 {
-  RakiaTextChannelPrivate *priv = TPSIP_TEXT_CHANNEL_GET_PRIVATE (chan);
+  RakiaTextChannelPrivate *priv = RAKIA_TEXT_CHANNEL_GET_PRIVATE (chan);
   TpMessage *msg;
   TpBaseConnection *base_conn;
   sip_call_id_t *hdr_call_id;
diff --git a/rakia/text-channel.h b/rakia/text-channel.h
index e74eb1c..4de8fa0 100644
--- a/rakia/text-channel.h
+++ b/rakia/text-channel.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __TPSIP_TEXT_CHANNEL_H__
-#define __TPSIP_TEXT_CHANNEL_H__
+#ifndef __RAKIA_TEXT_CHANNEL_H__
+#define __RAKIA_TEXT_CHANNEL_H__
 
 #include <glib-object.h>
 #include <telepathy-glib/dbus-properties-mixin.h>
@@ -48,18 +48,18 @@ struct _RakiaTextChannel {
 GType rakia_text_channel_get_type(void);
 
 /* TYPE MACROS */
-#define TPSIP_TYPE_TEXT_CHANNEL \
+#define RAKIA_TYPE_TEXT_CHANNEL \
   (rakia_text_channel_get_type())
-#define TPSIP_TEXT_CHANNEL(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), TPSIP_TYPE_TEXT_CHANNEL, RakiaTextChannel))
-#define TPSIP_TEXT_CHANNEL_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), TPSIP_TYPE_TEXT_CHANNEL, RakiaTextChannelClass))
-#define TPSIP_IS_TEXT_CHANNEL(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), TPSIP_TYPE_TEXT_CHANNEL))
-#define TPSIP_IS_TEXT_CHANNEL_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), TPSIP_TYPE_TEXT_CHANNEL))
-#define TPSIP_TEXT_CHANNEL_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), TPSIP_TYPE_TEXT_CHANNEL, RakiaTextChannelClass))
+#define RAKIA_TEXT_CHANNEL(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), RAKIA_TYPE_TEXT_CHANNEL, RakiaTextChannel))
+#define RAKIA_TEXT_CHANNEL_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), RAKIA_TYPE_TEXT_CHANNEL, RakiaTextChannelClass))
+#define RAKIA_IS_TEXT_CHANNEL(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), RAKIA_TYPE_TEXT_CHANNEL))
+#define RAKIA_IS_TEXT_CHANNEL_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), RAKIA_TYPE_TEXT_CHANNEL))
+#define RAKIA_TEXT_CHANNEL_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), RAKIA_TYPE_TEXT_CHANNEL, RakiaTextChannelClass))
 
 void rakia_text_channel_receive (RakiaTextChannel  *obj,
                                  const sip_t       *sip,
@@ -69,4 +69,4 @@ void rakia_text_channel_receive (RakiaTextChannel  *obj,
 
 G_END_DECLS
 
-#endif /* #ifndef __TPSIP_TEXT_CHANNEL_H__*/
+#endif /* #ifndef __RAKIA_TEXT_CHANNEL_H__*/
diff --git a/rakia/text-manager.c b/rakia/text-manager.c
index 731694f..9d5b1b7 100644
--- a/rakia/text-manager.c
+++ b/rakia/text-manager.c
@@ -36,7 +36,7 @@
 #include <sofia-sip/sip_tag.h>
 #include <sofia-sip/sip_status.h>
 
-#define DEBUG_FLAG TPSIP_DEBUG_IM
+#define DEBUG_FLAG RAKIA_DEBUG_IM
 #include "rakia/debug.h"
 
 
@@ -69,12 +69,12 @@ struct _RakiaTextManagerPrivate
   gboolean dispose_has_run;
 };
 
-#define TPSIP_TEXT_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TPSIP_TYPE_TEXT_MANAGER, RakiaTextManagerPrivate))
+#define RAKIA_TEXT_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), RAKIA_TYPE_TEXT_MANAGER, RakiaTextManagerPrivate))
 
 static void
 rakia_text_manager_init (RakiaTextManager *fac)
 {
-  RakiaTextManagerPrivate *priv = TPSIP_TEXT_MANAGER_GET_PRIVATE (fac);
+  RakiaTextManagerPrivate *priv = RAKIA_TEXT_MANAGER_GET_PRIVATE (fac);
 
   priv->conn = NULL;
   priv->channels = g_hash_table_new_full (g_direct_hash, g_direct_equal,
@@ -86,8 +86,8 @@ rakia_text_manager_init (RakiaTextManager *fac)
 static void
 rakia_text_manager_constructed (GObject *object)
 {
-  RakiaTextManager *fac = TPSIP_TEXT_MANAGER (object);
-  RakiaTextManagerPrivate *priv = TPSIP_TEXT_MANAGER_GET_PRIVATE (fac);
+  RakiaTextManager *fac = RAKIA_TEXT_MANAGER (object);
+  RakiaTextManagerPrivate *priv = RAKIA_TEXT_MANAGER_GET_PRIVATE (fac);
   GObjectClass *parent_object_class =
       G_OBJECT_CLASS (rakia_text_manager_parent_class);
 
@@ -101,8 +101,8 @@ rakia_text_manager_constructed (GObject *object)
 static void
 rakia_text_manager_dispose (GObject *object)
 {
-  RakiaTextManager *fac = TPSIP_TEXT_MANAGER (object);
-  RakiaTextManagerPrivate *priv = TPSIP_TEXT_MANAGER_GET_PRIVATE (fac);
+  RakiaTextManager *fac = RAKIA_TEXT_MANAGER (object);
+  RakiaTextManagerPrivate *priv = RAKIA_TEXT_MANAGER_GET_PRIVATE (fac);
 
   if (priv->dispose_has_run)
     return;
@@ -122,8 +122,8 @@ rakia_text_manager_get_property (GObject *object,
                                GValue *value,
                                GParamSpec *pspec)
 {
-  RakiaTextManager *fac = TPSIP_TEXT_MANAGER (object);
-  RakiaTextManagerPrivate *priv = TPSIP_TEXT_MANAGER_GET_PRIVATE (fac);
+  RakiaTextManager *fac = RAKIA_TEXT_MANAGER (object);
+  RakiaTextManagerPrivate *priv = RAKIA_TEXT_MANAGER_GET_PRIVATE (fac);
 
   switch (property_id) {
     case PROP_CONNECTION:
@@ -141,8 +141,8 @@ rakia_text_manager_set_property (GObject *object,
                                const GValue *value,
                                GParamSpec *pspec)
 {
-  RakiaTextManager *fac = TPSIP_TEXT_MANAGER (object);
-  RakiaTextManagerPrivate *priv = TPSIP_TEXT_MANAGER_GET_PRIVATE (fac);
+  RakiaTextManager *fac = RAKIA_TEXT_MANAGER (object);
+  RakiaTextManagerPrivate *priv = RAKIA_TEXT_MANAGER_GET_PRIVATE (fac);
 
   switch (property_id) {
     case PROP_CONNECTION:
@@ -170,7 +170,7 @@ rakia_text_manager_class_init (RakiaTextManagerClass *klass)
   param_spec = g_param_spec_object ("connection",
       "RakiaBaseConnection object",
       "SIP connection that owns this text channel manager",
-      TPSIP_TYPE_BASE_CONNECTION,
+      RAKIA_TYPE_BASE_CONNECTION,
       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_CONNECTION, param_spec);
 }
@@ -178,7 +178,7 @@ rakia_text_manager_class_init (RakiaTextManagerClass *klass)
 static void
 rakia_text_manager_close_all (RakiaTextManager *fac)
 {
-  RakiaTextManagerPrivate *priv = TPSIP_TEXT_MANAGER_GET_PRIVATE (fac);
+  RakiaTextManagerPrivate *priv = RAKIA_TEXT_MANAGER_GET_PRIVATE (fac);
   GHashTable *channels;
 
   if (priv->status_changed_id != 0)
@@ -217,8 +217,8 @@ rakia_text_manager_foreach_channel (TpChannelManager *manager,
                                     TpExportableChannelFunc func,
                                     gpointer user_data)
 {
-  RakiaTextManager *fac = TPSIP_TEXT_MANAGER (manager);
-  RakiaTextManagerPrivate *priv = TPSIP_TEXT_MANAGER_GET_PRIVATE (fac);
+  RakiaTextManager *fac = RAKIA_TEXT_MANAGER (manager);
+  RakiaTextManagerPrivate *priv = RAKIA_TEXT_MANAGER_GET_PRIVATE (fac);
   struct _ForeachData data;
 
   data.func = func;
@@ -236,8 +236,8 @@ rakia_text_manager_foreach_channel (TpChannelManager *manager,
 static void
 channel_closed (RakiaTextChannel *chan, gpointer user_data)
 {
-  RakiaTextManager *self = TPSIP_TEXT_MANAGER (user_data);
-  RakiaTextManagerPrivate *priv = TPSIP_TEXT_MANAGER_GET_PRIVATE (self);
+  RakiaTextManager *self = RAKIA_TEXT_MANAGER (user_data);
+  RakiaTextManagerPrivate *priv = RAKIA_TEXT_MANAGER_GET_PRIVATE (self);
   TpHandle contact_handle;
   gboolean really_destroyed = TRUE;
 
@@ -283,7 +283,7 @@ rakia_text_manager_new_channel (RakiaTextManager *fac,
   TpBaseConnection *conn;
   GSList *request_tokens;
 
-  priv = TPSIP_TEXT_MANAGER_GET_PRIVATE (fac);
+  priv = RAKIA_TEXT_MANAGER_GET_PRIVATE (fac);
   conn = priv->conn;
 
   object_path = g_strdup_printf ("%s/TextChannel%u",
@@ -291,7 +291,7 @@ rakia_text_manager_new_channel (RakiaTextManager *fac,
 
   DEBUG ("object path %s", object_path);
 
-  chan = g_object_new (TPSIP_TYPE_TEXT_CHANNEL,
+  chan = g_object_new (RAKIA_TYPE_TEXT_CHANNEL,
                        "connection", priv->conn,
                        "object-path", object_path,
                        "handle", handle,
@@ -361,7 +361,7 @@ rakia_text_manager_requestotron (RakiaTextManager *self,
                                  GHashTable *request_properties,
                                  gboolean require_new)
 {
-  RakiaTextManagerPrivate *priv = TPSIP_TEXT_MANAGER_GET_PRIVATE (self);
+  RakiaTextManagerPrivate *priv = RAKIA_TEXT_MANAGER_GET_PRIVATE (self);
   TpBaseConnection *base_conn = (TpBaseConnection *) priv->conn;
   TpHandle handle;
   GError *error = NULL;
@@ -419,7 +419,7 @@ rakia_text_manager_create_channel (TpChannelManager *manager,
                                    gpointer request_token,
                                    GHashTable *request_properties)
 {
-  RakiaTextManager *self = TPSIP_TEXT_MANAGER (manager);
+  RakiaTextManager *self = RAKIA_TEXT_MANAGER (manager);
 
   return rakia_text_manager_requestotron (self, request_token,
       request_properties, TRUE);
@@ -431,7 +431,7 @@ rakia_text_manager_request_channel (TpChannelManager *manager,
                                     gpointer request_token,
                                     GHashTable *request_properties)
 {
-  RakiaTextManager *self = TPSIP_TEXT_MANAGER (manager);
+  RakiaTextManager *self = RAKIA_TEXT_MANAGER (manager);
 
   return rakia_text_manager_requestotron (self, request_token,
       request_properties, FALSE);
@@ -443,7 +443,7 @@ rakia_text_manager_ensure_channel (TpChannelManager *manager,
                                    gpointer request_token,
                                    GHashTable *request_properties)
 {
-  RakiaTextManager *self = TPSIP_TEXT_MANAGER (manager);
+  RakiaTextManager *self = RAKIA_TEXT_MANAGER (manager);
 
   return rakia_text_manager_requestotron (self, request_token,
       request_properties, FALSE);
@@ -453,7 +453,7 @@ static inline RakiaTextChannel *
 rakia_text_manager_lookup_channel (RakiaTextManager *fac,
                                    TpHandle handle)
 {
-  RakiaTextManagerPrivate *priv = TPSIP_TEXT_MANAGER_GET_PRIVATE (fac);
+  RakiaTextManagerPrivate *priv = RAKIA_TEXT_MANAGER_GET_PRIVATE (fac);
 
   return g_hash_table_lookup (priv->channels,
       GUINT_TO_POINTER(handle));
@@ -601,7 +601,7 @@ connection_status_changed_cb (TpBaseConnection *conn,
                               guint reason,
                               RakiaTextManager *self)
 {
-  RakiaTextManagerPrivate *priv = TPSIP_TEXT_MANAGER_GET_PRIVATE (self);
+  RakiaTextManagerPrivate *priv = RAKIA_TEXT_MANAGER_GET_PRIVATE (self);
 
   switch (status)
     {
diff --git a/rakia/text-manager.h b/rakia/text-manager.h
index fc30edf..86d3daf 100644
--- a/rakia/text-manager.h
+++ b/rakia/text-manager.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __TPSIP_TEXT_MANAGER_H__
-#define __TPSIP_TEXT_MANAGER_H__
+#ifndef __RAKIA_TEXT_MANAGER_H__
+#define __RAKIA_TEXT_MANAGER_H__
 
 #include <glib-object.h>
 
@@ -39,18 +39,18 @@ struct _RakiaTextManager {
 GType rakia_text_manager_get_type(void);
 
 /* TYPE MACROS */
-#define TPSIP_TYPE_TEXT_MANAGER \
+#define RAKIA_TYPE_TEXT_MANAGER \
   (rakia_text_manager_get_type())
-#define TPSIP_TEXT_MANAGER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), TPSIP_TYPE_TEXT_MANAGER, RakiaTextManager))
-#define TPSIP_TEXT_MANAGER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), TPSIP_TYPE_TEXT_MANAGER, RakiaTextManagerClass))
-#define TPSIP_IS_TEXT_MANAGER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), TPSIP_TYPE_TEXT_MANAGER))
-#define TPSIP_IS_TEXT_MANAGER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), TPSIP_TYPE_TEXT_MANAGER))
-#define TPSIP_TEXT_MANAGER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), TPSIP_TYPE_TEXT_MANAGER, RakiaTextManagerClass))
+#define RAKIA_TEXT_MANAGER(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), RAKIA_TYPE_TEXT_MANAGER, RakiaTextManager))
+#define RAKIA_TEXT_MANAGER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), RAKIA_TYPE_TEXT_MANAGER, RakiaTextManagerClass))
+#define RAKIA_IS_TEXT_MANAGER(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), RAKIA_TYPE_TEXT_MANAGER))
+#define RAKIA_IS_TEXT_MANAGER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), RAKIA_TYPE_TEXT_MANAGER))
+#define RAKIA_TEXT_MANAGER_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), RAKIA_TYPE_TEXT_MANAGER, RakiaTextManagerClass))
 
 G_END_DECLS
 
diff --git a/rakia/util.h b/rakia/util.h
index c4baef4..81dc123 100644
--- a/rakia/util.h
+++ b/rakia/util.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef TPSIP_UTIL_H_
-#define TPSIP_UTIL_H_
+#ifndef RAKIA_UTIL_H_
+#define RAKIA_UTIL_H_
 
 #include <glib.h>
 
@@ -35,4 +35,4 @@ gchar const *rakia_version_string ();
 
 G_END_DECLS
 
-#endif /* !TPSIP_UTIL_H_ */
+#endif /* !RAKIA_UTIL_H_ */