Rename most of GabbleJingle* to WockyJingle*

This renames the classes I'm moving to Wocky, and updates all the remaining code to cope. A few things are missed out because it's only reasonable to change them when the code is in Wocky: • GABBLE_TYPE_STUN_SERVER_SOURCE (the GEnum for WockyStunServerSource) can't be renamed easily because it is generated by Gabble's enumtype thing. • GABBLE_DEBUG_MEDIA. Here's the program I used, for posterity. #!/usr/bin/perl -pi use strict; BEGIN { undef $/; } my @Classes = qw(Factory Session Transport_Iface Transport_IceUdp Transport_RawUdp Transport_Google Content Info Media_Rtp Relay); for my $Class (@Classes) { my $FullClass = "Jingle$Class"; $FullClass =~ s/_//g; my $under_class = "jingle_" . lc($Class); my $UNDER_CLASS = uc($under_class); s/Gabble$FullClass/Wocky$FullClass/g; s/gabble_$under_class/wocky_$under_class/g; s/GABBLE_$UNDER_CLASS/WOCKY_$UNDER_CLASS/g; s/GABBLE_TYPE_$UNDER_CLASS/WOCKY_TYPE_$UNDER_CLASS/g; s/GABBLE_IS_$UNDER_CLASS/WOCKY_IS_$UNDER_CLASS/g; } s/GabbleGoogleRelay/WockyGoogleRelay/g; s/gabble_google_relay/wocky_google_relay/g; s/GABBLE_N_JINGLE_RELAY_TYPES/WOCKY_N_JINGLE_RELAY_TYPES/g; s/gabble_stun_server/wocky_stun_server/g; s/GABBLE_STUN_SERVER/WOCKY_STUN_SERVER/g; # Can't rename GABBLE_TYPE_STUN_SERVER_SOURCE because it's generated. Blah. s/GabbleStunServer/WockyStunServer/g; my @Blah_Blah = qw(Candidate State Action Content_Senders Transport_Type Transport_Protocol Candidate_Type Reason Transport_State Dialect Content_State Media_Type Codec Media_Description Feedback_Message Rtp_Header_Extension Media_Profile); for my $Class (@Blah_Blah) { my $FullClass = "Jingle$Class"; $FullClass =~ s/_//g; my $under_class = "jingle_" . lc($Class); my $UNDER_CLASS = uc($under_class); s/\b$FullClass/Wocky$FullClass/g; s/\b_$FullClass/_Wocky$FullClass/g; s/\b$under_class/wocky_$under_class/g; s/\b$UNDER_CLASS/WOCKY_$UNDER_CLASS/g; } s/MAX_JINGLE_STATES/WOCKY_N_JINGLE_STATES/g; s/JINGLE_IS_GOOGLE_DIALECT/WOCKY_JINGLE_DIALECT_IS_GOOGLE/g;
author: Will Thompson <will.thompson@collabora.co.uk> 2012-02-21 16:11:32 +0000
committer: Will Thompson <will.thompson@collabora.co.uk> 2012-12-11 16:47:19 +0000
commit: efc093b82db19196d66e02100316295c0cc7e92e (patch)
tree: 175d69adcb0289d26365b16a689197a19c98b6bb
parent: 0f1435f548071f873d7626643f250b04b53931c9 (diff)
58 files changed, 2471 insertions, 2471 deletions
diff --git a/src/base-call-channel.c b/src/base-call-channel.c
index 3c682d2a4..e4560eddf 100644
--- a/src/base-call-channel.c
+++ b/src/base-call-channel.c
@@ -201,7 +201,7 @@ gabble_base_call_channel_finalize (GObject *object)
 GabbleCallContent *
 gabble_base_call_channel_add_content (GabbleBaseCallChannel *self,
     const gchar *name,
-    JingleMediaType mtype,
+    WockyJingleMediaType mtype,
     TpCallContentDisposition disposition)
 {
   TpBaseChannel *base = TP_BASE_CHANNEL (self);
@@ -221,7 +221,7 @@ gabble_base_call_channel_add_content (GabbleBaseCallChannel *self,
     "connection", tp_base_channel_get_connection (base),
     "object-path", object_path,
     "disposition", disposition,
-    "media-type", jingle_media_type_to_tp (mtype),
+    "media-type", wocky_jingle_media_type_to_tp (mtype),
     "name", name,
     NULL);
 
diff --git a/src/base-call-channel.h b/src/base-call-channel.h
index 04add06e8..25bbe67d4 100644
--- a/src/base-call-channel.h
+++ b/src/base-call-channel.h
@@ -83,7 +83,7 @@ GabbleCallMember * gabble_base_call_channel_get_member_from_handle (
 GabbleCallContent * gabble_base_call_channel_add_content (
     GabbleBaseCallChannel *self,
     const gchar *name,
-    JingleMediaType mtype,
+    WockyJingleMediaType mtype,
     TpCallContentDisposition disposition);
 
 void gabble_base_call_channel_remove_content (GabbleBaseCallChannel *self,
diff --git a/src/call-channel.c b/src/call-channel.c
index 223c22350..e49a51837 100644
--- a/src/call-channel.c
+++ b/src/call-channel.c
@@ -44,15 +44,15 @@
 
 static void async_initable_iface_init (GAsyncInitableIface *iface);
 
-static void call_session_state_changed_cb (GabbleJingleSession *session,
+static void call_session_state_changed_cb (WockyJingleSession *session,
   GParamSpec *param, GabbleCallChannel *self);
 static void call_member_content_added_cb (GabbleCallMember *member,
     GabbleCallMemberContent *content, GabbleCallChannel *self);
 static void call_member_content_removed_cb (GabbleCallMember *member,
     GabbleCallMemberContent *mcontent,
     GabbleBaseCallChannel *self);
-static void call_session_terminated_cb (GabbleJingleSession *session,
-    gboolean locally_terminated, JingleReason termination_reason,
+static void call_session_terminated_cb (WockyJingleSession *session,
+    gboolean locally_terminated, WockyJingleReason termination_reason,
     gchar *reason_text, GabbleCallChannel *self);
 
 static void call_channel_accept (TpBaseMediaCallChannel *channel);
@@ -86,7 +86,7 @@ struct _GabbleCallChannelPrivate
 
   /* Our only call member, owned by the base channel */
   GabbleCallMember *member;
-  GabbleJingleSession *session;
+  WockyJingleSession *session;
 };
 
 static void
@@ -222,9 +222,9 @@ gabble_call_channel_class_init (
   tp_base_media_call_class->hold_state_changed =
       call_channel_hold_state_changed;
 
-  param_spec = g_param_spec_object ("session", "GabbleJingleSession object",
+  param_spec = g_param_spec_object ("session", "WockyJingleSession object",
       "Jingle session associated with this media channel object.",
-      GABBLE_TYPE_JINGLE_SESSION,
+      WOCKY_TYPE_JINGLE_SESSION,
       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_SESSION, param_spec);
 }
@@ -253,8 +253,8 @@ gabble_call_channel_finalize (GObject *object)
 }
 
 static void
-call_session_terminated_cb (GabbleJingleSession *session,
-    gboolean locally_terminated, JingleReason termination_reason,
+call_session_terminated_cb (WockyJingleSession *session,
+    gboolean locally_terminated, WockyJingleReason termination_reason,
     gchar *reason_text, GabbleCallChannel *self)
 {
   TpHandle actor;
@@ -278,66 +278,66 @@ call_session_terminated_cb (GabbleJingleSession *session,
 
   switch (termination_reason)
     {
-    case JINGLE_REASON_UNKNOWN:
+    case WOCKY_JINGLE_REASON_UNKNOWN:
       call_reason = TP_CALL_STATE_CHANGE_REASON_UNKNOWN;
       break;
-    case JINGLE_REASON_BUSY:
+    case WOCKY_JINGLE_REASON_BUSY:
       call_reason = TP_CALL_STATE_CHANGE_REASON_BUSY;
       break;
-    case JINGLE_REASON_CANCEL:
+    case WOCKY_JINGLE_REASON_CANCEL:
       if (locally_terminated)
         call_reason = TP_CALL_STATE_CHANGE_REASON_USER_REQUESTED;
       else
         call_reason = TP_CALL_STATE_CHANGE_REASON_REJECTED;
       break;
-    case JINGLE_REASON_CONNECTIVITY_ERROR:
+    case WOCKY_JINGLE_REASON_CONNECTIVITY_ERROR:
       call_reason = TP_CALL_STATE_CHANGE_REASON_CONNECTIVITY_ERROR;
       break;
-    case JINGLE_REASON_FAILED_APPLICATION:
+    case WOCKY_JINGLE_REASON_FAILED_APPLICATION:
       call_reason = TP_CALL_STATE_CHANGE_REASON_MEDIA_ERROR;
       dbus_detail = TP_ERROR_STR_MEDIA_CODECS_INCOMPATIBLE;
       break;
-    case JINGLE_REASON_GENERAL_ERROR:
+    case WOCKY_JINGLE_REASON_GENERAL_ERROR:
       call_reason = TP_CALL_STATE_CHANGE_REASON_SERVICE_ERROR;
       break;
-    case JINGLE_REASON_GONE:
+    case WOCKY_JINGLE_REASON_GONE:
       /* This one is only in the media channel, we don't have a
        * Call reason to match */
       call_reason = TP_CALL_STATE_CHANGE_REASON_UNKNOWN;
       break;
-    case JINGLE_REASON_MEDIA_ERROR:
+    case WOCKY_JINGLE_REASON_MEDIA_ERROR:
       call_reason = TP_CALL_STATE_CHANGE_REASON_MEDIA_ERROR;
       break;
-    case JINGLE_REASON_SUCCESS:
+    case WOCKY_JINGLE_REASON_SUCCESS:
       call_reason = TP_CALL_STATE_CHANGE_REASON_USER_REQUESTED;
       break;
-    case JINGLE_REASON_TIMEOUT:
+    case WOCKY_JINGLE_REASON_TIMEOUT:
       call_reason = TP_CALL_STATE_CHANGE_REASON_NO_ANSWER;
       break;
-    case JINGLE_REASON_DECLINE:
+    case WOCKY_JINGLE_REASON_DECLINE:
       call_reason = TP_CALL_STATE_CHANGE_REASON_REJECTED;
       break;
-    case JINGLE_REASON_ALTERNATIVE_SESSION:
+    case WOCKY_JINGLE_REASON_ALTERNATIVE_SESSION:
       break;
-    case JINGLE_REASON_UNSUPPORTED_TRANSPORTS:
+    case WOCKY_JINGLE_REASON_UNSUPPORTED_TRANSPORTS:
       call_reason = TP_CALL_STATE_CHANGE_REASON_NETWORK_ERROR;
       break;
-    case JINGLE_REASON_FAILED_TRANSPORT:
+    case WOCKY_JINGLE_REASON_FAILED_TRANSPORT:
       call_reason = TP_CALL_STATE_CHANGE_REASON_CONNECTIVITY_ERROR;
       dbus_detail = TP_ERROR_STR_CONNECTION_FAILED;
       break;
-    case JINGLE_REASON_INCOMPATIBLE_PARAMETERS:
+    case WOCKY_JINGLE_REASON_INCOMPATIBLE_PARAMETERS:
       call_reason = TP_CALL_STATE_CHANGE_REASON_MEDIA_ERROR;
       dbus_detail = TP_ERROR_STR_MEDIA_CODECS_INCOMPATIBLE;
       break;
-    case JINGLE_REASON_SECURITY_ERROR:
+    case WOCKY_JINGLE_REASON_SECURITY_ERROR:
       call_reason = TP_CALL_STATE_CHANGE_REASON_CONNECTIVITY_ERROR;
       break;
-    case JINGLE_REASON_UNSUPPORTED_APPLICATIONS:
+    case WOCKY_JINGLE_REASON_UNSUPPORTED_APPLICATIONS:
       call_reason = TP_CALL_STATE_CHANGE_REASON_MEDIA_ERROR;
       dbus_detail = TP_ERROR_STR_MEDIA_UNSUPPORTED_TYPE;
       break;
-    case JINGLE_REASON_EXPIRED:
+    case WOCKY_JINGLE_REASON_EXPIRED:
       /* No matching error in our spec */
       call_reason = TP_CALL_STATE_CHANGE_REASON_UNKNOWN;
       break;
@@ -352,16 +352,16 @@ call_session_terminated_cb (GabbleJingleSession *session,
 }
 
 static void
-call_session_state_changed_cb (GabbleJingleSession *session,
+call_session_state_changed_cb (WockyJingleSession *session,
   GParamSpec *param,
   GabbleCallChannel *self)
 {
   TpBaseCallChannel *cbase = TP_BASE_CALL_CHANNEL (self);
-  JingleState state;
+  WockyJingleState state;
 
   g_object_get (session, "state", &state, NULL);
 
-  if (state == JINGLE_STATE_ACTIVE && !tp_base_call_channel_is_accepted (cbase))
+  if (state == WOCKY_JINGLE_STATE_ACTIVE && !tp_base_call_channel_is_accepted (cbase))
     {
       tp_base_call_channel_remote_accept (cbase);
     }
@@ -374,13 +374,13 @@ call_member_content_added_cb (GabbleCallMember *member,
     GabbleCallChannel *self)
 {
   GabbleBaseCallChannel *cbase = GABBLE_BASE_CALL_CHANNEL (self);
-  GabbleJingleContent *jingle_content;
+  WockyJingleContent *jingle_content;
   GabbleCallContent *c;
 
   jingle_content = gabble_call_member_content_get_jingle_content (content);
 
   if (jingle_content == NULL ||
-      gabble_jingle_content_is_created_by_us (jingle_content))
+      wocky_jingle_content_is_created_by_us (jingle_content))
     return;
 
   c = gabble_base_call_channel_add_content (cbase,
@@ -644,7 +644,7 @@ static void
 call_channel_accept (TpBaseMediaCallChannel *channel)
 {
   GabbleCallChannel *self = GABBLE_CALL_CHANNEL (channel);
-  gabble_jingle_session_accept (self->priv->session);
+  wocky_jingle_session_accept (self->priv->session);
 }
 
 static TpBaseCallContent *
@@ -657,7 +657,7 @@ call_channel_add_content (TpBaseCallChannel *base,
   GabbleCallChannel *self = GABBLE_CALL_CHANNEL (base);
   GabbleCallContent *content = NULL;
   GabbleCallMemberContent *mcontent;
-  JingleContentSenders senders;
+  WockyJingleContentSenders senders;
   gboolean initiated_by_us;
 
   if (initial_direction == TP_MEDIA_STREAM_DIRECTION_NONE)
@@ -674,25 +674,25 @@ call_channel_add_content (TpBaseCallChannel *base,
     {
     case TP_MEDIA_STREAM_DIRECTION_SEND:
       senders = initiated_by_us ?
-          JINGLE_CONTENT_SENDERS_INITIATOR : JINGLE_CONTENT_SENDERS_RESPONDER;
+          WOCKY_JINGLE_CONTENT_SENDERS_INITIATOR : WOCKY_JINGLE_CONTENT_SENDERS_RESPONDER;
       break;
     case TP_MEDIA_STREAM_DIRECTION_RECEIVE:
       senders = initiated_by_us ?
-          JINGLE_CONTENT_SENDERS_RESPONDER : JINGLE_CONTENT_SENDERS_INITIATOR;
+          WOCKY_JINGLE_CONTENT_SENDERS_RESPONDER : WOCKY_JINGLE_CONTENT_SENDERS_INITIATOR;
       break;
     default:
     case TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL:
-      senders = JINGLE_CONTENT_SENDERS_BOTH;
+      senders = WOCKY_JINGLE_CONTENT_SENDERS_BOTH;
     }
 
   mcontent = gabble_call_member_create_content (self->priv->member, name,
-      jingle_media_type_from_tp (type), senders, error);
+      wocky_jingle_media_type_from_tp (type), senders, error);
 
   if (mcontent != NULL)
     {
       content = gabble_base_call_channel_add_content (
         GABBLE_BASE_CALL_CHANNEL (base),
-        name, jingle_media_type_from_tp (type),
+        name, wocky_jingle_media_type_from_tp (type),
         TP_CALL_CONTENT_DISPOSITION_NONE);
       gabble_call_content_add_member_content (content, mcontent);
     }
@@ -710,10 +710,10 @@ call_channel_hold_state_changed (TpBaseMediaCallChannel *bmcc,
     {
     case TP_LOCAL_HOLD_STATE_HELD:
     case TP_LOCAL_HOLD_STATE_PENDING_HOLD:
-      gabble_jingle_session_set_local_hold (self->priv->session, TRUE);
+      wocky_jingle_session_set_local_hold (self->priv->session, TRUE);
       break;
     case TP_LOCAL_HOLD_STATE_UNHELD:
-      gabble_jingle_session_set_local_hold (self->priv->session, FALSE);
+      wocky_jingle_session_set_local_hold (self->priv->session, FALSE);
       break;
     case TP_LOCAL_HOLD_STATE_PENDING_UNHOLD:
       break;
diff --git a/src/call-content.c b/src/call-content.c
index 46616e39f..b7d7e186e 100644
--- a/src/call-content.c
+++ b/src/call-content.c
@@ -163,7 +163,7 @@ gabble_call_content_new_offer (GabbleCallContent *self,
       codecs = gabble_call_member_content_get_remote_codecs (content);
       for (l = codecs; l != NULL; l = g_list_next (l))
         {
-          JingleCodec *c = l->data;
+          WockyJingleCodec *c = l->data;
 
           tp_call_content_media_description_append_codec (md,
               c->id, c->name, c->clockrate, c->channels,
@@ -180,12 +180,12 @@ gabble_call_content_new_offer (GabbleCallContent *self,
   g_free (path);
 }
 
-JingleMediaType
+WockyJingleMediaType
 gabble_call_content_get_media_type (GabbleCallContent *self)
 {
   TpBaseCallContent *base = TP_BASE_CALL_CONTENT (self);
 
-  return jingle_media_type_from_tp (
+  return wocky_jingle_media_type_from_tp (
       tp_base_call_content_get_media_type (base));
 }
 
@@ -210,7 +210,7 @@ codec_array_to_list (GPtrArray *codecs)
 
   for (i = 0; i < codecs->len ; i++)
     {
-      JingleCodec *c;
+      WockyJingleCodec *c;
       GValueArray *va;
 
       va = g_ptr_array_index (codecs, i);
@@ -237,7 +237,7 @@ call_content_local_media_description_updated (GabbleCallContent *self,
     gpointer data)
 {
   GList *l;
-  JingleMediaDescription *md = jingle_media_description_new ();
+  WockyJingleMediaDescription *md = wocky_jingle_media_description_new ();
 
   md->codecs = codec_array_to_list (tp_asv_get_boxed (properties,
           TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_CODECS,
@@ -246,22 +246,22 @@ call_content_local_media_description_updated (GabbleCallContent *self,
   for (l = self->priv->contents; l != NULL; l = g_list_next (l))
     {
       GabbleCallMemberContent *c = GABBLE_CALL_MEMBER_CONTENT (l->data);
-      GabbleJingleContent *j =
+      WockyJingleContent *j =
         gabble_call_member_content_get_jingle_content (c);
 
       if (j == NULL)
         continue;
 
       /* FIXME react properly on errors ? */
-      jingle_media_rtp_set_local_media_description (GABBLE_JINGLE_MEDIA_RTP (j),
-        jingle_media_description_copy (md), TRUE, NULL);
+      jingle_media_rtp_set_local_media_description (WOCKY_JINGLE_MEDIA_RTP (j),
+        wocky_jingle_media_description_copy (md), TRUE, NULL);
     }
 
-  jingle_media_description_free (md);
+  wocky_jingle_media_description_free (md);
 }
 
 static TpStreamTransportType
-_jingle_to_tp_transport (JingleTransportType jt)
+_jingle_to_tp_transport (WockyJingleTransportType jt)
 {
   switch (jt)
   {
@@ -281,11 +281,11 @@ call_content_setup_jingle (GabbleCallContent *self,
     GabbleCallMemberContent *mcontent)
 {
   TpBaseCallContent *base = TP_BASE_CALL_CONTENT (self);
-  GabbleJingleContent *jingle;
+  WockyJingleContent *jingle;
   GabbleCallStream *stream;
   gchar *path;
-  JingleTransportType transport;
-  JingleMediaDescription *md;
+  WockyJingleTransportType transport;
+  WockyJingleMediaDescription *md;
   GHashTable *tp_md;
   TpHandle contact;
 
@@ -294,7 +294,7 @@ call_content_setup_jingle (GabbleCallContent *self,
   if (jingle == NULL)
     return;
 
-  transport = gabble_jingle_content_get_transport_type (jingle);
+  transport = wocky_jingle_content_get_transport_type (jingle);
   path = g_strdup_printf ("%s/Stream%p",
       tp_base_call_content_get_object_path (base),
       jingle);
@@ -306,7 +306,7 @@ call_content_setup_jingle (GabbleCallContent *self,
       NULL);
   g_free (path);
 
-  md = jingle_media_description_new ();
+  md = wocky_jingle_media_description_new ();
 
   /* FIXME: correct??? */
   contact = gabble_call_member_get_handle (
@@ -322,9 +322,9 @@ call_content_setup_jingle (GabbleCallContent *self,
 
   if (md->codecs != NULL)
     jingle_media_rtp_set_local_media_description (
-        GABBLE_JINGLE_MEDIA_RTP (jingle), md, TRUE, NULL);
+        WOCKY_JINGLE_MEDIA_RTP (jingle), md, TRUE, NULL);
   else
-    jingle_media_description_free (md);
+    wocky_jingle_media_description_free (md);
 
   tp_base_call_content_add_stream (base, TP_BASE_CALL_STREAM (stream));
   gabble_call_stream_update_member_states (stream);
@@ -346,7 +346,7 @@ member_content_removed_cb (GabbleCallMemberContent *mcontent,
   GabbleCallContent *self = GABBLE_CALL_CONTENT (user_data);
   GabbleCallContentPrivate *priv = self->priv;
   TpBaseCallContent *base = TP_BASE_CALL_CONTENT (self);
-  GabbleJingleContent *content;
+  WockyJingleContent *content;
   GList *l;
 
   priv->contents = g_list_remove (priv->contents, mcontent);
diff --git a/src/call-content.h b/src/call-content.h
index 70df5405b..97202c940 100644
--- a/src/call-content.h
+++ b/src/call-content.h
@@ -63,7 +63,7 @@ GType gabble_call_content_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), \
     GABBLE_TYPE_CALL_CONTENT, GabbleCallContentClass))
 
-JingleMediaType gabble_call_content_get_media_type (GabbleCallContent *self);
+WockyJingleMediaType gabble_call_content_get_media_type (GabbleCallContent *self);
 void gabble_call_content_new_offer (GabbleCallContent *self,
     GabbleCallMemberContent *content);
 
diff --git a/src/call-member-content.c b/src/call-member-content.c
index 8899b0f58..bbd082384 100644
--- a/src/call-member-content.c
+++ b/src/call-member-content.c
@@ -62,9 +62,9 @@ struct _GabbleCallMemberContentPrivate
 
   GabbleCallMember *member;
 
-  GabbleJingleContent *jingle_content;
+  WockyJingleContent *jingle_content;
   gchar *name;
-  JingleMediaType media_type;
+  WockyJingleMediaType media_type;
 
   GList *remote_codecs;
   gboolean removed;
@@ -136,7 +136,7 @@ gabble_call_member_content_set_property (GObject *object,
         break;
       case PROP_MEDIA_TYPE:
         priv->media_type = g_value_get_uint (value);
-        g_assert (priv->media_type != JINGLE_MEDIA_TYPE_NONE);
+        g_assert (priv->media_type != WOCKY_JINGLE_MEDIA_TYPE_NONE);
         break;
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -152,8 +152,8 @@ gabble_call_member_content_add_to_session (GabbleCallMemberContent *self)
 {
   GabbleCallMemberContentPrivate *priv = self->priv;
   const gchar *content_ns;
-  GabbleJingleSession *session;
-  GabbleJingleContent *content;
+  WockyJingleSession *session;
+  WockyJingleContent *content;
   const gchar *peer_resource;
   const gchar *transport_ns;
 
@@ -170,7 +170,7 @@ gabble_call_member_content_add_to_session (GabbleCallMemberContent *self)
 
   g_assert (session != NULL);
 
-  peer_resource = gabble_jingle_session_get_peer_resource (session);
+  peer_resource = wocky_jingle_session_get_peer_resource (session);
 
   if (peer_resource != NULL)
     DEBUG ("existing call, using peer resource %s", peer_resource);
@@ -180,8 +180,8 @@ gabble_call_member_content_add_to_session (GabbleCallMemberContent *self)
   DEBUG ("Creating new jingle content with ns %s : %s",
     content_ns, transport_ns);
 
-  content = gabble_jingle_session_add_content (session,
-      priv->media_type, JINGLE_CONTENT_SENDERS_BOTH,
+  content = wocky_jingle_session_add_content (session,
+      priv->media_type, WOCKY_JINGLE_CONTENT_SENDERS_BOTH,
       priv->name, content_ns, transport_ns);
 
   gabble_call_member_content_set_jingle_content (self, content);
@@ -237,16 +237,16 @@ gabble_call_member_content_class_init (
 
   param_spec = g_param_spec_uint ("media-type", "MediaType",
       "The media type of this jingle content",
-      JINGLE_MEDIA_TYPE_NONE,
-      JINGLE_MEDIA_TYPE_VIDEO,
-      JINGLE_MEDIA_TYPE_NONE,
+      WOCKY_JINGLE_MEDIA_TYPE_NONE,
+      WOCKY_JINGLE_MEDIA_TYPE_VIDEO,
+      WOCKY_JINGLE_MEDIA_TYPE_NONE,
       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_MEDIA_TYPE,
     param_spec);
 
   param_spec = g_param_spec_object ("jingle-content", "JingleContent",
       "The jingle content corresponding to this members content",
-      GABBLE_TYPE_JINGLE_CONTENT,
+      WOCKY_TYPE_JINGLE_CONTENT,
       G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_JINGLE_CONTENT,
     param_spec);
@@ -311,7 +311,7 @@ gabble_call_member_content_finalize (GObject *object)
   G_OBJECT_CLASS (gabble_call_member_content_parent_class)->finalize (object);
 }
 
-JingleMediaType
+WockyJingleMediaType
 gabble_call_member_content_get_media_type (GabbleCallMemberContent *self)
 {
   return self->priv->media_type;
@@ -323,7 +323,7 @@ gabble_call_member_content_get_name (GabbleCallMemberContent *self)
   return self->priv->name;
 }
 
-GabbleJingleContent *
+WockyJingleContent *
 gabble_call_member_content_get_jingle_content (
     GabbleCallMemberContent *self)
 {
@@ -332,7 +332,7 @@ gabble_call_member_content_get_jingle_content (
 
 GabbleCallMemberContent *
 gabble_call_member_content_new (const gchar *name,
-    JingleMediaType type,
+    WockyJingleMediaType type,
     GabbleCallMember *member)
 {
   return GABBLE_CALL_MEMBER_CONTENT (g_object_new (
@@ -344,7 +344,7 @@ gabble_call_member_content_new (const gchar *name,
 }
 
 static void
-call_member_content_jingle_removed_cb (GabbleJingleContent *jingle_content,
+call_member_content_jingle_removed_cb (WockyJingleContent *jingle_content,
     GabbleCallMemberContent *content)
 {
   if (!content->priv->removed)
@@ -355,8 +355,8 @@ call_member_content_jingle_removed_cb (GabbleJingleContent *jingle_content,
 }
 
 static void
-call_member_content_jingle_media_description_cb (GabbleJingleMediaRtp *media,
-    JingleMediaDescription *md,
+call_member_content_jingle_media_description_cb (WockyJingleMediaRtp *media,
+    WockyJingleMediaDescription *md,
     gpointer user_data)
 {
   GabbleCallMemberContent *self = GABBLE_CALL_MEMBER_CONTENT (user_data);
@@ -368,12 +368,12 @@ call_member_content_jingle_media_description_cb (GabbleJingleMediaRtp *media,
 
 GabbleCallMemberContent *
 gabble_call_member_content_from_jingle_content (
-  GabbleJingleContent *jingle_content,
+  WockyJingleContent *jingle_content,
   GabbleCallMember *member)
 {
   GabbleCallMemberContent *content;
   gchar *name;
-  JingleMediaType mtype;
+  WockyJingleMediaType mtype;
 
   g_object_get (jingle_content,
     "name", &name,
@@ -403,9 +403,9 @@ gabble_call_member_content_get_remote_codecs (GabbleCallMemberContent *self)
 
   if (self->priv->jingle_content != NULL)
     {
-      JingleMediaDescription *md;
-      md = gabble_jingle_media_rtp_get_remote_media_description (
-          GABBLE_JINGLE_MEDIA_RTP (self->priv->jingle_content));
+      WockyJingleMediaDescription *md;
+      md = wocky_jingle_media_rtp_get_remote_media_description (
+          WOCKY_JINGLE_MEDIA_RTP (self->priv->jingle_content));
       if (md != NULL)
         jcodecs = md->codecs;
     }
@@ -447,7 +447,7 @@ gabble_call_member_content_get_member (GabbleCallMemberContent *self)
 
 void
 gabble_call_member_content_set_jingle_content (GabbleCallMemberContent *self,
-    GabbleJingleContent *content)
+    WockyJingleContent *content)
 {
   g_assert (self->priv->jingle_content == NULL);
 
@@ -478,7 +478,7 @@ gabble_call_member_content_remove (GabbleCallMemberContent *self)
   g_object_ref (self);
   /* Remove ourselves from the sesison */
   if (priv->jingle_content != NULL)
-      gabble_jingle_session_remove_content (priv->jingle_content->session,
+      wocky_jingle_session_remove_content (priv->jingle_content->session,
           priv->jingle_content);
 
   g_signal_emit (self, signals[REMOVED], 0);
diff --git a/src/call-member-content.h b/src/call-member-content.h
index 98034096e..cab3c708a 100644
--- a/src/call-member-content.h
+++ b/src/call-member-content.h
@@ -61,20 +61,20 @@ GType gabble_call_member_content_get_type (void);
     GabbleCallMemberContentClass))
 
 GabbleCallMemberContent *gabble_call_member_content_new (const gchar *name,
-    JingleMediaType type,
+    WockyJingleMediaType type,
     GabbleCallMember *member);
 
 GabbleCallMemberContent *gabble_call_member_content_from_jingle_content (
-    GabbleJingleContent *jingle_content,
+    WockyJingleContent *jingle_content,
     GabbleCallMember *member);
 
-JingleMediaType gabble_call_member_content_get_media_type (
+WockyJingleMediaType gabble_call_member_content_get_media_type (
     GabbleCallMemberContent *self);
 
 const gchar *gabble_call_member_content_get_name (
     GabbleCallMemberContent *self);
 
-GabbleJingleContent *gabble_call_member_content_get_jingle_content (
+WockyJingleContent *gabble_call_member_content_get_jingle_content (
     GabbleCallMemberContent *self);
 
 gboolean gabble_call_member_content_has_jingle_content (
@@ -95,7 +95,7 @@ GabbleCallMember *gabble_call_member_content_get_member (
 
 void gabble_call_member_content_set_jingle_content (
     GabbleCallMemberContent *self,
-    GabbleJingleContent *content);
+    WockyJingleContent *content);
 
 void gabble_call_member_content_add_to_session (
     GabbleCallMemberContent *self);
diff --git a/src/call-member.c b/src/call-member.c
index 9c7b0d350..935dfaf71 100644
--- a/src/call-member.c
+++ b/src/call-member.c
@@ -60,7 +60,7 @@ struct _GabbleCallMemberPrivate
 
   GabbleBaseCallChannel *call;
   TpCallMemberFlags flags;
-  GabbleJingleSession *session;
+  WockyJingleSession *session;
 
   GList *contents;
   gchar *transport_ns;
@@ -126,7 +126,7 @@ gabble_call_member_set_property (GObject *object,
         break;
       case PROP_SESSION:
         gabble_call_member_set_session (self,
-          GABBLE_JINGLE_SESSION (g_value_get_object (value)));
+          WOCKY_JINGLE_SESSION (g_value_get_object (value)));
         break;
       case PROP_TARGET:
         priv->target = g_value_get_uint (value);
@@ -165,7 +165,7 @@ gabble_call_member_class_init (
 
   param_spec = g_param_spec_object ("session", "Session",
       "The jingle session below this call",
-      GABBLE_TYPE_JINGLE_SESSION,
+      WOCKY_TYPE_JINGLE_SESSION,
       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_SESSION, param_spec);
 
@@ -243,16 +243,16 @@ gabble_call_member_finalize (GObject *object)
 }
 
 static void
-remote_state_changed_cb (GabbleJingleSession *session, gpointer user_data)
+remote_state_changed_cb (WockyJingleSession *session, gpointer user_data)
 {
   GabbleCallMember *self = GABBLE_CALL_MEMBER (user_data);
   GabbleCallMemberPrivate *priv = self->priv;
   TpCallMemberFlags newflags = 0;
 
-  if (gabble_jingle_session_get_remote_ringing (session))
+  if (wocky_jingle_session_get_remote_ringing (session))
     newflags |= TP_CALL_MEMBER_FLAG_RINGING;
 
-  if (gabble_jingle_session_get_remote_hold (session))
+  if (wocky_jingle_session_get_remote_hold (session))
     newflags |= TP_CALL_MEMBER_FLAG_HELD;
 
   if (priv->flags == newflags)
@@ -293,14 +293,14 @@ gabble_call_member_add_member_content (GabbleCallMember *self,
 
 /* This function handles additional contents added by the remote side */
 static void
-new_content_cb (GabbleJingleSession *session,
-    GabbleJingleContent *c,
+new_content_cb (WockyJingleSession *session,
+    WockyJingleContent *c,
     gpointer user_data)
 {
   GabbleCallMember *self = GABBLE_CALL_MEMBER (user_data);
   GabbleCallMemberContent *content = NULL;
 
-  if (gabble_jingle_content_is_created_by_us (c))
+  if (wocky_jingle_content_is_created_by_us (c))
     return;
 
   content = gabble_call_member_content_from_jingle_content (c, self);
@@ -310,7 +310,7 @@ new_content_cb (GabbleJingleSession *session,
 
 static gboolean
 call_member_update_existing_content (GabbleCallMember *self,
-    GabbleJingleContent *content)
+    WockyJingleContent *content)
 {
   GList *l;
 
@@ -322,7 +322,7 @@ call_member_update_existing_content (GabbleCallMember *self,
         continue;
 
       if (!tp_strdiff (gabble_call_member_content_get_name (mcontent),
-          gabble_jingle_content_get_name (content)))
+          wocky_jingle_content_get_name (content)))
         {
           gabble_call_member_content_set_jingle_content (mcontent, content);
           return TRUE;
@@ -334,7 +334,7 @@ call_member_update_existing_content (GabbleCallMember *self,
 
 void
 gabble_call_member_set_session (GabbleCallMember *self,
-    GabbleJingleSession *session)
+    WockyJingleSession *session)
 {
   GabbleCallMemberPrivate *priv = self->priv;
   GList *c, *contents;
@@ -345,10 +345,10 @@ gabble_call_member_set_session (GabbleCallMember *self,
   DEBUG ("Setting session: %p -> %p\n", self, session);
   priv->session = g_object_ref (session);
 
-  contents = gabble_jingle_session_get_contents (session);
+  contents = wocky_jingle_session_get_contents (session);
   for (c = contents ; c != NULL; c = g_list_next (c))
     {
-      GabbleJingleContent *content = GABBLE_JINGLE_CONTENT (c->data);
+      WockyJingleContent *content = WOCKY_JINGLE_CONTENT (c->data);
 
       if (priv->transport_ns == NULL)
         {
@@ -380,7 +380,7 @@ gabble_call_member_set_session (GabbleCallMember *self,
   g_list_free (contents);
 }
 
-GabbleJingleSession *
+WockyJingleSession *
 gabble_call_member_get_session (GabbleCallMember *self)
 {
   return self->priv->session;
@@ -409,7 +409,7 @@ gabble_call_member_get_contents (GabbleCallMember *self)
 GabbleCallMemberContent *
 gabble_call_member_ensure_content (GabbleCallMember *self,
   const gchar *name,
-  JingleMediaType mtype)
+  WockyJingleMediaType mtype)
 {
   GabbleCallMemberPrivate *priv = self->priv;
   GList *l;
@@ -439,19 +439,19 @@ gabble_call_member_ensure_content (GabbleCallMember *self,
 GabbleCallMemberContent *
 gabble_call_member_create_content (GabbleCallMember *self,
   const gchar *name,
-  JingleMediaType mtype,
-  JingleContentSenders senders,
+  WockyJingleMediaType mtype,
+  WockyJingleContentSenders senders,
   GError **error)
 {
   GabbleCallMemberPrivate *priv = self->priv;
   const gchar *content_ns;
-  GabbleJingleContent *c;
+  WockyJingleContent *c;
   GabbleCallMemberContent *content;
   const gchar *peer_resource;
 
   g_assert (priv->session != NULL);
 
-  peer_resource = gabble_jingle_session_get_peer_resource (priv->session);
+  peer_resource = wocky_jingle_session_get_peer_resource (priv->session);
 
   DEBUG ("Creating new content %s, type %d", name, mtype);
 
@@ -474,7 +474,7 @@ gabble_call_member_create_content (GabbleCallMember *self,
   DEBUG ("Creating new jingle content with ns %s : %s",
     content_ns, priv->transport_ns);
 
-  c = gabble_jingle_session_add_content (priv->session,
+  c = wocky_jingle_session_add_content (priv->session,
       mtype, senders, name, content_ns, priv->transport_ns);
 
   g_assert (c != NULL);
@@ -492,7 +492,7 @@ gabble_call_member_accept (GabbleCallMember *self)
   self->priv->accepted = TRUE;
 
   if (self->priv->session != NULL)
-    gabble_jingle_session_accept (self->priv->session);
+    wocky_jingle_session_accept (self->priv->session);
 }
 
 /**
@@ -506,8 +506,8 @@ gabble_call_member_open_session (GabbleCallMember *self,
 {
   GabbleCallMemberPrivate *priv = self->priv;
   GabbleConnection *conn = gabble_call_member_get_connection (self);
-  GabbleJingleFactory *jf;
-  GabbleJingleSession *session;
+  WockyJingleFactory *jf;
+  WockyJingleSession *session;
   gchar *jid;
 
   jid = gabble_peer_to_jid (conn, priv->target, NULL);
@@ -515,7 +515,7 @@ gabble_call_member_open_session (GabbleCallMember *self,
   jf = gabble_jingle_mint_get_factory (conn->jingle_mint);
   g_return_val_if_fail (jf != NULL, FALSE);
 
-  session = gabble_jingle_factory_create_session (jf, jid, JINGLE_DIALECT_V032,
+  session = wocky_jingle_factory_create_session (jf, jid, WOCKY_JINGLE_DIALECT_V032,
       FALSE);
   DEBUG ("Created a jingle session: %p", session);
 
@@ -538,11 +538,11 @@ gabble_call_member_start_session (GabbleCallMember *self,
   TpBaseChannel *base_channel = TP_BASE_CHANNEL (priv->call);
   TpHandle target = tp_base_channel_get_target_handle (base_channel);
   const gchar *resource;
-  JingleDialect dialect;
+  WockyJingleDialect dialect;
   gchar *jid;
   const gchar *transport;
-  GabbleJingleFactory *jf;
-  GabbleJingleSession *session;
+  WockyJingleFactory *jf;
+  WockyJingleSession *session;
 
   /* FIXME might need to wait on capabilities, also don't need transport
    * and dialect already */
@@ -561,7 +561,7 @@ gabble_call_member_start_session (GabbleCallMember *self,
         gabble_call_member_get_connection (self)->jingle_mint);
   g_return_val_if_fail (jf != NULL, FALSE);
 
-  session = gabble_jingle_factory_create_session (jf, jid, dialect, FALSE);
+  session = wocky_jingle_factory_create_session (jf, jid, dialect, FALSE);
   g_free (jid);
 
   gabble_call_member_set_session (self, session);
@@ -570,11 +570,11 @@ gabble_call_member_start_session (GabbleCallMember *self,
 
   if (audio_name != NULL)
     gabble_call_member_create_content (self, audio_name,
-      JINGLE_MEDIA_TYPE_AUDIO, JINGLE_CONTENT_SENDERS_BOTH, NULL);
+      WOCKY_JINGLE_MEDIA_TYPE_AUDIO, WOCKY_JINGLE_CONTENT_SENDERS_BOTH, NULL);
 
   if (video_name != NULL)
     gabble_call_member_create_content (self, video_name,
-      JINGLE_MEDIA_TYPE_VIDEO, JINGLE_CONTENT_SENDERS_BOTH, NULL);
+      WOCKY_JINGLE_MEDIA_TYPE_VIDEO, WOCKY_JINGLE_CONTENT_SENDERS_BOTH, NULL);
 
   return TRUE;
 }
@@ -600,8 +600,8 @@ gabble_call_member_shutdown (GabbleCallMember *self)
 
   if (priv->session != NULL)
     {
-      gabble_jingle_session_terminate (priv->session,
-        JINGLE_REASON_UNKNOWN, NULL, NULL);
+      wocky_jingle_session_terminate (priv->session,
+        WOCKY_JINGLE_REASON_UNKNOWN, NULL, NULL);
     }
 
   /* removing the content will remove it from our list */
diff --git a/src/call-member.h b/src/call-member.h
index 4b052fa7e..4215222ff 100644
--- a/src/call-member.h
+++ b/src/call-member.h
@@ -63,12 +63,12 @@ GType gabble_call_member_get_type (void);
    GabbleCallMemberClass))
 
 void gabble_call_member_set_session (GabbleCallMember *member,
-    GabbleJingleSession *session);
+    WockyJingleSession *session);
 
 TpHandle gabble_call_member_get_handle (
     GabbleCallMember *self);
 
-GabbleJingleSession *gabble_call_member_get_session (
+WockyJingleSession *gabble_call_member_get_session (
     GabbleCallMember *self);
 
 TpCallMemberFlags gabble_call_member_get_flags (
@@ -79,13 +79,13 @@ GList *gabble_call_member_get_contents (GabbleCallMember *self);
 GabbleCallMemberContent * gabble_call_member_ensure_content (
     GabbleCallMember *self,
     const gchar *name,
-    JingleMediaType mtype);
+    WockyJingleMediaType mtype);
 
 GabbleCallMemberContent * gabble_call_member_create_content (
     GabbleCallMember *self,
     const gchar *name,
-    JingleMediaType mtype,
-    JingleContentSenders senders,
+    WockyJingleMediaType mtype,
+    WockyJingleContentSenders senders,
     GError **error);
 
 gboolean gabble_call_member_start_session (GabbleCallMember *self,
diff --git a/src/call-muc-channel.c b/src/call-muc-channel.c
index 3b4a063f1..909fe219c 100644
--- a/src/call-muc-channel.c
+++ b/src/call-muc-channel.c
@@ -417,7 +417,7 @@ call_muc_channel_member_content_added_cb (GabbleCallMember *member,
 {
   GabbleCallMucChannel *self = GABBLE_CALL_MUC_CHANNEL (user_data);
   const gchar *name;
-  JingleMediaType mtype;
+  WockyJingleMediaType mtype;
   GList *l;
   GabbleCallContent *ccontent;
 
@@ -432,7 +432,7 @@ call_muc_channel_member_content_added_cb (GabbleCallMember *member,
       TP_BASE_CALL_CHANNEL (self)); l != NULL; l = g_list_next (l))
     {
       const char *cname;
-      JingleMediaType cmtype;
+      WockyJingleMediaType cmtype;
 
       ccontent = GABBLE_CALL_CONTENT (l->data);
       cname = tp_base_call_content_get_name (
@@ -469,7 +469,7 @@ call_muc_channel_parse_codecs (GabbleCallMucChannel *self,
       guint id;
       guint clockrate = 0;
       guint channels = 0;
-      JingleCodec *codec;
+      WockyJingleCodec *codec;
       WockyNodeIter param_iter;
       WockyNode *parameter;
 
@@ -541,13 +541,13 @@ call_muc_channel_send_new_state (GabbleCallMucChannel *self)
       GHashTable *tp_md;
       GPtrArray *codecs;
       guint i;
-      JingleMediaType mtype = gabble_call_content_get_media_type (content);
+      WockyJingleMediaType mtype = gabble_call_content_get_media_type (content);
 
 
       wocky_node_add_build (m,
         '(', "content", '@', "name", name,
           '(', "description", ':', NS_JINGLE_RTP, '*', &description,
-            '@', "media", mtype == JINGLE_MEDIA_TYPE_AUDIO ? "audio" : "video",
+            '@', "media", mtype == WOCKY_JINGLE_MEDIA_TYPE_AUDIO ? "audio" : "video",
           ')',
         ')',
         NULL);
@@ -625,7 +625,7 @@ call_muc_channel_parse_participant (GabbleCallMucChannel *self,
     {
       GabbleCallMemberContent *member_content;
       WockyNode *description;
-      JingleMediaType mtype;
+      WockyJingleMediaType mtype;
       const gchar *name;
       const gchar *mattr;
       GList *codecs;
@@ -655,11 +655,11 @@ call_muc_channel_parse_participant (GabbleCallMucChannel *self,
 
       if (!tp_strdiff (mattr, "video"))
         {
-          mtype = JINGLE_MEDIA_TYPE_VIDEO;
+          mtype = WOCKY_JINGLE_MEDIA_TYPE_VIDEO;
         }
       else if (!tp_strdiff (mattr, "audio"))
         {
-          mtype = JINGLE_MEDIA_TYPE_AUDIO;
+          mtype = WOCKY_JINGLE_MEDIA_TYPE_AUDIO;
         }
       else
         {
@@ -678,7 +678,7 @@ call_muc_channel_parse_participant (GabbleCallMucChannel *self,
 
       if (!priv->initialized)
         {
-          if (mtype == JINGLE_MEDIA_TYPE_AUDIO)
+          if (mtype == WOCKY_JINGLE_MEDIA_TYPE_AUDIO)
             g_object_set (self, "initial-audio", TRUE, NULL);
           else
             g_object_set (self, "initial-video", TRUE, NULL);
@@ -997,7 +997,7 @@ call_muc_channel_init_async (GAsyncInitable *initable,
     {
       content = gabble_base_call_channel_add_content (
         GABBLE_BASE_CALL_CHANNEL (base),
-        initial_audio_name, JINGLE_MEDIA_TYPE_AUDIO,
+        initial_audio_name, WOCKY_JINGLE_MEDIA_TYPE_AUDIO,
         TP_CALL_CONTENT_DISPOSITION_INITIAL);
       call_muc_channel_setup_content (self, content);
     }
@@ -1006,7 +1006,7 @@ call_muc_channel_init_async (GAsyncInitable *initable,
     {
       content = gabble_base_call_channel_add_content (
         GABBLE_BASE_CALL_CHANNEL (base),
-        initial_video_name, JINGLE_MEDIA_TYPE_VIDEO,
+        initial_video_name, WOCKY_JINGLE_MEDIA_TYPE_VIDEO,
         TP_CALL_CONTENT_DISPOSITION_INITIAL);
       call_muc_channel_setup_content (self, content);
     }
@@ -1109,13 +1109,13 @@ gabble_call_muc_channel_new_finish (GObject *source,
 
 void
 gabble_call_muc_channel_incoming_session (GabbleCallMucChannel *self,
-    GabbleJingleSession *session)
+    WockyJingleSession *session)
 {
   GabbleCallMember *member;
   TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
       tp_base_channel_get_connection (TP_BASE_CHANNEL (self)),
       TP_HANDLE_TYPE_CONTACT);
-  const gchar *jid = gabble_jingle_session_get_peer_jid (session);
+  const gchar *jid = wocky_jingle_session_get_peer_jid (session);
   TpHandle peer = tp_handle_ensure (contact_repo, jid, NULL, NULL);
 
   DEBUG ("New incoming session from %s", jid);
@@ -1124,8 +1124,8 @@ gabble_call_muc_channel_incoming_session (GabbleCallMucChannel *self,
 
   if (member == NULL || gabble_call_member_get_session (member) != NULL)
     {
-      gabble_jingle_session_terminate (session,
-        JINGLE_REASON_UNKNOWN,
+      wocky_jingle_session_terminate (session,
+        WOCKY_JINGLE_REASON_UNKNOWN,
         "Muji jingle session initiated while there already was one",
         NULL);
     }
@@ -1177,7 +1177,7 @@ call_muc_channel_add_content (TpBaseCallChannel *base,
 
   content = gabble_base_call_channel_add_content (
         GABBLE_BASE_CALL_CHANNEL (base),
-        name, jingle_media_type_from_tp (type),
+        name, wocky_jingle_media_type_from_tp (type),
         TP_CALL_CONTENT_DISPOSITION_NONE);
 
   call_muc_channel_setup_content (self, content);
diff --git a/src/call-muc-channel.h b/src/call-muc-channel.h
index aa51700e1..34837b653 100644
--- a/src/call-muc-channel.h
+++ b/src/call-muc-channel.h
@@ -75,7 +75,7 @@ GabbleCallMucChannel * gabble_call_muc_channel_new_finish (GObject *source,
     GError **error);
 
 void gabble_call_muc_channel_incoming_session (GabbleCallMucChannel *self,
-    GabbleJingleSession *session);
+    WockyJingleSession *session);
 
 G_END_DECLS
 
diff --git a/src/call-stream.c b/src/call-stream.c
index c633a2711..3cb3b1b76 100644
--- a/src/call-stream.c
+++ b/src/call-stream.c
@@ -81,7 +81,7 @@ struct _GabbleCallStreamPrivate
 {
   gboolean dispose_has_run;
 
-  GabbleJingleContent *content;
+  WockyJingleContent *content;
 };
 
 static void
@@ -100,17 +100,17 @@ static GPtrArray *
 get_stun_servers (GabbleCallStream *self)
 {
   GPtrArray *arr;
-  GabbleJingleFactory *jf;
+  WockyJingleFactory *jf;
   GList *stun_servers;
 
   arr = g_ptr_array_new_with_free_func ((GDestroyNotify) g_value_array_free);
-  jf = gabble_jingle_session_get_factory (self->priv->content->session);
-  stun_servers = gabble_jingle_info_get_stun_servers (
-      gabble_jingle_factory_get_jingle_info (jf));
+  jf = wocky_jingle_session_get_factory (self->priv->content->session);
+  stun_servers = wocky_jingle_info_get_stun_servers (
+      wocky_jingle_factory_get_jingle_info (jf));
 
   while (stun_servers != NULL)
     {
-      GabbleStunServer *stun_server = stun_servers->data;
+      WockyStunServer *stun_server = stun_servers->data;
       GValueArray *va = tp_value_array_build (2,
           G_TYPE_STRING, stun_server->address,
           G_TYPE_UINT, (guint) stun_server->port,
@@ -140,9 +140,9 @@ gabble_call_stream_get_property (GObject    *object,
         break;
       case PROP_CAN_REQUEST_RECEIVING:
         {
-          JingleDialect dialect =
-              gabble_jingle_session_get_dialect (priv->content->session);
-          g_value_set_boolean (value, !JINGLE_IS_GOOGLE_DIALECT (dialect));
+          WockyJingleDialect dialect =
+              wocky_jingle_session_get_dialect (priv->content->session);
+          g_value_set_boolean (value, !WOCKY_JINGLE_DIALECT_IS_GOOGLE (dialect));
         }
         break;
       default:
@@ -192,7 +192,7 @@ google_relay_session_cb (GPtrArray *relays,
 }
 
 static void
-content_state_changed_cb (GabbleJingleContent *content,
+content_state_changed_cb (WockyJingleContent *content,
     GParamSpec *spec,
     gpointer user_data)
 {
@@ -202,7 +202,7 @@ content_state_changed_cb (GabbleJingleContent *content,
 }
 
 static void
-content_remote_members_changed_cb (GabbleJingleContent *content,
+content_remote_members_changed_cb (WockyJingleContent *content,
     GParamSpec *spec,
     gpointer user_data)
 {
@@ -213,7 +213,7 @@ content_remote_members_changed_cb (GabbleJingleContent *content,
 
 static void
 jingle_info_stun_server_changed_cb (
-    GabbleJingleInfo *jingle_info,
+    WockyJingleInfo *jingle_info,
     const gchar *stun_server,
     guint stun_port,
     GabbleCallStream *self)
@@ -228,7 +228,7 @@ jingle_info_stun_server_changed_cb (
 
 static void
 _new_candidates_cb (
-    GabbleJingleContent *content,
+    WockyJingleContent *content,
     GList *candidates,
     TpCallStreamEndpoint *endpoint)
 {
@@ -238,7 +238,7 @@ _new_candidates_cb (
   if (candidates == NULL)
     return;
 
-  if (gabble_jingle_content_get_credentials (content, &ufrag, &pwd))
+  if (wocky_jingle_content_get_credentials (content, &ufrag, &pwd))
     tp_call_stream_endpoint_set_remote_credentials (endpoint, ufrag, pwd);
 
   tp_candidates = gabble_call_candidates_to_array (candidates);
@@ -250,19 +250,19 @@ static void
 _endpoint_state_changed_cb (
     TpCallStreamEndpoint *endpoint,
     GParamSpec *spec,
-    GabbleJingleContent *content)
+    WockyJingleContent *content)
 {
   TpMediaStreamState state;
 
   /* We only care about connecting RTP, RTCP is optional */
   state = tp_call_stream_endpoint_get_state (endpoint, 1);
-  gabble_jingle_content_set_transport_state (content, state);
+  wocky_jingle_content_set_transport_state (content, state);
 }
 
 static TpCallStreamEndpoint *
 _hook_up_endpoint (GabbleCallStream *self,
     const gchar *path,
-    GabbleJingleContent *content)
+    WockyJingleContent *content)
 {
   TpBaseCallStream *base = (TpBaseCallStream *) self;
   TpBaseConnection *conn = tp_base_call_stream_get_connection (base);
@@ -273,7 +273,7 @@ _hook_up_endpoint (GabbleCallStream *self,
   GList *candidates;
   gchar *ufrag, *pwd;
 
-  switch (gabble_jingle_content_get_transport_type (content))
+  switch (wocky_jingle_content_get_transport_type (content))
     {
     case JINGLE_TRANSPORT_GOOGLE_P2P:
       type = TP_STREAM_TRANSPORT_TYPE_GTALK_P2P;
@@ -292,9 +292,9 @@ _hook_up_endpoint (GabbleCallStream *self,
   /* FIXME: ice??? */
   endpoint = tp_call_stream_endpoint_new (bus, path, type, FALSE);
 
-  if (gabble_jingle_content_get_credentials (content, &ufrag, &pwd))
+  if (wocky_jingle_content_get_credentials (content, &ufrag, &pwd))
     tp_call_stream_endpoint_set_remote_credentials (endpoint, ufrag, pwd);
-  candidates = gabble_jingle_content_get_remote_candidates (content);
+  candidates = wocky_jingle_content_get_remote_candidates (content);
   tp_candidates = gabble_call_candidates_to_array (candidates);
   tp_call_stream_endpoint_add_new_candidates (endpoint, tp_candidates);
   g_boxed_free (TP_ARRAY_TYPE_CANDIDATE_LIST, tp_candidates);
@@ -318,7 +318,7 @@ gabble_call_stream_constructed (GObject *obj)
   GabbleConnection *conn;
   TpCallStreamEndpoint *endpoint;
   gchar *path;
-  JingleTransportType transport;
+  WockyJingleTransportType transport;
   GPtrArray *stun_servers;
   gboolean locally_created;
 
@@ -330,7 +330,7 @@ gabble_call_stream_constructed (GObject *obj)
   g_object_get (priv->content, "locally-created", &locally_created, NULL);
 
   if (locally_created &&
-      gabble_jingle_content_sending (priv->content))
+      wocky_jingle_content_sending (priv->content))
     tp_base_media_call_stream_set_local_sending (
         TP_BASE_MEDIA_CALL_STREAM (self), TRUE);
 
@@ -343,7 +343,7 @@ gabble_call_stream_constructed (GObject *obj)
   g_object_unref (endpoint);
   g_free (path);
 
-  transport = gabble_jingle_content_get_transport_type (priv->content);
+  transport = wocky_jingle_content_get_transport_type (priv->content);
 
   if (transport == JINGLE_TRANSPORT_GOOGLE_P2P)
     {
@@ -352,7 +352,7 @@ gabble_call_stream_constructed (GObject *obj)
       /* See if our server is Google, and if it is, ask them for a relay.
        * We ask for enough relays for 2 components (RTP and RTCP) since we
        * don't yet know whether there will be RTCP. */
-      gabble_jingle_info_create_google_relay_session (
+      wocky_jingle_info_create_google_relay_session (
           gabble_jingle_mint_get_info (conn->jingle_mint),
           2, google_relay_session_cb, tp_weak_ref_new (self, NULL, NULL));
     }
@@ -385,7 +385,7 @@ gabble_call_stream_update_member_states (GabbleCallStream *self)
   TpBaseCallStream *base = TP_BASE_CALL_STREAM (self);
   TpBaseMediaCallStream *bmcs = TP_BASE_MEDIA_CALL_STREAM (self);
   GabbleCallStreamPrivate *priv = self->priv;
-  JingleContentState state;
+  WockyJingleContentState state;
   TpSendingState local_state;
   TpSendingState remote_state;
   TpBaseConnection *conn = tp_base_call_stream_get_connection (base);
@@ -395,13 +395,13 @@ gabble_call_stream_update_member_states (GabbleCallStream *self)
 
   g_object_get (priv->content, "state", &state, NULL);
 
-  if (state == JINGLE_CONTENT_STATE_REMOVING)
+  if (state == WOCKY_JINGLE_CONTENT_STATE_REMOVING)
     return;
 
   local_state = tp_base_call_stream_get_local_sending_state (base);
   remote_state = tp_base_call_stream_get_remote_sending_state (base, 0);
 
-  if (gabble_jingle_content_sending (priv->content))
+  if (wocky_jingle_content_sending (priv->content))
     {
       if (tp_base_media_call_stream_get_local_sending (bmcs))
         local_state = TP_SENDING_STATE_SENDING;
@@ -416,7 +416,7 @@ gabble_call_stream_update_member_states (GabbleCallStream *self)
         local_state = TP_SENDING_STATE_NONE;
     }
 
-  if (gabble_jingle_content_receiving (priv->content))
+  if (wocky_jingle_content_receiving (priv->content))
     {
       remote_state = TP_SENDING_STATE_SENDING;
     }
@@ -430,7 +430,7 @@ gabble_call_stream_update_member_states (GabbleCallStream *self)
   tp_base_call_stream_update_local_sending_state (base, local_state,
       0, TP_CALL_STATE_CHANGE_REASON_PROGRESS_MADE, "", "");
   peer = tp_handle_ensure (contact_repo,
-      gabble_jingle_session_get_peer_jid (priv->content->session),
+      wocky_jingle_session_get_peer_jid (priv->content->session),
       NULL,
       NULL);
   tp_base_call_stream_update_remote_sending_state (base,
@@ -459,7 +459,7 @@ gabble_call_stream_class_init (GabbleCallStreamClass *gabble_call_stream_class)
 
   param_spec = g_param_spec_object ("jingle-content", "Jingle Content",
       "The Jingle Content related to this content object",
-      GABBLE_TYPE_JINGLE_CONTENT,
+      WOCKY_TYPE_JINGLE_CONTENT,
       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_JINGLE_CONTENT,
       param_spec);
@@ -509,10 +509,10 @@ gabble_call_stream_add_candidates (TpBaseMediaCallStream *stream,
   for (i = 0; i < candidates->len ; i++)
     {
       GValueArray *va;
-      JingleCandidate *c;
+      WockyJingleCandidate *c;
       GHashTable *info;
       guint tptype;
-      JingleCandidateType type;
+      WockyJingleCandidateType type;
       /* borrowed strings, owned by other people. */
       const gchar *username;
       const gchar *password;
@@ -528,13 +528,13 @@ gabble_call_stream_add_candidates (TpBaseMediaCallStream *stream,
         default:
           /* Anything else is local */
         case TP_CALL_STREAM_CANDIDATE_TYPE_HOST:
-          type = JINGLE_CANDIDATE_TYPE_LOCAL;
+          type = WOCKY_JINGLE_CANDIDATE_TYPE_LOCAL;
           break;
         case TP_CALL_STREAM_CANDIDATE_TYPE_SERVER_REFLEXIVE:
-          type = JINGLE_CANDIDATE_TYPE_STUN;
+          type = WOCKY_JINGLE_CANDIDATE_TYPE_STUN;
           break;
         case TP_CALL_STREAM_CANDIDATE_TYPE_RELAY:
-          type = JINGLE_CANDIDATE_TYPE_RELAY;
+          type = WOCKY_JINGLE_CANDIDATE_TYPE_RELAY;
           break;
         }
 
@@ -550,7 +550,7 @@ gabble_call_stream_add_candidates (TpBaseMediaCallStream *stream,
       if (foundation == NULL)
         foundation = "1";
 
-      c = jingle_candidate_new (
+      c = wocky_jingle_candidate_new (
         /* transport protocol */
         tp_asv_get_uint32 (info, "protocol", NULL),
         /* Candidate type */
@@ -577,7 +577,7 @@ gabble_call_stream_add_candidates (TpBaseMediaCallStream *stream,
       g_ptr_array_add (accepted_candidates, va);
     }
 
-  gabble_jingle_content_add_candidates (priv->content, l);
+  wocky_jingle_content_add_candidates (priv->content, l);
 
   if (accepted_candidates->len == 0 && candidates->len != 0)
     {
@@ -599,7 +599,7 @@ gabble_call_stream_set_sending (TpBaseMediaCallStream *stream,
   if (sending)
     tp_base_media_call_stream_set_local_sending (stream, TRUE);
 
-  gabble_jingle_content_set_sending (self->priv->content, sending);
+  wocky_jingle_content_set_sending (self->priv->content, sending);
 
   return TRUE;
 }
@@ -609,10 +609,10 @@ static void gabble_call_stream_request_receiving (TpBaseMediaCallStream *stream,
 {
   GabbleCallStream *self = GABBLE_CALL_STREAM (stream);
 
-  gabble_jingle_content_request_receiving (self->priv->content, receive);
+  wocky_jingle_content_request_receiving (self->priv->content, receive);
 }
 
-GabbleJingleContent *
+WockyJingleContent *
 gabble_call_stream_get_jingle_content (GabbleCallStream *stream)
 {
   return stream->priv->content;
diff --git a/src/call-stream.h b/src/call-stream.h
index e30593e41..61f407514 100644
--- a/src/call-stream.h
+++ b/src/call-stream.h
@@ -61,7 +61,7 @@ GType gabble_call_stream_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_CALL_STREAM, \
     GabbleCallStreamClass))
 
-GabbleJingleContent *gabble_call_stream_get_jingle_content (
+WockyJingleContent *gabble_call_stream_get_jingle_content (
     GabbleCallStream *stream);
 
 void gabble_call_stream_update_member_states (GabbleCallStream *self);
diff --git a/src/ft-channel.c b/src/ft-channel.c
index 6f846461a..fd82405c5 100644
--- a/src/ft-channel.c
+++ b/src/ft-channel.c
@@ -1338,7 +1338,7 @@ offer_gtalk_file_transfer (GabbleFileTransferChannel *self,
   TpBaseChannel *base = TP_BASE_CHANNEL (self);
   GabbleConnection *conn = GABBLE_CONNECTION (
       tp_base_channel_get_connection (base));
-  GabbleJingleFactory *jf;
+  WockyJingleFactory *jf;
   GTalkFileCollection *gtalk_file_collection;
 
   DEBUG ("Offering Gtalk file transfer to %s", full_jid);
@@ -1457,7 +1457,7 @@ gabble_file_transfer_channel_offer_file (GabbleFileTransferChannel *self,
 #ifdef ENABLE_JINGLE_FILE_TRANSFER
   use_si = si &&
     (!jingle_share ||
-     gabble_jingle_info_get_google_relay_token (
+     wocky_jingle_info_get_google_relay_token (
        gabble_jingle_mint_get_info (conn->jingle_mint)) == NULL);
 #else
   use_si = si;
diff --git a/src/ft-manager.c b/src/ft-manager.c
index 0825a4b96..8685e03f7 100644
--- a/src/ft-manager.c
+++ b/src/ft-manager.c
@@ -340,24 +340,24 @@ gabble_ft_manager_channel_created (GabbleFtManager *self,
 #ifdef ENABLE_JINGLE_FILE_TRANSFER
 static void
 new_jingle_session_cb (GabbleJingleMint *jm,
-    GabbleJingleSession *sess,
+    WockyJingleSession *sess,
     gpointer data)
 {
   GabbleFtManager *self = GABBLE_FT_MANAGER (data);
   GTalkFileCollection *gtalk_fc = NULL;
-  GabbleJingleContent *content = NULL;
+  WockyJingleContent *content = NULL;
   GabbleJingleShareManifest *manifest = NULL;
   GList *channels = NULL;
   GList *cs, *i;
 
-  if (gabble_jingle_session_get_content_type (sess) ==
+  if (wocky_jingle_session_get_content_type (sess) ==
       GABBLE_TYPE_JINGLE_SHARE)
     {
-      cs = gabble_jingle_session_get_contents (sess);
+      cs = wocky_jingle_session_get_contents (sess);
 
       if (cs != NULL)
         {
-          content = GABBLE_JINGLE_CONTENT (cs->data);
+          content = WOCKY_JINGLE_CONTENT (cs->data);
           g_list_free (cs);
         }
 
@@ -387,7 +387,7 @@ new_jingle_session_cb (GabbleJingleMint *jm,
                   TP_BASE_CONNECTION (self->priv->connection),
                   TP_HANDLE_TYPE_CONTACT);
               TpHandle peer = tp_handle_ensure (contacts,
-                  gabble_jingle_session_get_peer_jid (sess), NULL, NULL);
+                  wocky_jingle_session_get_peer_jid (sess), NULL, NULL);
 
               filename = g_strdup_printf ("%s%s",
                   entry->name, entry->folder? ".tar":"");
diff --git a/src/google-relay.c b/src/google-relay.c
index 472ef3781..000deaa86 100644
--- a/src/google-relay.c
+++ b/src/google-relay.c
@@ -37,7 +37,7 @@
 
 #define RELAY_HTTP_TIMEOUT 5
 
-struct _GabbleGoogleRelayResolver {
+struct _WockyGoogleRelayResolver {
 #ifdef ENABLE_GOOGLE_RELAY
   SoupSession *soup;
 #else
@@ -50,19 +50,19 @@ typedef struct
   GPtrArray *relays;
   guint component;
   guint requests_to_do;
-  GabbleJingleInfoRelaySessionCb callback;
+  WockyJingleInfoRelaySessionCb callback;
   gpointer user_data;
 } RelaySessionData;
 
 static RelaySessionData *
 relay_session_data_new (guint requests_to_do,
-    GabbleJingleInfoRelaySessionCb callback,
+    WockyJingleInfoRelaySessionCb callback,
     gpointer user_data)
 {
   RelaySessionData *rsd = g_slice_new0 (RelaySessionData);
 
   rsd->relays = g_ptr_array_sized_new (requests_to_do);
-  g_ptr_array_set_free_func (rsd->relays, (GDestroyNotify) gabble_jingle_relay_free);
+  g_ptr_array_set_free_func (rsd->relays, (GDestroyNotify) wocky_jingle_relay_free);
   rsd->component = 1;
   rsd->requests_to_do = requests_to_do;
   rsd->callback = callback;
@@ -102,7 +102,7 @@ translate_relay_info (GPtrArray *relays,
     const gchar *relay_ip,
     const gchar *username,
     const gchar *password,
-    GabbleJingleRelayType relay_type,
+    WockyJingleRelayType relay_type,
     const gchar *port_string,
     guint component)
 {
@@ -129,7 +129,7 @@ translate_relay_info (GPtrArray *relays,
       relay_type, relay_ip, port, username, password, component);
 
   g_ptr_array_add (relays,
-      gabble_jingle_relay_new (relay_type, relay_ip, port, username, password,
+      wocky_jingle_relay_new (relay_type, relay_ip, port, username, password,
           component));
 }
 
@@ -213,11 +213,11 @@ on_http_response (SoupSession *soup,
       else
         {
           translate_relay_info (rsd->relays, relay_ip, username, password,
-              GABBLE_JINGLE_RELAY_TYPE_UDP, relay_udp_port, rsd->component);
+              WOCKY_JINGLE_RELAY_TYPE_UDP, relay_udp_port, rsd->component);
           translate_relay_info (rsd->relays, relay_ip, username, password,
-              GABBLE_JINGLE_RELAY_TYPE_TCP, relay_tcp_port, rsd->component);
+              WOCKY_JINGLE_RELAY_TYPE_TCP, relay_tcp_port, rsd->component);
           translate_relay_info (rsd->relays, relay_ip, username, password,
-              GABBLE_JINGLE_RELAY_TYPE_TLS, relay_ssltcp_port, rsd->component);
+              WOCKY_JINGLE_RELAY_TYPE_TLS, relay_ssltcp_port, rsd->component);
         }
 
       g_strfreev (lines);
@@ -235,11 +235,11 @@ on_http_response (SoupSession *soup,
 
 #endif  /* ENABLE_GOOGLE_RELAY */
 
-GabbleGoogleRelayResolver *
-gabble_google_relay_resolver_new (void)
+WockyGoogleRelayResolver *
+wocky_google_relay_resolver_new (void)
 {
-  GabbleGoogleRelayResolver *resolver =
-      g_slice_new0 (GabbleGoogleRelayResolver);
+  WockyGoogleRelayResolver *resolver =
+      g_slice_new0 (WockyGoogleRelayResolver);
 
 #ifdef ENABLE_GOOGLE_RELAY
 
@@ -255,20 +255,20 @@ gabble_google_relay_resolver_new (void)
 }
 
 void
-gabble_google_relay_resolver_destroy (GabbleGoogleRelayResolver *self)
+wocky_google_relay_resolver_destroy (WockyGoogleRelayResolver *self)
 {
   g_clear_object (&self->soup);
 
-  g_slice_free (GabbleGoogleRelayResolver, self);
+  g_slice_free (WockyGoogleRelayResolver, self);
 }
 
 void
-gabble_google_relay_resolver_resolve (GabbleGoogleRelayResolver *self,
+wocky_google_relay_resolver_resolve (WockyGoogleRelayResolver *self,
     guint components,
     const gchar *server,
     guint16 port,
     const gchar *token,
-    GabbleJingleInfoRelaySessionCb callback,
+    WockyJingleInfoRelaySessionCb callback,
     gpointer user_data)
 {
   RelaySessionData *rsd =
diff --git a/src/google-relay.h b/src/google-relay.h
index fc737a7c6..d8a5fe05a 100644
--- a/src/google-relay.h
+++ b/src/google-relay.h
@@ -1,5 +1,5 @@
 /*
- * google-relay.h - Header for GabbleGoogleRelaySession
+ * google-relay.h - Header for WockyGoogleRelaySession
  *
  * Copyright (C) 2006-2008 Collabora Ltd.
  * Copyright (C) 2011 Nokia Corporation
@@ -28,16 +28,16 @@
 
 G_BEGIN_DECLS
 
-typedef struct _GabbleGoogleRelayResolver GabbleGoogleRelayResolver;
+typedef struct _WockyGoogleRelayResolver WockyGoogleRelayResolver;
 
-GabbleGoogleRelayResolver * gabble_google_relay_resolver_new (void);
-void gabble_google_relay_resolver_destroy (GabbleGoogleRelayResolver *self);
-void gabble_google_relay_resolver_resolve (GabbleGoogleRelayResolver *self,
+WockyGoogleRelayResolver * wocky_google_relay_resolver_new (void);
+void wocky_google_relay_resolver_destroy (WockyGoogleRelayResolver *self);
+void wocky_google_relay_resolver_resolve (WockyGoogleRelayResolver *self,
     guint requests_to_do,
     const gchar *server,
     guint16 port,
     const gchar *token,
-    GabbleJingleInfoRelaySessionCb callback,
+    WockyJingleInfoRelaySessionCb callback,
     gpointer user_data);
 
 G_END_DECLS
diff --git a/src/gtalk-file-collection.c b/src/gtalk-file-collection.c
index b150ddaf5..f5591213e 100644
--- a/src/gtalk-file-collection.c
+++ b/src/gtalk-file-collection.c
@@ -66,7 +66,7 @@
  *              |                             \
  *              |                              \
  *          ref |                               \
- *     GabbleJingleSession                       \
+ *     WockyJingleSession                       \
  *              |                                 \ (one at a time)
  *              |                                  \
  *          ref |                                   \
@@ -74,7 +74,7 @@
  *              |                                                       |
  *              |                                                       |
  *         ref  |                           ref                         |
- *   GabbleTransportGoogle ----------------*- JingleCandidate        PseudoTCP
+ *   GabbleTransportGoogle ----------------*- WockyJingleCandidate        PseudoTCP
  *
  * The protocol works like this :
  * Once you receive an invitation, the manifest will contain a number of files
@@ -183,8 +183,8 @@ struct _GTalkFileCollectionPrivate
   /* the weakref to the channel here is held through the GList *channels */
   GHashTable *channels_usable;
   GabbleFileTransferChannel *current_channel;
-  GabbleJingleFactory *jingle_factory;
-  GabbleJingleSession *jingle;
+  WockyJingleFactory *jingle_factory;
+  WockyJingleSession *jingle;
   /* ICE component id to jingle share channel association
      GINT_TO_POINTER (candidate->component) => g_slice_new (ShareChannel) */
   GHashTable *share_channels;
@@ -249,8 +249,8 @@ gtalk_file_collection_dispose (GObject *object)
   self->priv->dispose_has_run = TRUE;
 
   if (self->priv->jingle != NULL)
-    gabble_jingle_session_terminate (self->priv->jingle,
-        JINGLE_REASON_UNKNOWN, NULL, NULL);
+    wocky_jingle_session_terminate (self->priv->jingle,
+        WOCKY_JINGLE_REASON_UNKNOWN, NULL, NULL);
 
   tp_clear_object (&self->priv->jingle);
 
@@ -412,11 +412,11 @@ del_channel (GTalkFileCollection * self, GabbleFileTransferChannel *channel)
 }
 
 static void
-jingle_session_state_changed_cb (GabbleJingleSession *session,
+jingle_session_state_changed_cb (WockyJingleSession *session,
                                  GParamSpec *arg1,
                                  GTalkFileCollection *self)
 {
-  JingleState state;
+  WockyJingleState state;
   GList *i;
 
   DEBUG ("called");
@@ -427,11 +427,11 @@ jingle_session_state_changed_cb (GabbleJingleSession *session,
 
   switch (state)
     {
-      case JINGLE_STATE_INVALID:
-      case JINGLE_STATE_PENDING_CREATED:
+      case WOCKY_JINGLE_STATE_INVALID:
+      case WOCKY_JINGLE_STATE_PENDING_CREATED:
         break;
-      case JINGLE_STATE_PENDING_INITIATE_SENT:
-      case JINGLE_STATE_PENDING_INITIATED:
+      case WOCKY_JINGLE_STATE_PENDING_INITIATE_SENT:
+      case WOCKY_JINGLE_STATE_PENDING_INITIATED:
         for (i = self->priv->channels; i;)
           {
             GabbleFileTransferChannel *channel = i->data;
@@ -441,8 +441,8 @@ jingle_session_state_changed_cb (GabbleJingleSession *session,
                 channel, GTALK_FILE_COLLECTION_STATE_PENDING, FALSE);
           }
         break;
-      case JINGLE_STATE_PENDING_ACCEPT_SENT:
-      case JINGLE_STATE_ACTIVE:
+      case WOCKY_JINGLE_STATE_PENDING_ACCEPT_SENT:
+      case WOCKY_JINGLE_STATE_ACTIVE:
         /* Do not set the channels to OPEN unless we're ready to send/receive
            data from them */
         if (self->priv->status == GTALK_FT_STATUS_INITIATED)
@@ -461,7 +461,7 @@ jingle_session_state_changed_cb (GabbleJingleSession *session,
                   channel, GTALK_FILE_COLLECTION_STATE_ACCEPTED, FALSE);
           }
         break;
-      case JINGLE_STATE_ENDED:
+      case WOCKY_JINGLE_STATE_ENDED:
         /* Do nothing, let the terminated signal set the correct state
            depending on the termination reason */
       default:
@@ -470,9 +470,9 @@ jingle_session_state_changed_cb (GabbleJingleSession *session,
 }
 
 static void
-jingle_session_terminated_cb (GabbleJingleSession *session,
+jingle_session_terminated_cb (WockyJingleSession *session,
                        gboolean local_terminator,
-                       JingleReason reason,
+                       WockyJingleReason reason,
                        const gchar *text,
                        gpointer user_data)
 {
@@ -494,7 +494,7 @@ jingle_session_terminated_cb (GabbleJingleSession *session,
 }
 
 static void
-content_new_remote_candidates_cb (GabbleJingleContent *content,
+content_new_remote_candidates_cb (WockyJingleContent *content,
     GList *clist, gpointer user_data)
 {
   GTalkFileCollection *self = GTALK_FILE_COLLECTION (user_data);
@@ -504,12 +504,12 @@ content_new_remote_candidates_cb (GabbleJingleContent *content,
 
   for (li = clist; li; li = li->next)
     {
-      JingleCandidate *candidate = li->data;
+      WockyJingleCandidate *candidate = li->data;
       NiceCandidate *cand = NULL;
       ShareChannel *share_channel = NULL;
       GSList *candidates = NULL;
 
-      if (candidate->protocol != JINGLE_TRANSPORT_PROTOCOL_UDP)
+      if (candidate->protocol != WOCKY_JINGLE_TRANSPORT_PROTOCOL_UDP)
         {
           DEBUG ("Ignoring candidate %s because of non-UDP protocol : %d",
               candidate->username, candidate->protocol);
@@ -526,14 +526,14 @@ content_new_remote_candidates_cb (GabbleJingleContent *content,
         }
 
       cand = nice_candidate_new (
-          candidate->type == JINGLE_CANDIDATE_TYPE_LOCAL?
+          candidate->type == WOCKY_JINGLE_CANDIDATE_TYPE_LOCAL?
           NICE_CANDIDATE_TYPE_HOST:
-          candidate->type == JINGLE_CANDIDATE_TYPE_STUN?
+          candidate->type == WOCKY_JINGLE_CANDIDATE_TYPE_STUN?
           NICE_CANDIDATE_TYPE_SERVER_REFLEXIVE:
           NICE_CANDIDATE_TYPE_RELAYED);
 
 
-      cand->transport = JINGLE_TRANSPORT_PROTOCOL_UDP;
+      cand->transport = WOCKY_JINGLE_TRANSPORT_PROTOCOL_UDP;
       nice_address_init (&cand->addr);
 
       if (!nice_address_set_from_string (&cand->addr, candidate->address))
@@ -577,7 +577,7 @@ nice_candidate_gathering_done (NiceAgent *agent, guint stream_id,
 {
   GTalkFileCollection *self = GTALK_FILE_COLLECTION (user_data);
   ShareChannel *share_channel = get_share_channel (self, agent);
-  GabbleJingleContent *content = GABBLE_JINGLE_CONTENT (share_channel->content);
+  WockyJingleContent *content = WOCKY_JINGLE_CONTENT (share_channel->content);
   GList *candidates = NULL;
   GList *remote_candidates = NULL;
   GSList *local_candidates;
@@ -586,7 +586,7 @@ nice_candidate_gathering_done (NiceAgent *agent, guint stream_id,
   DEBUG ("libnice candidate gathering done!!!!");
 
   /* Send remote candidates to libnice and listen to new signal */
-  remote_candidates = gabble_jingle_content_get_remote_candidates (content);
+  remote_candidates = wocky_jingle_content_get_remote_candidates (content);
   content_new_remote_candidates_cb (content, remote_candidates, self);
 
   gabble_signal_connect_weak (content, "new-candidates",
@@ -599,22 +599,22 @@ nice_candidate_gathering_done (NiceAgent *agent, guint stream_id,
   for (li = local_candidates; li; li = li->next)
     {
       NiceCandidate *cand = li->data;
-      JingleCandidate *candidate;
+      WockyJingleCandidate *candidate;
       gchar ip[NICE_ADDRESS_STRING_LEN];
 
       nice_address_to_string (&cand->addr, ip);
 
-      candidate = jingle_candidate_new (
+      candidate = wocky_jingle_candidate_new (
           /* protocol */
           cand->transport == NICE_CANDIDATE_TRANSPORT_UDP?
-          JINGLE_TRANSPORT_PROTOCOL_UDP:
-          JINGLE_TRANSPORT_PROTOCOL_TCP,
+          WOCKY_JINGLE_TRANSPORT_PROTOCOL_UDP:
+          WOCKY_JINGLE_TRANSPORT_PROTOCOL_TCP,
           /* candidate type */
           cand->type == NICE_CANDIDATE_TYPE_HOST?
-          JINGLE_CANDIDATE_TYPE_LOCAL:
+          WOCKY_JINGLE_CANDIDATE_TYPE_LOCAL:
           cand->type == NICE_CANDIDATE_TYPE_RELAYED?
-          JINGLE_CANDIDATE_TYPE_RELAY:
-          JINGLE_CANDIDATE_TYPE_STUN,
+          WOCKY_JINGLE_CANDIDATE_TYPE_RELAY:
+          WOCKY_JINGLE_CANDIDATE_TYPE_STUN,
           /* id */
           cand->foundation,
           /* component */
@@ -637,7 +637,7 @@ nice_candidate_gathering_done (NiceAgent *agent, guint stream_id,
       candidates = g_list_prepend (candidates, candidate);
     }
 
-  gabble_jingle_content_add_candidates (content, candidates);
+  wocky_jingle_content_add_candidates (content, candidates);
 }
 
 static void
@@ -646,8 +646,8 @@ nice_component_state_changed (NiceAgent *agent,  guint stream_id,
 {
   GTalkFileCollection *self = GTALK_FILE_COLLECTION (user_data);
   ShareChannel *share_channel = get_share_channel (self, agent);
-  GabbleJingleContent *content = GABBLE_JINGLE_CONTENT (share_channel->content);
-  JingleTransportState ts = JINGLE_TRANSPORT_STATE_DISCONNECTED;
+  WockyJingleContent *content = WOCKY_JINGLE_CONTENT (share_channel->content);
+  WockyJingleTransportState ts = WOCKY_JINGLE_TRANSPORT_STATE_DISCONNECTED;
 
   DEBUG ("libnice component state changed %d!!!!", state);
 
@@ -655,14 +655,14 @@ nice_component_state_changed (NiceAgent *agent,  guint stream_id,
     {
       case NICE_COMPONENT_STATE_DISCONNECTED:
       case NICE_COMPONENT_STATE_GATHERING:
-        ts = JINGLE_TRANSPORT_STATE_DISCONNECTED;
+        ts = WOCKY_JINGLE_TRANSPORT_STATE_DISCONNECTED;
         break;
       case NICE_COMPONENT_STATE_CONNECTING:
-        ts = JINGLE_TRANSPORT_STATE_CONNECTING;
+        ts = WOCKY_JINGLE_TRANSPORT_STATE_CONNECTING;
         break;
       case NICE_COMPONENT_STATE_CONNECTED:
       case NICE_COMPONENT_STATE_READY:
-        ts = JINGLE_TRANSPORT_STATE_CONNECTED;
+        ts = WOCKY_JINGLE_TRANSPORT_STATE_CONNECTED;
         break;
       case NICE_COMPONENT_STATE_FAILED:
         {
@@ -682,7 +682,7 @@ nice_component_state_changed (NiceAgent *agent,  guint stream_id,
           return;
         }
     }
-  gabble_jingle_content_set_transport_state (content, ts);
+  wocky_jingle_content_set_transport_state (content, ts);
 }
 
 static void
@@ -700,11 +700,11 @@ get_next_manifest_entry (GTalkFileCollection *self,
     {
       if (g_list_length (self->priv->channels) == 1)
         {
-          GabbleJingleContent *content = \
-              GABBLE_JINGLE_CONTENT (share_channel->content);
+          WockyJingleContent *content = \
+              WOCKY_JINGLE_CONTENT (share_channel->content);
 
           DEBUG ("Received all the files. Transfer is complete");
-          gabble_jingle_content_send_complete (content);
+          wocky_jingle_content_send_complete (content);
         }
 
       g_hash_table_replace (self->priv->channels_usable,
@@ -765,7 +765,7 @@ get_next_manifest_entry (GTalkFileCollection *self,
           "User-Agent: %s\r\n\r\n",
           (source_url != NULL ? source_url : ""),
           separator, filename,
-          gabble_jingle_session_get_initiator (self->priv->jingle),
+          wocky_jingle_session_get_initiator (self->priv->jingle),
           PACKAGE_STRING);
       g_free (filename);
 
@@ -852,19 +852,19 @@ typedef struct
 } GoogleRelaySessionData;
 
 static const NiceRelayType relay_type_map[] = {
-    /* GABBLE_JINGLE_RELAY_TYPE_UDP */ NICE_RELAY_TYPE_TURN_UDP,
-    /* GABBLE_JINGLE_RELAY_TYPE_TCP */ NICE_RELAY_TYPE_TURN_TCP,
-    /* GABBLE_JINGLE_RELAY_TYPE_TLS */ NICE_RELAY_TYPE_TURN_TLS,
+    /* WOCKY_JINGLE_RELAY_TYPE_UDP */ NICE_RELAY_TYPE_TURN_UDP,
+    /* WOCKY_JINGLE_RELAY_TYPE_TCP */ NICE_RELAY_TYPE_TURN_TCP,
+    /* WOCKY_JINGLE_RELAY_TYPE_TLS */ NICE_RELAY_TYPE_TURN_TLS,
 };
 
 static void
 set_relay_info (gpointer item, gpointer user_data)
 {
   GoogleRelaySessionData *data = user_data;
-  GabbleJingleRelay *relay = item;
+  WockyJingleRelay *relay = item;
   NiceRelayType type;
 
-  g_return_if_fail (relay->type < GABBLE_N_JINGLE_RELAY_TYPES);
+  g_return_if_fail (relay->type < WOCKY_N_JINGLE_RELAY_TYPES);
   type = relay_type_map[relay->type];
 
   nice_agent_set_relay_info (data->share_channel->agent,
@@ -896,7 +896,7 @@ google_relay_session_cb (GPtrArray *relays, gpointer user_data)
 
 
 static void
-content_new_share_channel_cb (GabbleJingleContent *content, const gchar *name,
+content_new_share_channel_cb (WockyJingleContent *content, const gchar *name,
     guint share_channel_id, gpointer user_data)
 {
   GTalkFileCollection *self = GTALK_FILE_COLLECTION (user_data);
@@ -944,11 +944,11 @@ content_new_share_channel_cb (GabbleJingleContent *content, const gchar *name,
   nice_agent_attach_recv (agent, stream_id, share_channel->component_id,
       g_main_context_default (), nice_data_received_cb, self);
 
-  stun_servers = gabble_jingle_info_get_stun_servers (
-      gabble_jingle_factory_get_jingle_info (self->priv->jingle_factory));
+  stun_servers = wocky_jingle_info_get_stun_servers (
+      wocky_jingle_factory_get_jingle_info (self->priv->jingle_factory));
   if (stun_servers != NULL)
     {
-      GabbleStunServer *stun_server = stun_servers->data;
+      WockyStunServer *stun_server = stun_servers->data;
 
       g_object_set (agent,
           "stun-server", stun_server->address,
@@ -963,13 +963,13 @@ content_new_share_channel_cb (GabbleJingleContent *content, const gchar *name,
   relay_data->share_channel = share_channel;
   g_object_add_weak_pointer (G_OBJECT (relay_data->u.self),
       &relay_data->u.ptr);
-  gabble_jingle_info_create_google_relay_session (
-      gabble_jingle_factory_get_jingle_info (self->priv->jingle_factory), 1,
+  wocky_jingle_info_create_google_relay_session (
+      wocky_jingle_factory_get_jingle_info (self->priv->jingle_factory), 1,
       google_relay_session_cb, relay_data);
 }
 
 static void
-content_completed (GabbleJingleContent *content, gpointer user_data)
+content_completed (WockyJingleContent *content, gpointer user_data)
 {
   GTalkFileCollection *self = GTALK_FILE_COLLECTION (user_data);
   GList *i;
@@ -1383,7 +1383,7 @@ nice_data_received_cb (NiceAgent *agent,
 
 static void
 set_session (GTalkFileCollection * self,
-    GabbleJingleSession *session, GabbleJingleContent *content)
+    WockyJingleSession *session, WockyJingleContent *content)
 {
   self->priv->jingle = g_object_ref (session);
 
@@ -1402,19 +1402,19 @@ set_session (GTalkFileCollection * self,
 
 GTalkFileCollection *
 gtalk_file_collection_new (GabbleFileTransferChannel *channel,
-    GabbleJingleFactory *jingle_factory, TpHandle handle, const gchar *jid)
+    WockyJingleFactory *jingle_factory, TpHandle handle, const gchar *jid)
 {
   GTalkFileCollection * self = g_object_new (GTALK_TYPE_FILE_COLLECTION, NULL);
-  GabbleJingleSession *session = NULL;
-  GabbleJingleContent *content = NULL;
+  WockyJingleSession *session = NULL;
+  WockyJingleContent *content = NULL;
   gchar *filename;
   guint64 size;
 
   self->priv->jingle_factory = jingle_factory;
   self->priv->requested = TRUE;
 
-  session = gabble_jingle_factory_create_session (jingle_factory,
-      jid, JINGLE_DIALECT_GTALK4, FALSE);
+  session = wocky_jingle_factory_create_session (jingle_factory,
+      jid, WOCKY_JINGLE_DIALECT_GTALK4, FALSE);
 
   if (session == NULL)
     {
@@ -1422,8 +1422,8 @@ gtalk_file_collection_new (GabbleFileTransferChannel *channel,
       return NULL;
     }
 
-  content = gabble_jingle_session_add_content (session,
-      JINGLE_MEDIA_TYPE_NONE, JINGLE_CONTENT_SENDERS_BOTH, "share",
+  content = wocky_jingle_session_add_content (session,
+      WOCKY_JINGLE_MEDIA_TYPE_NONE, WOCKY_JINGLE_CONTENT_SENDERS_BOTH, "share",
       NS_GOOGLE_SESSION_SHARE, NS_GOOGLE_TRANSPORT_P2P);
 
   if (content == NULL)
@@ -1451,22 +1451,22 @@ gtalk_file_collection_new (GabbleFileTransferChannel *channel,
 }
 
 GTalkFileCollection *
-gtalk_file_collection_new_from_session (GabbleJingleFactory *jingle_factory,
-    GabbleJingleSession *session)
+gtalk_file_collection_new_from_session (WockyJingleFactory *jingle_factory,
+    WockyJingleSession *session)
 {
   GTalkFileCollection * self = NULL;
-  GabbleJingleContent *content = NULL;
+  WockyJingleContent *content = NULL;
   GList *cs;
 
-  if (gabble_jingle_session_get_content_type (session) !=
+  if (wocky_jingle_session_get_content_type (session) !=
       GABBLE_TYPE_JINGLE_SHARE)
       return NULL;
 
-  cs = gabble_jingle_session_get_contents (session);
+  cs = wocky_jingle_session_get_contents (session);
 
   if (cs != NULL)
     {
-      content = GABBLE_JINGLE_CONTENT (cs->data);
+      content = WOCKY_JINGLE_CONTENT (cs->data);
       g_list_free (cs);
     }
 
@@ -1504,7 +1504,7 @@ gtalk_file_collection_initiate (GTalkFileCollection *self,
 
   if (self->priv->status == GTALK_FT_STATUS_PENDING)
     {
-      gabble_jingle_session_accept (self->priv->jingle);
+      wocky_jingle_session_accept (self->priv->jingle);
       self->priv->status = GTALK_FT_STATUS_INITIATED;
     }
   else
@@ -1519,7 +1519,7 @@ void
 gtalk_file_collection_accept (GTalkFileCollection *self,
     GabbleFileTransferChannel * channel)
 {
-  GList *cs = gabble_jingle_session_get_contents (self->priv->jingle);
+  GList *cs = wocky_jingle_session_get_contents (self->priv->jingle);
 
   DEBUG ("called");
 
@@ -1533,11 +1533,11 @@ gtalk_file_collection_accept (GTalkFileCollection *self,
     {
       if (cs != NULL)
         {
-          GabbleJingleContent *content = GABBLE_JINGLE_CONTENT (cs->data);
+          WockyJingleContent *content = WOCKY_JINGLE_CONTENT (cs->data);
           guint initial_id = 0;
           guint share_channel_id;
 
-          gabble_jingle_session_accept (self->priv->jingle);
+          wocky_jingle_session_accept (self->priv->jingle);
           self->priv->status = GTALK_FT_STATUS_ACCEPTED;
 
           /* The new-share-channel signal will take care of the rest.. */
@@ -1546,7 +1546,7 @@ gtalk_file_collection_accept (GTalkFileCollection *self,
               gchar *share_channel_name = NULL;
 
               share_channel_name = g_strdup_printf ("gabble-%d", ++initial_id);
-              share_channel_id = gabble_jingle_content_create_share_channel (
+              share_channel_id = wocky_jingle_content_create_share_channel (
                   content, share_channel_name);
               g_free (share_channel_name);
             } while (share_channel_id == 0 && initial_id < 10);
@@ -1685,8 +1685,8 @@ gtalk_file_collection_terminate (GTalkFileCollection *self,
              terminate all channels which should unref us which will unref the
              jingle session */
           self->priv->status = GTALK_FT_STATUS_TERMINATED;
-          gabble_jingle_session_terminate (self->priv->jingle,
-              JINGLE_REASON_UNKNOWN, NULL, NULL);
+          wocky_jingle_session_terminate (self->priv->jingle,
+              WOCKY_JINGLE_REASON_UNKNOWN, NULL, NULL);
           return;
         }
       return;
@@ -1697,7 +1697,7 @@ gtalk_file_collection_terminate (GTalkFileCollection *self,
 
       /* If this was the last channel, it will cause it to unref us and
          the dispose will be called, which will call
-         gabble_jingle_session_terminate */
+         wocky_jingle_session_terminate */
       gabble_file_transfer_channel_gtalk_file_collection_state_changed (channel,
           GTALK_FILE_COLLECTION_STATE_TERMINATED, TRUE);
     }
@@ -1726,8 +1726,8 @@ channel_disposed (gpointer data, GObject *object)
              terminate all channels which should unref us which will unref the
              jingle session */
           self->priv->status = GTALK_FT_STATUS_TERMINATED;
-          gabble_jingle_session_terminate (self->priv->jingle,
-              JINGLE_REASON_UNKNOWN, NULL, NULL);
+          wocky_jingle_session_terminate (self->priv->jingle,
+              WOCKY_JINGLE_REASON_UNKNOWN, NULL, NULL);
           return;
         }
     }
diff --git a/src/gtalk-file-collection.h b/src/gtalk-file-collection.h
index 895a77d43..7f835d257 100644
--- a/src/gtalk-file-collection.h
+++ b/src/gtalk-file-collection.h
@@ -73,11 +73,11 @@ struct _GTalkFileCollection {
 };
 
 GTalkFileCollection *gtalk_file_collection_new (
-    GabbleFileTransferChannel *channel, GabbleJingleFactory *jingle_factory,
+    GabbleFileTransferChannel *channel, WockyJingleFactory *jingle_factory,
     TpHandle handle, const gchar *jid);
 
 GTalkFileCollection *gtalk_file_collection_new_from_session (
-    GabbleJingleFactory *jingle_factory, GabbleJingleSession *session);
+    WockyJingleFactory *jingle_factory, WockyJingleSession *session);
 
 void gtalk_file_collection_add_channel (GTalkFileCollection *self,
     GabbleFileTransferChannel *channel);
diff --git a/src/jingle-content.c b/src/jingle-content.c
index a57e2cf4e..eb6f2f100 100644
--- a/src/jingle-content.c
+++ b/src/jingle-content.c
@@ -1,5 +1,5 @@
 /*
- * gabble-jingle-content.c - Source for GabbleJingleContent
+ * gabble-jingle-content.c - Source for WockyJingleContent
  * Copyright (C) 2008 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
@@ -64,19 +64,19 @@ enum
   LAST_PROPERTY
 };
 
-struct _GabbleJingleContentPrivate
+struct _WockyJingleContentPrivate
 {
   gchar *name;
   gchar *creator;
   gboolean created_by_us;
-  JingleContentState state;
-  JingleContentSenders senders;
+  WockyJingleContentState state;
+  WockyJingleContentSenders senders;
 
   gchar *content_ns;
   gchar *transport_ns;
   gchar *disposition;
 
-  GabbleJingleTransportIface *transport;
+  WockyJingleTransportIface *transport;
 
   /* Whether we've got the codecs (intersection) ready. */
   gboolean media_ready;
@@ -94,24 +94,24 @@ struct _GabbleJingleContentPrivate
 
 /* lookup tables */
 
-G_DEFINE_TYPE(GabbleJingleContent, gabble_jingle_content, G_TYPE_OBJECT);
+G_DEFINE_TYPE(WockyJingleContent, wocky_jingle_content, G_TYPE_OBJECT);
 
-static void new_transport_candidates_cb (GabbleJingleTransportIface *trans,
-    GList *candidates, GabbleJingleContent *content);
-static void _maybe_ready (GabbleJingleContent *self);
-static void transport_created (GabbleJingleContent *c);
+static void new_transport_candidates_cb (WockyJingleTransportIface *trans,
+    GList *candidates, WockyJingleContent *content);
+static void _maybe_ready (WockyJingleContent *self);
+static void transport_created (WockyJingleContent *c);
 
 static void
-gabble_jingle_content_init (GabbleJingleContent *obj)
+wocky_jingle_content_init (WockyJingleContent *obj)
 {
-  GabbleJingleContentPrivate *priv =
-     G_TYPE_INSTANCE_GET_PRIVATE (obj, GABBLE_TYPE_JINGLE_CONTENT,
-         GabbleJingleContentPrivate);
+  WockyJingleContentPrivate *priv =
+     G_TYPE_INSTANCE_GET_PRIVATE (obj, WOCKY_TYPE_JINGLE_CONTENT,
+         WockyJingleContentPrivate);
   obj->priv = priv;
 
   DEBUG ("%p", obj);
 
-  priv->state = JINGLE_CONTENT_STATE_EMPTY;
+  priv->state = WOCKY_JINGLE_CONTENT_STATE_EMPTY;
   priv->created_by_us = TRUE;
   priv->media_ready = FALSE;
   priv->have_local_candidates = FALSE;
@@ -122,10 +122,10 @@ gabble_jingle_content_init (GabbleJingleContent *obj)
 }
 
 static void
-gabble_jingle_content_dispose (GObject *object)
+wocky_jingle_content_dispose (GObject *object)
 {
-  GabbleJingleContent *content = GABBLE_JINGLE_CONTENT (object);
-  GabbleJingleContentPrivate *priv = content->priv;
+  WockyJingleContent *content = WOCKY_JINGLE_CONTENT (object);
+  WockyJingleContentPrivate *priv = content->priv;
 
   if (priv->dispose_has_run)
     return;
@@ -154,18 +154,18 @@ gabble_jingle_content_dispose (GObject *object)
   g_free (priv->disposition);
   priv->disposition = NULL;
 
-  if (G_OBJECT_CLASS (gabble_jingle_content_parent_class)->dispose)
-    G_OBJECT_CLASS (gabble_jingle_content_parent_class)->dispose (object);
+  if (G_OBJECT_CLASS (wocky_jingle_content_parent_class)->dispose)
+    G_OBJECT_CLASS (wocky_jingle_content_parent_class)->dispose (object);
 }
 
 static void
-gabble_jingle_content_get_property (GObject *object,
+wocky_jingle_content_get_property (GObject *object,
                                     guint property_id,
                                     GValue *value,
                                     GParamSpec *pspec)
 {
-  GabbleJingleContent *self = GABBLE_JINGLE_CONTENT (object);
-  GabbleJingleContentPrivate *priv = self->priv;
+  WockyJingleContent *self = WOCKY_JINGLE_CONTENT (object);
+  WockyJingleContentPrivate *priv = self->priv;
 
   switch (property_id) {
     case PROP_SESSION:
@@ -199,13 +199,13 @@ gabble_jingle_content_get_property (GObject *object,
 }
 
 static void
-gabble_jingle_content_set_property (GObject *object,
+wocky_jingle_content_set_property (GObject *object,
                                     guint property_id,
                                     const GValue *value,
                                     GParamSpec *pspec)
 {
-  GabbleJingleContent *self = GABBLE_JINGLE_CONTENT (object);
-  GabbleJingleContentPrivate *priv = self->priv;
+  WockyJingleContent *self = WOCKY_JINGLE_CONTENT (object);
+  WockyJingleContentPrivate *priv = self->priv;
 
   switch (property_id) {
     case PROP_SESSION:
@@ -224,13 +224,13 @@ gabble_jingle_content_set_property (GObject *object,
 
       if (priv->transport_ns != NULL)
         {
-          GType transport_type = gabble_jingle_factory_lookup_transport (
-              gabble_jingle_session_get_factory (self->session),
+          GType transport_type = wocky_jingle_factory_lookup_transport (
+              wocky_jingle_session_get_factory (self->session),
               priv->transport_ns);
 
           g_assert (transport_type != 0);
 
-          priv->transport = gabble_jingle_transport_iface_new (transport_type,
+          priv->transport = wocky_jingle_transport_iface_new (transport_type,
               self, priv->transport_ns);
 
           g_signal_connect (priv->transport, "new-candidates",
@@ -261,31 +261,31 @@ gabble_jingle_content_set_property (GObject *object,
   }
 }
 
-static JingleContentSenders
-get_default_senders_real (GabbleJingleContent *c)
+static WockyJingleContentSenders
+get_default_senders_real (WockyJingleContent *c)
 {
-  return JINGLE_CONTENT_SENDERS_BOTH;
+  return WOCKY_JINGLE_CONTENT_SENDERS_BOTH;
 }
 
 
 static void
-gabble_jingle_content_class_init (GabbleJingleContentClass *cls)
+wocky_jingle_content_class_init (WockyJingleContentClass *cls)
 {
   GParamSpec *param_spec;
   GObjectClass *object_class = G_OBJECT_CLASS (cls);
 
-  g_type_class_add_private (cls, sizeof (GabbleJingleContentPrivate));
+  g_type_class_add_private (cls, sizeof (WockyJingleContentPrivate));
 
-  object_class->get_property = gabble_jingle_content_get_property;
-  object_class->set_property = gabble_jingle_content_set_property;
-  object_class->dispose = gabble_jingle_content_dispose;
+  object_class->get_property = wocky_jingle_content_get_property;
+  object_class->set_property = wocky_jingle_content_set_property;
+  object_class->dispose = wocky_jingle_content_dispose;
 
   cls->get_default_senders = get_default_senders_real;
 
   /* property definitions */
-  param_spec = g_param_spec_object ("session", "GabbleJingleSession object",
+  param_spec = g_param_spec_object ("session", "WockyJingleSession object",
       "Jingle session object that owns this content.",
-      GABBLE_TYPE_JINGLE_SESSION,
+      WOCKY_TYPE_JINGLE_SESSION,
       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_SESSION, param_spec);
 
@@ -309,13 +309,13 @@ gabble_jingle_content_class_init (GabbleJingleContentClass *cls)
 
   param_spec = g_param_spec_uint ("senders", "Stream senders",
       "Valid senders for the stream.",
-      0, G_MAXUINT32, JINGLE_CONTENT_SENDERS_NONE,
+      0, G_MAXUINT32, WOCKY_JINGLE_CONTENT_SENDERS_NONE,
       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_SENDERS, param_spec);
 
   param_spec = g_param_spec_uint ("state", "Content state",
       "The current state that the content is in.",
-      0, G_MAXUINT32, JINGLE_CONTENT_STATE_EMPTY,
+      0, G_MAXUINT32, WOCKY_JINGLE_CONTENT_STATE_EMPTY,
       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_STATE, param_spec);
 
@@ -370,7 +370,7 @@ gabble_jingle_content_class_init (GabbleJingleContentClass *cls)
     G_TYPE_NONE,
     0);
 
-  /* This signal serves as notification that the GabbleJingleContent is now
+  /* This signal serves as notification that the WockyJingleContent is now
    * meaningless; everything holding a reference should drop it after receiving
    * 'removed'.
    */
@@ -384,42 +384,42 @@ gabble_jingle_content_class_init (GabbleJingleContentClass *cls)
 }
 
 
-static JingleContentSenders
-get_default_senders (GabbleJingleContent *c)
+static WockyJingleContentSenders
+get_default_senders (WockyJingleContent *c)
 {
-  JingleContentSenders (*virtual_method)(GabbleJingleContent *) = \
-      GABBLE_JINGLE_CONTENT_GET_CLASS (c)->get_default_senders;
+  WockyJingleContentSenders (*virtual_method)(WockyJingleContent *) = \
+      WOCKY_JINGLE_CONTENT_GET_CLASS (c)->get_default_senders;
 
   g_assert (virtual_method != NULL);
   return virtual_method (c);
 }
 
 
-static JingleContentSenders
+static WockyJingleContentSenders
 parse_senders (const gchar *txt)
 {
   if (txt == NULL)
-      return JINGLE_CONTENT_SENDERS_NONE;
+      return WOCKY_JINGLE_CONTENT_SENDERS_NONE;
 
   if (!wocky_strdiff (txt, "initiator"))
-      return JINGLE_CONTENT_SENDERS_INITIATOR;
+      return WOCKY_JINGLE_CONTENT_SENDERS_INITIATOR;
   else if (!wocky_strdiff (txt, "responder"))
-      return JINGLE_CONTENT_SENDERS_RESPONDER;
+      return WOCKY_JINGLE_CONTENT_SENDERS_RESPONDER;
   else if (!wocky_strdiff (txt, "both"))
-      return JINGLE_CONTENT_SENDERS_BOTH;
+      return WOCKY_JINGLE_CONTENT_SENDERS_BOTH;
 
-  return JINGLE_CONTENT_SENDERS_NONE;
+  return WOCKY_JINGLE_CONTENT_SENDERS_NONE;
 }
 
 static const gchar *
-produce_senders (JingleContentSenders senders)
+produce_senders (WockyJingleContentSenders senders)
 {
   switch (senders) {
-    case JINGLE_CONTENT_SENDERS_INITIATOR:
+    case WOCKY_JINGLE_CONTENT_SENDERS_INITIATOR:
       return "initiator";
-    case JINGLE_CONTENT_SENDERS_RESPONDER:
+    case WOCKY_JINGLE_CONTENT_SENDERS_RESPONDER:
       return "responder";
-    case JINGLE_CONTENT_SENDERS_BOTH:
+    case WOCKY_JINGLE_CONTENT_SENDERS_BOTH:
       return "both";
     default:
       DEBUG ("invalid content senders %u", senders);
@@ -435,18 +435,18 @@ produce_senders (JingleContentSenders senders)
     g_set_error (error, WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_BAD_REQUEST, txt)
 
 static void
-new_transport_candidates_cb (GabbleJingleTransportIface *trans,
-    GList *candidates, GabbleJingleContent *content)
+new_transport_candidates_cb (WockyJingleTransportIface *trans,
+    GList *candidates, WockyJingleContent *content)
 {
   /* just pass the signal on */
   g_signal_emit (content, signals[NEW_CANDIDATES], 0, candidates);
 }
 
 static void
-transport_created (GabbleJingleContent *c)
+transport_created (WockyJingleContent *c)
 {
-  void (*virtual_method)(GabbleJingleContent *, GabbleJingleTransportIface *) = \
-      GABBLE_JINGLE_CONTENT_GET_CLASS (c)->transport_created;
+  void (*virtual_method)(WockyJingleContent *, WockyJingleTransportIface *) = \
+      WOCKY_JINGLE_CONTENT_GET_CLASS (c)->transport_created;
 
   if (virtual_method != NULL)
     virtual_method (c, c->priv->transport);
@@ -454,11 +454,11 @@ transport_created (GabbleJingleContent *c)
 
 
 static void
-parse_description (GabbleJingleContent *c, WockyNode *desc_node,
+parse_description (WockyJingleContent *c, WockyNode *desc_node,
     GError **error)
 {
-  void (*virtual_method)(GabbleJingleContent *, WockyNode *,
-      GError **) = GABBLE_JINGLE_CONTENT_GET_CLASS (c)->parse_description;
+  void (*virtual_method)(WockyJingleContent *, WockyNode *,
+      GError **) = WOCKY_JINGLE_CONTENT_GET_CLASS (c)->parse_description;
 
   g_assert (virtual_method != NULL);
   virtual_method (c, desc_node, error);
@@ -467,30 +467,30 @@ parse_description (GabbleJingleContent *c, WockyNode *desc_node,
 static gboolean
 send_gtalk4_transport_accept (gpointer user_data)
 {
-  GabbleJingleContent *c = GABBLE_JINGLE_CONTENT (user_data);
-  GabbleJingleContentPrivate *priv = c->priv;
+  WockyJingleContent *c = WOCKY_JINGLE_CONTENT (user_data);
+  WockyJingleContentPrivate *priv = c->priv;
   WockyNode *sess_node;
-  WockyStanza *msg = gabble_jingle_session_new_message (c->session,
-      JINGLE_ACTION_TRANSPORT_ACCEPT, &sess_node);
+  WockyStanza *msg = wocky_jingle_session_new_message (c->session,
+      WOCKY_JINGLE_ACTION_TRANSPORT_ACCEPT, &sess_node);
 
   DEBUG ("Sending Gtalk4 'transport-accept' message to peer");
   wocky_node_add_child_ns (sess_node, "transport", priv->transport_ns);
 
-  gabble_jingle_session_send (c->session, msg);
+  wocky_jingle_session_send (c->session, msg);
 
   return FALSE;
 }
 
 void
-gabble_jingle_content_parse_add (GabbleJingleContent *c,
+wocky_jingle_content_parse_add (WockyJingleContent *c,
     WockyNode *content_node, gboolean google_mode, GError **error)
 {
-  GabbleJingleContentPrivate *priv = c->priv;
+  WockyJingleContentPrivate *priv = c->priv;
   const gchar *name, *creator, *senders, *disposition;
   WockyNode *trans_node, *desc_node;
   GType transport_type = 0;
-  GabbleJingleTransportIface *trans = NULL;
-  JingleDialect dialect = gabble_jingle_session_get_dialect (c->session);
+  WockyJingleTransportIface *trans = NULL;
+  WockyJingleDialect dialect = wocky_jingle_session_get_dialect (c->session);
 
   priv->created_by_us = FALSE;
 
@@ -519,10 +519,10 @@ gabble_jingle_content_parse_add (GabbleJingleContent *c,
           /* gtalk lj0.3 assumes google-p2p transport */
           DEBUG ("detected GTalk3 dialect");
 
-          dialect = JINGLE_DIALECT_GTALK3;
-          g_object_set (c->session, "dialect", JINGLE_DIALECT_GTALK3, NULL);
-          transport_type = gabble_jingle_factory_lookup_transport (
-              gabble_jingle_session_get_factory (c->session),
+          dialect = WOCKY_JINGLE_DIALECT_GTALK3;
+          g_object_set (c->session, "dialect", WOCKY_JINGLE_DIALECT_GTALK3, NULL);
+          transport_type = wocky_jingle_factory_lookup_transport (
+              wocky_jingle_session_get_factory (c->session),
               "");
 
           /* in practice we do support gtalk-p2p, so this can't happen */
@@ -538,10 +538,10 @@ gabble_jingle_content_parse_add (GabbleJingleContent *c,
   else
     {
       if (creator == NULL &&
-          gabble_jingle_session_peer_has_cap (c->session,
+          wocky_jingle_session_peer_has_cap (c->session,
               QUIRK_GOOGLE_WEBMAIL_CLIENT))
         {
-          if (gabble_jingle_content_creator_is_initiator (c))
+          if (wocky_jingle_content_creator_is_initiator (c))
             creator = "initiator";
           else
             creator = "responder";
@@ -566,8 +566,8 @@ gabble_jingle_content_parse_add (GabbleJingleContent *c,
     {
       const gchar *ns = wocky_node_get_ns (trans_node);
 
-      transport_type = gabble_jingle_factory_lookup_transport (
-          gabble_jingle_session_get_factory (c->session), ns);
+      transport_type = wocky_jingle_factory_lookup_transport (
+          wocky_jingle_session_get_factory (c->session), ns);
 
       if (transport_type == 0)
         {
@@ -583,7 +583,7 @@ gabble_jingle_content_parse_add (GabbleJingleContent *c,
   else
     priv->senders = parse_senders (senders);
 
-  if (priv->senders == JINGLE_CONTENT_SENDERS_NONE)
+  if (priv->senders == WOCKY_JINGLE_CONTENT_SENDERS_NONE)
     {
       SET_BAD_REQ ("invalid content senders");
       return;
@@ -605,7 +605,7 @@ gabble_jingle_content_parse_add (GabbleJingleContent *c,
 
   DEBUG ("content creating new transport type %s", g_type_name (transport_type));
 
-  trans = gabble_jingle_transport_iface_new (transport_type,
+  trans = wocky_jingle_transport_iface_new (transport_type,
       c, priv->transport_ns);
 
   g_signal_connect (trans, "new-candidates",
@@ -614,7 +614,7 @@ gabble_jingle_content_parse_add (GabbleJingleContent *c,
   /* Depending on transport, there may be initial candidates specified here */
   if (trans_node != NULL)
     {
-      gabble_jingle_transport_iface_parse_candidates (trans, trans_node, error);
+      wocky_jingle_transport_iface_parse_candidates (trans, trans_node, error);
       if (*error)
         {
           g_object_unref (trans);
@@ -629,30 +629,30 @@ gabble_jingle_content_parse_add (GabbleJingleContent *c,
   g_assert (priv->creator == NULL);
   priv->creator = g_strdup (creator);
 
-  priv->state = JINGLE_CONTENT_STATE_NEW;
+  priv->state = WOCKY_JINGLE_CONTENT_STATE_NEW;
 
   /* GTalk4 seems to require "transport-accept" for acknowledging
    * the transport type. wjt confirms that this is apparently necessary for
    * incoming calls to work.
    */
-  if (dialect == JINGLE_DIALECT_GTALK4)
+  if (dialect == WOCKY_JINGLE_DIALECT_GTALK4)
     priv->gtalk4_event_id = g_idle_add (send_gtalk4_transport_accept, c);
 
   return;
 }
 
 static guint
-new_share_channel (GabbleJingleContent *c, const gchar *name)
+new_share_channel (WockyJingleContent *c, const gchar *name)
 {
-  GabbleJingleContentPrivate *priv = c->priv;
-  GabbleJingleTransportGoogle *gtrans = NULL;
+  WockyJingleContentPrivate *priv = c->priv;
+  WockyJingleTransportGoogle *gtrans = NULL;
 
   if (priv->transport &&
-      GABBLE_IS_JINGLE_TRANSPORT_GOOGLE (priv->transport))
+      WOCKY_IS_JINGLE_TRANSPORT_GOOGLE (priv->transport))
     {
       guint id = priv->last_share_channel_component_id + 1;
 
-      gtrans = GABBLE_JINGLE_TRANSPORT_GOOGLE (priv->transport);
+      gtrans = WOCKY_JINGLE_TRANSPORT_GOOGLE (priv->transport);
 
       if (!jingle_transport_google_set_component_name (gtrans, name, id))
         return 0;
@@ -669,48 +669,48 @@ new_share_channel (GabbleJingleContent *c, const gchar *name)
 }
 
 guint
-gabble_jingle_content_create_share_channel (GabbleJingleContent *self,
+wocky_jingle_content_create_share_channel (WockyJingleContent *self,
     const gchar *name)
 {
-  GabbleJingleContentPrivate *priv = self->priv;
+  WockyJingleContentPrivate *priv = self->priv;
   WockyNode *sess_node, *channel_node;
   WockyStanza *msg = NULL;
 
   /* Send the info action before creating the channel, in case candidates need
      to be sent on the signal emit. It doesn't matter if the channel already
      exists anyways... */
-  msg = gabble_jingle_session_new_message (self->session,
-      JINGLE_ACTION_INFO, &sess_node);
+  msg = wocky_jingle_session_new_message (self->session,
+      WOCKY_JINGLE_ACTION_INFO, &sess_node);
 
   DEBUG ("Sending 'info' message to peer : channel %s", name);
   channel_node = wocky_node_add_child_ns (sess_node, "channel",
       priv->content_ns);
   wocky_node_set_attribute (channel_node, "name", name);
 
-  gabble_jingle_session_send (self->session, msg);
+  wocky_jingle_session_send (self->session, msg);
 
   return new_share_channel (self, name);
 }
 
 void
-gabble_jingle_content_send_complete (GabbleJingleContent *self)
+wocky_jingle_content_send_complete (WockyJingleContent *self)
 {
-  GabbleJingleContentPrivate *priv = self->priv;
+  WockyJingleContentPrivate *priv = self->priv;
   WockyNode *sess_node;
   WockyStanza *msg = NULL;
 
-  msg = gabble_jingle_session_new_message (self->session,
-      JINGLE_ACTION_INFO, &sess_node);
+  msg = wocky_jingle_session_new_message (self->session,
+      WOCKY_JINGLE_ACTION_INFO, &sess_node);
 
   DEBUG ("Sending 'info' message to peer : complete");
   wocky_node_add_child_ns (sess_node, "complete", priv->content_ns);
 
-  gabble_jingle_session_send (self->session, msg);
+  wocky_jingle_session_send (self->session, msg);
 
 }
 
 void
-gabble_jingle_content_parse_info (GabbleJingleContent *c,
+wocky_jingle_content_parse_info (WockyJingleContent *c,
     WockyNode *content_node, GError **error)
 {
   WockyNode *channel_node;
@@ -735,25 +735,25 @@ gabble_jingle_content_parse_info (GabbleJingleContent *c,
 }
 
 void
-gabble_jingle_content_parse_accept (GabbleJingleContent *c,
+wocky_jingle_content_parse_accept (WockyJingleContent *c,
     WockyNode *content_node, gboolean google_mode, GError **error)
 {
-  GabbleJingleContentPrivate *priv = c->priv;
+  WockyJingleContentPrivate *priv = c->priv;
   const gchar *senders;
   WockyNode *trans_node, *desc_node;
-  JingleDialect dialect = gabble_jingle_session_get_dialect (c->session);
-  JingleContentSenders newsenders;
+  WockyJingleDialect dialect = wocky_jingle_session_get_dialect (c->session);
+  WockyJingleContentSenders newsenders;
 
   desc_node = wocky_node_get_child (content_node, "description");
   trans_node = wocky_node_get_child (content_node, "transport");
   senders = wocky_node_get_attribute (content_node, "senders");
 
-  if (GABBLE_IS_JINGLE_MEDIA_RTP (c) &&
-      JINGLE_IS_GOOGLE_DIALECT (dialect) && trans_node == NULL)
+  if (WOCKY_IS_JINGLE_MEDIA_RTP (c) &&
+      WOCKY_JINGLE_DIALECT_IS_GOOGLE (dialect) && trans_node == NULL)
     {
       DEBUG ("no transport node, assuming GTalk3 dialect");
       /* gtalk lj0.3 assumes google-p2p transport */
-      g_object_set (c->session, "dialect", JINGLE_DIALECT_GTALK3, NULL);
+      g_object_set (c->session, "dialect", WOCKY_JINGLE_DIALECT_GTALK3, NULL);
     }
 
   if (senders == NULL)
@@ -761,7 +761,7 @@ gabble_jingle_content_parse_accept (GabbleJingleContent *c,
   else
     newsenders = parse_senders (senders);
 
-  if (newsenders == JINGLE_CONTENT_SENDERS_NONE)
+  if (newsenders == WOCKY_JINGLE_CONTENT_SENDERS_NONE)
     {
       SET_BAD_REQ ("invalid content senders");
       return;
@@ -779,21 +779,21 @@ gabble_jingle_content_parse_accept (GabbleJingleContent *c,
   if (*error != NULL)
       return;
 
-  priv->state = JINGLE_CONTENT_STATE_ACKNOWLEDGED;
+  priv->state = WOCKY_JINGLE_CONTENT_STATE_ACKNOWLEDGED;
   g_object_notify ((GObject *) c, "state");
 
   if (trans_node != NULL)
     {
-      gabble_jingle_transport_iface_parse_candidates (priv->transport,
+      wocky_jingle_transport_iface_parse_candidates (priv->transport,
         trans_node, NULL);
     }
 }
 
 void
-gabble_jingle_content_parse_description_info (GabbleJingleContent *c,
+wocky_jingle_content_parse_description_info (WockyJingleContent *c,
     WockyNode *content_node, GError **error)
 {
-  GabbleJingleContentPrivate *priv = c->priv;
+  WockyJingleContentPrivate *priv = c->priv;
   WockyNode *desc_node;
   desc_node = wocky_node_get_child (content_node, "description");
   if (desc_node == NULL)
@@ -802,7 +802,7 @@ gabble_jingle_content_parse_description_info (GabbleJingleContent *c,
       return;
     }
 
-  if (priv->created_by_us && priv->state < JINGLE_CONTENT_STATE_ACKNOWLEDGED)
+  if (priv->created_by_us && priv->state < WOCKY_JINGLE_CONTENT_STATE_ACKNOWLEDGED)
     {
       /* The stream was created by us and the other side didn't acknowledge it
        * yet, thus we don't have their codec information, thus the
@@ -816,20 +816,20 @@ gabble_jingle_content_parse_description_info (GabbleJingleContent *c,
 
 
 void
-gabble_jingle_content_produce_node (GabbleJingleContent *c,
+wocky_jingle_content_produce_node (WockyJingleContent *c,
     WockyNode *parent,
     gboolean include_description,
     gboolean include_transport,
     WockyNode **trans_node_out)
 {
-  GabbleJingleContentPrivate *priv = c->priv;
+  WockyJingleContentPrivate *priv = c->priv;
   WockyNode *content_node, *trans_node;
-  JingleDialect dialect = gabble_jingle_session_get_dialect (c->session);
-  void (*produce_desc)(GabbleJingleContent *, WockyNode *) =
-    GABBLE_JINGLE_CONTENT_GET_CLASS (c)->produce_description;
+  WockyJingleDialect dialect = wocky_jingle_session_get_dialect (c->session);
+  void (*produce_desc)(WockyJingleContent *, WockyNode *) =
+    WOCKY_JINGLE_CONTENT_GET_CLASS (c)->produce_description;
 
-  if ((dialect == JINGLE_DIALECT_GTALK3) ||
-      (dialect == JINGLE_DIALECT_GTALK4))
+  if ((dialect == WOCKY_JINGLE_DIALECT_GTALK3) ||
+      (dialect == WOCKY_JINGLE_DIALECT_GTALK4))
     {
       content_node = parent;
     }
@@ -841,7 +841,7 @@ gabble_jingle_content_produce_node (GabbleJingleContent *c,
           "senders", produce_senders (priv->senders),
           NULL);
 
-      if (gabble_jingle_content_creator_is_initiator (c))
+      if (wocky_jingle_content_creator_is_initiator (c))
         wocky_node_set_attribute (content_node, "creator", "initiator");
       else
         wocky_node_set_attribute (content_node, "creator", "responder");
@@ -852,7 +852,7 @@ gabble_jingle_content_produce_node (GabbleJingleContent *c,
 
   if (include_transport)
     {
-      if (dialect == JINGLE_DIALECT_GTALK3)
+      if (dialect == WOCKY_JINGLE_DIALECT_GTALK3)
         {
           /* GTalk 03 doesn't use a transport, but assumes gtalk-p2p */
           trans_node = parent;
@@ -869,15 +869,15 @@ gabble_jingle_content_produce_node (GabbleJingleContent *c,
 }
 
 void
-gabble_jingle_content_update_senders (GabbleJingleContent *c,
+wocky_jingle_content_update_senders (WockyJingleContent *c,
     WockyNode *content_node, GError **error)
 {
-  GabbleJingleContentPrivate *priv = c->priv;
-  JingleContentSenders senders;
+  WockyJingleContentPrivate *priv = c->priv;
+  WockyJingleContentSenders senders;
 
   senders = parse_senders (wocky_node_get_attribute (content_node, "senders"));
 
-  if (senders == JINGLE_CONTENT_SENDERS_NONE)
+  if (senders == WOCKY_JINGLE_CONTENT_SENDERS_NONE)
     {
       SET_BAD_REQ ("invalid content senders in stream");
       return;
@@ -888,19 +888,19 @@ gabble_jingle_content_update_senders (GabbleJingleContent *c,
 }
 
 void
-gabble_jingle_content_parse_transport_info (GabbleJingleContent *self,
+wocky_jingle_content_parse_transport_info (WockyJingleContent *self,
   WockyNode *trans_node, GError **error)
 {
-  GabbleJingleContentPrivate *priv = self->priv;
+  WockyJingleContentPrivate *priv = self->priv;
 
-  gabble_jingle_transport_iface_parse_candidates (priv->transport, trans_node, error);
+  wocky_jingle_transport_iface_parse_candidates (priv->transport, trans_node, error);
 }
 
-/* Takes in a list of slice-allocated JingleCandidate structs */
+/* Takes in a list of slice-allocated WockyJingleCandidate structs */
 void
-gabble_jingle_content_add_candidates (GabbleJingleContent *self, GList *li)
+wocky_jingle_content_add_candidates (WockyJingleContent *self, GList *li)
 {
-  GabbleJingleContentPrivate *priv = self->priv;
+  WockyJingleContentPrivate *priv = self->priv;
 
   DEBUG ("called content: %s created_by_us: %d", priv->name,
       priv->created_by_us);
@@ -908,7 +908,7 @@ gabble_jingle_content_add_candidates (GabbleJingleContent *self, GList *li)
   if (li == NULL)
     return;
 
-  gabble_jingle_transport_iface_new_local_candidates (priv->transport, li);
+  wocky_jingle_transport_iface_new_local_candidates (priv->transport, li);
 
   if (!priv->have_local_candidates)
     {
@@ -920,32 +920,32 @@ gabble_jingle_content_add_candidates (GabbleJingleContent *self, GList *li)
   /* If the content exists on the wire, let the transport send this candidate
    * if it wants to.
    */
-  if (priv->state > JINGLE_CONTENT_STATE_EMPTY)
-    gabble_jingle_transport_iface_send_candidates (priv->transport, FALSE);
+  if (priv->state > WOCKY_JINGLE_CONTENT_STATE_EMPTY)
+    wocky_jingle_transport_iface_send_candidates (priv->transport, FALSE);
 }
 
 /* Returns whether the content is ready to be signalled (initiated, for local
  * streams, or acknowledged, for remote streams. */
 gboolean
-gabble_jingle_content_is_ready (GabbleJingleContent *self)
+wocky_jingle_content_is_ready (WockyJingleContent *self)
 {
-  GabbleJingleContentPrivate *priv = self->priv;
+  WockyJingleContentPrivate *priv = self->priv;
 
   if (priv->created_by_us)
     {
       /* If it's created by us, media ready, not signalled, and we have
        * at least one local candidate, it's ready to be added. */
-      if (priv->media_ready && priv->state == JINGLE_CONTENT_STATE_EMPTY &&
-          (!GABBLE_IS_JINGLE_MEDIA_RTP (self) || priv->have_local_candidates))
+      if (priv->media_ready && priv->state == WOCKY_JINGLE_CONTENT_STATE_EMPTY &&
+          (!WOCKY_IS_JINGLE_MEDIA_RTP (self) || priv->have_local_candidates))
         return TRUE;
     }
   else
     {
       /* If it's created by peer, media and transports ready,
        * and not acknowledged yet, it's ready for acceptance. */
-      if (priv->media_ready && priv->state == JINGLE_CONTENT_STATE_NEW &&
-          (!GABBLE_IS_JINGLE_MEDIA_RTP (self) ||
-              gabble_jingle_transport_iface_can_accept (priv->transport)))
+      if (priv->media_ready && priv->state == WOCKY_JINGLE_CONTENT_STATE_NEW &&
+          (!WOCKY_IS_JINGLE_MEDIA_RTP (self) ||
+              wocky_jingle_transport_iface_can_accept (priv->transport)))
         return TRUE;
     }
 
@@ -953,47 +953,47 @@ gabble_jingle_content_is_ready (GabbleJingleContent *self)
 }
 
 static void
-send_content_add_or_accept (GabbleJingleContent *self)
+send_content_add_or_accept (WockyJingleContent *self)
 {
-  GabbleJingleContentPrivate *priv = self->priv;
+  WockyJingleContentPrivate *priv = self->priv;
   WockyStanza *msg;
   WockyNode *sess_node, *transport_node;
-  JingleAction action;
-  JingleContentState new_state = JINGLE_CONTENT_STATE_EMPTY;
+  WockyJingleAction action;
+  WockyJingleContentState new_state = WOCKY_JINGLE_CONTENT_STATE_EMPTY;
 
-  g_assert (gabble_jingle_content_is_ready (self));
+  g_assert (wocky_jingle_content_is_ready (self));
 
   if (priv->created_by_us)
     {
       /* TODO: set a timer for acknowledgement */
-      action = JINGLE_ACTION_CONTENT_ADD;
-      new_state = JINGLE_CONTENT_STATE_SENT;
+      action = WOCKY_JINGLE_ACTION_CONTENT_ADD;
+      new_state = WOCKY_JINGLE_CONTENT_STATE_SENT;
     }
   else
     {
-      action = JINGLE_ACTION_CONTENT_ACCEPT;
-      new_state = JINGLE_CONTENT_STATE_ACKNOWLEDGED;
+      action = WOCKY_JINGLE_ACTION_CONTENT_ACCEPT;
+      new_state = WOCKY_JINGLE_CONTENT_STATE_ACKNOWLEDGED;
     }
 
-  msg = gabble_jingle_session_new_message (self->session,
+  msg = wocky_jingle_session_new_message (self->session,
       action, &sess_node);
-  gabble_jingle_content_produce_node (self, sess_node, TRUE, TRUE,
+  wocky_jingle_content_produce_node (self, sess_node, TRUE, TRUE,
       &transport_node);
-  gabble_jingle_transport_iface_inject_candidates (priv->transport,
+  wocky_jingle_transport_iface_inject_candidates (priv->transport,
       transport_node);
-  gabble_jingle_session_send (self->session, msg);
+  wocky_jingle_session_send (self->session, msg);
 
   priv->state = new_state;
   g_object_notify (G_OBJECT (self), "state");
 }
 
 static void
-_maybe_ready (GabbleJingleContent *self)
+_maybe_ready (WockyJingleContent *self)
 {
-  GabbleJingleContentPrivate *priv = self->priv;
-  JingleState state;
+  WockyJingleContentPrivate *priv = self->priv;
+  WockyJingleState state;
 
-  if (!gabble_jingle_content_is_ready (self))
+  if (!wocky_jingle_content_is_ready (self))
       return;
 
   /* If content disposition is session and session
@@ -1005,7 +1005,7 @@ _maybe_ready (GabbleJingleContent *self)
   g_object_get (self->session, "state", &state, NULL);
 
   if (!wocky_strdiff (priv->disposition, "session") &&
-      (state < JINGLE_STATE_PENDING_ACCEPT_SENT))
+      (state < WOCKY_JINGLE_STATE_PENDING_ACCEPT_SENT))
     {
       /* Notify the session that we're ready for
        * session-initiate/session-accept */
@@ -1013,12 +1013,12 @@ _maybe_ready (GabbleJingleContent *self)
     }
   else
     {
-      if (state >= JINGLE_STATE_PENDING_INITIATE_SENT)
+      if (state >= WOCKY_JINGLE_STATE_PENDING_INITIATE_SENT)
         {
           send_content_add_or_accept (self);
 
           /* if neccessary, transmit the candidates */
-          gabble_jingle_transport_iface_send_candidates (priv->transport,
+          wocky_jingle_transport_iface_send_candidates (priv->transport,
               FALSE);
         }
       else
@@ -1032,24 +1032,24 @@ _maybe_ready (GabbleJingleContent *self)
 }
 
 void
-gabble_jingle_content_maybe_send_description (GabbleJingleContent *self)
+wocky_jingle_content_maybe_send_description (WockyJingleContent *self)
 {
-  GabbleJingleContentPrivate *priv = self->priv;
+  WockyJingleContentPrivate *priv = self->priv;
 
   /* If we didn't send the content yet there is no reason to send a
    * description-info to update it */
-  if (priv->state < JINGLE_CONTENT_STATE_SENT)
+  if (priv->state < WOCKY_JINGLE_CONTENT_STATE_SENT)
     return;
 
-  if (gabble_jingle_session_defines_action (self->session,
-          JINGLE_ACTION_DESCRIPTION_INFO))
+  if (wocky_jingle_session_defines_action (self->session,
+          WOCKY_JINGLE_ACTION_DESCRIPTION_INFO))
     {
       WockyNode *sess_node;
-      WockyStanza *msg = gabble_jingle_session_new_message (self->session,
-          JINGLE_ACTION_DESCRIPTION_INFO, &sess_node);
+      WockyStanza *msg = wocky_jingle_session_new_message (self->session,
+          WOCKY_JINGLE_ACTION_DESCRIPTION_INFO, &sess_node);
 
-      gabble_jingle_content_produce_node (self, sess_node, TRUE, FALSE, NULL);
-      gabble_jingle_session_send (self->session, msg);
+      wocky_jingle_content_produce_node (self, sess_node, TRUE, FALSE, NULL);
+      wocky_jingle_session_send (self->session, msg);
     }
   else
     {
@@ -1062,26 +1062,26 @@ gabble_jingle_content_maybe_send_description (GabbleJingleContent *self)
  * candidates), and when we detect gtalk3 after we've transmitted some
  * candidates. */
 void
-gabble_jingle_content_retransmit_candidates (GabbleJingleContent *self,
+wocky_jingle_content_retransmit_candidates (WockyJingleContent *self,
     gboolean all)
 {
-  gabble_jingle_transport_iface_send_candidates (self->priv->transport, all);
+  wocky_jingle_transport_iface_send_candidates (self->priv->transport, all);
 }
 
 void
-gabble_jingle_content_inject_candidates (GabbleJingleContent *self,
+wocky_jingle_content_inject_candidates (WockyJingleContent *self,
     WockyNode *transport_node)
 {
-  gabble_jingle_transport_iface_inject_candidates (self->priv->transport,
+  wocky_jingle_transport_iface_inject_candidates (self->priv->transport,
       transport_node);
 }
 
 
 /* Called by a subclass when the media is ready (e.g. we got local codecs) */
 void
-_gabble_jingle_content_set_media_ready (GabbleJingleContent *self)
+_wocky_jingle_content_set_media_ready (WockyJingleContent *self)
 {
-  GabbleJingleContentPrivate *priv = self->priv;
+  WockyJingleContentPrivate *priv = self->priv;
 
   DEBUG ("media ready on content: %s created_by_us: %d", priv->name,
       priv->created_by_us);
@@ -1092,10 +1092,10 @@ _gabble_jingle_content_set_media_ready (GabbleJingleContent *self)
 }
 
 void
-gabble_jingle_content_set_transport_state (GabbleJingleContent *self,
-    JingleTransportState state)
+wocky_jingle_content_set_transport_state (WockyJingleContent *self,
+    WockyJingleTransportState state)
 {
-  GabbleJingleContentPrivate *priv = self->priv;
+  WockyJingleContentPrivate *priv = self->priv;
 
   g_object_set (priv->transport, "state", state, NULL);
 
@@ -1103,38 +1103,38 @@ gabble_jingle_content_set_transport_state (GabbleJingleContent *self,
 }
 
 GList *
-gabble_jingle_content_get_remote_candidates (GabbleJingleContent *c)
+wocky_jingle_content_get_remote_candidates (WockyJingleContent *c)
 {
-  GabbleJingleContentPrivate *priv = c->priv;
+  WockyJingleContentPrivate *priv = c->priv;
 
-  return gabble_jingle_transport_iface_get_remote_candidates (priv->transport);
+  return wocky_jingle_transport_iface_get_remote_candidates (priv->transport);
 }
 
 GList *
-gabble_jingle_content_get_local_candidates (GabbleJingleContent *c)
+wocky_jingle_content_get_local_candidates (WockyJingleContent *c)
 {
-  GabbleJingleContentPrivate *priv = c->priv;
+  WockyJingleContentPrivate *priv = c->priv;
 
-  return gabble_jingle_transport_iface_get_local_candidates (priv->transport);
+  return wocky_jingle_transport_iface_get_local_candidates (priv->transport);
 }
 
 gboolean
-gabble_jingle_content_get_credentials (GabbleJingleContent *c,
+wocky_jingle_content_get_credentials (WockyJingleContent *c,
     gchar **ufrag, gchar **pwd)
 {
-  GabbleJingleContentPrivate *priv = c->priv;
+  WockyJingleContentPrivate *priv = c->priv;
 
   return jingle_transport_get_credentials (priv->transport, ufrag, pwd);
 }
 
 gboolean
-gabble_jingle_content_change_direction (GabbleJingleContent *c,
-    JingleContentSenders senders)
+wocky_jingle_content_change_direction (WockyJingleContent *c,
+    WockyJingleContentSenders senders)
 {
-  GabbleJingleContentPrivate *priv = c->priv;
+  WockyJingleContentPrivate *priv = c->priv;
   WockyStanza *msg;
   WockyNode *sess_node;
-  JingleDialect dialect = gabble_jingle_session_get_dialect (c->session);
+  WockyJingleDialect dialect = wocky_jingle_session_get_dialect (c->session);
 
   if (senders == priv->senders)
     return TRUE;
@@ -1142,18 +1142,18 @@ gabble_jingle_content_change_direction (GabbleJingleContent *c,
   priv->senders = senders;
   g_object_notify (G_OBJECT (c), "senders");
 
-  if (JINGLE_IS_GOOGLE_DIALECT (dialect))
+  if (WOCKY_JINGLE_DIALECT_IS_GOOGLE (dialect))
     {
       DEBUG ("ignoring direction change request for GTalk stream");
       return FALSE;
     }
 
-  if (priv->state >= JINGLE_CONTENT_STATE_SENT)
+  if (priv->state >= WOCKY_JINGLE_CONTENT_STATE_SENT)
     {
-      msg = gabble_jingle_session_new_message (c->session,
-          JINGLE_ACTION_CONTENT_MODIFY, &sess_node);
-      gabble_jingle_content_produce_node (c, sess_node, FALSE, FALSE, NULL);
-      gabble_jingle_session_send (c->session, msg);
+      msg = wocky_jingle_session_new_message (c->session,
+          WOCKY_JINGLE_ACTION_CONTENT_MODIFY, &sess_node);
+      wocky_jingle_content_produce_node (c, sess_node, FALSE, FALSE, NULL);
+      wocky_jingle_session_send (c->session, msg);
     }
 
   /* FIXME: actually check whether remote end accepts our content-modify */
@@ -1166,10 +1166,10 @@ _on_remove_reply (
     GAsyncResult *result,
     gpointer user_data)
 {
-  GabbleJingleContent *c = GABBLE_JINGLE_CONTENT (user_data);
-  GabbleJingleContentPrivate *priv = c->priv;
+  WockyJingleContent *c = WOCKY_JINGLE_CONTENT (user_data);
+  WockyJingleContentPrivate *priv = c->priv;
 
-  g_assert (priv->state == JINGLE_CONTENT_STATE_REMOVING);
+  g_assert (priv->state == WOCKY_JINGLE_CONTENT_STATE_REMOVING);
 
   DEBUG ("%p", c);
 
@@ -1181,11 +1181,11 @@ _on_remove_reply (
 }
 
 static void
-_content_remove (GabbleJingleContent *c,
+_content_remove (WockyJingleContent *c,
     gboolean signal_peer,
-    JingleReason reason)
+    WockyJingleReason reason)
 {
-  GabbleJingleContentPrivate *priv = c->priv;
+  WockyJingleContentPrivate *priv = c->priv;
   WockyStanza *msg;
   WockyNode *sess_node;
 
@@ -1194,32 +1194,32 @@ _content_remove (GabbleJingleContent *c,
   /* If we were already signalled and removal is not a side-effect of
    * something else (sesssion termination, or removal by peer),
    * we have to signal removal to the peer. */
-  if (signal_peer && (priv->state != JINGLE_CONTENT_STATE_EMPTY))
+  if (signal_peer && (priv->state != WOCKY_JINGLE_CONTENT_STATE_EMPTY))
     {
-      if (priv->state == JINGLE_CONTENT_STATE_REMOVING)
+      if (priv->state == WOCKY_JINGLE_CONTENT_STATE_REMOVING)
         {
           DEBUG ("ignoring request to remove content which is already being removed");
           return;
         }
 
-      priv->state = JINGLE_CONTENT_STATE_REMOVING;
+      priv->state = WOCKY_JINGLE_CONTENT_STATE_REMOVING;
       g_object_notify ((GObject *) c, "state");
 
-      msg = gabble_jingle_session_new_message (c->session,
-          reason == JINGLE_REASON_UNKNOWN ?
-          JINGLE_ACTION_CONTENT_REMOVE : JINGLE_ACTION_CONTENT_REJECT,
+      msg = wocky_jingle_session_new_message (c->session,
+          reason == WOCKY_JINGLE_REASON_UNKNOWN ?
+          WOCKY_JINGLE_ACTION_CONTENT_REMOVE : WOCKY_JINGLE_ACTION_CONTENT_REJECT,
           &sess_node);
 
-      if (reason != JINGLE_REASON_UNKNOWN)
+      if (reason != WOCKY_JINGLE_REASON_UNKNOWN)
         {
           WockyNode *reason_node = wocky_node_add_child_with_content (sess_node,
               "reason", NULL);
           wocky_node_add_child_with_content (reason_node,
-              gabble_jingle_session_get_reason_name (reason), NULL);
+              wocky_jingle_session_get_reason_name (reason), NULL);
         }
 
-      gabble_jingle_content_produce_node (c, sess_node, FALSE, FALSE, NULL);
-      wocky_porter_send_iq_async (gabble_jingle_session_get_porter (c->session),
+      wocky_jingle_content_produce_node (c, sess_node, FALSE, FALSE, NULL);
+      wocky_porter_send_iq_async (wocky_jingle_session_get_porter (c->session),
           msg, NULL, _on_remove_reply, g_object_ref (c));
       g_object_unref (msg);
     }
@@ -1234,27 +1234,27 @@ _content_remove (GabbleJingleContent *c,
 }
 
 void
-gabble_jingle_content_remove (GabbleJingleContent *c,
+wocky_jingle_content_remove (WockyJingleContent *c,
     gboolean signal_peer)
 {
-  _content_remove (c, signal_peer, JINGLE_REASON_UNKNOWN);
+  _content_remove (c, signal_peer, WOCKY_JINGLE_REASON_UNKNOWN);
 }
 
 void
-gabble_jingle_content_reject (GabbleJingleContent *c,
-    JingleReason reason)
+wocky_jingle_content_reject (WockyJingleContent *c,
+    WockyJingleReason reason)
 {
   _content_remove (c, TRUE, reason);
 }
 
 gboolean
-gabble_jingle_content_is_created_by_us (GabbleJingleContent *c)
+wocky_jingle_content_is_created_by_us (WockyJingleContent *c)
 {
   return c->priv->created_by_us;
 }
 
 gboolean
-gabble_jingle_content_creator_is_initiator (GabbleJingleContent *c)
+wocky_jingle_content_creator_is_initiator (WockyJingleContent *c)
 {
   gboolean session_created_by_us;
 
@@ -1264,40 +1264,40 @@ gabble_jingle_content_creator_is_initiator (GabbleJingleContent *c)
 }
 
 const gchar *
-gabble_jingle_content_get_name (GabbleJingleContent *self)
+wocky_jingle_content_get_name (WockyJingleContent *self)
 {
   return self->priv->name;
 }
 
 const gchar *
-gabble_jingle_content_get_ns (GabbleJingleContent *self)
+wocky_jingle_content_get_ns (WockyJingleContent *self)
 {
   return self->priv->content_ns;
 }
 
 const gchar *
-gabble_jingle_content_get_transport_ns (GabbleJingleContent *self)
+wocky_jingle_content_get_transport_ns (WockyJingleContent *self)
 {
   return self->priv->transport_ns;
 }
 
 const gchar *
-gabble_jingle_content_get_disposition (GabbleJingleContent *self)
+wocky_jingle_content_get_disposition (WockyJingleContent *self)
 {
   return self->priv->disposition;
 }
 
-JingleTransportType
-gabble_jingle_content_get_transport_type (GabbleJingleContent *c)
+WockyJingleTransportType
+wocky_jingle_content_get_transport_type (WockyJingleContent *c)
 {
-  return gabble_jingle_transport_iface_get_transport_type (c->priv->transport);
+  return wocky_jingle_transport_iface_get_transport_type (c->priv->transport);
 }
 
 static gboolean
-jingle_content_has_direction (GabbleJingleContent *self,
+jingle_content_has_direction (WockyJingleContent *self,
   gboolean sending)
 {
-  GabbleJingleContentPrivate *priv = self->priv;
+  WockyJingleContentPrivate *priv = self->priv;
   gboolean initiated_by_us;
 
   g_object_get (self->session, "local-initiator",
@@ -1305,13 +1305,13 @@ jingle_content_has_direction (GabbleJingleContent *self,
 
   switch (priv->senders)
     {
-      case JINGLE_CONTENT_SENDERS_BOTH:
+      case WOCKY_JINGLE_CONTENT_SENDERS_BOTH:
         return TRUE;
-      case JINGLE_CONTENT_SENDERS_NONE:
+      case WOCKY_JINGLE_CONTENT_SENDERS_NONE:
         return FALSE;
-      case JINGLE_CONTENT_SENDERS_INITIATOR:
+      case WOCKY_JINGLE_CONTENT_SENDERS_INITIATOR:
         return sending ? initiated_by_us : !initiated_by_us;
-      case JINGLE_CONTENT_SENDERS_RESPONDER:
+      case WOCKY_JINGLE_CONTENT_SENDERS_RESPONDER:
         return sending ? !initiated_by_us : initiated_by_us;
     }
 
@@ -1319,26 +1319,26 @@ jingle_content_has_direction (GabbleJingleContent *self,
 }
 
 gboolean
-gabble_jingle_content_sending (GabbleJingleContent *self)
+wocky_jingle_content_sending (WockyJingleContent *self)
 {
   return jingle_content_has_direction (self, TRUE);
 }
 
 gboolean
-gabble_jingle_content_receiving (GabbleJingleContent *self)
+wocky_jingle_content_receiving (WockyJingleContent *self)
 {
   return jingle_content_has_direction (self, FALSE);
 }
 
 void
-gabble_jingle_content_set_sending (GabbleJingleContent *self,
+wocky_jingle_content_set_sending (WockyJingleContent *self,
   gboolean send)
 {
-  GabbleJingleContentPrivate *priv = self->priv;
-  JingleContentSenders senders;
+  WockyJingleContentPrivate *priv = self->priv;
+  WockyJingleContentSenders senders;
   gboolean initiated_by_us;
 
-  if (send == gabble_jingle_content_sending (self))
+  if (send == wocky_jingle_content_sending (self))
     return;
 
   g_object_get (self->session, "local-initiator",
@@ -1346,37 +1346,37 @@ gabble_jingle_content_set_sending (GabbleJingleContent *self,
 
   if (send)
     {
-      if (priv->senders == JINGLE_CONTENT_SENDERS_NONE)
-        senders = (initiated_by_us ? JINGLE_CONTENT_SENDERS_INITIATOR :
-          JINGLE_CONTENT_SENDERS_RESPONDER);
+      if (priv->senders == WOCKY_JINGLE_CONTENT_SENDERS_NONE)
+        senders = (initiated_by_us ? WOCKY_JINGLE_CONTENT_SENDERS_INITIATOR :
+          WOCKY_JINGLE_CONTENT_SENDERS_RESPONDER);
       else
-        senders = JINGLE_CONTENT_SENDERS_BOTH;
+        senders = WOCKY_JINGLE_CONTENT_SENDERS_BOTH;
     }
   else
     {
-      if (priv->senders == JINGLE_CONTENT_SENDERS_BOTH)
-        senders = (initiated_by_us ? JINGLE_CONTENT_SENDERS_RESPONDER :
-          JINGLE_CONTENT_SENDERS_INITIATOR);
+      if (priv->senders == WOCKY_JINGLE_CONTENT_SENDERS_BOTH)
+        senders = (initiated_by_us ? WOCKY_JINGLE_CONTENT_SENDERS_RESPONDER :
+          WOCKY_JINGLE_CONTENT_SENDERS_INITIATOR);
       else
-        senders = JINGLE_CONTENT_SENDERS_NONE;
+        senders = WOCKY_JINGLE_CONTENT_SENDERS_NONE;
     }
 
-  if (senders == JINGLE_CONTENT_SENDERS_NONE)
-    gabble_jingle_content_remove (self, TRUE);
+  if (senders == WOCKY_JINGLE_CONTENT_SENDERS_NONE)
+    wocky_jingle_content_remove (self, TRUE);
   else
-    gabble_jingle_content_change_direction (self, senders);
+    wocky_jingle_content_change_direction (self, senders);
 }
 
 
 void
-gabble_jingle_content_request_receiving (GabbleJingleContent *self,
+wocky_jingle_content_request_receiving (WockyJingleContent *self,
   gboolean receive)
 {
-  GabbleJingleContentPrivate *priv = self->priv;
-  JingleContentSenders senders;
+  WockyJingleContentPrivate *priv = self->priv;
+  WockyJingleContentSenders senders;
   gboolean initiated_by_us;
 
-  if (receive == gabble_jingle_content_receiving (self))
+  if (receive == wocky_jingle_content_receiving (self))
     return;
 
   g_object_get (self->session, "local-initiator",
@@ -1384,24 +1384,24 @@ gabble_jingle_content_request_receiving (GabbleJingleContent *self,
 
   if (receive)
     {
-      if (priv->senders == JINGLE_CONTENT_SENDERS_NONE)
-        senders = (initiated_by_us ? JINGLE_CONTENT_SENDERS_RESPONDER :
-            JINGLE_CONTENT_SENDERS_INITIATOR);
+      if (priv->senders == WOCKY_JINGLE_CONTENT_SENDERS_NONE)
+        senders = (initiated_by_us ? WOCKY_JINGLE_CONTENT_SENDERS_RESPONDER :
+            WOCKY_JINGLE_CONTENT_SENDERS_INITIATOR);
       else
-        senders = JINGLE_CONTENT_SENDERS_BOTH;
+        senders = WOCKY_JINGLE_CONTENT_SENDERS_BOTH;
     }
   else
     {
-      if (priv->senders == JINGLE_CONTENT_SENDERS_BOTH)
-        senders = (initiated_by_us ? JINGLE_CONTENT_SENDERS_INITIATOR :
-            JINGLE_CONTENT_SENDERS_RESPONDER);
+      if (priv->senders == WOCKY_JINGLE_CONTENT_SENDERS_BOTH)
+        senders = (initiated_by_us ? WOCKY_JINGLE_CONTENT_SENDERS_INITIATOR :
+            WOCKY_JINGLE_CONTENT_SENDERS_RESPONDER);
       else
-        senders = JINGLE_CONTENT_SENDERS_NONE;
+        senders = WOCKY_JINGLE_CONTENT_SENDERS_NONE;
     }
 
 
-  if (senders == JINGLE_CONTENT_SENDERS_NONE)
-    gabble_jingle_content_remove (self, TRUE);
+  if (senders == WOCKY_JINGLE_CONTENT_SENDERS_NONE)
+    wocky_jingle_content_remove (self, TRUE);
   else
-    gabble_jingle_content_change_direction (self, senders);
+    wocky_jingle_content_change_direction (self, senders);
 }
diff --git a/src/jingle-content.h b/src/jingle-content.h
index 1c337efb5..f702c1190 100644
--- a/src/jingle-content.h
+++ b/src/jingle-content.h
@@ -1,5 +1,5 @@
 /*
- * jingle-content.h - Header for GabbleJingleContent
+ * jingle-content.h - Header for WockyJingleContent
  * Copyright (C) 2008 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
@@ -29,22 +29,22 @@
 G_BEGIN_DECLS
 
 typedef enum {
-  JINGLE_MEDIA_TYPE_NONE = 0,
-  JINGLE_MEDIA_TYPE_AUDIO,
-  JINGLE_MEDIA_TYPE_VIDEO,
-} JingleMediaType;
+  WOCKY_JINGLE_MEDIA_TYPE_NONE = 0,
+  WOCKY_JINGLE_MEDIA_TYPE_AUDIO,
+  WOCKY_JINGLE_MEDIA_TYPE_VIDEO,
+} WockyJingleMediaType;
 
 typedef enum {
-  JINGLE_CONTENT_STATE_EMPTY = 0,
-  JINGLE_CONTENT_STATE_NEW,
-  JINGLE_CONTENT_STATE_SENT,
-  JINGLE_CONTENT_STATE_ACKNOWLEDGED,
-  JINGLE_CONTENT_STATE_REMOVING
-} JingleContentState;
+  WOCKY_JINGLE_CONTENT_STATE_EMPTY = 0,
+  WOCKY_JINGLE_CONTENT_STATE_NEW,
+  WOCKY_JINGLE_CONTENT_STATE_SENT,
+  WOCKY_JINGLE_CONTENT_STATE_ACKNOWLEDGED,
+  WOCKY_JINGLE_CONTENT_STATE_REMOVING
+} WockyJingleContentState;
 
-struct _JingleCandidate {
-  JingleTransportProtocol protocol;
-  JingleCandidateType type;
+struct _WockyJingleCandidate {
+  WockyJingleTransportProtocol protocol;
+  WockyJingleCandidateType type;
 
   gchar *id;
   gchar *address;
@@ -58,106 +58,106 @@ struct _JingleCandidate {
   int network;
 };
 
-typedef struct _GabbleJingleContentClass GabbleJingleContentClass;
+typedef struct _WockyJingleContentClass WockyJingleContentClass;
 
-GType gabble_jingle_content_get_type (void);
+GType wocky_jingle_content_get_type (void);
 
 /* TYPE MACROS */
-#define GABBLE_TYPE_JINGLE_CONTENT \
-  (gabble_jingle_content_get_type ())
-#define GABBLE_JINGLE_CONTENT(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_JINGLE_CONTENT, \
-                              GabbleJingleContent))
-#define GABBLE_JINGLE_CONTENT_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_JINGLE_CONTENT, \
-                           GabbleJingleContentClass))
-#define GABBLE_IS_JINGLE_CONTENT(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_JINGLE_CONTENT))
-#define GABBLE_IS_JINGLE_CONTENT_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_JINGLE_CONTENT))
-#define GABBLE_JINGLE_CONTENT_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_JINGLE_CONTENT, \
-                              GabbleJingleContentClass))
-
-struct _GabbleJingleContentClass {
+#define WOCKY_TYPE_JINGLE_CONTENT \
+  (wocky_jingle_content_get_type ())
+#define WOCKY_JINGLE_CONTENT(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), WOCKY_TYPE_JINGLE_CONTENT, \
+                              WockyJingleContent))
+#define WOCKY_JINGLE_CONTENT_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), WOCKY_TYPE_JINGLE_CONTENT, \
+                           WockyJingleContentClass))
+#define WOCKY_IS_JINGLE_CONTENT(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), WOCKY_TYPE_JINGLE_CONTENT))
+#define WOCKY_IS_JINGLE_CONTENT_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), WOCKY_TYPE_JINGLE_CONTENT))
+#define WOCKY_JINGLE_CONTENT_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), WOCKY_TYPE_JINGLE_CONTENT, \
+                              WockyJingleContentClass))
+
+struct _WockyJingleContentClass {
     GObjectClass parent_class;
 
-    void  (*parse_description) (GabbleJingleContent *, WockyNode *,
+    void  (*parse_description) (WockyJingleContent *, WockyNode *,
         GError **);
-    void  (*produce_description) (GabbleJingleContent *, WockyNode *);
-    void  (*transport_created) (GabbleJingleContent *,
-        GabbleJingleTransportIface *);
-    JingleContentSenders (*get_default_senders) (GabbleJingleContent *);
+    void  (*produce_description) (WockyJingleContent *, WockyNode *);
+    void  (*transport_created) (WockyJingleContent *,
+        WockyJingleTransportIface *);
+    WockyJingleContentSenders (*get_default_senders) (WockyJingleContent *);
 };
 
-typedef struct _GabbleJingleContentPrivate GabbleJingleContentPrivate;
+typedef struct _WockyJingleContentPrivate WockyJingleContentPrivate;
 
-struct _GabbleJingleContent {
+struct _WockyJingleContent {
     GObject parent;
-    GabbleJingleContentPrivate *priv;
+    WockyJingleContentPrivate *priv;
 
-    GabbleJingleSession *session;
+    WockyJingleSession *session;
 };
 
-void gabble_jingle_content_parse_add (GabbleJingleContent *c,
+void wocky_jingle_content_parse_add (WockyJingleContent *c,
     WockyNode *content_node, gboolean google_mode, GError **error);
-void gabble_jingle_content_update_senders (GabbleJingleContent *c,
+void wocky_jingle_content_update_senders (WockyJingleContent *c,
     WockyNode *content_node, GError **error);
-void gabble_jingle_content_produce_node (GabbleJingleContent *c,
+void wocky_jingle_content_produce_node (WockyJingleContent *c,
     WockyNode *parent,
     gboolean include_description,
     gboolean include_transport,
     WockyNode **trans_node_out);
-void gabble_jingle_content_parse_accept (GabbleJingleContent *c,
+void wocky_jingle_content_parse_accept (WockyJingleContent *c,
   WockyNode *content_node, gboolean google_mode, GError **error);
 
-void gabble_jingle_content_parse_info (GabbleJingleContent *c,
+void wocky_jingle_content_parse_info (WockyJingleContent *c,
     WockyNode *content_node, GError **error);
-void gabble_jingle_content_parse_transport_info (GabbleJingleContent *self,
+void wocky_jingle_content_parse_transport_info (WockyJingleContent *self,
   WockyNode *trans_node, GError **error);
-void gabble_jingle_content_parse_description_info (GabbleJingleContent *self,
+void wocky_jingle_content_parse_description_info (WockyJingleContent *self,
   WockyNode *trans_node, GError **error);
-guint gabble_jingle_content_create_share_channel (GabbleJingleContent *self,
+guint wocky_jingle_content_create_share_channel (WockyJingleContent *self,
     const gchar *name);
-void gabble_jingle_content_add_candidates (GabbleJingleContent *self, GList *li);
-void _gabble_jingle_content_set_media_ready (GabbleJingleContent *self);
-gboolean gabble_jingle_content_is_ready (GabbleJingleContent *self);
-void gabble_jingle_content_set_transport_state (GabbleJingleContent *content,
-    JingleTransportState state);
-void gabble_jingle_content_remove (GabbleJingleContent *c, gboolean signal_peer);
-void gabble_jingle_content_reject (GabbleJingleContent *c,
-    JingleReason reason);
-
-GList *gabble_jingle_content_get_remote_candidates (GabbleJingleContent *c);
-GList *gabble_jingle_content_get_local_candidates (GabbleJingleContent *c);
-gboolean gabble_jingle_content_get_credentials (GabbleJingleContent *c,
+void wocky_jingle_content_add_candidates (WockyJingleContent *self, GList *li);
+void _wocky_jingle_content_set_media_ready (WockyJingleContent *self);
+gboolean wocky_jingle_content_is_ready (WockyJingleContent *self);
+void wocky_jingle_content_set_transport_state (WockyJingleContent *content,
+    WockyJingleTransportState state);
+void wocky_jingle_content_remove (WockyJingleContent *c, gboolean signal_peer);
+void wocky_jingle_content_reject (WockyJingleContent *c,
+    WockyJingleReason reason);
+
+GList *wocky_jingle_content_get_remote_candidates (WockyJingleContent *c);
+GList *wocky_jingle_content_get_local_candidates (WockyJingleContent *c);
+gboolean wocky_jingle_content_get_credentials (WockyJingleContent *c,
   gchar **ufrag, gchar **pwd);
-gboolean gabble_jingle_content_change_direction (GabbleJingleContent *c,
-    JingleContentSenders senders);
-void gabble_jingle_content_retransmit_candidates (GabbleJingleContent *self,
+gboolean wocky_jingle_content_change_direction (WockyJingleContent *c,
+    WockyJingleContentSenders senders);
+void wocky_jingle_content_retransmit_candidates (WockyJingleContent *self,
     gboolean all);
-void gabble_jingle_content_inject_candidates (GabbleJingleContent *self,
+void wocky_jingle_content_inject_candidates (WockyJingleContent *self,
     WockyNode *transport_node);
-gboolean gabble_jingle_content_is_created_by_us (GabbleJingleContent *c);
-gboolean gabble_jingle_content_creator_is_initiator (GabbleJingleContent *c);
+gboolean wocky_jingle_content_is_created_by_us (WockyJingleContent *c);
+gboolean wocky_jingle_content_creator_is_initiator (WockyJingleContent *c);
 
-const gchar *gabble_jingle_content_get_name (GabbleJingleContent *self);
-const gchar *gabble_jingle_content_get_ns (GabbleJingleContent *self);
-const gchar *gabble_jingle_content_get_disposition (GabbleJingleContent *self);
-JingleTransportType gabble_jingle_content_get_transport_type (GabbleJingleContent *c);
-const gchar *gabble_jingle_content_get_transport_ns (GabbleJingleContent *self);
+const gchar *wocky_jingle_content_get_name (WockyJingleContent *self);
+const gchar *wocky_jingle_content_get_ns (WockyJingleContent *self);
+const gchar *wocky_jingle_content_get_disposition (WockyJingleContent *self);
+WockyJingleTransportType wocky_jingle_content_get_transport_type (WockyJingleContent *c);
+const gchar *wocky_jingle_content_get_transport_ns (WockyJingleContent *self);
 
-void gabble_jingle_content_maybe_send_description (GabbleJingleContent *self);
+void wocky_jingle_content_maybe_send_description (WockyJingleContent *self);
 
-gboolean gabble_jingle_content_sending (GabbleJingleContent *self);
-gboolean gabble_jingle_content_receiving (GabbleJingleContent *self);
+gboolean wocky_jingle_content_sending (WockyJingleContent *self);
+gboolean wocky_jingle_content_receiving (WockyJingleContent *self);
 
-void gabble_jingle_content_set_sending (GabbleJingleContent *self,
+void wocky_jingle_content_set_sending (WockyJingleContent *self,
     gboolean send);
-void gabble_jingle_content_request_receiving (GabbleJingleContent *self,
+void wocky_jingle_content_request_receiving (WockyJingleContent *self,
     gboolean receive);
 
-void gabble_jingle_content_send_complete (GabbleJingleContent *self);
+void wocky_jingle_content_send_complete (WockyJingleContent *self);
 
 #endif /* __JINGLE_CONTENT_H__ */
 
diff --git a/src/jingle-factory.c b/src/jingle-factory.c
index 2451dd63d..f3ad394f7 100644
--- a/src/jingle-factory.c
+++ b/src/jingle-factory.c
@@ -41,7 +41,7 @@
 
 #include "google-relay.h"
 
-G_DEFINE_TYPE(GabbleJingleFactory, gabble_jingle_factory, G_TYPE_OBJECT);
+G_DEFINE_TYPE(WockyJingleFactory, wocky_jingle_factory, G_TYPE_OBJECT);
 
 /* signal enum */
 enum
@@ -60,7 +60,7 @@ enum
   LAST_PROPERTY
 };
 
-struct _GabbleJingleFactoryPrivate
+struct _WockyJingleFactoryPrivate
 {
   WockySession *session;
   WockyPorter *porter;
@@ -68,10 +68,10 @@ struct _GabbleJingleFactoryPrivate
   GHashTable *content_types;
   GHashTable *transports;
 
-  /* instances of SESSION_MAP_KEY_FORMAT => GabbleJingleSession. */
+  /* instances of SESSION_MAP_KEY_FORMAT => WockyJingleSession. */
   GHashTable *sessions;
 
-  GabbleJingleInfo *jingle_info;
+  WockyJingleInfo *jingle_info;
 
   gboolean dispose_has_run;
 };
@@ -80,31 +80,31 @@ static gboolean jingle_cb (
     WockyPorter *porter,
     WockyStanza *msg,
     gpointer user_data);
-static GabbleJingleSession *create_session (GabbleJingleFactory *fac,
+static WockyJingleSession *create_session (WockyJingleFactory *fac,
     const gchar *sid,
     const gchar *jid,
-    JingleDialect dialect,
+    WockyJingleDialect dialect,
     gboolean local_hold);
 
 static gboolean session_query_cap_cb (
-    GabbleJingleSession *session,
+    WockyJingleSession *session,
     WockyContact *contact,
     const gchar *cap_or_quirk,
     gpointer user_data);
-static void session_terminated_cb (GabbleJingleSession *sess,
+static void session_terminated_cb (WockyJingleSession *sess,
     gboolean local_terminator,
-    JingleReason reason,
+    WockyJingleReason reason,
     const gchar *text,
-    GabbleJingleFactory *fac);
+    WockyJingleFactory *fac);
 
-static void attach_to_wocky_session (GabbleJingleFactory *self);
+static void attach_to_wocky_session (WockyJingleFactory *self);
 
 static void
-gabble_jingle_factory_init (GabbleJingleFactory *obj)
+wocky_jingle_factory_init (WockyJingleFactory *obj)
 {
-  GabbleJingleFactoryPrivate *priv =
-     G_TYPE_INSTANCE_GET_PRIVATE (obj, GABBLE_TYPE_JINGLE_FACTORY,
-         GabbleJingleFactoryPrivate);
+  WockyJingleFactoryPrivate *priv =
+     G_TYPE_INSTANCE_GET_PRIVATE (obj, WOCKY_TYPE_JINGLE_FACTORY,
+         WockyJingleFactoryPrivate);
   obj->priv = priv;
 
   priv->sessions = g_hash_table_new_full (g_str_hash, g_str_equal,
@@ -120,10 +120,10 @@ gabble_jingle_factory_init (GabbleJingleFactory *obj)
 }
 
 static void
-gabble_jingle_factory_dispose (GObject *object)
+wocky_jingle_factory_dispose (GObject *object)
 {
-  GabbleJingleFactory *fac = GABBLE_JINGLE_FACTORY (object);
-  GabbleJingleFactoryPrivate *priv = fac->priv;
+  WockyJingleFactory *fac = WOCKY_JINGLE_FACTORY (object);
+  WockyJingleFactoryPrivate *priv = fac->priv;
   GHashTableIter iter;
   gpointer val;
 
@@ -133,7 +133,7 @@ gabble_jingle_factory_dispose (GObject *object)
   DEBUG ("dispose called");
   priv->dispose_has_run = TRUE;
 
-  gabble_jingle_factory_stop (fac);
+  wocky_jingle_factory_stop (fac);
   g_clear_object (&priv->session);
   g_clear_object (&priv->porter);
 
@@ -149,18 +149,18 @@ gabble_jingle_factory_dispose (GObject *object)
   priv->transports = NULL;
   g_clear_object (&priv->jingle_info);
 
-  if (G_OBJECT_CLASS (gabble_jingle_factory_parent_class)->dispose)
-    G_OBJECT_CLASS (gabble_jingle_factory_parent_class)->dispose (object);
+  if (G_OBJECT_CLASS (wocky_jingle_factory_parent_class)->dispose)
+    G_OBJECT_CLASS (wocky_jingle_factory_parent_class)->dispose (object);
 }
 
 static void
-gabble_jingle_factory_get_property (GObject *object,
+wocky_jingle_factory_get_property (GObject *object,
                                    guint property_id,
                                    GValue *value,
                                    GParamSpec *pspec)
 {
-  GabbleJingleFactory *chan = GABBLE_JINGLE_FACTORY (object);
-  GabbleJingleFactoryPrivate *priv = chan->priv;
+  WockyJingleFactory *chan = WOCKY_JINGLE_FACTORY (object);
+  WockyJingleFactoryPrivate *priv = chan->priv;
 
   switch (property_id) {
     case PROP_SESSION:
@@ -173,13 +173,13 @@ gabble_jingle_factory_get_property (GObject *object,
 }
 
 static void
-gabble_jingle_factory_set_property (GObject *object,
+wocky_jingle_factory_set_property (GObject *object,
                                    guint property_id,
                                    const GValue *value,
                                    GParamSpec *pspec)
 {
-  GabbleJingleFactory *chan = GABBLE_JINGLE_FACTORY (object);
-  GabbleJingleFactoryPrivate *priv = chan->priv;
+  WockyJingleFactory *chan = WOCKY_JINGLE_FACTORY (object);
+  WockyJingleFactoryPrivate *priv = chan->priv;
 
   switch (property_id) {
     case PROP_SESSION:
@@ -192,10 +192,10 @@ gabble_jingle_factory_set_property (GObject *object,
 }
 
 static void
-gabble_jingle_factory_constructed (GObject *obj)
+wocky_jingle_factory_constructed (GObject *obj)
 {
-  GabbleJingleFactory *self = GABBLE_JINGLE_FACTORY (obj);
-  GObjectClass *parent = G_OBJECT_CLASS (gabble_jingle_factory_parent_class);
+  WockyJingleFactory *self = WOCKY_JINGLE_FACTORY (obj);
+  GObjectClass *parent = G_OBJECT_CLASS (wocky_jingle_factory_parent_class);
 
   if (parent->constructed != NULL)
     parent->constructed (obj);
@@ -210,17 +210,17 @@ gabble_jingle_factory_constructed (GObject *obj)
 }
 
 static void
-gabble_jingle_factory_class_init (GabbleJingleFactoryClass *cls)
+wocky_jingle_factory_class_init (WockyJingleFactoryClass *cls)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (cls);
   GParamSpec *param_spec;
 
-  g_type_class_add_private (cls, sizeof (GabbleJingleFactoryPrivate));
+  g_type_class_add_private (cls, sizeof (WockyJingleFactoryPrivate));
 
-  object_class->constructed = gabble_jingle_factory_constructed;
-  object_class->get_property = gabble_jingle_factory_get_property;
-  object_class->set_property = gabble_jingle_factory_set_property;
-  object_class->dispose = gabble_jingle_factory_dispose;
+  object_class->constructed = wocky_jingle_factory_constructed;
+  object_class->get_property = wocky_jingle_factory_get_property;
+  object_class->set_property = wocky_jingle_factory_set_property;
+  object_class->dispose = wocky_jingle_factory_dispose;
 
   param_spec = g_param_spec_object ("session", "WockySession object",
       "WockySession to listen for Jingle sessions on",
@@ -238,7 +238,7 @@ gabble_jingle_factory_class_init (GabbleJingleFactoryClass *cls)
   signals[NEW_SESSION] = g_signal_new ("new-session",
         G_TYPE_FROM_CLASS (cls), G_SIGNAL_RUN_LAST,
         0, NULL, NULL, gabble_marshal_VOID__OBJECT_BOOL,
-        G_TYPE_NONE, 2, GABBLE_TYPE_JINGLE_SESSION, G_TYPE_BOOLEAN);
+        G_TYPE_NONE, 2, WOCKY_TYPE_JINGLE_SESSION, G_TYPE_BOOLEAN);
 
   /*
    * @contact: the peer in a call
@@ -255,19 +255,19 @@ gabble_jingle_factory_class_init (GabbleJingleFactoryClass *cls)
         G_TYPE_BOOLEAN, 2, WOCKY_TYPE_CONTACT, G_TYPE_STRING);
 }
 
-GabbleJingleFactory *
-gabble_jingle_factory_new (
+WockyJingleFactory *
+wocky_jingle_factory_new (
     WockySession *session)
 {
-  return g_object_new (GABBLE_TYPE_JINGLE_FACTORY,
+  return g_object_new (WOCKY_TYPE_JINGLE_FACTORY,
       "session", session,
       NULL);
 }
 
 static void
-attach_to_wocky_session (GabbleJingleFactory *self)
+attach_to_wocky_session (WockyJingleFactory *self)
 {
-  GabbleJingleFactoryPrivate *priv = self->priv;
+  WockyJingleFactoryPrivate *priv = self->priv;
 
   g_assert (priv->session != NULL);
 
@@ -281,13 +281,13 @@ attach_to_wocky_session (GabbleJingleFactory *self)
       WOCKY_PORTER_HANDLER_PRIORITY_NORMAL, jingle_cb, self,
       NULL);
 
-  priv->jingle_info = gabble_jingle_info_new (priv->porter);
+  priv->jingle_info = wocky_jingle_info_new (priv->porter);
 }
 
 void
-gabble_jingle_factory_stop (GabbleJingleFactory *self)
+wocky_jingle_factory_stop (WockyJingleFactory *self)
 {
-  GabbleJingleFactoryPrivate *priv = self->priv;
+  WockyJingleFactoryPrivate *priv = self->priv;
 
   if (priv->porter != NULL &&
       priv->jingle_handler_id != 0)
@@ -311,7 +311,7 @@ make_session_map_key (
 }
 
 static gchar *
-get_unique_sid_for (GabbleJingleFactory *factory,
+get_unique_sid_for (WockyJingleFactory *factory,
     const gchar *jid,
     gchar **key)
 {
@@ -334,18 +334,18 @@ get_unique_sid_for (GabbleJingleFactory *factory,
   return sid;
 }
 
-static GabbleJingleSession *
-ensure_session (GabbleJingleFactory *self,
+static WockyJingleSession *
+ensure_session (WockyJingleFactory *self,
     const gchar *sid,
     const gchar *from,
-    JingleAction action,
-    JingleDialect dialect,
+    WockyJingleAction action,
+    WockyJingleDialect dialect,
     gboolean *new_session,
     GError **error)
 {
-  GabbleJingleFactoryPrivate *priv = self->priv;
+  WockyJingleFactoryPrivate *priv = self->priv;
   gchar *key;
-  GabbleJingleSession *sess;
+  WockyJingleSession *sess;
 
   if (!wocky_decode_jid (from, NULL, NULL, NULL))
     {
@@ -360,7 +360,7 @@ ensure_session (GabbleJingleFactory *self,
 
   if (sess == NULL)
     {
-      if (action == JINGLE_ACTION_SESSION_INITIATE)
+      if (action == WOCKY_JINGLE_ACTION_SESSION_INITIATE)
         {
           sess = create_session (self, sid, from, dialect, FALSE);
           *new_session = TRUE;
@@ -387,16 +387,16 @@ jingle_cb (
     WockyStanza *msg,
     gpointer user_data)
 {
-  GabbleJingleFactory *self = GABBLE_JINGLE_FACTORY (user_data);
+  WockyJingleFactory *self = WOCKY_JINGLE_FACTORY (user_data);
   GError *error = NULL;
   const gchar *sid, *from;
-  GabbleJingleSession *sess;
+  WockyJingleSession *sess;
   gboolean new_session = FALSE;
-  JingleAction action;
-  JingleDialect dialect;
+  WockyJingleAction action;
+  WockyJingleDialect dialect;
 
   /* see if it's a jingle message and detect dialect */
-  sid = gabble_jingle_session_detect (msg, &action, &dialect);
+  sid = wocky_jingle_session_detect (msg, &action, &dialect);
   from = wocky_stanza_get_from (msg);
 
   if (sid == NULL || from == NULL)
@@ -409,7 +409,7 @@ jingle_cb (
     goto REQUEST_ERROR;
 
   /* now act on the message */
-  if (!gabble_jingle_session_parse (sess, action, msg, &error))
+  if (!wocky_jingle_session_parse (sess, action, msg, &error))
     goto REQUEST_ERROR;
 
   /* This has to be after the call to parse(), not inside create_session():
@@ -433,19 +433,19 @@ REQUEST_ERROR:
   g_error_free (error);
 
   if (sess != NULL && new_session)
-    gabble_jingle_session_terminate (sess, JINGLE_REASON_UNKNOWN, NULL, NULL);
+    wocky_jingle_session_terminate (sess, WOCKY_JINGLE_REASON_UNKNOWN, NULL, NULL);
 
   return TRUE;
 }
 
 static gboolean
 session_query_cap_cb (
-    GabbleJingleSession *session,
+    WockyJingleSession *session,
     WockyContact *contact,
     const gchar *cap_or_quirk,
     gpointer user_data)
 {
-  GabbleJingleFactory *self = GABBLE_JINGLE_FACTORY (user_data);
+  WockyJingleFactory *self = WOCKY_JINGLE_FACTORY (user_data);
   gboolean ret;
 
   /* Propagate the query out to the application. We can't depend on the
@@ -460,17 +460,17 @@ session_query_cap_cb (
 /*
  * If sid is set to NULL a unique sid is generated and
  * the "local-initiator" property of the newly created
- * GabbleJingleSession is set to true.
+ * WockyJingleSession is set to true.
  */
-static GabbleJingleSession *
-create_session (GabbleJingleFactory *fac,
+static WockyJingleSession *
+create_session (WockyJingleFactory *fac,
     const gchar *sid,
     const gchar *jid,
-    JingleDialect dialect,
+    WockyJingleDialect dialect,
     gboolean local_hold)
 {
-  GabbleJingleFactoryPrivate *priv = fac->priv;
-  GabbleJingleSession *sess;
+  WockyJingleFactoryPrivate *priv = fac->priv;
+  WockyJingleSession *sess;
   gboolean local_initiator;
   gchar *sid_, *key;
   gpointer contact;
@@ -505,7 +505,7 @@ create_session (GabbleJingleFactory *fac,
    * get_unique_sid_for should have ensured the key is fresh. */
   g_assert (NULL == g_hash_table_lookup (priv->sessions, key));
 
-  sess = gabble_jingle_session_new (
+  sess = wocky_jingle_session_new (
       fac,
       priv->porter,
       sid_, local_initiator, contact, dialect, local_hold);
@@ -526,32 +526,32 @@ create_session (GabbleJingleFactory *fac,
   return sess;
 }
 
-GabbleJingleSession *
-gabble_jingle_factory_create_session (GabbleJingleFactory *fac,
+WockyJingleSession *
+wocky_jingle_factory_create_session (WockyJingleFactory *fac,
     const gchar *jid,
-    JingleDialect dialect,
+    WockyJingleDialect dialect,
     gboolean local_hold)
 {
-  GabbleJingleSession *session = create_session (fac, NULL, jid, dialect, local_hold);
+  WockyJingleSession *session = create_session (fac, NULL, jid, dialect, local_hold);
 
   g_signal_emit (fac, signals[NEW_SESSION], 0, session, TRUE);
   return session;
 }
 
 void
-gabble_jingle_factory_register_transport (GabbleJingleFactory *self,
+wocky_jingle_factory_register_transport (WockyJingleFactory *self,
                                           gchar *xmlns,
                                           GType transport_type)
 {
   g_return_if_fail (g_type_is_a (transport_type,
-        GABBLE_TYPE_JINGLE_TRANSPORT_IFACE));
+        WOCKY_TYPE_JINGLE_TRANSPORT_IFACE));
 
   g_hash_table_insert (self->priv->transports, xmlns,
       GSIZE_TO_POINTER (transport_type));
 }
 
 GType
-gabble_jingle_factory_lookup_transport (GabbleJingleFactory *self,
+wocky_jingle_factory_lookup_transport (WockyJingleFactory *self,
                                         const gchar *xmlns)
 {
   return GPOINTER_TO_SIZE (g_hash_table_lookup (self->priv->transports,
@@ -559,18 +559,18 @@ gabble_jingle_factory_lookup_transport (GabbleJingleFactory *self,
 }
 
 void
-gabble_jingle_factory_register_content_type (GabbleJingleFactory *self,
+wocky_jingle_factory_register_content_type (WockyJingleFactory *self,
                                              gchar *xmlns,
                                              GType content_type)
 {
-  g_return_if_fail (g_type_is_a (content_type, GABBLE_TYPE_JINGLE_CONTENT));
+  g_return_if_fail (g_type_is_a (content_type, WOCKY_TYPE_JINGLE_CONTENT));
 
   g_hash_table_insert (self->priv->content_types, xmlns,
       GSIZE_TO_POINTER (content_type));
 }
 
 GType
-gabble_jingle_factory_lookup_content_type (GabbleJingleFactory *self,
+wocky_jingle_factory_lookup_content_type (WockyJingleFactory *self,
                                            const gchar *xmlns)
 {
   return GPOINTER_TO_SIZE (g_hash_table_lookup (self->priv->content_types,
@@ -578,15 +578,15 @@ gabble_jingle_factory_lookup_content_type (GabbleJingleFactory *self,
 }
 
 static void
-session_terminated_cb (GabbleJingleSession *session,
+session_terminated_cb (WockyJingleSession *session,
                        gboolean local_terminator G_GNUC_UNUSED,
-                       JingleReason reason G_GNUC_UNUSED,
+                       WockyJingleReason reason G_GNUC_UNUSED,
                        const gchar *text G_GNUC_UNUSED,
-                       GabbleJingleFactory *factory)
+                       WockyJingleFactory *factory)
 {
   gchar *key = make_session_map_key (
-      gabble_jingle_session_get_peer_jid (session),
-      gabble_jingle_session_get_sid (session));
+      wocky_jingle_session_get_peer_jid (session),
+      wocky_jingle_session_get_sid (session));
 
   DEBUG ("removing terminated session with key %s", key);
 
@@ -596,9 +596,9 @@ session_terminated_cb (GabbleJingleSession *session,
   g_free (key);
 }
 
-GabbleJingleInfo *
-gabble_jingle_factory_get_jingle_info (
-    GabbleJingleFactory *self)
+WockyJingleInfo *
+wocky_jingle_factory_get_jingle_info (
+    WockyJingleFactory *self)
 {
   return self->priv->jingle_info;
 }
diff --git a/src/jingle-factory.h b/src/jingle-factory.h
index d254dbf20..b715d1637 100644
--- a/src/jingle-factory.h
+++ b/src/jingle-factory.h
@@ -1,5 +1,5 @@
 /*
- * jingle-factory.h - Header for GabbleJingleFactory
+ * jingle-factory.h - Header for WockyJingleFactory
  * Copyright (C) 2008 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
@@ -27,62 +27,62 @@
 
 G_BEGIN_DECLS
 
-typedef struct _GabbleJingleFactoryClass GabbleJingleFactoryClass;
+typedef struct _WockyJingleFactoryClass WockyJingleFactoryClass;
 
-GType gabble_jingle_factory_get_type (void);
+GType wocky_jingle_factory_get_type (void);
 
 /* TYPE MACROS */
-#define GABBLE_TYPE_JINGLE_FACTORY \
-  (gabble_jingle_factory_get_type ())
-#define GABBLE_JINGLE_FACTORY(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_JINGLE_FACTORY, \
-                              GabbleJingleFactory))
-#define GABBLE_JINGLE_FACTORY_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_JINGLE_FACTORY, \
-                           GabbleJingleFactoryClass))
-#define GABBLE_IS_JINGLE_FACTORY(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_JINGLE_FACTORY))
-#define GABBLE_IS_JINGLE_FACTORY_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_JINGLE_FACTORY))
-#define GABBLE_JINGLE_FACTORY_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_JINGLE_FACTORY, \
-                              GabbleJingleFactoryClass))
-
-struct _GabbleJingleFactoryClass {
+#define WOCKY_TYPE_JINGLE_FACTORY \
+  (wocky_jingle_factory_get_type ())
+#define WOCKY_JINGLE_FACTORY(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), WOCKY_TYPE_JINGLE_FACTORY, \
+                              WockyJingleFactory))
+#define WOCKY_JINGLE_FACTORY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), WOCKY_TYPE_JINGLE_FACTORY, \
+                           WockyJingleFactoryClass))
+#define WOCKY_IS_JINGLE_FACTORY(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), WOCKY_TYPE_JINGLE_FACTORY))
+#define WOCKY_IS_JINGLE_FACTORY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), WOCKY_TYPE_JINGLE_FACTORY))
+#define WOCKY_JINGLE_FACTORY_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), WOCKY_TYPE_JINGLE_FACTORY, \
+                              WockyJingleFactoryClass))
+
+struct _WockyJingleFactoryClass {
     GObjectClass parent_class;
 };
 
-typedef struct _GabbleJingleFactoryPrivate GabbleJingleFactoryPrivate;
+typedef struct _WockyJingleFactoryPrivate WockyJingleFactoryPrivate;
 
-struct _GabbleJingleFactory {
+struct _WockyJingleFactory {
     GObject parent;
 
-    GabbleJingleFactoryPrivate *priv;
+    WockyJingleFactoryPrivate *priv;
 };
 
-GabbleJingleFactory *gabble_jingle_factory_new (
+WockyJingleFactory *wocky_jingle_factory_new (
     WockySession *session);
 
-void gabble_jingle_factory_stop (GabbleJingleFactory *self);
+void wocky_jingle_factory_stop (WockyJingleFactory *self);
 
-void gabble_jingle_factory_register_content_type (GabbleJingleFactory *self,
+void wocky_jingle_factory_register_content_type (WockyJingleFactory *self,
     gchar *xmlns, GType content_type);
-GType gabble_jingle_factory_lookup_content_type (GabbleJingleFactory *self,
+GType wocky_jingle_factory_lookup_content_type (WockyJingleFactory *self,
     const gchar *xmlns);
 
-void gabble_jingle_factory_register_transport (GabbleJingleFactory *self,
+void wocky_jingle_factory_register_transport (WockyJingleFactory *self,
     gchar *xmlns, GType transport_type);
-GType gabble_jingle_factory_lookup_transport (GabbleJingleFactory *self,
+GType wocky_jingle_factory_lookup_transport (WockyJingleFactory *self,
     const gchar *xmlns);
 
-GabbleJingleSession *gabble_jingle_factory_create_session (
-    GabbleJingleFactory *fac,
+WockyJingleSession *wocky_jingle_factory_create_session (
+    WockyJingleFactory *fac,
     const gchar *jid,
-    JingleDialect dialect,
+    WockyJingleDialect dialect,
     gboolean local_hold);
 
-GabbleJingleInfo *gabble_jingle_factory_get_jingle_info (
-    GabbleJingleFactory *fac);
+WockyJingleInfo *wocky_jingle_factory_get_jingle_info (
+    WockyJingleFactory *fac);
 
 G_END_DECLS;
 
diff --git a/src/jingle-info-internal.h b/src/jingle-info-internal.h
index 1f76ce3bc..fa0707bc7 100644
--- a/src/jingle-info-internal.h
+++ b/src/jingle-info-internal.h
@@ -1,5 +1,5 @@
 /*
- * jingle-info-internal.h - internal types for GabbleJingleInfo
+ * jingle-info-internal.h - internal types for WockyJingleInfo
  * Copyright © 2012 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
@@ -17,13 +17,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef GABBLE_JINGLE_INFO_INTERNAL_H
-#define GABBLE_JINGLE_INFO_INTERNAL_H
+#ifndef WOCKY_JINGLE_INFO_INTERNAL_H
+#define WOCKY_JINGLE_INFO_INTERNAL_H
 
 typedef enum {
-    GABBLE_STUN_SERVER_USER_SPECIFIED,
-    GABBLE_STUN_SERVER_DISCOVERED,
-    GABBLE_STUN_SERVER_FALLBACK
-} GabbleStunServerSource;
+    WOCKY_STUN_SERVER_USER_SPECIFIED,
+    WOCKY_STUN_SERVER_DISCOVERED,
+    WOCKY_STUN_SERVER_FALLBACK
+} WockyStunServerSource;
 
-#endif /* GABBLE_JINGLE_INFO_INTERNAL_H */
+#endif /* WOCKY_JINGLE_INFO_INTERNAL_H */
diff --git a/src/jingle-info.c b/src/jingle-info.c
index 07f111436..8855f1257 100644
--- a/src/jingle-info.c
+++ b/src/jingle-info.c
@@ -37,15 +37,15 @@ static gboolean jingle_info_cb (
     WockyStanza *stanza,
     gpointer user_data);
 
-struct _GabbleJingleInfoPrivate {
+struct _WockyJingleInfoPrivate {
     WockyPorter *porter;
     guint jingle_info_handler_id;
     gchar *jid_domain;
 
-    GabbleGoogleRelayResolver *google_resolver;
+    WockyGoogleRelayResolver *google_resolver;
 
-    GabbleStunServer *stun_server;
-    GabbleStunServer *fallback_stun_server;
+    WockyStunServer *stun_server;
+    WockyStunServer *fallback_stun_server;
 
     gchar *relay_token;
 
@@ -76,52 +76,52 @@ static guint signals[N_SIGNALS];
 static gboolean test_mode = FALSE;
 
 void
-gabble_jingle_info_set_test_mode (void)
+wocky_jingle_info_set_test_mode (void)
 {
   test_mode = TRUE;
 }
 
-static GabbleStunServer *
-gabble_stun_server_new (
+static WockyStunServer *
+wocky_stun_server_new (
     gchar *address,
     guint16 port)
 {
-  GabbleStunServer stun_server = { address, port };
+  WockyStunServer stun_server = { address, port };
 
-  return g_slice_dup (GabbleStunServer, &stun_server);
+  return g_slice_dup (WockyStunServer, &stun_server);
 }
 
 static void
-gabble_stun_server_free (GabbleStunServer *stun_server)
+wocky_stun_server_free (WockyStunServer *stun_server)
 {
   if (stun_server != NULL)
     {
       g_free (stun_server->address);
-      g_slice_free (GabbleStunServer, stun_server);
+      g_slice_free (WockyStunServer, stun_server);
     }
 }
 
-G_DEFINE_TYPE (GabbleJingleInfo, gabble_jingle_info, G_TYPE_OBJECT)
+G_DEFINE_TYPE (WockyJingleInfo, wocky_jingle_info, G_TYPE_OBJECT)
 
 static void
-gabble_jingle_info_init (GabbleJingleInfo *self)
+wocky_jingle_info_init (WockyJingleInfo *self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GABBLE_TYPE_JINGLE_INFO,
-      GabbleJingleInfoPrivate);
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, WOCKY_TYPE_JINGLE_INFO,
+      WockyJingleInfoPrivate);
 
   self->priv->relay_http_port = 80;
   self->priv->get_stun_from_jingle = TRUE;
 }
 
 static void
-gabble_jingle_info_get_property (
+wocky_jingle_info_get_property (
     GObject *object,
     guint property_id,
     GValue *value,
     GParamSpec *pspec)
 {
-  GabbleJingleInfo *self = GABBLE_JINGLE_INFO (object);
-  GabbleJingleInfoPrivate *priv = self->priv;
+  WockyJingleInfo *self = WOCKY_JINGLE_INFO (object);
+  WockyJingleInfoPrivate *priv = self->priv;
 
   switch (property_id)
     {
@@ -135,14 +135,14 @@ gabble_jingle_info_get_property (
 }
 
 static void
-gabble_jingle_info_set_property (
+wocky_jingle_info_set_property (
     GObject *object,
     guint property_id,
     const GValue *value,
     GParamSpec *pspec)
 {
-  GabbleJingleInfo *self = GABBLE_JINGLE_INFO (object);
-  GabbleJingleInfoPrivate *priv = self->priv;
+  WockyJingleInfo *self = WOCKY_JINGLE_INFO (object);
+  WockyJingleInfoPrivate *priv = self->priv;
 
   switch (property_id)
     {
@@ -157,11 +157,11 @@ gabble_jingle_info_set_property (
 }
 
 static void
-gabble_jingle_info_constructed (GObject *object)
+wocky_jingle_info_constructed (GObject *object)
 {
-  GabbleJingleInfo *self = GABBLE_JINGLE_INFO (object);
-  GabbleJingleInfoPrivate *priv = self->priv;
-  GObjectClass *parent_class = gabble_jingle_info_parent_class;
+  WockyJingleInfo *self = WOCKY_JINGLE_INFO (object);
+  WockyJingleInfoPrivate *priv = self->priv;
+  GObjectClass *parent_class = wocky_jingle_info_parent_class;
 
   if (parent_class->constructed != NULL)
     parent_class->constructed (object);
@@ -174,11 +174,11 @@ gabble_jingle_info_constructed (GObject *object)
 }
 
 static void
-gabble_jingle_info_dispose (GObject *object)
+wocky_jingle_info_dispose (GObject *object)
 {
-  GabbleJingleInfo *self = GABBLE_JINGLE_INFO (object);
-  GabbleJingleInfoPrivate *priv = self->priv;
-  GObjectClass *parent_class = gabble_jingle_info_parent_class;
+  WockyJingleInfo *self = WOCKY_JINGLE_INFO (object);
+  WockyJingleInfoPrivate *priv = self->priv;
+  GObjectClass *parent_class = wocky_jingle_info_parent_class;
 
   if (priv->porter != NULL)
     {
@@ -191,15 +191,15 @@ gabble_jingle_info_dispose (GObject *object)
 
   if (priv->google_resolver != NULL)
     {
-      gabble_google_relay_resolver_destroy (priv->google_resolver);
+      wocky_google_relay_resolver_destroy (priv->google_resolver);
       priv->google_resolver = NULL;
     }
 
   g_free (priv->jid_domain);
   priv->jid_domain = NULL;
-  gabble_stun_server_free (priv->stun_server);
+  wocky_stun_server_free (priv->stun_server);
   priv->stun_server = NULL;
-  gabble_stun_server_free (priv->fallback_stun_server);
+  wocky_stun_server_free (priv->fallback_stun_server);
   priv->fallback_stun_server = NULL;
   g_free (priv->relay_token);
   priv->relay_token = NULL;
@@ -211,17 +211,17 @@ gabble_jingle_info_dispose (GObject *object)
 }
 
 static void
-gabble_jingle_info_class_init (GabbleJingleInfoClass *klass)
+wocky_jingle_info_class_init (WockyJingleInfoClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GParamSpec *param_spec;
 
-  object_class->get_property = gabble_jingle_info_get_property;
-  object_class->set_property = gabble_jingle_info_set_property;
-  object_class->constructed = gabble_jingle_info_constructed;
-  object_class->dispose = gabble_jingle_info_dispose;
+  object_class->get_property = wocky_jingle_info_get_property;
+  object_class->set_property = wocky_jingle_info_set_property;
+  object_class->constructed = wocky_jingle_info_constructed;
+  object_class->dispose = wocky_jingle_info_dispose;
 
-  g_type_class_add_private (klass, sizeof (GabbleJingleInfoPrivate));
+  g_type_class_add_private (klass, sizeof (WockyJingleInfoPrivate));
 
   param_spec = g_param_spec_object ("porter", "WockyC2SPorter",
       "Porter for the current connection",
@@ -235,20 +235,20 @@ gabble_jingle_info_class_init (GabbleJingleInfoClass *klass)
       G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_UINT);
 }
 
-GabbleJingleInfo *
-gabble_jingle_info_new (
+WockyJingleInfo *
+wocky_jingle_info_new (
     WockyPorter *porter)
 {
-  return g_object_new (GABBLE_TYPE_JINGLE_INFO,
+  return g_object_new (WOCKY_TYPE_JINGLE_INFO,
       "porter", porter,
       NULL);
 }
 
 typedef struct {
-    GabbleJingleInfo *factory;
+    WockyJingleInfo *factory;
     gchar *stun_server;
     guint16 stun_port;
-    GabbleStunServerSource source;
+    WockyStunServerSource source;
     GCancellable *cancellable;
 } PendingStunServer;
 
@@ -272,10 +272,10 @@ stun_server_resolved_cb (GObject *resolver,
                          gpointer user_data)
 {
   PendingStunServer *data = user_data;
-  GabbleJingleInfo *self = data->factory;
-  GabbleJingleInfoPrivate *priv = self->priv;
+  WockyJingleInfo *self = data->factory;
+  WockyJingleInfoPrivate *priv = self->priv;
   GError *e = NULL;
-  GabbleStunServer *stun_server;
+  WockyStunServer *stun_server;
   gchar *address;
   GList *entries;
 
@@ -306,16 +306,16 @@ stun_server_resolved_cb (GObject *resolver,
       goto out;
     }
 
-  stun_server = gabble_stun_server_new (address, data->stun_port);
+  stun_server = wocky_stun_server_new (address, data->stun_port);
 
-  if (data->source == GABBLE_STUN_SERVER_FALLBACK)
+  if (data->source == WOCKY_STUN_SERVER_FALLBACK)
     {
-      gabble_stun_server_free (priv->fallback_stun_server);
+      wocky_stun_server_free (priv->fallback_stun_server);
       priv->fallback_stun_server = stun_server;
     }
   else
     {
-      gabble_stun_server_free (priv->stun_server);
+      wocky_stun_server_free (priv->stun_server);
       priv->stun_server = stun_server;
 
       g_signal_emit (self, signals[STUN_SERVER_CHANGED], 0,
@@ -328,11 +328,11 @@ out:
 }
 
 static void
-gabble_jingle_info_take_stun_server_internal (
-    GabbleJingleInfo *self,
+wocky_jingle_info_take_stun_server_internal (
+    WockyJingleInfo *self,
     gchar *stun_server,
     guint16 stun_port,
-    GabbleStunServerSource source)
+    WockyStunServerSource source)
 {
   GResolver *resolver;
   PendingStunServer *data;
@@ -340,7 +340,7 @@ gabble_jingle_info_take_stun_server_internal (
   if (stun_server == NULL)
     return;
 
-  if (source == GABBLE_STUN_SERVER_USER_SPECIFIED)
+  if (source == WOCKY_STUN_SERVER_USER_SPECIFIED)
     self->priv->get_stun_from_jingle = FALSE;
 
   resolver = g_resolver_get_default ();
@@ -364,8 +364,8 @@ gabble_jingle_info_take_stun_server_internal (
 }
 
 /*
- * gabble_jingle_info_take_stun_server:
- * @self: a #GabbleJingleInfo object
+ * wocky_jingle_info_take_stun_server:
+ * @self: a #WockyJingleInfo object
  * @stun_server: (transfer full): the STUN server's address
  * @stun_port: the STUN server's port
  * @is_fallback: %TRUE if this is a last resort; %FALSE if this STUN server was
@@ -373,23 +373,23 @@ gabble_jingle_info_take_stun_server_internal (
  *  user's XMPP server).
  */
 void
-gabble_jingle_info_take_stun_server (
-    GabbleJingleInfo *self,
+wocky_jingle_info_take_stun_server (
+    WockyJingleInfo *self,
     gchar *stun_server,
     guint16 stun_port,
     gboolean is_fallback)
 {
-  GabbleStunServerSource source = is_fallback
-      ? GABBLE_STUN_SERVER_FALLBACK
-      : GABBLE_STUN_SERVER_USER_SPECIFIED;
+  WockyStunServerSource source = is_fallback
+      ? WOCKY_STUN_SERVER_FALLBACK
+      : WOCKY_STUN_SERVER_USER_SPECIFIED;
 
-  gabble_jingle_info_take_stun_server_internal (self, stun_server, stun_port,
+  wocky_jingle_info_take_stun_server_internal (self, stun_server, stun_port,
       source);
 }
 
 static void
 got_jingle_info_stanza (
-    GabbleJingleInfo *self,
+    WockyJingleInfo *self,
     WockyStanza *stanza)
 {
   WockyNode *node, *query_node;
@@ -428,8 +428,8 @@ got_jingle_info_stanza (
             {
               DEBUG ("jingle info: got stun server %s, port %u", server,
                   port);
-              gabble_jingle_info_take_stun_server_internal (self,
-                  g_strdup (server), port, GABBLE_STUN_SERVER_DISCOVERED);
+              wocky_jingle_info_take_stun_server_internal (self,
+                  g_strdup (server), port, WOCKY_STUN_SERVER_DISCOVERED);
             }
         }
     }
@@ -523,7 +523,7 @@ jingle_info_cb (
     WockyStanza *stanza,
     gpointer user_data)
 {
-  GabbleJingleInfo *self = GABBLE_JINGLE_INFO (user_data);
+  WockyJingleInfo *self = WOCKY_JINGLE_INFO (user_data);
 
   got_jingle_info_stanza (self, stanza);
   wocky_porter_acknowledge_iq (porter, stanza, NULL);
@@ -538,7 +538,7 @@ jingle_info_reply_cb (
     gpointer user_data)
 {
   WockyPorter *porter = WOCKY_PORTER (source);
-  GabbleJingleInfo *self = GABBLE_JINGLE_INFO (user_data);
+  WockyJingleInfo *self = WOCKY_JINGLE_INFO (user_data);
   WockyStanza *reply = NULL;
   GError *error = NULL;
 
@@ -559,10 +559,10 @@ jingle_info_reply_cb (
 }
 
 static void
-gabble_jingle_info_send_google_request (
-    GabbleJingleInfo *self)
+wocky_jingle_info_send_google_request (
+    WockyJingleInfo *self)
 {
-  GabbleJingleInfoPrivate *priv = self->priv;
+  WockyJingleInfoPrivate *priv = self->priv;
   WockyStanza *stanza = wocky_stanza_build (
       WOCKY_STANZA_TYPE_IQ, WOCKY_STANZA_SUB_TYPE_GET, NULL,
       wocky_porter_get_bare_jid (priv->porter),
@@ -584,8 +584,8 @@ discover_stun_servers_cb (GObject *resolver,
     GAsyncResult *result,
     gpointer user_data)
 {
-  GabbleJingleInfo *self = GABBLE_JINGLE_INFO (user_data);
-  GabbleJingleInfoPrivate *priv = self->priv;
+  WockyJingleInfo *self = WOCKY_JINGLE_INFO (user_data);
+  WockyJingleInfoPrivate *priv = self->priv;
   GError *error = NULL;
   GList *targets;
 
@@ -612,7 +612,7 @@ discover_stun_servers_cb (GObject *resolver,
 
           DEBUG ("Found STUN server: %s:%d", hostname, port);
 
-          gabble_jingle_info_take_stun_server (self, g_strdup (hostname), port,
+          wocky_jingle_info_take_stun_server (self, g_strdup (hostname), port,
               FALSE);
         }
 
@@ -624,10 +624,10 @@ discover_stun_servers_cb (GObject *resolver,
 }
 
 static void
-gabble_jingle_info_lookup_srv (
-    GabbleJingleInfo *self)
+wocky_jingle_info_lookup_srv (
+    WockyJingleInfo *self)
 {
-  GabbleJingleInfoPrivate *priv = self->priv;
+  WockyJingleInfoPrivate *priv = self->priv;
   GResolver *resolver;
 
   g_assert (priv->jid_domain != NULL);
@@ -639,31 +639,31 @@ gabble_jingle_info_lookup_srv (
 }
 
 void
-gabble_jingle_info_send_request (
-    GabbleJingleInfo *self,
+wocky_jingle_info_send_request (
+    WockyJingleInfo *self,
     gboolean google_jingleinfo_supported)
 {
   /* FIXME: we probably don't want to send either query if the user specified a
    * stun server (that is, get_stun_from_jingle is FALSE).
    */
   if (google_jingleinfo_supported)
-    gabble_jingle_info_send_google_request (self);
+    wocky_jingle_info_send_google_request (self);
   else
-    gabble_jingle_info_lookup_srv (self);
+    wocky_jingle_info_lookup_srv (self);
 }
 
 /*
- * gabble_jingle_info_get_stun_servers:
+ * wocky_jingle_info_get_stun_servers:
  *
  * Grabs the currently known and resolved stun servers.
  *
- * Returns: (transfer container): a list of GabbleJingleInfo structs
+ * Returns: (transfer container): a list of WockyJingleInfo structs
  */
 GList *
-gabble_jingle_info_get_stun_servers (
-    GabbleJingleInfo *self)
+wocky_jingle_info_get_stun_servers (
+    WockyJingleInfo *self)
 {
-  GabbleJingleInfoPrivate *priv = self->priv;
+  WockyJingleInfoPrivate *priv = self->priv;
   GQueue stun_servers = G_QUEUE_INIT;
 
   if (priv->stun_server != NULL)
@@ -678,53 +678,53 @@ gabble_jingle_info_get_stun_servers (
 }
 
 const gchar *
-gabble_jingle_info_get_google_relay_token (
-    GabbleJingleInfo *self)
+wocky_jingle_info_get_google_relay_token (
+    WockyJingleInfo *self)
 {
   return self->priv->relay_token;
 }
 
-GabbleJingleRelay *
-gabble_jingle_relay_new (
-    GabbleJingleRelayType type,
+WockyJingleRelay *
+wocky_jingle_relay_new (
+    WockyJingleRelayType type,
     const gchar *ip,
     guint port,
     const gchar *username,
     const gchar *password,
     guint component)
 {
-  GabbleJingleRelay ret = { type, g_strdup (ip), port, g_strdup (username),
+  WockyJingleRelay ret = { type, g_strdup (ip), port, g_strdup (username),
       g_strdup (password), component };
 
-  return g_slice_dup (GabbleJingleRelay, &ret);
+  return g_slice_dup (WockyJingleRelay, &ret);
 }
 
 void
-gabble_jingle_relay_free (GabbleJingleRelay *relay)
+wocky_jingle_relay_free (WockyJingleRelay *relay)
 {
   g_free (relay->ip);
   g_free (relay->username);
   g_free (relay->password);
-  g_slice_free (GabbleJingleRelay, relay);
+  g_slice_free (WockyJingleRelay, relay);
 }
 
 void
-gabble_jingle_info_create_google_relay_session (
-    GabbleJingleInfo *self,
+wocky_jingle_info_create_google_relay_session (
+    WockyJingleInfo *self,
     guint components,
-    GabbleJingleInfoRelaySessionCb callback,
+    WockyJingleInfoRelaySessionCb callback,
     gpointer user_data)
 {
-  GabbleJingleInfoPrivate *priv = self->priv;
+  WockyJingleInfoPrivate *priv = self->priv;
 
   g_return_if_fail (callback != NULL);
 
   if (priv->google_resolver == NULL)
     {
-      priv->google_resolver = gabble_google_relay_resolver_new ();
+      priv->google_resolver = wocky_google_relay_resolver_new ();
     }
 
-  gabble_google_relay_resolver_resolve (priv->google_resolver,
+  wocky_google_relay_resolver_resolve (priv->google_resolver,
       components, priv->relay_server, priv->relay_http_port, priv->relay_token,
       callback, user_data);
 }
diff --git a/src/jingle-info.h b/src/jingle-info.h
index afac05610..d006da44e 100644
--- a/src/jingle-info.h
+++ b/src/jingle-info.h
@@ -17,105 +17,105 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef GABBLE_JINGLE_INFO_H
-#define GABBLE_JINGLE_INFO_H
+#ifndef WOCKY_JINGLE_INFO_H
+#define WOCKY_JINGLE_INFO_H
 
 #include <glib-object.h>
 #include <wocky/wocky.h>
 
-typedef struct _GabbleJingleInfo GabbleJingleInfo;
-typedef struct _GabbleJingleInfoClass GabbleJingleInfoClass;
-typedef struct _GabbleJingleInfoPrivate GabbleJingleInfoPrivate;
+typedef struct _WockyJingleInfo WockyJingleInfo;
+typedef struct _WockyJingleInfoClass WockyJingleInfoClass;
+typedef struct _WockyJingleInfoPrivate WockyJingleInfoPrivate;
 
-struct _GabbleJingleInfoClass {
+struct _WockyJingleInfoClass {
     GObjectClass parent_class;
 };
 
-struct _GabbleJingleInfo {
+struct _WockyJingleInfo {
     GObject parent;
 
-    GabbleJingleInfoPrivate *priv;
+    WockyJingleInfoPrivate *priv;
 };
 
-GType gabble_jingle_info_get_type (void);
+GType wocky_jingle_info_get_type (void);
 
-GabbleJingleInfo *gabble_jingle_info_new (
+WockyJingleInfo *wocky_jingle_info_new (
     WockyPorter *porter);
 
-void gabble_jingle_info_take_stun_server (
-    GabbleJingleInfo *self,
+void wocky_jingle_info_take_stun_server (
+    WockyJingleInfo *self,
     gchar *stun_server,
     guint16 stun_port,
     gboolean is_fallback);
-void gabble_jingle_info_send_request (
-    GabbleJingleInfo *self,
+void wocky_jingle_info_send_request (
+    WockyJingleInfo *self,
     gboolean google_jingleinfo_supported);
 
 typedef struct {
     gchar *address;
     guint16 port;
-} GabbleStunServer;
+} WockyStunServer;
 
-GList *gabble_jingle_info_get_stun_servers (
-    GabbleJingleInfo *self);
+GList *wocky_jingle_info_get_stun_servers (
+    WockyJingleInfo *self);
 
-const gchar *gabble_jingle_info_get_google_relay_token (
-    GabbleJingleInfo *self);
+const gchar *wocky_jingle_info_get_google_relay_token (
+    WockyJingleInfo *self);
 
 typedef enum {
-    GABBLE_JINGLE_RELAY_TYPE_UDP,
-    GABBLE_JINGLE_RELAY_TYPE_TCP,
-    GABBLE_JINGLE_RELAY_TYPE_TLS
-} GabbleJingleRelayType;
-#define GABBLE_N_JINGLE_RELAY_TYPES 3
+    WOCKY_JINGLE_RELAY_TYPE_UDP,
+    WOCKY_JINGLE_RELAY_TYPE_TCP,
+    WOCKY_JINGLE_RELAY_TYPE_TLS
+} WockyJingleRelayType;
+#define WOCKY_N_JINGLE_RELAY_TYPES 3
 
 typedef struct {
-    GabbleJingleRelayType type;
+    WockyJingleRelayType type;
     gchar *ip;
     guint port;
     gchar *username;
     gchar *password;
     guint component;
-} GabbleJingleRelay;
+} WockyJingleRelay;
 
-GabbleJingleRelay *gabble_jingle_relay_new (
-    GabbleJingleRelayType type,
+WockyJingleRelay *wocky_jingle_relay_new (
+    WockyJingleRelayType type,
     const gchar *ip,
     guint port,
     const gchar *username,
     const gchar *password,
     guint component);
-void gabble_jingle_relay_free (GabbleJingleRelay *relay);
+void wocky_jingle_relay_free (WockyJingleRelay *relay);
 
 /*
- * @relays: (element-type GabbleJingleRelay) (transfer none): a possibly-empty
- *  array of GabbleJingleRelay structs.
+ * @relays: (element-type WockyJingleRelay) (transfer none): a possibly-empty
+ *  array of WockyJingleRelay structs.
  */
-typedef void (*GabbleJingleInfoRelaySessionCb) (
+typedef void (*WockyJingleInfoRelaySessionCb) (
     GPtrArray *relays,
     gpointer user_data);
-void gabble_jingle_info_create_google_relay_session (
-    GabbleJingleInfo *self,
+void wocky_jingle_info_create_google_relay_session (
+    WockyJingleInfo *self,
     guint components,
-    GabbleJingleInfoRelaySessionCb callback,
+    WockyJingleInfoRelaySessionCb callback,
     gpointer user_data);
 
-void gabble_jingle_info_set_test_mode (void);
+void wocky_jingle_info_set_test_mode (void);
 
 /* TYPE MACROS */
-#define GABBLE_TYPE_JINGLE_INFO \
-  (gabble_jingle_info_get_type ())
-#define GABBLE_JINGLE_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_JINGLE_INFO, GabbleJingleInfo))
-#define GABBLE_JINGLE_INFO_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_JINGLE_INFO,\
-                           GabbleJingleInfoClass))
-#define GABBLE_IS_JINGLE_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_JINGLE_INFO))
-#define GABBLE_IS_JINGLE_INFO_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_JINGLE_INFO))
-#define GABBLE_JINGLE_INFO_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_JINGLE_INFO, \
-                              GabbleJingleInfoClass))
-
-#endif /* GABBLE_JINGLE_INFO_H */
+#define WOCKY_TYPE_JINGLE_INFO \
+  (wocky_jingle_info_get_type ())
+#define WOCKY_JINGLE_INFO(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), WOCKY_TYPE_JINGLE_INFO, WockyJingleInfo))
+#define WOCKY_JINGLE_INFO_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), WOCKY_TYPE_JINGLE_INFO,\
+                           WockyJingleInfoClass))
+#define WOCKY_IS_JINGLE_INFO(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), WOCKY_TYPE_JINGLE_INFO))
+#define WOCKY_IS_JINGLE_INFO_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), WOCKY_TYPE_JINGLE_INFO))
+#define WOCKY_JINGLE_INFO_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), WOCKY_TYPE_JINGLE_INFO, \
+                              WockyJingleInfoClass))
+
+#endif /* WOCKY_JINGLE_INFO_H */
diff --git a/src/jingle-media-rtp.c b/src/jingle-media-rtp.c
index 65ad46b50..7bf80c6f8 100644
--- a/src/jingle-media-rtp.c
+++ b/src/jingle-media-rtp.c
@@ -1,5 +1,5 @@
 /*
- * jingle-media-rtp.c - Source for GabbleJingleMediaRtp
+ * jingle-media-rtp.c - Source for WockyJingleMediaRtp
  *
  * Copyright (C) 2008 Collabora Ltd.
  *
@@ -41,8 +41,8 @@
 #include "presence-cache.h"
 #include "jingle-transport-google.h"
 
-G_DEFINE_TYPE (GabbleJingleMediaRtp,
-    gabble_jingle_media_rtp, GABBLE_TYPE_JINGLE_CONTENT);
+G_DEFINE_TYPE (WockyJingleMediaRtp,
+    wocky_jingle_media_rtp, WOCKY_TYPE_JINGLE_CONTENT);
 
 /* signal enum */
 enum
@@ -62,22 +62,22 @@ enum
 };
 
 typedef enum {
-  JINGLE_MEDIA_PROFILE_RTP_AVP,
-} JingleMediaProfile;
+  WOCKY_JINGLE_MEDIA_PROFILE_RTP_AVP,
+} WockyJingleMediaProfile;
 
-struct _GabbleJingleMediaRtpPrivate
+struct _WockyJingleMediaRtpPrivate
 {
-  JingleMediaDescription *local_media_description;
+  WockyJingleMediaDescription *local_media_description;
 
-  /* Holds (JingleCodec *)'s borrowed from local_media_description,
+  /* Holds (WockyJingleCodec *)'s borrowed from local_media_description,
    * namely codecs which have changed from local_media_description's
    * previous value. Since the contents are borrowed, this must be
    * freed with g_list_free, not jingle_media_rtp_free_codecs().
    */
   GList *local_codec_updates;
 
-  JingleMediaDescription *remote_media_description;
-  JingleMediaType media_type;
+  WockyJingleMediaDescription *remote_media_description;
+  WockyJingleMediaType media_type;
   gboolean remote_mute;
 
   gboolean has_rtcp_fb;
@@ -87,20 +87,20 @@ struct _GabbleJingleMediaRtpPrivate
 };
 
 static void
-gabble_jingle_media_rtp_init (GabbleJingleMediaRtp *obj)
+wocky_jingle_media_rtp_init (WockyJingleMediaRtp *obj)
 {
-  GabbleJingleMediaRtpPrivate *priv =
-     G_TYPE_INSTANCE_GET_PRIVATE (obj, GABBLE_TYPE_JINGLE_MEDIA_RTP,
-         GabbleJingleMediaRtpPrivate);
+  WockyJingleMediaRtpPrivate *priv =
+     G_TYPE_INSTANCE_GET_PRIVATE (obj, WOCKY_TYPE_JINGLE_MEDIA_RTP,
+         WockyJingleMediaRtpPrivate);
   obj->priv = priv;
   priv->dispose_has_run = FALSE;
 }
 
-JingleCodec *
+WockyJingleCodec *
 jingle_media_rtp_codec_new (guint id, const gchar *name,
     guint clockrate, guint channels, GHashTable *params)
 {
-  JingleCodec *p = g_slice_new0 (JingleCodec);
+  WockyJingleCodec *p = g_slice_new0 (WockyJingleCodec);
 
   p->id = id;
   p->name = g_strdup (name);
@@ -124,16 +124,16 @@ jingle_media_rtp_codec_new (guint id, const gchar *name,
 
 
 static GList *
-jingle_feedback_message_list_copy (GList *fbs)
+wocky_jingle_feedback_message_list_copy (GList *fbs)
 {
   GQueue new = G_QUEUE_INIT;
   GList *li;
 
   for (li = fbs; li; li = li->next)
     {
-      JingleFeedbackMessage *fb = li->data;
+      WockyJingleFeedbackMessage *fb = li->data;
 
-      g_queue_push_tail (&new, jingle_feedback_message_new (fb->type,
+      g_queue_push_tail (&new, wocky_jingle_feedback_message_new (fb->type,
               fb->subtype));
     }
 
@@ -141,26 +141,26 @@ jingle_feedback_message_list_copy (GList *fbs)
 }
 
 static void
-jingle_feedback_message_list_free (GList *fbs)
+wocky_jingle_feedback_message_list_free (GList *fbs)
 {
   while (fbs != NULL)
     {
-      jingle_feedback_message_free (fbs->data);
+      wocky_jingle_feedback_message_free (fbs->data);
       fbs = g_list_delete_link (fbs, fbs);
     }
 }
 
 void
-jingle_media_rtp_codec_free (JingleCodec *p)
+jingle_media_rtp_codec_free (WockyJingleCodec *p)
 {
   g_hash_table_unref (p->params);
   g_free (p->name);
-  jingle_feedback_message_list_free (p->feedback_msgs);
-  g_slice_free (JingleCodec, p);
+  wocky_jingle_feedback_message_list_free (p->feedback_msgs);
+  g_slice_free (WockyJingleCodec, p);
 }
 
 static void
-add_codec_to_table (JingleCodec *codec,
+add_codec_to_table (WockyJingleCodec *codec,
                     GHashTable *table)
 {
   g_hash_table_insert (table, GUINT_TO_POINTER ((guint) codec->id), codec);
@@ -182,8 +182,8 @@ jingle_media_rtp_copy_codecs (GList *codecs)
 
   for (l = codecs; l != NULL; l = g_list_next (l))
     {
-      JingleCodec *c = l->data;
-      JingleCodec *newc =  jingle_media_rtp_codec_new (c->id,
+      WockyJingleCodec *c = l->data;
+      WockyJingleCodec *newc =  jingle_media_rtp_codec_new (c->id,
           c->name, c->clockrate, c->channels, c->params);
       newc->trr_int = c->trr_int;
       ret = g_list_append (ret, newc);
@@ -203,10 +203,10 @@ jingle_media_rtp_free_codecs (GList *codecs)
 }
 
 static void
-gabble_jingle_media_rtp_dispose (GObject *object)
+wocky_jingle_media_rtp_dispose (GObject *object)
 {
-  GabbleJingleMediaRtp *trans = GABBLE_JINGLE_MEDIA_RTP (object);
-  GabbleJingleMediaRtpPrivate *priv = trans->priv;
+  WockyJingleMediaRtp *trans = WOCKY_JINGLE_MEDIA_RTP (object);
+  WockyJingleMediaRtpPrivate *priv = trans->priv;
 
   if (priv->dispose_has_run)
     return;
@@ -215,11 +215,11 @@ gabble_jingle_media_rtp_dispose (GObject *object)
   priv->dispose_has_run = TRUE;
 
   if (priv->remote_media_description != NULL)
-    jingle_media_description_free (priv->remote_media_description);
+    wocky_jingle_media_description_free (priv->remote_media_description);
   priv->remote_media_description = NULL;
 
   if (priv->local_media_description != NULL)
-    jingle_media_description_free (priv->local_media_description);
+    wocky_jingle_media_description_free (priv->local_media_description);
   priv->local_media_description = NULL;
 
   if (priv->local_codec_updates != NULL)
@@ -230,18 +230,18 @@ gabble_jingle_media_rtp_dispose (GObject *object)
       priv->local_codec_updates = NULL;
     }
 
-  if (G_OBJECT_CLASS (gabble_jingle_media_rtp_parent_class)->dispose)
-    G_OBJECT_CLASS (gabble_jingle_media_rtp_parent_class)->dispose (object);
+  if (G_OBJECT_CLASS (wocky_jingle_media_rtp_parent_class)->dispose)
+    G_OBJECT_CLASS (wocky_jingle_media_rtp_parent_class)->dispose (object);
 }
 
 static void
-gabble_jingle_media_rtp_get_property (GObject *object,
+wocky_jingle_media_rtp_get_property (GObject *object,
                                              guint property_id,
                                              GValue *value,
                                              GParamSpec *pspec)
 {
-  GabbleJingleMediaRtp *trans = GABBLE_JINGLE_MEDIA_RTP (object);
-  GabbleJingleMediaRtpPrivate *priv = trans->priv;
+  WockyJingleMediaRtp *trans = WOCKY_JINGLE_MEDIA_RTP (object);
+  WockyJingleMediaRtpPrivate *priv = trans->priv;
 
   switch (property_id) {
     case PROP_MEDIA_TYPE:
@@ -257,13 +257,13 @@ gabble_jingle_media_rtp_get_property (GObject *object,
 }
 
 static void
-gabble_jingle_media_rtp_set_property (GObject *object,
+wocky_jingle_media_rtp_set_property (GObject *object,
                                              guint property_id,
                                              const GValue *value,
                                              GParamSpec *pspec)
 {
-  GabbleJingleMediaRtp *trans = GABBLE_JINGLE_MEDIA_RTP (object);
-  GabbleJingleMediaRtpPrivate *priv = trans->priv;
+  WockyJingleMediaRtp *trans = WOCKY_JINGLE_MEDIA_RTP (object);
+  WockyJingleMediaRtpPrivate *priv = trans->priv;
 
   switch (property_id) {
     case PROP_MEDIA_TYPE:
@@ -278,25 +278,25 @@ gabble_jingle_media_rtp_set_property (GObject *object,
   }
 }
 
-static void parse_description (GabbleJingleContent *content,
+static void parse_description (WockyJingleContent *content,
     WockyNode *desc_node, GError **error);
-static void produce_description (GabbleJingleContent *obj,
+static void produce_description (WockyJingleContent *obj,
     WockyNode *content_node);
-static void transport_created (GabbleJingleContent *obj,
-    GabbleJingleTransportIface *transport);
+static void transport_created (WockyJingleContent *obj,
+    WockyJingleTransportIface *transport);
 
 static void
-gabble_jingle_media_rtp_class_init (GabbleJingleMediaRtpClass *cls)
+wocky_jingle_media_rtp_class_init (WockyJingleMediaRtpClass *cls)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (cls);
-  GabbleJingleContentClass *content_class = GABBLE_JINGLE_CONTENT_CLASS (cls);
+  WockyJingleContentClass *content_class = WOCKY_JINGLE_CONTENT_CLASS (cls);
   GParamSpec *param_spec;
 
-  g_type_class_add_private (cls, sizeof (GabbleJingleMediaRtpPrivate));
+  g_type_class_add_private (cls, sizeof (WockyJingleMediaRtpPrivate));
 
-  object_class->get_property = gabble_jingle_media_rtp_get_property;
-  object_class->set_property = gabble_jingle_media_rtp_set_property;
-  object_class->dispose = gabble_jingle_media_rtp_dispose;
+  object_class->get_property = wocky_jingle_media_rtp_get_property;
+  object_class->set_property = wocky_jingle_media_rtp_set_property;
+  object_class->dispose = wocky_jingle_media_rtp_dispose;
 
   content_class->parse_description = parse_description;
   content_class->produce_description = produce_description;
@@ -304,7 +304,7 @@ gabble_jingle_media_rtp_class_init (GabbleJingleMediaRtpClass *cls)
 
   param_spec = g_param_spec_uint ("media-type", "RTP media type",
       "Media type.",
-      JINGLE_MEDIA_TYPE_NONE, G_MAXUINT32, JINGLE_MEDIA_TYPE_NONE,
+      WOCKY_JINGLE_MEDIA_TYPE_NONE, G_MAXUINT32, WOCKY_JINGLE_MEDIA_TYPE_NONE,
       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_MEDIA_TYPE, param_spec);
 
@@ -321,24 +321,24 @@ gabble_jingle_media_rtp_class_init (GabbleJingleMediaRtpClass *cls)
         G_TYPE_NONE, 1, G_TYPE_POINTER);
 }
 
-static void transport_created (GabbleJingleContent *content,
-    GabbleJingleTransportIface *transport)
+static void transport_created (WockyJingleContent *content,
+    WockyJingleTransportIface *transport)
 {
-  GabbleJingleMediaRtp *self = GABBLE_JINGLE_MEDIA_RTP (content);
-  GabbleJingleMediaRtpPrivate *priv = self->priv;
-  GabbleJingleTransportGoogle *gtrans = NULL;
-  JingleDialect dialect;
+  WockyJingleMediaRtp *self = WOCKY_JINGLE_MEDIA_RTP (content);
+  WockyJingleMediaRtpPrivate *priv = self->priv;
+  WockyJingleTransportGoogle *gtrans = NULL;
+  WockyJingleDialect dialect;
 
-  if (GABBLE_IS_JINGLE_TRANSPORT_GOOGLE (transport))
+  if (WOCKY_IS_JINGLE_TRANSPORT_GOOGLE (transport))
     {
-      gtrans = GABBLE_JINGLE_TRANSPORT_GOOGLE (transport);
-      dialect = gabble_jingle_session_get_dialect (content->session);
+      gtrans = WOCKY_JINGLE_TRANSPORT_GOOGLE (transport);
+      dialect = wocky_jingle_session_get_dialect (content->session);
 
-      if (priv->media_type == JINGLE_MEDIA_TYPE_VIDEO &&
-          (JINGLE_IS_GOOGLE_DIALECT (dialect) ||
-           gabble_jingle_session_peer_has_cap (content->session,
+      if (priv->media_type == WOCKY_JINGLE_MEDIA_TYPE_VIDEO &&
+          (WOCKY_JINGLE_DIALECT_IS_GOOGLE (dialect) ||
+           wocky_jingle_session_peer_has_cap (content->session,
                QUIRK_GOOGLE_WEBMAIL_CLIENT) ||
-           gabble_jingle_session_peer_has_cap (content->session,
+           wocky_jingle_session_peer_has_cap (content->session,
                QUIRK_ANDROID_GTALK_CLIENT)))
         {
           jingle_transport_google_set_component_name (gtrans, "video_rtp", 1);
@@ -353,7 +353,7 @@ static void transport_created (GabbleJingleContent *content,
 }
 
 
-static JingleMediaType
+static WockyJingleMediaType
 extract_media_type (WockyNode *desc_node,
                     GError **error)
 {
@@ -365,31 +365,31 @@ extract_media_type (WockyNode *desc_node,
         {
           g_set_error (error, WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_BAD_REQUEST,
               "missing required media type attribute");
-          return JINGLE_MEDIA_TYPE_NONE;
+          return WOCKY_JINGLE_MEDIA_TYPE_NONE;
         }
 
       if (!wocky_strdiff (type, "audio"))
-          return JINGLE_MEDIA_TYPE_AUDIO;
+          return WOCKY_JINGLE_MEDIA_TYPE_AUDIO;
 
       if (!wocky_strdiff (type, "video"))
-        return JINGLE_MEDIA_TYPE_VIDEO;
+        return WOCKY_JINGLE_MEDIA_TYPE_VIDEO;
 
       g_set_error (error, WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_BAD_REQUEST,
           "unknown media type %s", type);
-      return JINGLE_MEDIA_TYPE_NONE;
+      return WOCKY_JINGLE_MEDIA_TYPE_NONE;
     }
 
   if (wocky_node_has_ns (desc_node, NS_JINGLE_DESCRIPTION_AUDIO))
-    return JINGLE_MEDIA_TYPE_AUDIO;
+    return WOCKY_JINGLE_MEDIA_TYPE_AUDIO;
 
   if (wocky_node_has_ns (desc_node, NS_JINGLE_DESCRIPTION_VIDEO))
-    return JINGLE_MEDIA_TYPE_VIDEO;
+    return WOCKY_JINGLE_MEDIA_TYPE_VIDEO;
 
   if (wocky_node_has_ns (desc_node, NS_GOOGLE_SESSION_PHONE))
-    return JINGLE_MEDIA_TYPE_AUDIO;
+    return WOCKY_JINGLE_MEDIA_TYPE_AUDIO;
 
   if (wocky_node_has_ns (desc_node, NS_GOOGLE_SESSION_VIDEO))
-    return JINGLE_MEDIA_TYPE_VIDEO;
+    return WOCKY_JINGLE_MEDIA_TYPE_VIDEO;
 
   /* If we get here, namespace in use is not one of namespaces we signed up
    * with, so obviously a bug somewhere.
@@ -397,8 +397,8 @@ extract_media_type (WockyNode *desc_node,
   g_assert_not_reached ();
 }
 
-static JingleFeedbackMessage *
-parse_rtcp_fb (GabbleJingleContent *content, WockyNode *node)
+static WockyJingleFeedbackMessage *
+parse_rtcp_fb (WockyJingleContent *content, WockyNode *node)
 {
   const gchar *pt_ns = wocky_node_get_ns (node);
   const gchar *type;
@@ -417,7 +417,7 @@ parse_rtcp_fb (GabbleJingleContent *content, WockyNode *node)
   if (subtype == NULL)
     subtype = "";
 
-  return jingle_feedback_message_new (type, subtype);
+  return wocky_jingle_feedback_message_new (type, subtype);
 }
 
 
@@ -425,7 +425,7 @@ parse_rtcp_fb (GabbleJingleContent *content, WockyNode *node)
  * Returns G_MAXUINT on error
  */
 static guint
-parse_rtcp_fb_trr_int (GabbleJingleContent *content, WockyNode *node)
+parse_rtcp_fb_trr_int (WockyJingleContent *content, WockyNode *node)
 {
   const gchar *pt_ns = wocky_node_get_ns (node);
   const gchar *txt;
@@ -451,16 +451,16 @@ parse_rtcp_fb_trr_int (GabbleJingleContent *content, WockyNode *node)
  * parse_payload_type:
  * @node: a <payload-type> node.
  *
- * Returns: a newly-allocated JingleCodec if parsing succeeds, or %NULL
+ * Returns: a newly-allocated WockyJingleCodec if parsing succeeds, or %NULL
  *          otherwise.
  */
-static JingleCodec *
-parse_payload_type (GabbleJingleContent *content,
+static WockyJingleCodec *
+parse_payload_type (WockyJingleContent *content,
     WockyNode *node)
 {
-  GabbleJingleMediaRtp *self = GABBLE_JINGLE_MEDIA_RTP (content);
-  GabbleJingleMediaRtpPrivate *priv = self->priv;
-  JingleCodec *p;
+  WockyJingleMediaRtp *self = WOCKY_JINGLE_MEDIA_RTP (content);
+  WockyJingleMediaRtpPrivate *priv = self->priv;
+  WockyJingleCodec *p;
   const char *txt;
   guint8 id;
   const gchar *name;
@@ -512,7 +512,7 @@ parse_payload_type (GabbleJingleContent *content,
         }
       else if (!wocky_strdiff (param->name, "rtcp-fb"))
         {
-          JingleFeedbackMessage *fb = parse_rtcp_fb (content, param);
+          WockyJingleFeedbackMessage *fb = parse_rtcp_fb (content, param);
 
           if (fb != NULL)
             {
@@ -539,11 +539,11 @@ parse_payload_type (GabbleJingleContent *content,
   return p;
 }
 
-static JingleRtpHeaderExtension *
+static WockyJingleRtpHeaderExtension *
 parse_rtp_header_extension (WockyNode *node)
 {
   guint id;
-  JingleContentSenders senders;
+  WockyJingleContentSenders senders;
   const gchar *uri;
   const char *txt;
 
@@ -560,11 +560,11 @@ parse_rtp_header_extension (WockyNode *node)
   txt = wocky_node_get_attribute (node, "senders");
 
   if (txt == NULL || !g_ascii_strcasecmp (txt, "both"))
-    senders = JINGLE_CONTENT_SENDERS_BOTH;
+    senders = WOCKY_JINGLE_CONTENT_SENDERS_BOTH;
   else if (!g_ascii_strcasecmp (txt, "initiator"))
-    senders = JINGLE_CONTENT_SENDERS_INITIATOR;
+    senders = WOCKY_JINGLE_CONTENT_SENDERS_INITIATOR;
   else if (!g_ascii_strcasecmp (txt, "responder"))
-    senders = JINGLE_CONTENT_SENDERS_RESPONDER;
+    senders = WOCKY_JINGLE_CONTENT_SENDERS_RESPONDER;
   else
     return NULL;
 
@@ -573,7 +573,7 @@ parse_rtp_header_extension (WockyNode *node)
   if (uri == NULL)
     return NULL;
 
-  return jingle_rtp_header_extension_new (id, senders, uri);
+  return wocky_jingle_rtp_header_extension_new (id, senders, uri);
 }
 
 
@@ -591,8 +591,8 @@ parse_rtp_header_extension (WockyNode *node)
  * have, returns %FALSE and sets @e.
  */
 static gboolean
-codec_update_coherent (const JingleCodec *old_c,
-                       const JingleCodec *new_c,
+codec_update_coherent (const WockyJingleCodec *old_c,
+                       const WockyJingleCodec *new_c,
                        GError **e)
 {
   const GQuark domain = WOCKY_XMPP_ERROR;
@@ -634,13 +634,13 @@ codec_update_coherent (const JingleCodec *old_c,
 }
 
 static void
-update_remote_media_description (GabbleJingleMediaRtp *self,
-                                 JingleMediaDescription *new_media_description,
+update_remote_media_description (WockyJingleMediaRtp *self,
+                                 WockyJingleMediaDescription *new_media_description,
                                  GError **error)
 {
-  GabbleJingleMediaRtpPrivate *priv = self->priv;
+  WockyJingleMediaRtpPrivate *priv = self->priv;
   GHashTable *rc = NULL;
-  JingleCodec *old_c, *new_c;
+  WockyJingleCodec *old_c, *new_c;
   GList *l;
   GError *e = NULL;
 
@@ -680,7 +680,7 @@ update_remote_media_description (GabbleJingleMediaRtp *self,
 
 out:
   if (new_media_description != NULL)
-    jingle_media_description_free (new_media_description);
+    wocky_jingle_media_description_free (new_media_description);
 
   if (rc != NULL)
     g_hash_table_unref (rc);
@@ -699,15 +699,15 @@ out:
 }
 
 static void
-parse_description (GabbleJingleContent *content,
+parse_description (WockyJingleContent *content,
     WockyNode *desc_node, GError **error)
 {
-  GabbleJingleMediaRtp *self = GABBLE_JINGLE_MEDIA_RTP (content);
-  GabbleJingleMediaRtpPrivate *priv = self->priv;
-  JingleMediaType mtype;
-  JingleMediaDescription *md;
-  JingleCodec *p;
-  JingleDialect dialect = gabble_jingle_session_get_dialect (content->session);
+  WockyJingleMediaRtp *self = WOCKY_JINGLE_MEDIA_RTP (content);
+  WockyJingleMediaRtpPrivate *priv = self->priv;
+  WockyJingleMediaType mtype;
+  WockyJingleMediaDescription *md;
+  WockyJingleCodec *p;
+  WockyJingleDialect dialect = wocky_jingle_session_get_dialect (content->session);
   gboolean video_session = FALSE;
   WockyNodeIter i;
   WockyNode *node;
@@ -716,41 +716,41 @@ parse_description (GabbleJingleContent *content,
 
   DEBUG ("node: %s", desc_node->name);
 
-  if (priv->media_type == JINGLE_MEDIA_TYPE_NONE)
+  if (priv->media_type == WOCKY_JINGLE_MEDIA_TYPE_NONE)
     mtype = extract_media_type (desc_node, error);
   else
     mtype = priv->media_type;
 
-  if (mtype == JINGLE_MEDIA_TYPE_NONE)
+  if (mtype == WOCKY_JINGLE_MEDIA_TYPE_NONE)
     return;
 
   DEBUG ("detected media type %u", mtype);
 
-  if (dialect == JINGLE_DIALECT_GTALK3)
+  if (dialect == WOCKY_JINGLE_DIALECT_GTALK3)
     {
       const gchar *desc_ns =
         wocky_node_get_ns (desc_node);
       video_session = !wocky_strdiff (desc_ns, NS_GOOGLE_SESSION_VIDEO);
     }
 
-  md = jingle_media_description_new ();
+  md = wocky_jingle_media_description_new ();
 
   wocky_node_iter_init (&i, desc_node, NULL, NULL);
   while (wocky_node_iter_next (&i, &node) && !description_error)
     {
       if (!wocky_strdiff (node->name, "payload-type"))
         {
-          if (dialect == JINGLE_DIALECT_GTALK3)
+          if (dialect == WOCKY_JINGLE_DIALECT_GTALK3)
             {
               const gchar *pt_ns = wocky_node_get_ns (node);
 
-              if (priv->media_type == JINGLE_MEDIA_TYPE_AUDIO)
+              if (priv->media_type == WOCKY_JINGLE_MEDIA_TYPE_AUDIO)
                 {
                   if (video_session &&
                       wocky_strdiff (pt_ns, NS_GOOGLE_SESSION_PHONE))
                     continue;
                 }
-              else if (priv->media_type == JINGLE_MEDIA_TYPE_VIDEO)
+              else if (priv->media_type == WOCKY_JINGLE_MEDIA_TYPE_VIDEO)
                 {
                   if (!(video_session && pt_ns == NULL)
                       && wocky_strdiff (pt_ns, NS_GOOGLE_SESSION_VIDEO))
@@ -774,7 +774,7 @@ parse_description (GabbleJingleContent *content,
       else if (!wocky_strdiff (node->name, "rtp-hdrext"))
         {
           const gchar *pt_ns = wocky_node_get_ns (node);
-          JingleRtpHeaderExtension *hdrext;
+          WockyJingleRtpHeaderExtension *hdrext;
 
           if (wocky_strdiff (pt_ns, NS_JINGLE_RTP_HDREXT))
             continue;
@@ -794,7 +794,7 @@ parse_description (GabbleJingleContent *content,
         }
       else if (!wocky_strdiff (node->name, "rtcp-fb"))
         {
-          JingleFeedbackMessage *fb = parse_rtcp_fb (content, node);
+          WockyJingleFeedbackMessage *fb = parse_rtcp_fb (content, node);
 
           if (fb == NULL)
             {
@@ -827,7 +827,7 @@ parse_description (GabbleJingleContent *content,
   if (description_error)
     {
       /* rollback these */
-      jingle_media_description_free (md);
+      wocky_jingle_media_description_free (md);
       g_set_error (error, WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_BAD_REQUEST,
           "invalid description");
       return;
@@ -906,7 +906,7 @@ produce_rtcp_fb_trr_int (WockyNode *node,
 
 
 static void
-produce_rtcp_fb (JingleFeedbackMessage *fb, WockyNode *node)
+produce_rtcp_fb (WockyJingleFeedbackMessage *fb, WockyNode *node)
 {
   WockyNode *fb_node;
 
@@ -920,14 +920,14 @@ produce_rtcp_fb (JingleFeedbackMessage *fb, WockyNode *node)
 }
 
 static void
-produce_payload_type (GabbleJingleContent *content,
+produce_payload_type (WockyJingleContent *content,
                       WockyNode *desc_node,
-                      JingleMediaType type,
-                      JingleCodec *p,
-                      JingleDialect dialect)
+                      WockyJingleMediaType type,
+                      WockyJingleCodec *p,
+                      WockyJingleDialect dialect)
 {
-  GabbleJingleMediaRtp *self = GABBLE_JINGLE_MEDIA_RTP (content);
-  GabbleJingleMediaRtpPrivate *priv = self->priv;
+  WockyJingleMediaRtp *self = WOCKY_JINGLE_MEDIA_RTP (content);
+  WockyJingleMediaRtpPrivate *priv = self->priv;
   WockyNode *pt_node;
   gchar buf[16];
 
@@ -937,9 +937,9 @@ produce_payload_type (GabbleJingleContent *content,
   sprintf (buf, "%d", p->id);
   wocky_node_set_attribute (pt_node, "id", buf);
 
-  if (dialect == JINGLE_DIALECT_GTALK3)
+  if (dialect == WOCKY_JINGLE_DIALECT_GTALK3)
     {
-      if (type == JINGLE_MEDIA_TYPE_AUDIO)
+      if (type == WOCKY_JINGLE_MEDIA_TYPE_AUDIO)
         {
           /* Gtalk 03 has either an audio or a video session, in case of a
            * video session the audio codecs need to set their namespace to
@@ -968,7 +968,7 @@ produce_payload_type (GabbleJingleContent *content,
   /* name: optional */
   if (*p->name != '\0')
     {
-      if (JINGLE_IS_GOOGLE_DIALECT (dialect))
+      if (WOCKY_JINGLE_DIALECT_IS_GOOGLE (dialect))
         wocky_node_set_attribute (pt_node, "name", gtalk_case (p->name));
       else
         wocky_node_set_attribute (pt_node, "name", p->name);
@@ -979,7 +979,7 @@ produce_payload_type (GabbleJingleContent *content,
     {
       const gchar *attname = "clockrate";
 
-      if (dialect == JINGLE_DIALECT_V015)
+      if (dialect == WOCKY_JINGLE_DIALECT_V015)
         attname = "rate";
 
       sprintf (buf, "%u", p->clockrate);
@@ -1004,25 +1004,25 @@ produce_payload_type (GabbleJingleContent *content,
 }
 
 static WockyNode *
-produce_description_node (JingleDialect dialect, JingleMediaType media_type,
+produce_description_node (WockyJingleDialect dialect, WockyJingleMediaType media_type,
    WockyNode *content_node)
 {
   WockyNode *desc_node;
   const gchar *xmlns = NULL, *media_attr = NULL;
 
-  if (dialect == JINGLE_DIALECT_GTALK3)
+  if (dialect == WOCKY_JINGLE_DIALECT_GTALK3)
     return NULL;
 
   switch (dialect)
     {
-      case JINGLE_DIALECT_GTALK4:
-        g_assert (media_type == JINGLE_MEDIA_TYPE_AUDIO);
+      case WOCKY_JINGLE_DIALECT_GTALK4:
+        g_assert (media_type == WOCKY_JINGLE_MEDIA_TYPE_AUDIO);
         xmlns = NS_GOOGLE_SESSION_PHONE;
         break;
-      case JINGLE_DIALECT_V015:
-        if (media_type == JINGLE_MEDIA_TYPE_AUDIO)
+      case WOCKY_JINGLE_DIALECT_V015:
+        if (media_type == WOCKY_JINGLE_MEDIA_TYPE_AUDIO)
             xmlns = NS_JINGLE_DESCRIPTION_AUDIO;
-        else if (media_type == JINGLE_MEDIA_TYPE_VIDEO)
+        else if (media_type == WOCKY_JINGLE_MEDIA_TYPE_VIDEO)
             xmlns = NS_JINGLE_DESCRIPTION_VIDEO;
         else
           {
@@ -1032,9 +1032,9 @@ produce_description_node (JingleDialect dialect, JingleMediaType media_type,
         break;
       default:
         xmlns = NS_JINGLE_RTP;
-        if (media_type == JINGLE_MEDIA_TYPE_AUDIO)
+        if (media_type == WOCKY_JINGLE_MEDIA_TYPE_AUDIO)
             media_attr = "audio";
-        else if (media_type == JINGLE_MEDIA_TYPE_VIDEO)
+        else if (media_type == WOCKY_JINGLE_MEDIA_TYPE_VIDEO)
             media_attr = "video";
         else
             g_assert_not_reached ();
@@ -1052,7 +1052,7 @@ produce_description_node (JingleDialect dialect, JingleMediaType media_type,
 static void
 produce_hdrext (gpointer data, gpointer user_data)
 {
-  JingleRtpHeaderExtension *hdrext = data;
+  WockyJingleRtpHeaderExtension *hdrext = data;
   WockyNode *desc_node = user_data;
   WockyNode *hdrext_node;
   gchar buf[16];
@@ -1064,27 +1064,27 @@ produce_hdrext (gpointer data, gpointer user_data)
   wocky_node_set_attribute (hdrext_node, "id", buf);
   wocky_node_set_attribute (hdrext_node, "uri", hdrext->uri);
 
-  if (hdrext->senders == JINGLE_CONTENT_SENDERS_INITIATOR)
+  if (hdrext->senders == WOCKY_JINGLE_CONTENT_SENDERS_INITIATOR)
     wocky_node_set_attribute (hdrext_node, "senders", "initiator");
-  else if (hdrext->senders == JINGLE_CONTENT_SENDERS_RESPONDER)
+  else if (hdrext->senders == WOCKY_JINGLE_CONTENT_SENDERS_RESPONDER)
     wocky_node_set_attribute (hdrext_node, "senders", "responder");
 
   wocky_node_set_attribute (hdrext_node, "xmlns", NS_JINGLE_RTP_HDREXT);
 }
 
 static void
-produce_description (GabbleJingleContent *content, WockyNode *content_node)
+produce_description (WockyJingleContent *content, WockyNode *content_node)
 {
-  GabbleJingleMediaRtp *self = GABBLE_JINGLE_MEDIA_RTP (content);
-  GabbleJingleMediaRtpPrivate *priv = self->priv;
+  WockyJingleMediaRtp *self = WOCKY_JINGLE_MEDIA_RTP (content);
+  WockyJingleMediaRtpPrivate *priv = self->priv;
   GList *li;
-  JingleDialect dialect = gabble_jingle_session_get_dialect (content->session);
+  WockyJingleDialect dialect = wocky_jingle_session_get_dialect (content->session);
   WockyNode *desc_node;
 
-  if (gabble_jingle_session_peer_has_cap (content->session, NS_JINGLE_RTCP_FB))
+  if (wocky_jingle_session_peer_has_cap (content->session, NS_JINGLE_RTCP_FB))
     priv->has_rtcp_fb = TRUE;
 
-  if (gabble_jingle_session_peer_has_cap (content->session, NS_JINGLE_RTP_HDREXT))
+  if (wocky_jingle_session_peer_has_cap (content->session, NS_JINGLE_RTP_HDREXT))
     priv->has_rtp_hdrext = TRUE;
 
   desc_node = produce_description_node (dialect, priv->media_type,
@@ -1167,7 +1167,7 @@ jingle_media_rtp_compare_codecs (GList *old,
   gboolean ret = FALSE;
   GHashTable *old_table = build_codec_table (old);
   GList *l;
-  JingleCodec *old_c, *new_c;
+  WockyJingleCodec *old_c, *new_c;
 
   g_assert (changed != NULL && *changed == NULL);
 
@@ -1212,12 +1212,12 @@ out:
  *  example)
  */
 gboolean
-jingle_media_rtp_set_local_media_description (GabbleJingleMediaRtp *self,
-                                              JingleMediaDescription *md,
+jingle_media_rtp_set_local_media_description (WockyJingleMediaRtp *self,
+                                              WockyJingleMediaDescription *md,
                                               gboolean ready,
                                               GError **error)
 {
-  GabbleJingleMediaRtpPrivate *priv = self->priv;
+  WockyJingleMediaRtpPrivate *priv = self->priv;
 
   DEBUG ("setting new local media description");
 
@@ -1233,7 +1233,7 @@ jingle_media_rtp_set_local_media_description (GabbleJingleMediaRtp *self,
             md->codecs, &changed, &err))
         {
           DEBUG ("codec update was illegal: %s", err->message);
-          jingle_media_description_free (md);
+          wocky_jingle_media_description_free (md);
           g_propagate_error (error, err);
           return FALSE;
         }
@@ -1241,20 +1241,20 @@ jingle_media_rtp_set_local_media_description (GabbleJingleMediaRtp *self,
       if (changed == NULL)
         {
           DEBUG ("codec update changed nothing!");
-          jingle_media_description_free (md);
+          wocky_jingle_media_description_free (md);
           goto out;
         }
 
       DEBUG ("%u codecs changed", g_list_length (changed));
       priv->local_codec_updates = changed;
 
-      jingle_media_description_free (priv->local_media_description);
+      wocky_jingle_media_description_free (priv->local_media_description);
     }
 
   priv->local_media_description = md;
 
   /* Codecs have changed, sending a fresh description might be necessary */
-  gabble_jingle_content_maybe_send_description (GABBLE_JINGLE_CONTENT (self));
+  wocky_jingle_content_maybe_send_description (WOCKY_JINGLE_CONTENT (self));
 
   /* Update done if any, free the changed codecs if any */
   g_list_free (priv->local_codec_updates);
@@ -1262,55 +1262,55 @@ jingle_media_rtp_set_local_media_description (GabbleJingleMediaRtp *self,
 
 out:
   if (ready)
-    _gabble_jingle_content_set_media_ready (GABBLE_JINGLE_CONTENT (self));
+    _wocky_jingle_content_set_media_ready (WOCKY_JINGLE_CONTENT (self));
 
   return TRUE;
 }
 
 void
-jingle_media_rtp_register (GabbleJingleFactory *factory)
+jingle_media_rtp_register (WockyJingleFactory *factory)
 {
   /* Current (v0.25) Jingle draft URI */
-  gabble_jingle_factory_register_content_type (factory,
-      NS_JINGLE_RTP, GABBLE_TYPE_JINGLE_MEDIA_RTP);
+  wocky_jingle_factory_register_content_type (factory,
+      NS_JINGLE_RTP, WOCKY_TYPE_JINGLE_MEDIA_RTP);
 
   /* Old Jingle audio/video namespaces */
-  gabble_jingle_factory_register_content_type (factory,
+  wocky_jingle_factory_register_content_type (factory,
       NS_JINGLE_DESCRIPTION_AUDIO,
-      GABBLE_TYPE_JINGLE_MEDIA_RTP);
+      WOCKY_TYPE_JINGLE_MEDIA_RTP);
 
-  gabble_jingle_factory_register_content_type (factory,
+  wocky_jingle_factory_register_content_type (factory,
       NS_JINGLE_DESCRIPTION_VIDEO,
-      GABBLE_TYPE_JINGLE_MEDIA_RTP);
+      WOCKY_TYPE_JINGLE_MEDIA_RTP);
 
   /* GTalk audio call namespace */
-  gabble_jingle_factory_register_content_type (factory,
+  wocky_jingle_factory_register_content_type (factory,
       NS_GOOGLE_SESSION_PHONE,
-      GABBLE_TYPE_JINGLE_MEDIA_RTP);
+      WOCKY_TYPE_JINGLE_MEDIA_RTP);
 
   /* GTalk video call namespace */
-  gabble_jingle_factory_register_content_type (factory,
+  wocky_jingle_factory_register_content_type (factory,
       NS_GOOGLE_SESSION_VIDEO,
-      GABBLE_TYPE_JINGLE_MEDIA_RTP);
+      WOCKY_TYPE_JINGLE_MEDIA_RTP);
 }
 
 /* We can't get remote media description when they're signalled, because
  * the signal is emitted immediately upon JingleContent creation,
  * and parsing, which is before a corresponding MediaStream is
  * created. */
-JingleMediaDescription *
-gabble_jingle_media_rtp_get_remote_media_description (
-    GabbleJingleMediaRtp *self)
+WockyJingleMediaDescription *
+wocky_jingle_media_rtp_get_remote_media_description (
+    WockyJingleMediaRtp *self)
 {
-  GabbleJingleMediaRtpPrivate *priv = self->priv;
+  WockyJingleMediaRtpPrivate *priv = self->priv;
 
   return priv->remote_media_description;
 }
 
-JingleMediaDescription *
-jingle_media_description_new (void)
+WockyJingleMediaDescription *
+wocky_jingle_media_description_new (void)
 {
-  JingleMediaDescription *md = g_slice_new0 (JingleMediaDescription);
+  WockyJingleMediaDescription *md = g_slice_new0 (WockyJingleMediaDescription);
 
   md->trr_int = G_MAXUINT;
 
@@ -1318,45 +1318,45 @@ jingle_media_description_new (void)
 }
 
 void
-jingle_media_description_free (JingleMediaDescription *md)
+wocky_jingle_media_description_free (WockyJingleMediaDescription *md)
 {
   jingle_media_rtp_free_codecs (md->codecs);
 
   while (md->hdrexts != NULL)
     {
-      jingle_rtp_header_extension_free (md->hdrexts->data);
+      wocky_jingle_rtp_header_extension_free (md->hdrexts->data);
       md->hdrexts = g_list_delete_link (md->hdrexts, md->hdrexts);
     }
 
-  g_slice_free (JingleMediaDescription, md);
+  g_slice_free (WockyJingleMediaDescription, md);
 }
 
-JingleMediaDescription *
-jingle_media_description_copy (JingleMediaDescription *md)
+WockyJingleMediaDescription *
+wocky_jingle_media_description_copy (WockyJingleMediaDescription *md)
 {
-  JingleMediaDescription *newmd = g_slice_new0 (JingleMediaDescription);
+  WockyJingleMediaDescription *newmd = g_slice_new0 (WockyJingleMediaDescription);
   GList *li;
 
   newmd->codecs = jingle_media_rtp_copy_codecs (md->codecs);
-  newmd->feedback_msgs = jingle_feedback_message_list_copy (md->feedback_msgs);
+  newmd->feedback_msgs = wocky_jingle_feedback_message_list_copy (md->feedback_msgs);
   newmd->trr_int = md->trr_int;
 
   for (li = md->hdrexts; li; li = li->next)
     {
-      JingleRtpHeaderExtension *h = li->data;
+      WockyJingleRtpHeaderExtension *h = li->data;
 
       newmd->hdrexts = g_list_append (newmd->hdrexts,
-          jingle_rtp_header_extension_new (h->id, h->senders, h->uri));
+          wocky_jingle_rtp_header_extension_new (h->id, h->senders, h->uri));
     }
 
   return newmd;
 }
 
-JingleRtpHeaderExtension *
-jingle_rtp_header_extension_new (guint id, JingleContentSenders senders,
+WockyJingleRtpHeaderExtension *
+wocky_jingle_rtp_header_extension_new (guint id, WockyJingleContentSenders senders,
     const gchar *uri)
 {
-  JingleRtpHeaderExtension *hdrext = g_slice_new (JingleRtpHeaderExtension);
+  WockyJingleRtpHeaderExtension *hdrext = g_slice_new (WockyJingleRtpHeaderExtension);
 
   hdrext->id = id;
   hdrext->senders = senders;
@@ -1366,16 +1366,16 @@ jingle_rtp_header_extension_new (guint id, JingleContentSenders senders,
 }
 
 void
-jingle_rtp_header_extension_free (JingleRtpHeaderExtension *hdrext)
+wocky_jingle_rtp_header_extension_free (WockyJingleRtpHeaderExtension *hdrext)
 {
   g_free (hdrext->uri);
-  g_slice_free (JingleRtpHeaderExtension, hdrext);
+  g_slice_free (WockyJingleRtpHeaderExtension, hdrext);
 }
 
-JingleFeedbackMessage *
-jingle_feedback_message_new (const gchar *type, const gchar *subtype)
+WockyJingleFeedbackMessage *
+wocky_jingle_feedback_message_new (const gchar *type, const gchar *subtype)
 {
-  JingleFeedbackMessage *fb = g_slice_new0 (JingleFeedbackMessage);
+  WockyJingleFeedbackMessage *fb = g_slice_new0 (WockyJingleFeedbackMessage);
 
   fb->type = g_strdup (type);
   fb->subtype = g_strdup (subtype);
@@ -1384,17 +1384,17 @@ jingle_feedback_message_new (const gchar *type, const gchar *subtype)
 }
 
 void
-jingle_feedback_message_free (JingleFeedbackMessage *fb)
+wocky_jingle_feedback_message_free (WockyJingleFeedbackMessage *fb)
 {
   g_free (fb->type);
   g_free (fb->subtype);
-  g_slice_free (JingleFeedbackMessage, fb);
+  g_slice_free (WockyJingleFeedbackMessage, fb);
 }
 
 
 static gint
-jingle_feedback_message_compare (const JingleFeedbackMessage *fb1,
-    const JingleFeedbackMessage *fb2)
+wocky_jingle_feedback_message_compare (const WockyJingleFeedbackMessage *fb1,
+    const WockyJingleFeedbackMessage *fb2)
 {
   if (!g_ascii_strcasecmp (fb1->type, fb2->type) &&
       !g_ascii_strcasecmp (fb1->subtype, fb2->subtype))
@@ -1404,7 +1404,7 @@ jingle_feedback_message_compare (const JingleFeedbackMessage *fb1,
 }
 
 /**
- * jingle_media_description_simplify:
+ * wocky_jingle_media_description_simplify:
  *
  * Removes duplicated Feedback message and put them in the global structure
  *
@@ -1415,7 +1415,7 @@ jingle_feedback_message_compare (const JingleFeedbackMessage *fb1,
  */
 
 void
-jingle_media_description_simplify (JingleMediaDescription *md)
+wocky_jingle_media_description_simplify (WockyJingleMediaDescription *md)
 {
   GList *item;
   guint trr_int = 0;
@@ -1425,7 +1425,7 @@ jingle_media_description_simplify (JingleMediaDescription *md)
 
   for (item = md->codecs; item; item = item->next)
     {
-      JingleCodec *c = item->data;
+      WockyJingleCodec *c = item->data;
 
       if (!init)
         {
@@ -1451,11 +1451,11 @@ jingle_media_description_simplify (JingleMediaDescription *md)
 
           for (item2 = identical_fbs; item2;)
             {
-              JingleFeedbackMessage *fb = identical_fbs->data;
+              WockyJingleFeedbackMessage *fb = identical_fbs->data;
               GList *next = item2->next;
 
               if (!g_list_find_custom (c->feedback_msgs, fb,
-                      (GCompareFunc) jingle_feedback_message_compare))
+                      (GCompareFunc) wocky_jingle_feedback_message_compare))
                 identical_fbs = g_list_delete_link (identical_fbs,  item2);
 
               item2 = next;
@@ -1481,14 +1481,14 @@ jingle_media_description_simplify (JingleMediaDescription *md)
    */
   if (identical_fbs)
     {
-      md->feedback_msgs = jingle_feedback_message_list_copy (identical_fbs);
+      md->feedback_msgs = wocky_jingle_feedback_message_list_copy (identical_fbs);
       g_list_free (identical_fbs);
     }
 
   if (trr_int_all_same || md->feedback_msgs != NULL)
     for (item = md->codecs; item; item = item->next)
       {
-        JingleCodec *c = item->data;
+        WockyJingleCodec *c = item->data;
         GList *item2;
 
         /* If the trr_int is the same everywhere, lets put the default on
@@ -1503,12 +1503,12 @@ jingle_media_description_simplify (JingleMediaDescription *md)
         for (item2 = md->feedback_msgs; item2; item2 = item2->next)
           {
             GList *duplicated;
-            JingleFeedbackMessage *fb = item2->data;
+            WockyJingleFeedbackMessage *fb = item2->data;
 
             while ((duplicated = g_list_find_custom (c->feedback_msgs, fb,
-                        (GCompareFunc) jingle_feedback_message_compare)) != NULL)
+                        (GCompareFunc) wocky_jingle_feedback_message_compare)) != NULL)
               {
-                jingle_feedback_message_free (duplicated->data);
+                wocky_jingle_feedback_message_free (duplicated->data);
                 c->feedback_msgs = g_list_delete_link (c->feedback_msgs,
                     duplicated);
               }
diff --git a/src/jingle-media-rtp.h b/src/jingle-media-rtp.h
index d904c8c10..4854b790f 100644
--- a/src/jingle-media-rtp.h
+++ b/src/jingle-media-rtp.h
@@ -1,5 +1,5 @@
 /*
- * jingle-media-rtp.h - Header for GabbleJingleMediaRtp
+ * jingle-media-rtp.h - Header for WockyJingleMediaRtp
  * Copyright (C) 2008 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
@@ -27,36 +27,36 @@
 
 G_BEGIN_DECLS
 
-typedef struct _GabbleJingleMediaRtpClass GabbleJingleMediaRtpClass;
+typedef struct _WockyJingleMediaRtpClass WockyJingleMediaRtpClass;
 
-GType gabble_jingle_media_rtp_get_type (void);
+GType wocky_jingle_media_rtp_get_type (void);
 
 /* TYPE MACROS */
-#define GABBLE_TYPE_JINGLE_MEDIA_RTP \
-  (gabble_jingle_media_rtp_get_type ())
-#define GABBLE_JINGLE_MEDIA_RTP(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_JINGLE_MEDIA_RTP, \
-                              GabbleJingleMediaRtp))
-#define GABBLE_JINGLE_MEDIA_RTP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_JINGLE_MEDIA_RTP, \
-                           GabbleJingleMediaRtpClass))
-#define GABBLE_IS_JINGLE_MEDIA_RTP(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_JINGLE_MEDIA_RTP))
-#define GABBLE_IS_JINGLE_MEDIA_RTP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_JINGLE_MEDIA_RTP))
-#define GABBLE_JINGLE_MEDIA_RTP_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_JINGLE_MEDIA_RTP, \
-                              GabbleJingleMediaRtpClass))
-
-struct _GabbleJingleMediaRtpClass {
-    GabbleJingleContentClass parent_class;
+#define WOCKY_TYPE_JINGLE_MEDIA_RTP \
+  (wocky_jingle_media_rtp_get_type ())
+#define WOCKY_JINGLE_MEDIA_RTP(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), WOCKY_TYPE_JINGLE_MEDIA_RTP, \
+                              WockyJingleMediaRtp))
+#define WOCKY_JINGLE_MEDIA_RTP_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), WOCKY_TYPE_JINGLE_MEDIA_RTP, \
+                           WockyJingleMediaRtpClass))
+#define WOCKY_IS_JINGLE_MEDIA_RTP(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), WOCKY_TYPE_JINGLE_MEDIA_RTP))
+#define WOCKY_IS_JINGLE_MEDIA_RTP_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), WOCKY_TYPE_JINGLE_MEDIA_RTP))
+#define WOCKY_JINGLE_MEDIA_RTP_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), WOCKY_TYPE_JINGLE_MEDIA_RTP, \
+                              WockyJingleMediaRtpClass))
+
+struct _WockyJingleMediaRtpClass {
+    WockyJingleContentClass parent_class;
 };
 
-typedef struct _GabbleJingleMediaRtpPrivate GabbleJingleMediaRtpPrivate;
+typedef struct _WockyJingleMediaRtpPrivate WockyJingleMediaRtpPrivate;
 
-struct _GabbleJingleMediaRtp {
-    GabbleJingleContent parent;
-    GabbleJingleMediaRtpPrivate *priv;
+struct _WockyJingleMediaRtp {
+    WockyJingleContent parent;
+    WockyJingleMediaRtpPrivate *priv;
 };
 
 typedef struct {
@@ -67,36 +67,36 @@ typedef struct {
   GHashTable *params;
   guint trr_int;
   GList *feedback_msgs;
-} JingleCodec;
+} WockyJingleCodec;
 
 typedef struct {
   gchar *type;
   gchar *subtype;
-} JingleFeedbackMessage;
+} WockyJingleFeedbackMessage;
 
 typedef struct {
   guint id;
-  JingleContentSenders senders;
+  WockyJingleContentSenders senders;
   gchar *uri;
-} JingleRtpHeaderExtension;
+} WockyJingleRtpHeaderExtension;
 
 typedef struct {
   GList *codecs;
   GList *hdrexts;
   guint trr_int;
   GList *feedback_msgs;
-} JingleMediaDescription;
+} WockyJingleMediaDescription;
 
-void jingle_media_rtp_register (GabbleJingleFactory *factory);
+void jingle_media_rtp_register (WockyJingleFactory *factory);
 gboolean jingle_media_rtp_set_local_media_description (
-    GabbleJingleMediaRtp *self, JingleMediaDescription *md, gboolean ready,
+    WockyJingleMediaRtp *self, WockyJingleMediaDescription *md, gboolean ready,
     GError **error);
-JingleMediaDescription *gabble_jingle_media_rtp_get_remote_media_description (
-    GabbleJingleMediaRtp *self);
+WockyJingleMediaDescription *wocky_jingle_media_rtp_get_remote_media_description (
+    WockyJingleMediaRtp *self);
 
-JingleCodec * jingle_media_rtp_codec_new (guint id, const gchar *name,
+WockyJingleCodec * jingle_media_rtp_codec_new (guint id, const gchar *name,
     guint clockrate, guint channels, GHashTable *params);
-void jingle_media_rtp_codec_free (JingleCodec *p);
+void jingle_media_rtp_codec_free (WockyJingleCodec *p);
 void jingle_media_rtp_free_codecs (GList *codecs);
 GList * jingle_media_rtp_copy_codecs (GList *codecs);
 
@@ -105,20 +105,20 @@ gboolean jingle_media_rtp_compare_codecs (GList *old,
     GList **changed,
     GError **e);
 
-JingleMediaDescription *jingle_media_description_new (void);
-void jingle_media_description_free (JingleMediaDescription *md);
-JingleMediaDescription *jingle_media_description_copy (
-    JingleMediaDescription *md);
+WockyJingleMediaDescription *wocky_jingle_media_description_new (void);
+void wocky_jingle_media_description_free (WockyJingleMediaDescription *md);
+WockyJingleMediaDescription *wocky_jingle_media_description_copy (
+    WockyJingleMediaDescription *md);
 
-JingleRtpHeaderExtension *jingle_rtp_header_extension_new (guint id,
-    JingleContentSenders senders, const gchar *uri);
-void jingle_rtp_header_extension_free (JingleRtpHeaderExtension *hdrext);
+WockyJingleRtpHeaderExtension *wocky_jingle_rtp_header_extension_new (guint id,
+    WockyJingleContentSenders senders, const gchar *uri);
+void wocky_jingle_rtp_header_extension_free (WockyJingleRtpHeaderExtension *hdrext);
 
 
-JingleFeedbackMessage *jingle_feedback_message_new (const gchar *type,
+WockyJingleFeedbackMessage *wocky_jingle_feedback_message_new (const gchar *type,
     const gchar *subtype);
-void jingle_feedback_message_free (JingleFeedbackMessage *fb);
-void jingle_media_description_simplify (JingleMediaDescription *md);
+void wocky_jingle_feedback_message_free (WockyJingleFeedbackMessage *fb);
+void wocky_jingle_media_description_simplify (WockyJingleMediaDescription *md);
 
 #endif /* __JINGLE_MEDIA_RTP_H__ */
 
diff --git a/src/jingle-mint.c b/src/jingle-mint.c
index 2cb6d0e9d..b45992efc 100644
--- a/src/jingle-mint.c
+++ b/src/jingle-mint.c
@@ -1,5 +1,5 @@
 /*
- * jingle-mint.c - creates and configures a GabbleJingleFactory
+ * jingle-mint.c - creates and configures a WockyJingleFactory
  * Copyright ©2012 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
@@ -39,7 +39,7 @@
 struct _GabbleJingleMintPrivate {
     GabbleConnection *conn;
 
-    GabbleJingleFactory *factory;
+    WockyJingleFactory *factory;
 };
 
 enum {
@@ -65,12 +65,12 @@ static void connection_porter_available_cb (
     gpointer user_data);
 
 static void factory_new_session_cb (
-    GabbleJingleFactory *factory,
-    GabbleJingleSession *session,
+    WockyJingleFactory *factory,
+    WockyJingleSession *session,
     gboolean initiated_locally,
     gpointer user_data);
 static gboolean factory_query_cap_cb (
-    GabbleJingleFactory *factory,
+    WockyJingleFactory *factory,
     WockyContact *contact,
     const gchar *cap_or_quirk,
     gpointer user_data);
@@ -177,7 +177,7 @@ gabble_jingle_mint_class_init (GabbleJingleMintClass *klass)
   signals[INCOMING_SESSION] = g_signal_new ("incoming-session",
         G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
         0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT,
-        G_TYPE_NONE, 1, GABBLE_TYPE_JINGLE_SESSION);
+        G_TYPE_NONE, 1, WOCKY_TYPE_JINGLE_SESSION);
 }
 
 GabbleJingleMint *
@@ -207,7 +207,7 @@ connection_status_changed_cb (
 
     case TP_CONNECTION_STATUS_CONNECTED:
         {
-          GabbleJingleInfo *info = gabble_jingle_mint_get_info (self);
+          WockyJingleInfo *info = gabble_jingle_mint_get_info (self);
           gchar *stun_server = NULL;
           guint stun_port = 0;
 
@@ -217,7 +217,7 @@ connection_status_changed_cb (
               NULL);
 
           if (stun_server != NULL)
-            gabble_jingle_info_take_stun_server (info,
+            wocky_jingle_info_take_stun_server (info,
                 stun_server, stun_port, FALSE);
 
           g_object_get (priv->conn,
@@ -226,10 +226,10 @@ connection_status_changed_cb (
               NULL);
 
           if (stun_server != NULL)
-            gabble_jingle_info_take_stun_server (info,
+            wocky_jingle_info_take_stun_server (info,
                 stun_server, stun_port, TRUE);
 
-          gabble_jingle_info_send_request (info,
+          wocky_jingle_info_send_request (info,
               /* FIXME: one day Wocky will know about caps and then we won't
                * have to pass in a flag here.
                */
@@ -240,7 +240,7 @@ connection_status_changed_cb (
 
     case TP_CONNECTION_STATUS_DISCONNECTED:
       if (priv->factory != NULL)
-        gabble_jingle_factory_stop (priv->factory);
+        wocky_jingle_factory_stop (priv->factory);
       break;
     }
 }
@@ -258,7 +258,7 @@ connection_porter_available_cb (
   g_assert (conn->session != NULL);
 
   g_assert (priv->factory == NULL);
-  priv->factory = gabble_jingle_factory_new (conn->session);
+  priv->factory = wocky_jingle_factory_new (conn->session);
 
   tp_g_signal_connect_object (priv->factory, "new-session",
       (GCallback) factory_new_session_cb, self, 0);
@@ -268,12 +268,12 @@ connection_porter_available_cb (
 
 static void
 session_about_to_initiate_cb (
-    GabbleJingleSession *session,
+    WockyJingleSession *session,
     gpointer user_data)
 {
   GabbleJingleMint *self = GABBLE_JINGLE_MINT (user_data);
   GabbleJingleMintPrivate *priv = self->priv;
-  const gchar *peer_jid = gabble_jingle_session_get_peer_jid (session);
+  const gchar *peer_jid = wocky_jingle_session_get_peer_jid (session);
   TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
       (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
   TpHandle peer = tp_handle_ensure (contact_repo, peer_jid, NULL, NULL);
@@ -286,8 +286,8 @@ session_about_to_initiate_cb (
 
 static void
 factory_new_session_cb (
-    GabbleJingleFactory *factory,
-    GabbleJingleSession *session,
+    WockyJingleFactory *factory,
+    WockyJingleSession *session,
     gboolean initiated_locally,
     gpointer user_data)
 {
@@ -304,7 +304,7 @@ factory_new_session_cb (
 
 static gboolean
 factory_query_cap_cb (
-    GabbleJingleFactory *factory,
+    WockyJingleFactory *factory,
     WockyContact *contact,
     const gchar *cap_or_quirk,
     gpointer user_data)
@@ -331,16 +331,16 @@ factory_query_cap_cb (
     }
 }
 
-GabbleJingleFactory *
+WockyJingleFactory *
 gabble_jingle_mint_get_factory (
     GabbleJingleMint *self)
 {
   return self->priv->factory;
 }
 
-GabbleJingleInfo *
+WockyJingleInfo *
 gabble_jingle_mint_get_info (
     GabbleJingleMint *self)
 {
-  return gabble_jingle_factory_get_jingle_info (self->priv->factory);
+  return wocky_jingle_factory_get_jingle_info (self->priv->factory);
 }
diff --git a/src/jingle-mint.h b/src/jingle-mint.h
index 90b52270a..0b2e2ed0d 100644
--- a/src/jingle-mint.h
+++ b/src/jingle-mint.h
@@ -1,5 +1,5 @@
 /*
- * jingle-mint.h - creates and configures a GabbleJingleFactory
+ * jingle-mint.h - creates and configures a WockyJingleFactory
  * Copyright ©2012 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
@@ -45,9 +45,9 @@ GType gabble_jingle_mint_get_type (void);
 GabbleJingleMint *gabble_jingle_mint_new (
     GabbleConnection *connection);
 
-GabbleJingleFactory *gabble_jingle_mint_get_factory (
+WockyJingleFactory *gabble_jingle_mint_get_factory (
     GabbleJingleMint *self);
-GabbleJingleInfo *gabble_jingle_mint_get_info (
+WockyJingleInfo *gabble_jingle_mint_get_info (
     GabbleJingleMint *self);
 
 /* TYPE MACROS */
diff --git a/src/jingle-session.c b/src/jingle-session.c
index 67fc3c4ff..e8fea568a 100644
--- a/src/jingle-session.c
+++ b/src/jingle-session.c
@@ -1,5 +1,5 @@
 /*
- * gabble-jingle-session.c - Source for GabbleJingleSession
+ * gabble-jingle-session.c - Source for WockyJingleSession
  * Copyright (C) 2008 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
@@ -41,7 +41,7 @@
 #include "jingle-media-rtp.h"
 #include "namespaces.h"
 
-G_DEFINE_TYPE(GabbleJingleSession, gabble_jingle_session, G_TYPE_OBJECT);
+G_DEFINE_TYPE(WockyJingleSession, wocky_jingle_session, G_TYPE_OBJECT);
 
 /* signal enum */
 enum
@@ -73,10 +73,10 @@ enum
   LAST_PROPERTY
 };
 
-struct _GabbleJingleSessionPrivate
+struct _WockyJingleSessionPrivate
 {
   /* Borrowed; the factory owns us. */
-  GabbleJingleFactory *jingle_factory;
+  WockyJingleFactory *jingle_factory;
   WockyPorter *porter;
 
   WockyContact *peer_contact;
@@ -87,13 +87,13 @@ struct _GabbleJingleSessionPrivate
   const gchar *initiator;
   gboolean local_initiator;
 
-  /* GabbleJingleContent objects keyed by content name.
+  /* WockyJingleContent objects keyed by content name.
    * Table owns references to these objects. */
   GHashTable *initiator_contents;
   GHashTable *responder_contents;
 
-  JingleDialect dialect;
-  JingleState state;
+  WockyJingleDialect dialect;
+  WockyJingleState state;
   gchar *sid;
 
   gboolean locally_accepted;
@@ -108,88 +108,88 @@ struct _GabbleJingleSessionPrivate
 };
 
 typedef struct {
-  JingleState state;
-  JingleAction *actions;
-} JingleStateActions;
+  WockyJingleState state;
+  WockyJingleAction *actions;
+} WockyJingleStateActions;
 
 /* gcc should be able to figure this out from the table below, but.. */
 #define MAX_ACTIONS_PER_STATE 12
 
-/* NB: JINGLE_ACTION_UNKNOWN is used as a terminator here. */
-static JingleAction allowed_actions[MAX_JINGLE_STATES][MAX_ACTIONS_PER_STATE] = {
-  /* JINGLE_STATE_PENDING_CREATED */
-  { JINGLE_ACTION_SESSION_INITIATE, JINGLE_ACTION_UNKNOWN },
-  /* JINGLE_STATE_PENDING_INITIATE_SENT */
-  { JINGLE_ACTION_SESSION_TERMINATE, JINGLE_ACTION_SESSION_ACCEPT,
-    JINGLE_ACTION_TRANSPORT_ACCEPT, /* required for GTalk4 */
-    JINGLE_ACTION_DESCRIPTION_INFO, JINGLE_ACTION_SESSION_INFO,
-    JINGLE_ACTION_TRANSPORT_INFO, JINGLE_ACTION_INFO,
-    JINGLE_ACTION_UNKNOWN },
-  /* JINGLE_STATE_PENDING_INITIATED */
-  { JINGLE_ACTION_SESSION_ACCEPT, JINGLE_ACTION_SESSION_TERMINATE,
-    JINGLE_ACTION_TRANSPORT_INFO, JINGLE_ACTION_CONTENT_REJECT,
-    JINGLE_ACTION_CONTENT_MODIFY, JINGLE_ACTION_CONTENT_ACCEPT,
-    JINGLE_ACTION_CONTENT_REMOVE,  JINGLE_ACTION_DESCRIPTION_INFO,
-    JINGLE_ACTION_TRANSPORT_ACCEPT, JINGLE_ACTION_SESSION_INFO,
-    JINGLE_ACTION_INFO,
-    JINGLE_ACTION_UNKNOWN },
-  /* JINGLE_STATE_PENDING_ACCEPT_SENT */
-  { JINGLE_ACTION_TRANSPORT_INFO, JINGLE_ACTION_DESCRIPTION_INFO,
-    JINGLE_ACTION_SESSION_TERMINATE, JINGLE_ACTION_SESSION_INFO,
-    JINGLE_ACTION_INFO,
-    JINGLE_ACTION_UNKNOWN },
-  /* JINGLE_STATE_ACTIVE */
-  { JINGLE_ACTION_CONTENT_MODIFY, JINGLE_ACTION_CONTENT_ADD,
-    JINGLE_ACTION_CONTENT_REMOVE, JINGLE_ACTION_CONTENT_REPLACE,
-    JINGLE_ACTION_CONTENT_ACCEPT, JINGLE_ACTION_CONTENT_REJECT,
-    JINGLE_ACTION_SESSION_INFO, JINGLE_ACTION_TRANSPORT_INFO,
-    JINGLE_ACTION_DESCRIPTION_INFO, JINGLE_ACTION_INFO,
-    JINGLE_ACTION_SESSION_TERMINATE, JINGLE_ACTION_UNKNOWN },
-  /* JINGLE_STATE_ENDED */
-  { JINGLE_ACTION_UNKNOWN }
+/* NB: WOCKY_JINGLE_ACTION_UNKNOWN is used as a terminator here. */
+static WockyJingleAction allowed_actions[WOCKY_N_JINGLE_STATES][MAX_ACTIONS_PER_STATE] = {
+  /* WOCKY_JINGLE_STATE_PENDING_CREATED */
+  { WOCKY_JINGLE_ACTION_SESSION_INITIATE, WOCKY_JINGLE_ACTION_UNKNOWN },
+  /* WOCKY_JINGLE_STATE_PENDING_INITIATE_SENT */
+  { WOCKY_JINGLE_ACTION_SESSION_TERMINATE, WOCKY_JINGLE_ACTION_SESSION_ACCEPT,
+    WOCKY_JINGLE_ACTION_TRANSPORT_ACCEPT, /* required for GTalk4 */
+    WOCKY_JINGLE_ACTION_DESCRIPTION_INFO, WOCKY_JINGLE_ACTION_SESSION_INFO,
+    WOCKY_JINGLE_ACTION_TRANSPORT_INFO, WOCKY_JINGLE_ACTION_INFO,
+    WOCKY_JINGLE_ACTION_UNKNOWN },
+  /* WOCKY_JINGLE_STATE_PENDING_INITIATED */
+  { WOCKY_JINGLE_ACTION_SESSION_ACCEPT, WOCKY_JINGLE_ACTION_SESSION_TERMINATE,
+    WOCKY_JINGLE_ACTION_TRANSPORT_INFO, WOCKY_JINGLE_ACTION_CONTENT_REJECT,
+    WOCKY_JINGLE_ACTION_CONTENT_MODIFY, WOCKY_JINGLE_ACTION_CONTENT_ACCEPT,
+    WOCKY_JINGLE_ACTION_CONTENT_REMOVE,  WOCKY_JINGLE_ACTION_DESCRIPTION_INFO,
+    WOCKY_JINGLE_ACTION_TRANSPORT_ACCEPT, WOCKY_JINGLE_ACTION_SESSION_INFO,
+    WOCKY_JINGLE_ACTION_INFO,
+    WOCKY_JINGLE_ACTION_UNKNOWN },
+  /* WOCKY_JINGLE_STATE_PENDING_ACCEPT_SENT */
+  { WOCKY_JINGLE_ACTION_TRANSPORT_INFO, WOCKY_JINGLE_ACTION_DESCRIPTION_INFO,
+    WOCKY_JINGLE_ACTION_SESSION_TERMINATE, WOCKY_JINGLE_ACTION_SESSION_INFO,
+    WOCKY_JINGLE_ACTION_INFO,
+    WOCKY_JINGLE_ACTION_UNKNOWN },
+  /* WOCKY_JINGLE_STATE_ACTIVE */
+  { WOCKY_JINGLE_ACTION_CONTENT_MODIFY, WOCKY_JINGLE_ACTION_CONTENT_ADD,
+    WOCKY_JINGLE_ACTION_CONTENT_REMOVE, WOCKY_JINGLE_ACTION_CONTENT_REPLACE,
+    WOCKY_JINGLE_ACTION_CONTENT_ACCEPT, WOCKY_JINGLE_ACTION_CONTENT_REJECT,
+    WOCKY_JINGLE_ACTION_SESSION_INFO, WOCKY_JINGLE_ACTION_TRANSPORT_INFO,
+    WOCKY_JINGLE_ACTION_DESCRIPTION_INFO, WOCKY_JINGLE_ACTION_INFO,
+    WOCKY_JINGLE_ACTION_SESSION_TERMINATE, WOCKY_JINGLE_ACTION_UNKNOWN },
+  /* WOCKY_JINGLE_STATE_ENDED */
+  { WOCKY_JINGLE_ACTION_UNKNOWN }
 };
 
 gboolean
-gabble_jingle_session_defines_action (GabbleJingleSession *sess,
-    JingleAction a)
+wocky_jingle_session_defines_action (WockyJingleSession *sess,
+    WockyJingleAction a)
 {
-  JingleDialect d = sess->priv->dialect;
+  WockyJingleDialect d = sess->priv->dialect;
 
-  if (a == JINGLE_ACTION_UNKNOWN)
+  if (a == WOCKY_JINGLE_ACTION_UNKNOWN)
     return FALSE;
 
   switch (d)
     {
-      case JINGLE_DIALECT_V032:
+      case WOCKY_JINGLE_DIALECT_V032:
         return TRUE;
-      case JINGLE_DIALECT_V015:
-        return (a != JINGLE_ACTION_DESCRIPTION_INFO &&
-            a != JINGLE_ACTION_SESSION_INFO);
-      case JINGLE_DIALECT_GTALK4:
-        if (a == JINGLE_ACTION_TRANSPORT_ACCEPT ||
-            a == JINGLE_ACTION_INFO )
+      case WOCKY_JINGLE_DIALECT_V015:
+        return (a != WOCKY_JINGLE_ACTION_DESCRIPTION_INFO &&
+            a != WOCKY_JINGLE_ACTION_SESSION_INFO);
+      case WOCKY_JINGLE_DIALECT_GTALK4:
+        if (a == WOCKY_JINGLE_ACTION_TRANSPORT_ACCEPT ||
+            a == WOCKY_JINGLE_ACTION_INFO )
           return TRUE;
-      case JINGLE_DIALECT_GTALK3:
-        return (a == JINGLE_ACTION_SESSION_ACCEPT ||
-            a == JINGLE_ACTION_SESSION_INITIATE ||
-            a == JINGLE_ACTION_SESSION_TERMINATE ||
-            a == JINGLE_ACTION_TRANSPORT_INFO ||
-            a == JINGLE_ACTION_INFO);
+      case WOCKY_JINGLE_DIALECT_GTALK3:
+        return (a == WOCKY_JINGLE_ACTION_SESSION_ACCEPT ||
+            a == WOCKY_JINGLE_ACTION_SESSION_INITIATE ||
+            a == WOCKY_JINGLE_ACTION_SESSION_TERMINATE ||
+            a == WOCKY_JINGLE_ACTION_TRANSPORT_INFO ||
+            a == WOCKY_JINGLE_ACTION_INFO);
       default:
         return FALSE;
     }
 }
 
-static void gabble_jingle_session_send_held (GabbleJingleSession *sess);
-static void content_ready_cb (GabbleJingleContent *c, gpointer user_data);
-static void content_removed_cb (GabbleJingleContent *c, gpointer user_data);
+static void wocky_jingle_session_send_held (WockyJingleSession *sess);
+static void content_ready_cb (WockyJingleContent *c, gpointer user_data);
+static void content_removed_cb (WockyJingleContent *c, gpointer user_data);
 
 static void
-gabble_jingle_session_init (GabbleJingleSession *obj)
+wocky_jingle_session_init (WockyJingleSession *obj)
 {
-  GabbleJingleSessionPrivate *priv =
-     G_TYPE_INSTANCE_GET_PRIVATE (obj, GABBLE_TYPE_JINGLE_SESSION,
-         GabbleJingleSessionPrivate);
+  WockyJingleSessionPrivate *priv =
+     G_TYPE_INSTANCE_GET_PRIVATE (obj, WOCKY_TYPE_JINGLE_SESSION,
+         WockyJingleSessionPrivate);
   obj->priv = priv;
 
   DEBUG ("Initializing the jingle session %p", obj);
@@ -199,7 +199,7 @@ gabble_jingle_session_init (GabbleJingleSession *obj)
   priv->responder_contents = g_hash_table_new_full (g_str_hash, g_str_equal,
       g_free, g_object_unref);
 
-  priv->state = JINGLE_STATE_PENDING_CREATED;
+  priv->state = WOCKY_JINGLE_STATE_PENDING_CREATED;
   priv->locally_accepted = FALSE;
   priv->locally_terminated = FALSE;
   priv->dispose_has_run = FALSE;
@@ -207,7 +207,7 @@ gabble_jingle_session_init (GabbleJingleSession *obj)
 
 static void
 dispose_content_hash (
-    GabbleJingleSession *sess,
+    WockyJingleSession *sess,
     GHashTable **contents)
 {
   GHashTableIter iter;
@@ -226,10 +226,10 @@ dispose_content_hash (
 }
 
 static void
-gabble_jingle_session_dispose (GObject *object)
+wocky_jingle_session_dispose (GObject *object)
 {
-  GabbleJingleSession *sess = GABBLE_JINGLE_SESSION (object);
-  GabbleJingleSessionPrivate *priv = sess->priv;
+  WockyJingleSession *sess = WOCKY_JINGLE_SESSION (object);
+  WockyJingleSessionPrivate *priv = sess->priv;
 
   if (priv->dispose_has_run)
     return;
@@ -237,8 +237,8 @@ gabble_jingle_session_dispose (GObject *object)
   DEBUG ("called");
   priv->dispose_has_run = TRUE;
 
-  g_assert ((priv->state == JINGLE_STATE_PENDING_CREATED) ||
-      (priv->state == JINGLE_STATE_ENDED));
+  g_assert ((priv->state == WOCKY_JINGLE_STATE_PENDING_CREATED) ||
+      (priv->state == WOCKY_JINGLE_STATE_ENDED));
 
   dispose_content_hash (sess, &priv->initiator_contents);
   dispose_content_hash (sess, &priv->responder_contents);
@@ -252,18 +252,18 @@ gabble_jingle_session_dispose (GObject *object)
   g_free (priv->peer_jid);
   priv->peer_jid = NULL;
 
-  if (G_OBJECT_CLASS (gabble_jingle_session_parent_class)->dispose)
-    G_OBJECT_CLASS (gabble_jingle_session_parent_class)->dispose (object);
+  if (G_OBJECT_CLASS (wocky_jingle_session_parent_class)->dispose)
+    G_OBJECT_CLASS (wocky_jingle_session_parent_class)->dispose (object);
 }
 
 static void
-gabble_jingle_session_get_property (GObject *object,
+wocky_jingle_session_get_property (GObject *object,
                                     guint property_id,
                                     GValue *value,
                                     GParamSpec *pspec)
 {
-  GabbleJingleSession *sess = GABBLE_JINGLE_SESSION (object);
-  GabbleJingleSessionPrivate *priv = sess->priv;
+  WockyJingleSession *sess = WOCKY_JINGLE_SESSION (object);
+  WockyJingleSessionPrivate *priv = sess->priv;
 
   switch (property_id) {
     case PROP_JINGLE_FACTORY:
@@ -303,13 +303,13 @@ gabble_jingle_session_get_property (GObject *object,
 }
 
 static void
-gabble_jingle_session_set_property (GObject *object,
+wocky_jingle_session_set_property (GObject *object,
                                     guint property_id,
                                     const GValue *value,
                                     GParamSpec *pspec)
 {
-  GabbleJingleSession *sess = GABBLE_JINGLE_SESSION (object);
-  GabbleJingleSessionPrivate *priv = sess->priv;
+  WockyJingleSession *sess = WOCKY_JINGLE_SESSION (object);
+  WockyJingleSessionPrivate *priv = sess->priv;
 
   switch (property_id) {
     case PROP_JINGLE_FACTORY:
@@ -341,9 +341,9 @@ gabble_jingle_session_set_property (GObject *object,
           {
             priv->local_hold = local_hold;
 
-            if (priv->state >= JINGLE_STATE_PENDING_INITIATED &&
-                priv->state < JINGLE_STATE_ENDED)
-              gabble_jingle_session_send_held (sess);
+            if (priv->state >= WOCKY_JINGLE_STATE_PENDING_INITIATED &&
+                priv->state < WOCKY_JINGLE_STATE_ENDED)
+              wocky_jingle_session_send_held (sess);
 
             /* else, we'll send this in set_state when we move to PENDING_INITIATED or
              * better.
@@ -359,12 +359,12 @@ gabble_jingle_session_set_property (GObject *object,
 }
 
 static void
-gabble_jingle_session_constructed (GObject *object)
+wocky_jingle_session_constructed (GObject *object)
 {
   void (*chain_up) (GObject *) =
-      G_OBJECT_CLASS (gabble_jingle_session_parent_class)->constructed;
-  GabbleJingleSession *self = GABBLE_JINGLE_SESSION (object);
-  GabbleJingleSessionPrivate *priv = self->priv;
+      G_OBJECT_CLASS (wocky_jingle_session_parent_class)->constructed;
+  WockyJingleSession *self = WOCKY_JINGLE_SESSION (object);
+  WockyJingleSessionPrivate *priv = self->priv;
 
   if (chain_up != NULL)
     chain_up (object);
@@ -386,17 +386,17 @@ gabble_jingle_session_constructed (GObject *object)
         WOCKY_RESOURCE_CONTACT (priv->peer_contact));
 }
 
-GabbleJingleSession *
-gabble_jingle_session_new (
-                           GabbleJingleFactory *factory,
+WockyJingleSession *
+wocky_jingle_session_new (
+                           WockyJingleFactory *factory,
                            WockyPorter *porter,
                            const gchar *session_id,
                            gboolean local_initiator,
                            WockyContact *peer,
-                           JingleDialect dialect,
+                           WockyJingleDialect dialect,
                            gboolean local_hold)
 {
-  return g_object_new (GABBLE_TYPE_JINGLE_SESSION,
+  return g_object_new (WOCKY_TYPE_JINGLE_SESSION,
       "session-id", session_id,
       "jingle-factory", factory,
       "porter", porter,
@@ -408,23 +408,23 @@ gabble_jingle_session_new (
 }
 
 static void
-gabble_jingle_session_class_init (GabbleJingleSessionClass *cls)
+wocky_jingle_session_class_init (WockyJingleSessionClass *cls)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (cls);
   GParamSpec *param_spec;
 
-  g_type_class_add_private (cls, sizeof (GabbleJingleSessionPrivate));
+  g_type_class_add_private (cls, sizeof (WockyJingleSessionPrivate));
 
-  object_class->constructed = gabble_jingle_session_constructed;
-  object_class->get_property = gabble_jingle_session_get_property;
-  object_class->set_property = gabble_jingle_session_set_property;
-  object_class->dispose = gabble_jingle_session_dispose;
+  object_class->constructed = wocky_jingle_session_constructed;
+  object_class->get_property = wocky_jingle_session_get_property;
+  object_class->set_property = wocky_jingle_session_set_property;
+  object_class->dispose = wocky_jingle_session_dispose;
 
   /* property definitions */
   param_spec = g_param_spec_object ("jingle-factory",
-      "GabbleJingleFactory object",
+      "WockyJingleFactory object",
       "The Jingle factory which created this session",
-      GABBLE_TYPE_JINGLE_FACTORY,
+      WOCKY_TYPE_JINGLE_FACTORY,
       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_JINGLE_FACTORY, param_spec);
 
@@ -448,7 +448,7 @@ gabble_jingle_session_class_init (GabbleJingleSessionClass *cls)
       param_spec);
 
   /**
-   * GabbleJingleSession:peer-contact:
+   * WockyJingleSession:peer-contact:
    *
    * The #WockyContact representing the other party in the session. Note that
    * if this is a #WockyBareContact (as opposed to a #WockyResourceContact) the
@@ -462,13 +462,13 @@ gabble_jingle_session_class_init (GabbleJingleSessionClass *cls)
 
   param_spec = g_param_spec_uint ("state", "Session state",
       "The current state that the session is in.",
-      0, G_MAXUINT32, JINGLE_STATE_PENDING_CREATED,
+      0, G_MAXUINT32, WOCKY_JINGLE_STATE_PENDING_CREATED,
       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_STATE, param_spec);
 
   param_spec = g_param_spec_uint ("dialect", "Jingle dialect",
       "Jingle dialect used for this session.",
-      0, G_MAXUINT32, JINGLE_DIALECT_ERROR,
+      0, G_MAXUINT32, WOCKY_JINGLE_DIALECT_ERROR,
       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_DIALECT, param_spec);
 
@@ -511,7 +511,7 @@ gabble_jingle_session_class_init (GabbleJingleSessionClass *cls)
 
   /*
    * @contact: this call's peer (the artist commonly known as
-   *  gabble_jingle_session_get_peer_contact())
+   *  wocky_jingle_session_get_peer_contact())
    * @cap: the XEP-0115 feature string the session is interested in.
    *
    * Emitted when the session wants to check whether the peer has a particular
@@ -530,16 +530,16 @@ gabble_jingle_session_class_init (GabbleJingleSessionClass *cls)
         G_TYPE_NONE, 0);
 }
 
-typedef void (*HandlerFunc)(GabbleJingleSession *sess,
+typedef void (*HandlerFunc)(WockyJingleSession *sess,
     WockyNode *node, GError **error);
-typedef void (*ContentHandlerFunc)(GabbleJingleSession *sess,
-    GabbleJingleContent *c, WockyNode *content_node, gpointer user_data,
+typedef void (*ContentHandlerFunc)(WockyJingleSession *sess,
+    WockyJingleContent *c, WockyNode *content_node, gpointer user_data,
     GError **error);
 
 static gboolean
-extract_reason (WockyNode *node, JingleReason *reason, gchar **message)
+extract_reason (WockyNode *node, WockyJingleReason *reason, gchar **message)
 {
-  JingleReason _reason = JINGLE_REASON_UNKNOWN;
+  WockyJingleReason _reason = WOCKY_JINGLE_REASON_UNKNOWN;
   WockyNode *child;
   WockyNodeIter iter;
 
@@ -553,7 +553,7 @@ extract_reason (WockyNode *node, JingleReason *reason, gchar **message)
   while (wocky_node_iter_next (&iter, &child))
     {
       if (wocky_enum_from_nick (
-              jingle_reason_get_type (), child->name, (gint *) &_reason))
+              wocky_jingle_reason_get_type (), child->name, (gint *) &_reason))
         {
           if (reason != NULL)
             *reason = _reason;
@@ -564,87 +564,87 @@ extract_reason (WockyNode *node, JingleReason *reason, gchar **message)
   return FALSE;
 }
 
-static JingleAction
+static WockyJingleAction
 parse_action (const gchar *txt)
 {
   if (txt == NULL)
-      return JINGLE_ACTION_UNKNOWN;
+      return WOCKY_JINGLE_ACTION_UNKNOWN;
 
   /* synonyms, best deal with them right now */
   if (!wocky_strdiff (txt, "initiate") ||
       !wocky_strdiff (txt, "session-initiate"))
-        return JINGLE_ACTION_SESSION_INITIATE;
+        return WOCKY_JINGLE_ACTION_SESSION_INITIATE;
   else if (!wocky_strdiff (txt, "terminate") ||
       !wocky_strdiff (txt, "session-terminate") ||
       !wocky_strdiff (txt, "reject"))
-        return JINGLE_ACTION_SESSION_TERMINATE;
+        return WOCKY_JINGLE_ACTION_SESSION_TERMINATE;
   else if (!wocky_strdiff (txt, "accept") ||
       !wocky_strdiff (txt, "session-accept"))
-        return JINGLE_ACTION_SESSION_ACCEPT;
+        return WOCKY_JINGLE_ACTION_SESSION_ACCEPT;
   else if (!wocky_strdiff (txt, "candidates") ||
       !wocky_strdiff (txt, "transport-info"))
-        return JINGLE_ACTION_TRANSPORT_INFO;
+        return WOCKY_JINGLE_ACTION_TRANSPORT_INFO;
   else if (!wocky_strdiff (txt, "content-accept"))
-      return JINGLE_ACTION_CONTENT_ACCEPT;
+      return WOCKY_JINGLE_ACTION_CONTENT_ACCEPT;
   else if (!wocky_strdiff (txt, "content-add"))
-      return JINGLE_ACTION_CONTENT_ADD;
+      return WOCKY_JINGLE_ACTION_CONTENT_ADD;
   else if (!wocky_strdiff (txt, "content-modify"))
-      return JINGLE_ACTION_CONTENT_MODIFY;
+      return WOCKY_JINGLE_ACTION_CONTENT_MODIFY;
   else if (!wocky_strdiff (txt, "content-replace"))
-      return JINGLE_ACTION_CONTENT_REPLACE;
+      return WOCKY_JINGLE_ACTION_CONTENT_REPLACE;
   else if (!wocky_strdiff (txt, "content-reject"))
-      return JINGLE_ACTION_CONTENT_REJECT;
+      return WOCKY_JINGLE_ACTION_CONTENT_REJECT;
   else if (!wocky_strdiff (txt, "content-remove"))
-      return JINGLE_ACTION_CONTENT_REMOVE;
+      return WOCKY_JINGLE_ACTION_CONTENT_REMOVE;
   else if (!wocky_strdiff (txt, "session-info"))
-      return JINGLE_ACTION_SESSION_INFO;
+      return WOCKY_JINGLE_ACTION_SESSION_INFO;
   else if (!wocky_strdiff (txt, "transport-accept"))
-      return JINGLE_ACTION_TRANSPORT_ACCEPT;
+      return WOCKY_JINGLE_ACTION_TRANSPORT_ACCEPT;
   else if (!wocky_strdiff (txt, "description-info"))
-      return JINGLE_ACTION_DESCRIPTION_INFO;
+      return WOCKY_JINGLE_ACTION_DESCRIPTION_INFO;
   else if (!wocky_strdiff (txt, "info"))
-      return JINGLE_ACTION_INFO;
+      return WOCKY_JINGLE_ACTION_INFO;
 
-  return JINGLE_ACTION_UNKNOWN;
+  return WOCKY_JINGLE_ACTION_UNKNOWN;
 }
 
 static const gchar *
-produce_action (JingleAction action, JingleDialect dialect)
+produce_action (WockyJingleAction action, WockyJingleDialect dialect)
 {
-  gboolean gmode = (dialect == JINGLE_DIALECT_GTALK3) ||
-      (dialect == JINGLE_DIALECT_GTALK4);
+  gboolean gmode = (dialect == WOCKY_JINGLE_DIALECT_GTALK3) ||
+      (dialect == WOCKY_JINGLE_DIALECT_GTALK4);
 
-  g_return_val_if_fail (action != JINGLE_ACTION_UNKNOWN, NULL);
+  g_return_val_if_fail (action != WOCKY_JINGLE_ACTION_UNKNOWN, NULL);
 
   switch (action) {
-    case JINGLE_ACTION_SESSION_INITIATE:
+    case WOCKY_JINGLE_ACTION_SESSION_INITIATE:
       return (gmode) ? "initiate" : "session-initiate";
-    case JINGLE_ACTION_SESSION_TERMINATE:
+    case WOCKY_JINGLE_ACTION_SESSION_TERMINATE:
       return (gmode) ? "terminate" : "session-terminate";
-    case JINGLE_ACTION_SESSION_ACCEPT:
+    case WOCKY_JINGLE_ACTION_SESSION_ACCEPT:
       return (gmode) ? "accept" : "session-accept";
-    case JINGLE_ACTION_TRANSPORT_INFO:
-      return (dialect == JINGLE_DIALECT_GTALK3) ?
+    case WOCKY_JINGLE_ACTION_TRANSPORT_INFO:
+      return (dialect == WOCKY_JINGLE_DIALECT_GTALK3) ?
         "candidates" : "transport-info";
-    case JINGLE_ACTION_CONTENT_ACCEPT:
+    case WOCKY_JINGLE_ACTION_CONTENT_ACCEPT:
       return "content-accept";
-    case JINGLE_ACTION_CONTENT_ADD:
+    case WOCKY_JINGLE_ACTION_CONTENT_ADD:
       return "content-add";
-    case JINGLE_ACTION_CONTENT_MODIFY:
+    case WOCKY_JINGLE_ACTION_CONTENT_MODIFY:
       return "content-modify";
-    case JINGLE_ACTION_CONTENT_REMOVE:
+    case WOCKY_JINGLE_ACTION_CONTENT_REMOVE:
       return "content-remove";
-    case JINGLE_ACTION_CONTENT_REPLACE:
+    case WOCKY_JINGLE_ACTION_CONTENT_REPLACE:
       return "content-replace";
-    case JINGLE_ACTION_CONTENT_REJECT:
+    case WOCKY_JINGLE_ACTION_CONTENT_REJECT:
       return "content-reject";
-    case JINGLE_ACTION_SESSION_INFO:
+    case WOCKY_JINGLE_ACTION_SESSION_INFO:
       return "session-info";
-    case JINGLE_ACTION_TRANSPORT_ACCEPT:
+    case WOCKY_JINGLE_ACTION_TRANSPORT_ACCEPT:
       return "transport-accept";
-    case JINGLE_ACTION_DESCRIPTION_INFO:
+    case WOCKY_JINGLE_ACTION_DESCRIPTION_INFO:
       return "description-info";
-    case JINGLE_ACTION_INFO:
+    case WOCKY_JINGLE_ACTION_INFO:
       return "info";
     default:
       /* only reached if g_return_val_if_fail is disabled */
@@ -654,11 +654,11 @@ produce_action (JingleAction action, JingleDialect dialect)
 }
 
 static gboolean
-action_is_allowed (JingleAction action, JingleState state)
+action_is_allowed (WockyJingleAction action, WockyJingleState state)
 {
   guint i;
 
-  for (i = 0; allowed_actions[state][i] != JINGLE_ACTION_UNKNOWN; i++)
+  for (i = 0; allowed_actions[state][i] != WOCKY_JINGLE_ACTION_UNKNOWN; i++)
     {
       if (allowed_actions[state][i] == action)
         return TRUE;
@@ -667,18 +667,18 @@ action_is_allowed (JingleAction action, JingleState state)
   return FALSE;
 }
 
-static void gabble_jingle_session_send_rtp_info (GabbleJingleSession *sess,
+static void wocky_jingle_session_send_rtp_info (WockyJingleSession *sess,
     const gchar *name);
-static void set_state (GabbleJingleSession *sess,
-    JingleState state, JingleReason termination_reason, const gchar *text);
-static GabbleJingleContent *_get_any_content (GabbleJingleSession *session);
+static void set_state (WockyJingleSession *sess,
+    WockyJingleState state, WockyJingleReason termination_reason, const gchar *text);
+static WockyJingleContent *_get_any_content (WockyJingleSession *session);
 
 gboolean
-gabble_jingle_session_peer_has_cap (
-    GabbleJingleSession *self,
+wocky_jingle_session_peer_has_cap (
+    WockyJingleSession *self,
     const gchar *cap_or_quirk)
 {
-  GabbleJingleSessionPrivate *priv = self->priv;
+  WockyJingleSessionPrivate *priv = self->priv;
   gboolean ret;
 
   g_signal_emit (self, signals[QUERY_CAP], 0,
@@ -688,14 +688,14 @@ gabble_jingle_session_peer_has_cap (
 }
 
 static gboolean
-lookup_content (GabbleJingleSession *sess,
+lookup_content (WockyJingleSession *sess,
     const gchar *name,
     const gchar *creator,
     gboolean fail_if_missing,
-    GabbleJingleContent **c,
+    WockyJingleContent **c,
     GError **error)
 {
-  GabbleJingleSessionPrivate *priv = sess->priv;
+  WockyJingleSessionPrivate *priv = sess->priv;
 
   if (name == NULL)
     {
@@ -704,7 +704,7 @@ lookup_content (GabbleJingleSession *sess,
       return FALSE;
     }
 
-  if (JINGLE_IS_GOOGLE_DIALECT (priv->dialect))
+  if (WOCKY_JINGLE_DIALECT_IS_GOOGLE (priv->dialect))
     {
       /* Only the initiator can create contents on GTalk. */
       *c = g_hash_table_lookup (priv->initiator_contents, name);
@@ -725,7 +725,7 @@ lookup_content (GabbleJingleSession *sess,
        * pick globally-unique content names.
        */
       if (creator == NULL &&
-          gabble_jingle_session_peer_has_cap (sess,
+          wocky_jingle_session_peer_has_cap (sess,
               QUIRK_OMITS_CONTENT_CREATORS))
         {
           DEBUG ("working around missing 'creator' attribute");
@@ -763,14 +763,14 @@ lookup_content (GabbleJingleSession *sess,
 }
 
 static void
-_foreach_content (GabbleJingleSession *sess,
+_foreach_content (WockyJingleSession *sess,
     WockyNode *node,
     gboolean fail_if_missing,
     ContentHandlerFunc func,
     gpointer user_data,
     GError **error)
 {
-  GabbleJingleContent *c;
+  WockyJingleContent *c;
   WockyNode *content_node;
   WockyNodeIter iter;
 
@@ -790,7 +790,7 @@ _foreach_content (GabbleJingleSession *sess,
 }
 
 struct idle_content_reject_ctx {
-    GabbleJingleSession *session;
+    WockyJingleSession *session;
     WockyStanza *msg;
 };
 
@@ -799,7 +799,7 @@ idle_content_reject (gpointer data)
 {
   struct idle_content_reject_ctx *ctx = data;
 
-  gabble_jingle_session_send (ctx->session, ctx->msg);
+  wocky_jingle_session_send (ctx->session, ctx->msg);
 
   g_object_unref (ctx->session);
   g_free (ctx);
@@ -808,7 +808,7 @@ idle_content_reject (gpointer data)
 }
 
 static void
-fire_idle_content_reject (GabbleJingleSession *sess, const gchar *name,
+fire_idle_content_reject (WockyJingleSession *sess, const gchar *name,
     const gchar *creator)
 {
   struct idle_content_reject_ctx *ctx = g_new0 (struct idle_content_reject_ctx, 1);
@@ -818,8 +818,8 @@ fire_idle_content_reject (GabbleJingleSession *sess, const gchar *name,
       creator = "";
 
   ctx->session = g_object_ref (sess);
-  ctx->msg = gabble_jingle_session_new_message (ctx->session,
-      JINGLE_ACTION_CONTENT_REJECT, &sess_node);
+  ctx->msg = wocky_jingle_session_new_message (ctx->session,
+      WOCKY_JINGLE_ACTION_CONTENT_REJECT, &sess_node);
 
   g_debug ("name = %s, initiator = %s", name, creator);
 
@@ -831,14 +831,14 @@ fire_idle_content_reject (GabbleJingleSession *sess, const gchar *name,
   g_idle_add (idle_content_reject, ctx);
 }
 
-static GabbleJingleContent *
-create_content (GabbleJingleSession *sess, GType content_type,
-  JingleMediaType type, JingleContentSenders senders,
+static WockyJingleContent *
+create_content (WockyJingleSession *sess, GType content_type,
+  WockyJingleMediaType type, WockyJingleContentSenders senders,
   const gchar *content_ns, const gchar *transport_ns,
   const gchar *name, WockyNode *content_node, GError **error)
 {
-  GabbleJingleSessionPrivate *priv = sess->priv;
-  GabbleJingleContent *c;
+  WockyJingleSessionPrivate *priv = sess->priv;
+  WockyJingleContent *c;
   GHashTable *contents;
 
   DEBUG ("session creating new content name %s, type %d", name, type);
@@ -863,8 +863,8 @@ create_content (GabbleJingleSession *sess, GType content_type,
   /* if we are called by parser, parse content add */
   if (content_node != NULL)
     {
-      gabble_jingle_content_parse_add (c, content_node,
-          JINGLE_IS_GOOGLE_DIALECT (priv->dialect), error);
+      wocky_jingle_content_parse_add (c, content_node,
+          WOCKY_JINGLE_DIALECT_IS_GOOGLE (priv->dialect), error);
 
       if (*error != NULL)
         {
@@ -874,10 +874,10 @@ create_content (GabbleJingleSession *sess, GType content_type,
 
       /* gtalk streams don't have name, so use whatever Content came up with */
       if (name == NULL)
-        name = gabble_jingle_content_get_name (c);
+        name = wocky_jingle_content_get_name (c);
     }
 
-  if (priv->local_initiator == gabble_jingle_content_is_created_by_us (c))
+  if (priv->local_initiator == wocky_jingle_content_is_created_by_us (c))
     {
       DEBUG ("inserting content %s into initiator_contents", name);
       contents = priv->initiator_contents;
@@ -900,10 +900,10 @@ create_content (GabbleJingleSession *sess, GType content_type,
 
 
 static void
-_each_content_add (GabbleJingleSession *sess, GabbleJingleContent *c,
+_each_content_add (WockyJingleSession *sess, WockyJingleContent *c,
     WockyNode *content_node, gpointer user_data, GError **error)
 {
-  GabbleJingleSessionPrivate *priv = sess->priv;
+  WockyJingleSessionPrivate *priv = sess->priv;
   const gchar *name = wocky_node_get_attribute (content_node, "name");
   WockyNode *desc_node = wocky_node_get_child (content_node,
       "description");
@@ -914,8 +914,8 @@ _each_content_add (GabbleJingleSession *sess, GabbleJingleContent *c,
     {
       content_ns = wocky_node_get_ns (desc_node);
       DEBUG ("namespace: %s", content_ns);
-      content_type = gabble_jingle_factory_lookup_content_type (
-          gabble_jingle_session_get_factory (sess),
+      content_type = wocky_jingle_factory_lookup_content_type (
+          wocky_jingle_session_get_factory (sess),
           content_ns);
     }
 
@@ -923,7 +923,7 @@ _each_content_add (GabbleJingleSession *sess, GabbleJingleContent *c,
     {
       /* if this is session-initiate, we should return error, otherwise,
        * we should respond with content-reject */
-      if (priv->state < JINGLE_STATE_PENDING_INITIATED)
+      if (priv->state < WOCKY_JINGLE_STATE_PENDING_INITIATED)
         g_set_error (error, WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_BAD_REQUEST,
             "unsupported content type with ns %s", content_ns);
       else
@@ -940,46 +940,46 @@ _each_content_add (GabbleJingleSession *sess, GabbleJingleContent *c,
       return;
     }
 
-  create_content (sess, content_type, JINGLE_MEDIA_TYPE_NONE,
-      JINGLE_CONTENT_SENDERS_BOTH, content_ns, NULL, NULL, content_node,
+  create_content (sess, content_type, WOCKY_JINGLE_MEDIA_TYPE_NONE,
+      WOCKY_JINGLE_CONTENT_SENDERS_BOTH, content_ns, NULL, NULL, content_node,
       error);
 }
 
 static void
-_each_content_remove (GabbleJingleSession *sess, GabbleJingleContent *c,
+_each_content_remove (WockyJingleSession *sess, WockyJingleContent *c,
     WockyNode *content_node, gpointer user_data, GError **error)
 {
   g_assert (c != NULL);
 
-  gabble_jingle_content_remove (c, FALSE);
+  wocky_jingle_content_remove (c, FALSE);
 }
 
 static void
-_each_content_rejected (GabbleJingleSession *sess, GabbleJingleContent *c,
+_each_content_rejected (WockyJingleSession *sess, WockyJingleContent *c,
     WockyNode *content_node, gpointer user_data, GError **error)
 {
-  JingleReason reason = GPOINTER_TO_UINT (user_data);
+  WockyJingleReason reason = GPOINTER_TO_UINT (user_data);
   g_assert (c != NULL);
 
   g_signal_emit (sess, signals[CONTENT_REJECTED], 0, c, reason, "");
 
-  gabble_jingle_content_remove (c, FALSE);
+  wocky_jingle_content_remove (c, FALSE);
 }
 
 static void
-_each_content_modify (GabbleJingleSession *sess, GabbleJingleContent *c,
+_each_content_modify (WockyJingleSession *sess, WockyJingleContent *c,
     WockyNode *content_node, gpointer user_data, GError **error)
 {
   g_assert (c != NULL);
 
-  gabble_jingle_content_update_senders (c, content_node, error);
+  wocky_jingle_content_update_senders (c, content_node, error);
 
   if (*error != NULL)
     return;
 }
 
 static void
-_each_content_replace (GabbleJingleSession *sess, GabbleJingleContent *c,
+_each_content_replace (WockyJingleSession *sess, WockyJingleContent *c,
     WockyNode *content_node, gpointer user_data, GError **error)
 {
   _each_content_remove (sess, c, content_node, NULL, error);
@@ -991,16 +991,16 @@ _each_content_replace (GabbleJingleSession *sess, GabbleJingleContent *c,
 }
 
 static void
-_each_content_accept (GabbleJingleSession *sess, GabbleJingleContent *c,
+_each_content_accept (WockyJingleSession *sess, WockyJingleContent *c,
     WockyNode *content_node, gpointer user_data, GError **error)
 {
-  GabbleJingleSessionPrivate *priv = sess->priv;
-  JingleContentState state;
+  WockyJingleSessionPrivate *priv = sess->priv;
+  WockyJingleContentState state;
 
   g_assert (c != NULL);
 
   g_object_get (c, "state", &state, NULL);
-  if (state != JINGLE_CONTENT_STATE_SENT)
+  if (state != WOCKY_JINGLE_CONTENT_STATE_SENT)
     {
 #ifdef ENABLE_DEBUG
       const gchar *name = wocky_node_get_attribute (content_node, "name");
@@ -1009,33 +1009,33 @@ _each_content_accept (GabbleJingleSession *sess, GabbleJingleContent *c,
       return;
     }
 
-  gabble_jingle_content_parse_accept (c, content_node,
-      JINGLE_IS_GOOGLE_DIALECT (priv->dialect), error);
+  wocky_jingle_content_parse_accept (c, content_node,
+      WOCKY_JINGLE_DIALECT_IS_GOOGLE (priv->dialect), error);
 }
 
 static void
-_each_description_info (GabbleJingleSession *sess, GabbleJingleContent *c,
+_each_description_info (WockyJingleSession *sess, WockyJingleContent *c,
     WockyNode *content_node, gpointer user_data, GError **error)
 {
-  gabble_jingle_content_parse_description_info (c, content_node, error);
+  wocky_jingle_content_parse_description_info (c, content_node, error);
 }
 
 static void
-on_session_initiate (GabbleJingleSession *sess, WockyNode *node,
+on_session_initiate (WockyJingleSession *sess, WockyNode *node,
   GError **error)
 {
-  GabbleJingleSessionPrivate *priv = sess->priv;
+  WockyJingleSessionPrivate *priv = sess->priv;
 
   /* we can't call ourselves at the moment */
   if (priv->local_initiator)
     {
       /* We ignore initiate from us, and terminate the session immediately
        * afterwards */
-      gabble_jingle_session_terminate (sess, JINGLE_REASON_BUSY, NULL, NULL);
+      wocky_jingle_session_terminate (sess, WOCKY_JINGLE_REASON_BUSY, NULL, NULL);
       return;
     }
 
-  if ((priv->dialect == JINGLE_DIALECT_GTALK3))
+  if ((priv->dialect == WOCKY_JINGLE_DIALECT_GTALK3))
     {
       const gchar *content_ns = NULL;
       WockyNode *desc_node =
@@ -1044,23 +1044,23 @@ on_session_initiate (GabbleJingleSession *sess, WockyNode *node,
 
       if (!wocky_strdiff (content_ns, NS_GOOGLE_SESSION_VIDEO))
         {
-          GabbleJingleFactory *factory =
-              gabble_jingle_session_get_factory (sess);
+          WockyJingleFactory *factory =
+              wocky_jingle_session_get_factory (sess);
           GType content_type = 0;
 
           DEBUG ("GTalk v3 session with audio and video");
 
           /* audio and video content */
-          content_type = gabble_jingle_factory_lookup_content_type (
+          content_type = wocky_jingle_factory_lookup_content_type (
             factory, content_ns);
-          create_content (sess, content_type, JINGLE_MEDIA_TYPE_VIDEO,
-            JINGLE_CONTENT_SENDERS_BOTH, NS_GOOGLE_SESSION_VIDEO, NULL,
+          create_content (sess, content_type, WOCKY_JINGLE_MEDIA_TYPE_VIDEO,
+            WOCKY_JINGLE_CONTENT_SENDERS_BOTH, NS_GOOGLE_SESSION_VIDEO, NULL,
               "video", node, error);
 
-          content_type = gabble_jingle_factory_lookup_content_type (
+          content_type = wocky_jingle_factory_lookup_content_type (
             factory, NS_GOOGLE_SESSION_PHONE);
-          create_content (sess, content_type, JINGLE_MEDIA_TYPE_AUDIO,
-            JINGLE_CONTENT_SENDERS_BOTH, NS_GOOGLE_SESSION_PHONE, NULL,
+          create_content (sess, content_type, WOCKY_JINGLE_MEDIA_TYPE_AUDIO,
+            WOCKY_JINGLE_CONTENT_SENDERS_BOTH, NS_GOOGLE_SESSION_PHONE, NULL,
               "audio", node, error);
         }
       else
@@ -1068,7 +1068,7 @@ on_session_initiate (GabbleJingleSession *sess, WockyNode *node,
           _each_content_add (sess, NULL, node, NULL, error);
         }
     }
-  else if (priv->dialect == JINGLE_DIALECT_GTALK4)
+  else if (priv->dialect == WOCKY_JINGLE_DIALECT_GTALK4)
     {
       /* in this case we implicitly have just one content */
       _each_content_add (sess, NULL, node, NULL, error);
@@ -1084,84 +1084,84 @@ on_session_initiate (GabbleJingleSession *sess, WockyNode *node,
        * disposition; resolve this as soon as the proper procedure is defined
        * in XEP-0166. */
 
-      set_state (sess, JINGLE_STATE_PENDING_INITIATED, JINGLE_REASON_UNKNOWN,
+      set_state (sess, WOCKY_JINGLE_STATE_PENDING_INITIATED, WOCKY_JINGLE_REASON_UNKNOWN,
           NULL);
 
-      gabble_jingle_session_send_rtp_info (sess, "ringing");
+      wocky_jingle_session_send_rtp_info (sess, "ringing");
     }
 }
 
 static void
-on_content_add (GabbleJingleSession *sess, WockyNode *node,
+on_content_add (WockyJingleSession *sess, WockyNode *node,
   GError **error)
 {
   _foreach_content (sess, node, FALSE, _each_content_add, NULL, error);
 }
 
 static void
-on_content_modify (GabbleJingleSession *sess, WockyNode *node,
+on_content_modify (WockyJingleSession *sess, WockyNode *node,
     GError **error)
 {
   _foreach_content (sess, node, TRUE, _each_content_modify, NULL, error);
 }
 
 static void
-on_content_remove (GabbleJingleSession *sess, WockyNode *node,
+on_content_remove (WockyJingleSession *sess, WockyNode *node,
     GError **error)
 {
   _foreach_content (sess, node, TRUE, _each_content_remove, NULL, error);
 }
 
 static void
-on_content_replace (GabbleJingleSession *sess, WockyNode *node,
+on_content_replace (WockyJingleSession *sess, WockyNode *node,
     GError **error)
 {
   _foreach_content (sess, node, TRUE, _each_content_replace, NULL, error);
 }
 
 static void
-on_content_reject (GabbleJingleSession *sess, WockyNode *node,
+on_content_reject (WockyJingleSession *sess, WockyNode *node,
     GError **error)
 {
   WockyNode *n = wocky_node_get_child (node, "reason");
-  JingleReason reason = JINGLE_REASON_UNKNOWN;
+  WockyJingleReason reason = WOCKY_JINGLE_REASON_UNKNOWN;
 
   DEBUG (" ");
 
   if (n != NULL)
     extract_reason (n, &reason, NULL);
 
-  if (reason == JINGLE_REASON_UNKNOWN)
-    reason = JINGLE_REASON_GENERAL_ERROR;
+  if (reason == WOCKY_JINGLE_REASON_UNKNOWN)
+    reason = WOCKY_JINGLE_REASON_GENERAL_ERROR;
 
   _foreach_content (sess, node, TRUE, _each_content_rejected,
       GUINT_TO_POINTER (reason), error);
 }
 
 static void
-on_content_accept (GabbleJingleSession *sess, WockyNode *node,
+on_content_accept (WockyJingleSession *sess, WockyNode *node,
     GError **error)
 {
   _foreach_content (sess, node, TRUE, _each_content_accept, NULL, error);
 }
 
 static void
-on_session_accept (GabbleJingleSession *sess, WockyNode *node,
+on_session_accept (WockyJingleSession *sess, WockyNode *node,
     GError **error)
 {
-  GabbleJingleSessionPrivate *priv = sess->priv;
+  WockyJingleSessionPrivate *priv = sess->priv;
 
   DEBUG ("called");
 
-  if ((priv->dialect == JINGLE_DIALECT_GTALK3) ||
-      (priv->dialect == JINGLE_DIALECT_GTALK4))
+  if ((priv->dialect == WOCKY_JINGLE_DIALECT_GTALK3) ||
+      (priv->dialect == WOCKY_JINGLE_DIALECT_GTALK4))
     {
       /* Google Talk calls don't have contents per se; they just have
        * <payload-type>s in different namespaces for audio and video, in the
        * same <description> stanza. So we need to feed the whole stanza to each
        * content in turn.
        */
-      GList *cs = gabble_jingle_session_get_contents (sess);
+      GList *cs = wocky_jingle_session_get_contents (sess);
       GList *l;
 
       for (l = cs; l != NULL; l = l->next)
@@ -1177,14 +1177,14 @@ on_session_accept (GabbleJingleSession *sess, WockyNode *node,
   if (*error != NULL)
       return;
 
-  set_state (sess, JINGLE_STATE_ACTIVE, JINGLE_REASON_UNKNOWN, NULL);
+  set_state (sess, WOCKY_JINGLE_STATE_ACTIVE, WOCKY_JINGLE_REASON_UNKNOWN, NULL);
 
   /* Make sure each content knows the session is active */
-  g_list_foreach (gabble_jingle_session_get_contents (sess),
+  g_list_foreach (wocky_jingle_session_get_contents (sess),
       (GFunc) g_object_notify, "state");
 
 
-  if (priv->dialect != JINGLE_DIALECT_V032)
+  if (priv->dialect != WOCKY_JINGLE_DIALECT_V032)
     {
       /* If this is a dialect that doesn't support <active/>, we treat
        * session-accept as the cue to remove the ringing flag.
@@ -1199,12 +1199,12 @@ mute_all_foreach (gpointer key,
     gpointer value,
     gpointer mute)
 {
-  if (G_OBJECT_TYPE (value) == GABBLE_TYPE_JINGLE_MEDIA_RTP)
+  if (G_OBJECT_TYPE (value) == WOCKY_TYPE_JINGLE_MEDIA_RTP)
     g_object_set (value, "remote-mute", GPOINTER_TO_INT (mute), NULL);
 }
 
 static void
-mute_all (GabbleJingleSession *sess,
+mute_all (WockyJingleSession *sess,
     gboolean mute)
 {
   g_hash_table_foreach (sess->priv->initiator_contents, mute_all_foreach,
@@ -1214,13 +1214,13 @@ mute_all (GabbleJingleSession *sess,
 }
 
 static gboolean
-set_mute (GabbleJingleSession *sess,
+set_mute (WockyJingleSession *sess,
     const gchar *name,
     const gchar *creator,
     gboolean mute,
     GError **error)
 {
-  GabbleJingleContent *c;
+  WockyJingleContent *c;
 
   if (name == NULL)
     {
@@ -1232,7 +1232,7 @@ set_mute (GabbleJingleSession *sess,
       error))
     return FALSE;
 
-  if (G_OBJECT_TYPE (c) != GABBLE_TYPE_JINGLE_MEDIA_RTP)
+  if (G_OBJECT_TYPE (c) != WOCKY_TYPE_JINGLE_MEDIA_RTP)
     {
       g_set_error (error, WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_BAD_REQUEST,
           "content '%s' isn't an RTP session", name);
@@ -1244,21 +1244,21 @@ set_mute (GabbleJingleSession *sess,
 }
 
 static void
-set_hold (GabbleJingleSession *sess,
+set_hold (WockyJingleSession *sess,
     gboolean hold)
 {
   sess->priv->remote_hold = hold;
 }
 
 static void
-set_ringing (GabbleJingleSession *sess,
+set_ringing (WockyJingleSession *sess,
     gboolean ringing)
 {
   sess->priv->remote_ringing = ringing;
 }
 
 static gboolean
-handle_payload (GabbleJingleSession *sess,
+handle_payload (WockyJingleSession *sess,
     WockyNode *payload,
     gboolean *handled,
     GError **error)
@@ -1318,7 +1318,7 @@ handle_payload (GabbleJingleSession *sess,
 }
 
 static void
-on_session_info (GabbleJingleSession *sess,
+on_session_info (WockyJingleSession *sess,
     WockyNode *node,
     GError **error)
 {
@@ -1365,50 +1365,50 @@ on_session_info (GabbleJingleSession *sess,
 }
 
 static void
-on_session_terminate (GabbleJingleSession *sess, WockyNode *node,
+on_session_terminate (WockyJingleSession *sess, WockyNode *node,
     GError **error)
 {
   gchar *text = NULL;
   WockyNode *n = wocky_node_get_child (node, "reason");
-  JingleReason jingle_reason = JINGLE_REASON_UNKNOWN;
+  WockyJingleReason wocky_jingle_reason = WOCKY_JINGLE_REASON_UNKNOWN;
 
   if (n != NULL)
-    extract_reason (n, &jingle_reason, &text);
+    extract_reason (n, &wocky_jingle_reason, &text);
 
   DEBUG ("remote end terminated the session with reason %s and text '%s'",
-      gabble_jingle_session_get_reason_name (jingle_reason),
+      wocky_jingle_session_get_reason_name (wocky_jingle_reason),
       (text != NULL ? text : "(none)"));
 
-  set_state (sess, JINGLE_STATE_ENDED, jingle_reason, text);
+  set_state (sess, WOCKY_JINGLE_STATE_ENDED, wocky_jingle_reason, text);
 
   g_free (text);
 }
 
 static void
-on_transport_info (GabbleJingleSession *sess, WockyNode *node,
+on_transport_info (WockyJingleSession *sess, WockyNode *node,
     GError **error)
 {
-  GabbleJingleSessionPrivate *priv = sess->priv;
-  GabbleJingleContent *c = NULL;
+  WockyJingleSessionPrivate *priv = sess->priv;
+  WockyJingleContent *c = NULL;
 
-  if (JINGLE_IS_GOOGLE_DIALECT (priv->dialect))
+  if (WOCKY_JINGLE_DIALECT_IS_GOOGLE (priv->dialect))
     {
       GHashTableIter iter;
       gpointer value;
 
-      if (priv->dialect == JINGLE_DIALECT_GTALK4)
+      if (priv->dialect == WOCKY_JINGLE_DIALECT_GTALK4)
         {
           if (!wocky_strdiff (wocky_node_get_attribute (node, "type"),
                 "candidates"))
             {
-              GList *contents = gabble_jingle_session_get_contents (sess);
+              GList *contents = wocky_jingle_session_get_contents (sess);
               GList *l;
 
               DEBUG ("switching to gtalk3 dialect and retransmiting our candidates");
-              priv->dialect = JINGLE_DIALECT_GTALK3;
+              priv->dialect = WOCKY_JINGLE_DIALECT_GTALK3;
 
               for (l = contents; l != NULL; l = l->next)
-                gabble_jingle_content_retransmit_candidates (l->data, TRUE);
+                wocky_jingle_content_retransmit_candidates (l->data, TRUE);
 
               g_list_free (contents);
             }
@@ -1429,7 +1429,7 @@ on_transport_info (GabbleJingleSession *sess, WockyNode *node,
         while (g_hash_table_iter_next (&iter, NULL, &value))
           {
             c = value;
-            gabble_jingle_content_parse_transport_info (c, node, error);
+            wocky_jingle_content_parse_transport_info (c, node, error);
             if (error != NULL && *error != NULL)
               break;
           }
@@ -1454,7 +1454,7 @@ on_transport_info (GabbleJingleSession *sess, WockyNode *node,
               /* we need transport child of content node */
               transport_node = wocky_node_get_child (
                 content_node, "transport");
-              gabble_jingle_content_parse_transport_info (c,
+              wocky_jingle_content_parse_transport_info (c,
                 transport_node, &e);
             }
 
@@ -1472,34 +1472,34 @@ on_transport_info (GabbleJingleSession *sess, WockyNode *node,
 }
 
 static void
-on_transport_accept (GabbleJingleSession *sess, WockyNode *node,
+on_transport_accept (WockyJingleSession *sess, WockyNode *node,
     GError **error)
 {
   DEBUG ("Ignoring 'transport-accept' action from peer");
 }
 
 static void
-on_description_info (GabbleJingleSession *sess, WockyNode *node,
+on_description_info (WockyJingleSession *sess, WockyNode *node,
     GError **error)
 {
   _foreach_content (sess, node, TRUE, _each_description_info, NULL, error);
 }
 
 static void
-on_info (GabbleJingleSession *sess, WockyNode *node,
+on_info (WockyJingleSession *sess, WockyNode *node,
     GError **error)
 {
-  GabbleJingleSessionPrivate *priv = sess->priv;
-  GabbleJingleContent *c = NULL;
+  WockyJingleSessionPrivate *priv = sess->priv;
+  WockyJingleContent *c = NULL;
 
   DEBUG ("received info ");
-  if (JINGLE_IS_GOOGLE_DIALECT (priv->dialect))
+  if (WOCKY_JINGLE_DIALECT_IS_GOOGLE (priv->dialect))
     {
       GHashTableIter iter;
       g_hash_table_iter_init (&iter, priv->initiator_contents);
       while (g_hash_table_iter_next (&iter, NULL, (gpointer) &c))
         {
-          gabble_jingle_content_parse_info (c, node, error);
+          wocky_jingle_content_parse_info (c, node, error);
           if (error != NULL && *error != NULL)
             break;
         }
@@ -1525,12 +1525,12 @@ static HandlerFunc handlers[] = {
 };
 
 static void
-jingle_state_machine_dance (GabbleJingleSession *sess,
-    JingleAction action,
+wocky_jingle_state_machine_dance (WockyJingleSession *sess,
+    WockyJingleAction action,
     WockyNode *node,
     GError **error)
 {
-  GabbleJingleSessionPrivate *priv = sess->priv;
+  WockyJingleSessionPrivate *priv = sess->priv;
 
   /* parser should've checked this already */
   g_assert (action_is_allowed (action, priv->state));
@@ -1539,27 +1539,27 @@ jingle_state_machine_dance (GabbleJingleSession *sess,
   handlers[action] (sess, node, error);
 }
 
-static JingleDialect
+static WockyJingleDialect
 detect_google_dialect (WockyNode *session_node)
 {
   /* The GTALK3 dialect is the only one that supports video at this time */
   if (wocky_node_get_child_ns (session_node,
       "description", NS_GOOGLE_SESSION_VIDEO) != NULL)
-    return JINGLE_DIALECT_GTALK3;
+    return WOCKY_JINGLE_DIALECT_GTALK3;
 
   /* GTalk4 has a transport item, GTalk3 doesn't */
   if (wocky_node_get_child_ns (session_node,
       "transport", NS_GOOGLE_TRANSPORT_P2P) == NULL)
-    return JINGLE_DIALECT_GTALK3;
+    return WOCKY_JINGLE_DIALECT_GTALK3;
 
-  return JINGLE_DIALECT_GTALK4;
+  return WOCKY_JINGLE_DIALECT_GTALK4;
 }
 
 const gchar *
-gabble_jingle_session_detect (
+wocky_jingle_session_detect (
     WockyStanza *stanza,
-    JingleAction *action,
-    JingleDialect *dialect)
+    WockyJingleAction *action,
+    WockyJingleDialect *dialect)
 {
   const gchar *actxt, *sid;
   WockyNode *iq_node, *session_node;
@@ -1582,7 +1582,7 @@ gabble_jingle_session_detect (
 
   if (session_node != NULL)
     {
-      *dialect = JINGLE_DIALECT_V032;
+      *dialect = WOCKY_JINGLE_DIALECT_V032;
     }
   else
     {
@@ -1591,7 +1591,7 @@ gabble_jingle_session_detect (
 
       if (session_node != NULL)
         {
-          *dialect = JINGLE_DIALECT_V015;
+          *dialect = WOCKY_JINGLE_DIALECT_V015;
         }
       else
         {
@@ -1628,13 +1628,13 @@ gabble_jingle_session_detect (
 }
 
 gboolean
-gabble_jingle_session_parse (
-    GabbleJingleSession *sess,
-    JingleAction action,
+wocky_jingle_session_parse (
+    WockyJingleSession *sess,
+    WockyJingleAction action,
     WockyStanza *stanza,
     GError **error)
 {
-  GabbleJingleSessionPrivate *priv = sess->priv;
+  WockyJingleSessionPrivate *priv = sess->priv;
   WockyNode *iq_node, *session_node;
   const gchar *from, *action_name;
 
@@ -1642,7 +1642,7 @@ gabble_jingle_session_parse (
   from = wocky_stanza_get_from (stanza);
   iq_node = wocky_stanza_get_top_node (stanza);
 
-  if (action == JINGLE_ACTION_UNKNOWN)
+  if (action == WOCKY_JINGLE_ACTION_UNKNOWN)
     {
       g_set_error (error, WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_BAD_REQUEST,
           "unknown session action");
@@ -1655,16 +1655,16 @@ gabble_jingle_session_parse (
       action_name, from, priv->sid, priv->dialect, priv->state);
 
   switch (priv->dialect) {
-    case JINGLE_DIALECT_V032:
+    case WOCKY_JINGLE_DIALECT_V032:
       session_node = wocky_node_get_child_ns (iq_node,
           "jingle", NS_JINGLE032);
       break;
-    case JINGLE_DIALECT_V015:
+    case WOCKY_JINGLE_DIALECT_V015:
       session_node = wocky_node_get_child_ns (iq_node,
           "jingle", NS_JINGLE015);
       break;
-    case JINGLE_DIALECT_GTALK3:
-    case JINGLE_DIALECT_GTALK4:
+    case WOCKY_JINGLE_DIALECT_GTALK3:
+    case WOCKY_JINGLE_DIALECT_GTALK4:
       session_node = wocky_node_get_child_ns (iq_node,
           "session", NS_GOOGLE_SESSION);
       break;
@@ -1680,7 +1680,7 @@ gabble_jingle_session_parse (
       return FALSE;
     }
 
-  if (!gabble_jingle_session_defines_action (sess, action))
+  if (!wocky_jingle_session_defines_action (sess, action))
     {
       g_set_error (error, WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_BAD_REQUEST,
           "action '%s' unknown (using dialect %u)", action_name, priv->dialect);
@@ -1694,7 +1694,7 @@ gabble_jingle_session_parse (
       return FALSE;
     }
 
-  jingle_state_machine_dance (sess, action, session_node, error);
+  wocky_jingle_state_machine_dance (sess, action, session_node, error);
 
   if (*error != NULL)
     return FALSE;
@@ -1703,38 +1703,38 @@ gabble_jingle_session_parse (
 }
 
 WockyStanza *
-gabble_jingle_session_new_message (GabbleJingleSession *sess,
-    JingleAction action, WockyNode **sess_node)
+wocky_jingle_session_new_message (WockyJingleSession *sess,
+    WockyJingleAction action, WockyNode **sess_node)
 {
-  GabbleJingleSessionPrivate *priv = sess->priv;
+  WockyJingleSessionPrivate *priv = sess->priv;
   WockyStanza *stanza;
   WockyNode *session_node;
   gchar *el = NULL, *ns = NULL;
   gboolean gtalk_mode = FALSE;
 
-  g_return_val_if_fail (action != JINGLE_ACTION_UNKNOWN, NULL);
+  g_return_val_if_fail (action != WOCKY_JINGLE_ACTION_UNKNOWN, NULL);
 
-  g_assert ((action == JINGLE_ACTION_SESSION_INITIATE) ||
-            (priv->state > JINGLE_STATE_PENDING_CREATED));
-  g_assert (GABBLE_IS_JINGLE_SESSION (sess));
+  g_assert ((action == WOCKY_JINGLE_ACTION_SESSION_INITIATE) ||
+            (priv->state > WOCKY_JINGLE_STATE_PENDING_CREATED));
+  g_assert (WOCKY_IS_JINGLE_SESSION (sess));
 
   switch (priv->dialect)
     {
-      case JINGLE_DIALECT_V032:
+      case WOCKY_JINGLE_DIALECT_V032:
         el = "jingle";
         ns = NS_JINGLE032;
         break;
-      case JINGLE_DIALECT_V015:
+      case WOCKY_JINGLE_DIALECT_V015:
         el = "jingle";
         ns = NS_JINGLE015;
         break;
-      case JINGLE_DIALECT_GTALK3:
-      case JINGLE_DIALECT_GTALK4:
+      case WOCKY_JINGLE_DIALECT_GTALK3:
+      case WOCKY_JINGLE_DIALECT_GTALK4:
         el = "session";
         ns = NS_GOOGLE_SESSION;
         gtalk_mode = TRUE;
         break;
-      case JINGLE_DIALECT_ERROR:
+      case WOCKY_JINGLE_DIALECT_ERROR:
         g_assert_not_reached ();
     }
 
@@ -1758,20 +1758,20 @@ gabble_jingle_session_new_message (GabbleJingleSession *sess,
   return stanza;
 }
 
-typedef void (*ContentMapperFunc) (GabbleJingleSession *sess,
-    GabbleJingleContent *c, gpointer user_data);
+typedef void (*ContentMapperFunc) (WockyJingleSession *sess,
+    WockyJingleContent *c, gpointer user_data);
 
 static void
-_map_initial_contents (GabbleJingleSession *sess, ContentMapperFunc mapper,
+_map_initial_contents (WockyJingleSession *sess, ContentMapperFunc mapper,
     gpointer user_data)
 {
   GList *li;
-  GList *contents = gabble_jingle_session_get_contents (sess);
+  GList *contents = wocky_jingle_session_get_contents (sess);
 
   for (li = contents; li; li = li->next)
     {
-      GabbleJingleContent *c = GABBLE_JINGLE_CONTENT (li->data);
-      const gchar *disposition = gabble_jingle_content_get_disposition (c);
+      WockyJingleContent *c = WOCKY_JINGLE_CONTENT (li->data);
+      const gchar *disposition = wocky_jingle_content_get_disposition (c);
 
       if (!wocky_strdiff (disposition, "session"))
         mapper (sess, c, user_data);
@@ -1781,46 +1781,46 @@ _map_initial_contents (GabbleJingleSession *sess, ContentMapperFunc mapper,
 }
 
 static void
-_check_content_ready (GabbleJingleSession *sess,
-    GabbleJingleContent *c, gpointer user_data)
+_check_content_ready (WockyJingleSession *sess,
+    WockyJingleContent *c, gpointer user_data)
 {
   gboolean *ready = (gboolean *) user_data;
 
-  if (!gabble_jingle_content_is_ready (c))
+  if (!wocky_jingle_content_is_ready (c))
     {
       *ready = FALSE;
     }
 }
 
 static void
-_transmit_candidates (GabbleJingleSession *sess,
-    GabbleJingleContent *c,
+_transmit_candidates (WockyJingleSession *sess,
+    WockyJingleContent *c,
     gpointer user_data)
 {
-  gabble_jingle_content_retransmit_candidates (c, FALSE);
+  wocky_jingle_content_retransmit_candidates (c, FALSE);
 }
 
 static void
-_fill_content (GabbleJingleSession *sess,
-    GabbleJingleContent *c, gpointer user_data)
+_fill_content (WockyJingleSession *sess,
+    WockyJingleContent *c, gpointer user_data)
 {
   WockyNode *sess_node = user_data;
   WockyNode *transport_node;
-  JingleContentState state;
+  WockyJingleContentState state;
 
-  gabble_jingle_content_produce_node (c, sess_node, TRUE, TRUE,
+  wocky_jingle_content_produce_node (c, sess_node, TRUE, TRUE,
       &transport_node);
-  gabble_jingle_content_inject_candidates (c, transport_node);
+  wocky_jingle_content_inject_candidates (c, transport_node);
 
   g_object_get (c, "state", &state, NULL);
 
-  if (state == JINGLE_CONTENT_STATE_EMPTY)
+  if (state == WOCKY_JINGLE_CONTENT_STATE_EMPTY)
     {
-      g_object_set (c, "state", JINGLE_CONTENT_STATE_SENT, NULL);
+      g_object_set (c, "state", WOCKY_JINGLE_CONTENT_STATE_SENT, NULL);
     }
-  else if (state == JINGLE_CONTENT_STATE_NEW)
+  else if (state == WOCKY_JINGLE_CONTENT_STATE_NEW)
     {
-      g_object_set (c, "state", JINGLE_CONTENT_STATE_ACKNOWLEDGED, NULL);
+      g_object_set (c, "state", WOCKY_JINGLE_CONTENT_STATE_ACKNOWLEDGED, NULL);
     }
   else
     {
@@ -1830,14 +1830,14 @@ _fill_content (GabbleJingleSession *sess,
 }
 
 /**
- * gabble_jingle_session_send:
+ * wocky_jingle_session_send:
  * @sess: a session
  * @stanza: (transfer full): a stanza, of which this function will take ownership
  *
  * A shorthand for sending a Jingle IQ without waiting for the reply.
  */
 void
-gabble_jingle_session_send (GabbleJingleSession *sess,
+wocky_jingle_session_send (WockyJingleSession *sess,
     WockyStanza *stanza)
 {
   wocky_porter_send_iq_async (sess->priv->porter,
@@ -1852,11 +1852,11 @@ _on_initiate_reply (
     gpointer user_data)
 {
   WockyPorter *porter = WOCKY_PORTER (source);
-  GabbleJingleSession *sess = GABBLE_JINGLE_SESSION (user_data);
-  GabbleJingleSessionPrivate *priv = sess->priv;
+  WockyJingleSession *sess = WOCKY_JINGLE_SESSION (user_data);
+  WockyJingleSessionPrivate *priv = sess->priv;
   WockyStanza *reply;
 
-  if (priv->state != JINGLE_STATE_PENDING_INITIATE_SENT)
+  if (priv->state != WOCKY_JINGLE_STATE_PENDING_INITIATE_SENT)
     {
       DEBUG ("Ignoring session-initiate reply; session %p is in state %u.",
           sess, priv->state);
@@ -1868,9 +1868,9 @@ _on_initiate_reply (
   if (reply != NULL &&
       !wocky_stanza_extract_errors (reply, NULL, NULL, NULL, NULL))
     {
-      set_state (sess, JINGLE_STATE_PENDING_INITIATED, 0, NULL);
+      set_state (sess, WOCKY_JINGLE_STATE_PENDING_INITIATED, 0, NULL);
 
-      if (priv->dialect != JINGLE_DIALECT_V032)
+      if (priv->dialect != WOCKY_JINGLE_DIALECT_V032)
         {
           /* If this is a dialect that doesn't support <ringing/>, we treat the
            * session-initiate being acked as the cue to say we're ringing.
@@ -1881,7 +1881,7 @@ _on_initiate_reply (
     }
   else
     {
-      set_state (sess, JINGLE_STATE_ENDED, JINGLE_REASON_UNKNOWN,
+      set_state (sess, WOCKY_JINGLE_STATE_ENDED, WOCKY_JINGLE_REASON_UNKNOWN,
           NULL);
     }
 
@@ -1896,11 +1896,11 @@ _on_accept_reply (
     gpointer user_data)
 {
   WockyPorter *porter = WOCKY_PORTER (source);
-  GabbleJingleSession *sess = GABBLE_JINGLE_SESSION (user_data);
-  GabbleJingleSessionPrivate *priv = sess->priv;
+  WockyJingleSession *sess = WOCKY_JINGLE_SESSION (user_data);
+  WockyJingleSessionPrivate *priv = sess->priv;
   WockyStanza *reply;
 
-  if (priv->state != JINGLE_STATE_PENDING_ACCEPT_SENT)
+  if (priv->state != WOCKY_JINGLE_STATE_PENDING_ACCEPT_SENT)
     {
       DEBUG ("Ignoring session-accept reply; session %p is in state %u.",
           sess, priv->state);
@@ -1912,12 +1912,12 @@ _on_accept_reply (
   if (reply != NULL &&
       !wocky_stanza_extract_errors (reply, NULL, NULL, NULL, NULL))
     {
-      set_state (sess, JINGLE_STATE_ACTIVE, 0, NULL);
-      gabble_jingle_session_send_rtp_info (sess, "active");
+      set_state (sess, WOCKY_JINGLE_STATE_ACTIVE, 0, NULL);
+      wocky_jingle_session_send_rtp_info (sess, "active");
     }
   else
     {
-      set_state (sess, JINGLE_STATE_ENDED, JINGLE_REASON_UNKNOWN,
+      set_state (sess, WOCKY_JINGLE_STATE_ENDED, WOCKY_JINGLE_REASON_UNKNOWN,
           NULL);
     }
 
@@ -1926,14 +1926,14 @@ _on_accept_reply (
 }
 
 static void
-try_session_initiate_or_accept (GabbleJingleSession *sess)
+try_session_initiate_or_accept (WockyJingleSession *sess)
 {
-  GabbleJingleSessionPrivate *priv = sess->priv;
+  WockyJingleSessionPrivate *priv = sess->priv;
   WockyStanza *msg;
   WockyNode *sess_node;
   gboolean contents_ready = TRUE;
-  JingleAction action;
-  JingleState new_state;
+  WockyJingleAction action;
+  WockyJingleState new_state;
   GAsyncReadyCallback handler;
 
   DEBUG ("Trying initiate or accept");
@@ -1944,7 +1944,7 @@ try_session_initiate_or_accept (GabbleJingleSession *sess)
 
   if (priv->local_initiator)
     {
-      if (priv->state != JINGLE_STATE_PENDING_CREATED)
+      if (priv->state != WOCKY_JINGLE_STATE_PENDING_CREATED)
         {
           DEBUG ("session is in state %u, won't try to initiate", priv->state);
           return;
@@ -1958,13 +1958,13 @@ try_session_initiate_or_accept (GabbleJingleSession *sess)
 
       g_signal_emit (sess, signals[ABOUT_TO_INITIATE], 0);
 
-      action = JINGLE_ACTION_SESSION_INITIATE;
-      new_state = JINGLE_STATE_PENDING_INITIATE_SENT;
+      action = WOCKY_JINGLE_ACTION_SESSION_INITIATE;
+      new_state = WOCKY_JINGLE_STATE_PENDING_INITIATE_SENT;
       handler = _on_initiate_reply;
     }
   else
     {
-      if (priv->state != JINGLE_STATE_PENDING_INITIATED)
+      if (priv->state != WOCKY_JINGLE_STATE_PENDING_INITIATED)
         {
           DEBUG ("session is in state %u, won't try to accept", priv->state);
           return;
@@ -1976,8 +1976,8 @@ try_session_initiate_or_accept (GabbleJingleSession *sess)
           return;
         }
 
-      action = JINGLE_ACTION_SESSION_ACCEPT;
-      new_state = JINGLE_STATE_PENDING_ACCEPT_SENT;
+      action = WOCKY_JINGLE_ACTION_SESSION_ACCEPT;
+      new_state = WOCKY_JINGLE_STATE_PENDING_ACCEPT_SENT;
       handler = _on_accept_reply;
     }
 
@@ -1991,9 +1991,9 @@ try_session_initiate_or_accept (GabbleJingleSession *sess)
       return;
     }
 
-  msg = gabble_jingle_session_new_message (sess, action, &sess_node);
+  msg = wocky_jingle_session_new_message (sess, action, &sess_node);
 
-  if (priv->dialect == JINGLE_DIALECT_GTALK3)
+  if (priv->dialect == WOCKY_JINGLE_DIALECT_GTALK3)
     {
       gboolean has_video = FALSE;
       gboolean has_audio = FALSE;
@@ -2003,15 +2003,15 @@ try_session_initiate_or_accept (GabbleJingleSession *sess)
       g_hash_table_iter_init (&iter, priv->initiator_contents);
       while (g_hash_table_iter_next (&iter, NULL, &value))
         {
-          JingleMediaType type;
+          WockyJingleMediaType type;
 
           g_object_get (value, "media-type", &type, NULL);
 
-          if (type == JINGLE_MEDIA_TYPE_VIDEO)
+          if (type == WOCKY_JINGLE_MEDIA_TYPE_VIDEO)
             {
               has_video = TRUE;
             }
-          else if (type == JINGLE_MEDIA_TYPE_AUDIO)
+          else if (type == WOCKY_JINGLE_MEDIA_TYPE_AUDIO)
             {
               has_audio = TRUE;
             }
@@ -2040,18 +2040,18 @@ try_session_initiate_or_accept (GabbleJingleSession *sess)
  * set_state:
  * @sess: a jingle session
  * @state: the new state for the session
- * @termination_reason: if @state is JINGLE_STATE_ENDED, the reason the session
- *                      ended. Otherwise, must be JINGLE_REASON_UNKNOWN.
- * @text: if @state is JINGLE_STATE_ENDED, the human-readable reason the session
+ * @termination_reason: if @state is WOCKY_JINGLE_STATE_ENDED, the reason the session
+ *                      ended. Otherwise, must be WOCKY_JINGLE_REASON_UNKNOWN.
+ * @text: if @state is WOCKY_JINGLE_STATE_ENDED, the human-readable reason the session
  *        ended.
  */
 static void
-set_state (GabbleJingleSession *sess,
-           JingleState state,
-           JingleReason termination_reason,
+set_state (WockyJingleSession *sess,
+           WockyJingleState state,
+           WockyJingleReason termination_reason,
            const gchar *text)
 {
-  GabbleJingleSessionPrivate *priv = sess->priv;
+  WockyJingleSessionPrivate *priv = sess->priv;
 
   if (state <= priv->state)
     {
@@ -2059,8 +2059,8 @@ set_state (GabbleJingleSession *sess,
       return;
     }
 
-  if (state != JINGLE_STATE_ENDED)
-    g_assert (termination_reason == JINGLE_REASON_UNKNOWN);
+  if (state != WOCKY_JINGLE_STATE_ENDED)
+    g_assert (termination_reason == WOCKY_JINGLE_REASON_UNKNOWN);
 
   DEBUG ("Setting state of JingleSession: %p (priv = %p) from %u to %u", sess, priv, priv->state, state);
 
@@ -2069,19 +2069,19 @@ set_state (GabbleJingleSession *sess,
 
   /* If we have an outstanding "you're on hold notification", send it */
   if (priv->local_hold &&
-      state >= JINGLE_STATE_PENDING_INITIATED &&
-      state < JINGLE_STATE_ENDED)
-    gabble_jingle_session_send_held (sess);
+      state >= WOCKY_JINGLE_STATE_PENDING_INITIATED &&
+      state < WOCKY_JINGLE_STATE_ENDED)
+    wocky_jingle_session_send_held (sess);
 
-  if (state == JINGLE_STATE_ENDED)
+  if (state == WOCKY_JINGLE_STATE_ENDED)
     g_signal_emit (sess, signals[TERMINATED], 0, priv->locally_terminated,
         termination_reason, text);
 }
 
 void
-gabble_jingle_session_accept (GabbleJingleSession *sess)
+wocky_jingle_session_accept (WockyJingleSession *sess)
 {
-  GabbleJingleSessionPrivate *priv = sess->priv;
+  WockyJingleSessionPrivate *priv = sess->priv;
 
   priv->locally_accepted = TRUE;
 
@@ -2089,9 +2089,9 @@ gabble_jingle_session_accept (GabbleJingleSession *sess)
 }
 
 const gchar *
-gabble_jingle_session_get_reason_name (JingleReason reason)
+wocky_jingle_session_get_reason_name (WockyJingleReason reason)
 {
-  GEnumClass *klass = g_type_class_ref (jingle_reason_get_type ());
+  GEnumClass *klass = g_type_class_ref (wocky_jingle_reason_get_type ());
   GEnumValue *enum_value = g_enum_get_value (klass, (gint) reason);
 
   g_return_val_if_fail (enum_value != NULL, NULL);
@@ -2100,33 +2100,33 @@ gabble_jingle_session_get_reason_name (JingleReason reason)
 }
 
 gboolean
-gabble_jingle_session_terminate (GabbleJingleSession *sess,
-                                 JingleReason reason,
+wocky_jingle_session_terminate (WockyJingleSession *sess,
+                                 WockyJingleReason reason,
                                  const gchar *text,
                                  GError **error)
 {
-  GabbleJingleSessionPrivate *priv = sess->priv;
+  WockyJingleSessionPrivate *priv = sess->priv;
   const gchar *reason_elt;
 
-  if (priv->state == JINGLE_STATE_ENDED)
+  if (priv->state == WOCKY_JINGLE_STATE_ENDED)
     {
       DEBUG ("session already terminated, ignoring terminate request");
       return TRUE;
     }
 
-  if (reason == JINGLE_REASON_UNKNOWN)
-    reason = (priv->state == JINGLE_STATE_ACTIVE) ?
-      JINGLE_REASON_SUCCESS : JINGLE_REASON_CANCEL;
+  if (reason == WOCKY_JINGLE_REASON_UNKNOWN)
+    reason = (priv->state == WOCKY_JINGLE_STATE_ACTIVE) ?
+      WOCKY_JINGLE_REASON_SUCCESS : WOCKY_JINGLE_REASON_CANCEL;
 
-  reason_elt = gabble_jingle_session_get_reason_name (reason);
+  reason_elt = wocky_jingle_session_get_reason_name (reason);
 
-  if (priv->state != JINGLE_STATE_PENDING_CREATED)
+  if (priv->state != WOCKY_JINGLE_STATE_PENDING_CREATED)
     {
       WockyNode *session_node;
-      WockyStanza *msg = gabble_jingle_session_new_message (sess,
-          JINGLE_ACTION_SESSION_TERMINATE, &session_node);
+      WockyStanza *msg = wocky_jingle_session_new_message (sess,
+          WOCKY_JINGLE_ACTION_SESSION_TERMINATE, &session_node);
 
-      if (priv->dialect == JINGLE_DIALECT_V032 && reason_elt != NULL)
+      if (priv->dialect == WOCKY_JINGLE_DIALECT_V032 && reason_elt != NULL)
         {
           WockyNode *r = wocky_node_add_child_with_content (session_node, "reason",
               NULL);
@@ -2137,7 +2137,7 @@ gabble_jingle_session_terminate (GabbleJingleSession *sess,
             wocky_node_add_child_with_content (r, "text", text);
         }
 
-      gabble_jingle_session_send (sess, msg);
+      wocky_jingle_session_send (sess, msg);
     }
 
   /* NOTE: on "terminated", jingle factory and media channel will unref
@@ -2146,7 +2146,7 @@ gabble_jingle_session_terminate (GabbleJingleSession *sess,
 
   DEBUG ("we are terminating this session");
   priv->locally_terminated = TRUE;
-  set_state (sess, JINGLE_STATE_ENDED, reason, text);
+  set_state (sess, WOCKY_JINGLE_STATE_ENDED, reason, text);
 
   return TRUE;
 }
@@ -2154,22 +2154,22 @@ gabble_jingle_session_terminate (GabbleJingleSession *sess,
 static void
 _foreach_count_active_contents (gpointer key, gpointer value, gpointer user_data)
 {
-  GabbleJingleContent *c = value;
+  WockyJingleContent *c = value;
   guint *n_contents = user_data;
-  JingleContentState state;
+  WockyJingleContentState state;
 
   g_object_get (c, "state", &state, NULL);
-  if ((state >= JINGLE_CONTENT_STATE_NEW) &&
-      (state < JINGLE_CONTENT_STATE_REMOVING))
+  if ((state >= WOCKY_JINGLE_CONTENT_STATE_NEW) &&
+      (state < WOCKY_JINGLE_CONTENT_STATE_REMOVING))
     {
       *n_contents = *n_contents + 1;
     }
 }
 
 static gboolean
-count_active_contents (GabbleJingleSession *sess)
+count_active_contents (WockyJingleSession *sess)
 {
-  GabbleJingleSessionPrivate *priv = sess->priv;
+  WockyJingleSessionPrivate *priv = sess->priv;
   guint n_contents = 0;
 
   g_hash_table_foreach (priv->initiator_contents, _foreach_count_active_contents,
@@ -2181,24 +2181,24 @@ count_active_contents (GabbleJingleSession *sess)
 }
 
 static void
-content_removed_cb (GabbleJingleContent *c, gpointer user_data)
+content_removed_cb (WockyJingleContent *c, gpointer user_data)
 {
-  GabbleJingleSession *sess = GABBLE_JINGLE_SESSION (user_data);
-  GabbleJingleSessionPrivate *priv = sess->priv;
-  const gchar *name = gabble_jingle_content_get_name (c);
+  WockyJingleSession *sess = WOCKY_JINGLE_SESSION (user_data);
+  WockyJingleSessionPrivate *priv = sess->priv;
+  const gchar *name = wocky_jingle_content_get_name (c);
 
-  if (gabble_jingle_content_creator_is_initiator (c))
+  if (wocky_jingle_content_creator_is_initiator (c))
     g_hash_table_remove (priv->initiator_contents, name);
   else
     g_hash_table_remove (priv->responder_contents, name);
 
-  if (priv->state == JINGLE_STATE_ENDED)
+  if (priv->state == WOCKY_JINGLE_STATE_ENDED)
     return;
 
   if (count_active_contents (sess) == 0)
     {
-      gabble_jingle_session_terminate (sess,
-          JINGLE_REASON_UNKNOWN, NULL, NULL);
+      wocky_jingle_session_terminate (sess,
+          WOCKY_JINGLE_REASON_UNKNOWN, NULL, NULL);
     }
   else
     {
@@ -2211,31 +2211,31 @@ content_removed_cb (GabbleJingleContent *c, gpointer user_data)
 
 
 void
-gabble_jingle_session_remove_content (GabbleJingleSession *sess,
-    GabbleJingleContent *c)
+wocky_jingle_session_remove_content (WockyJingleSession *sess,
+    WockyJingleContent *c)
 {
   if (count_active_contents (sess) > 1)
     {
-      gabble_jingle_content_remove (c, TRUE);
+      wocky_jingle_content_remove (c, TRUE);
     }
   else
     {
       /* session will be terminated when the content gets marked as removed */
       DEBUG ("called for last active content, doing session-terminate instead");
-      gabble_jingle_content_remove (c, FALSE);
+      wocky_jingle_content_remove (c, FALSE);
     }
 }
 
-GabbleJingleContent *
-gabble_jingle_session_add_content (GabbleJingleSession *sess,
-    JingleMediaType mtype,
-    JingleContentSenders senders,
+WockyJingleContent *
+wocky_jingle_session_add_content (WockyJingleSession *sess,
+    WockyJingleMediaType mtype,
+    WockyJingleContentSenders senders,
     const gchar *name,
     const gchar *content_ns,
     const gchar *transport_ns)
 {
-  GabbleJingleSessionPrivate *priv = sess->priv;
-  GabbleJingleContent *c;
+  WockyJingleSessionPrivate *priv = sess->priv;
+  WockyJingleContent *c;
   GType content_type;
   GHashTable *contents = priv->local_initiator ? priv->initiator_contents
       : priv->responder_contents;
@@ -2243,7 +2243,7 @@ gabble_jingle_session_add_content (GabbleJingleSession *sess,
   gchar *cname = NULL;
 
   if (name == NULL || *name == '\0')
-    name = (mtype == JINGLE_MEDIA_TYPE_AUDIO ?  "Audio" : "Video");
+    name = (mtype == WOCKY_JINGLE_MEDIA_TYPE_AUDIO ?  "Audio" : "Video");
 
   cname = g_strdup (name);
 
@@ -2254,8 +2254,8 @@ gabble_jingle_session_add_content (GabbleJingleSession *sess,
       cname = g_strdup_printf ("%s_%d", name, id++);
     }
 
-  content_type = gabble_jingle_factory_lookup_content_type (
-      gabble_jingle_session_get_factory (sess),
+  content_type = wocky_jingle_factory_lookup_content_type (
+      wocky_jingle_session_get_factory (sess),
       content_ns);
 
   g_assert (content_type != 0);
@@ -2274,12 +2274,12 @@ gabble_jingle_session_add_content (GabbleJingleSession *sess,
 /* Get any content. Either we're in google mode (so we only have one content
  * anyways), or we just need any content type to figure out what use case
  * we're in (media, ft, etc). */
-static GabbleJingleContent *
-_get_any_content (GabbleJingleSession *session)
+static WockyJingleContent *
+_get_any_content (WockyJingleSession *session)
 {
-  GabbleJingleContent *c;
+  WockyJingleContent *c;
 
-  GList *li = gabble_jingle_session_get_contents (session);
+  GList *li = wocky_jingle_session_get_contents (session);
 
   if (li == NULL)
       return NULL;
@@ -2295,9 +2295,9 @@ _get_any_content (GabbleJingleSession *session)
  * contents found in a session (e.g. media-rtp for audio/video), so that
  * should not be a problem. Returns 0 if there are no contents yet. */
 GType
-gabble_jingle_session_get_content_type (GabbleJingleSession *sess)
+wocky_jingle_session_get_content_type (WockyJingleSession *sess)
 {
-  GabbleJingleContent *c = _get_any_content (sess);
+  WockyJingleContent *c = _get_any_content (sess);
 
   if (c == NULL)
       return 0;
@@ -2307,41 +2307,41 @@ gabble_jingle_session_get_content_type (GabbleJingleSession *sess)
 
 /* FIXME: probably should make this into a property */
 GList *
-gabble_jingle_session_get_contents (GabbleJingleSession *sess)
+wocky_jingle_session_get_contents (WockyJingleSession *sess)
 {
-  GabbleJingleSessionPrivate *priv = sess->priv;
+  WockyJingleSessionPrivate *priv = sess->priv;
 
   return g_list_concat (g_hash_table_get_values (priv->initiator_contents),
       g_hash_table_get_values (priv->responder_contents));
 }
 
 const gchar *
-gabble_jingle_session_get_peer_resource (GabbleJingleSession *sess)
+wocky_jingle_session_get_peer_resource (WockyJingleSession *sess)
 {
   return sess->priv->peer_resource;
 }
 
 const gchar *
-gabble_jingle_session_get_initiator (GabbleJingleSession *sess)
+wocky_jingle_session_get_initiator (WockyJingleSession *sess)
 {
   return sess->priv->initiator;
 }
 
 const gchar *
-gabble_jingle_session_get_sid (GabbleJingleSession *sess)
+wocky_jingle_session_get_sid (WockyJingleSession *sess)
 {
   return sess->priv->sid;
 }
 
 static void
-content_ready_cb (GabbleJingleContent *c, gpointer user_data)
+content_ready_cb (WockyJingleContent *c, gpointer user_data)
 {
-  GabbleJingleSession *sess = GABBLE_JINGLE_SESSION (user_data);
+  WockyJingleSession *sess = WOCKY_JINGLE_SESSION (user_data);
   const gchar *disposition;
 
   DEBUG ("called");
 
-  disposition = gabble_jingle_content_get_disposition (c);
+  disposition = wocky_jingle_content_get_disposition (c);
   /* This assertion is actually safe, because 'ready' is only emitted by
    * contents with disposition "session". But this is crazy.
    */
@@ -2351,97 +2351,97 @@ content_ready_cb (GabbleJingleContent *c, gpointer user_data)
 }
 
 static void
-gabble_jingle_session_send_rtp_info (GabbleJingleSession *sess,
+wocky_jingle_session_send_rtp_info (WockyJingleSession *sess,
     const gchar *name)
 {
   WockyStanza *message;
   WockyNode *jingle;
 
-  if (!gabble_jingle_session_defines_action (sess, JINGLE_ACTION_SESSION_INFO))
+  if (!wocky_jingle_session_defines_action (sess, WOCKY_JINGLE_ACTION_SESSION_INFO))
     {
       DEBUG ("Not sending <%s/>; not using modern Jingle", name);
       return;
     }
 
-  message = gabble_jingle_session_new_message (sess,
-      JINGLE_ACTION_SESSION_INFO, &jingle);
+  message = wocky_jingle_session_new_message (sess,
+      WOCKY_JINGLE_ACTION_SESSION_INFO, &jingle);
   wocky_node_add_child_ns_q (jingle, name,
       g_quark_from_static_string (NS_JINGLE_RTP_INFO));
 
   /* This is just informational, so ignoring the reply. */
-  gabble_jingle_session_send (sess, message);
+  wocky_jingle_session_send (sess, message);
 }
 
 static void
-gabble_jingle_session_send_held (GabbleJingleSession *sess)
+wocky_jingle_session_send_held (WockyJingleSession *sess)
 {
   const gchar *s = (sess->priv->local_hold ? "hold" : "unhold");
 
-  gabble_jingle_session_send_rtp_info (sess, s);
+  wocky_jingle_session_send_rtp_info (sess, s);
 }
 
 void
-gabble_jingle_session_set_local_hold (GabbleJingleSession *sess,
+wocky_jingle_session_set_local_hold (WockyJingleSession *sess,
     gboolean held)
 {
   g_object_set (sess, "local-hold", held, NULL);
 }
 
 gboolean
-gabble_jingle_session_get_remote_hold (GabbleJingleSession *sess)
+wocky_jingle_session_get_remote_hold (WockyJingleSession *sess)
 {
-  g_assert (GABBLE_IS_JINGLE_SESSION (sess));
+  g_assert (WOCKY_IS_JINGLE_SESSION (sess));
 
   return sess->priv->remote_hold;
 }
 
 gboolean
-gabble_jingle_session_get_remote_ringing (GabbleJingleSession *sess)
+wocky_jingle_session_get_remote_ringing (WockyJingleSession *sess)
 {
-  g_assert (GABBLE_IS_JINGLE_SESSION (sess));
+  g_assert (WOCKY_IS_JINGLE_SESSION (sess));
 
   return sess->priv->remote_ringing;
 }
 
 gboolean
-gabble_jingle_session_can_modify_contents (GabbleJingleSession *sess)
+wocky_jingle_session_can_modify_contents (WockyJingleSession *sess)
 {
-  return !JINGLE_IS_GOOGLE_DIALECT (sess->priv->dialect) &&
-      !gabble_jingle_session_peer_has_cap (sess, QUIRK_GOOGLE_WEBMAIL_CLIENT);
+  return !WOCKY_JINGLE_DIALECT_IS_GOOGLE (sess->priv->dialect) &&
+      !wocky_jingle_session_peer_has_cap (sess, QUIRK_GOOGLE_WEBMAIL_CLIENT);
 }
 
-JingleDialect
-gabble_jingle_session_get_dialect (GabbleJingleSession *sess)
+WockyJingleDialect
+wocky_jingle_session_get_dialect (WockyJingleSession *sess)
 {
   return sess->priv->dialect;
 }
 
 WockyContact *
-gabble_jingle_session_get_peer_contact (GabbleJingleSession *self)
+wocky_jingle_session_get_peer_contact (WockyJingleSession *self)
 {
   return self->priv->peer_contact;
 }
 
 /*
- * gabble_jingle_session_get_peer_jid:
+ * wocky_jingle_session_get_peer_jid:
  * @sess: a jingle session
  *
  * Returns: the full JID of the remote contact.
  */
 const gchar *
-gabble_jingle_session_get_peer_jid (GabbleJingleSession *sess)
+wocky_jingle_session_get_peer_jid (WockyJingleSession *sess)
 {
   return sess->priv->peer_jid;
 }
 
-GabbleJingleFactory *
-gabble_jingle_session_get_factory (GabbleJingleSession *self)
+WockyJingleFactory *
+wocky_jingle_session_get_factory (WockyJingleSession *self)
 {
   return self->priv->jingle_factory;
 }
 
 WockyPorter *
-gabble_jingle_session_get_porter (GabbleJingleSession *self)
+wocky_jingle_session_get_porter (WockyJingleSession *self)
 {
   return self->priv->porter;
 }
diff --git a/src/jingle-session.h b/src/jingle-session.h
index 95bc23af1..c49ede2f7 100644
--- a/src/jingle-session.h
+++ b/src/jingle-session.h
@@ -1,5 +1,5 @@
 /*
- * jingle-session.h - Header for GabbleJingleSession
+ * jingle-session.h - Header for WockyJingleSession
  * Copyright (C) 2008 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
@@ -35,105 +35,105 @@ typedef enum
   MODE_JINGLE
 } GabbleMediaSessionMode;
 
-typedef struct _GabbleJingleSessionClass GabbleJingleSessionClass;
+typedef struct _WockyJingleSessionClass WockyJingleSessionClass;
 
-GType gabble_jingle_session_get_type (void);
+GType wocky_jingle_session_get_type (void);
 
 /* TYPE MACROS */
-#define GABBLE_TYPE_JINGLE_SESSION \
-  (gabble_jingle_session_get_type ())
-#define GABBLE_JINGLE_SESSION(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_JINGLE_SESSION, \
-                              GabbleJingleSession))
-#define GABBLE_JINGLE_SESSION_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_JINGLE_SESSION, \
-                           GabbleJingleSessionClass))
-#define GABBLE_IS_JINGLE_SESSION(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_JINGLE_SESSION))
-#define GABBLE_IS_JINGLE_SESSION_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_JINGLE_SESSION))
-#define GABBLE_JINGLE_SESSION_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_JINGLE_SESSION, \
-                              GabbleJingleSessionClass))
-
-struct _GabbleJingleSessionClass {
+#define WOCKY_TYPE_JINGLE_SESSION \
+  (wocky_jingle_session_get_type ())
+#define WOCKY_JINGLE_SESSION(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), WOCKY_TYPE_JINGLE_SESSION, \
+                              WockyJingleSession))
+#define WOCKY_JINGLE_SESSION_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), WOCKY_TYPE_JINGLE_SESSION, \
+                           WockyJingleSessionClass))
+#define WOCKY_IS_JINGLE_SESSION(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), WOCKY_TYPE_JINGLE_SESSION))
+#define WOCKY_IS_JINGLE_SESSION_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), WOCKY_TYPE_JINGLE_SESSION))
+#define WOCKY_JINGLE_SESSION_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), WOCKY_TYPE_JINGLE_SESSION, \
+                              WockyJingleSessionClass))
+
+struct _WockyJingleSessionClass {
     GObjectClass parent_class;
 };
 
-typedef struct _GabbleJingleSessionPrivate GabbleJingleSessionPrivate;
+typedef struct _WockyJingleSessionPrivate WockyJingleSessionPrivate;
 
-struct _GabbleJingleSession {
+struct _WockyJingleSession {
     GObject parent;
-    GabbleJingleSessionPrivate *priv;
+    WockyJingleSessionPrivate *priv;
 };
 
-GabbleJingleSession *gabble_jingle_session_new (
-    GabbleJingleFactory *factory,
+WockyJingleSession *wocky_jingle_session_new (
+    WockyJingleFactory *factory,
     WockyPorter *porter,
     const gchar *session_id,
     gboolean local_initiator,
     WockyContact *peer,
-    JingleDialect dialect,
+    WockyJingleDialect dialect,
     gboolean local_hold);
 
-const gchar * gabble_jingle_session_detect (WockyStanza *stanza,
-    JingleAction *action, JingleDialect *dialect);
-gboolean gabble_jingle_session_parse (GabbleJingleSession *sess,
-    JingleAction action, WockyStanza *stanza, GError **error);
-WockyStanza *gabble_jingle_session_new_message (GabbleJingleSession *sess,
-    JingleAction action, WockyNode **sess_node);
+const gchar * wocky_jingle_session_detect (WockyStanza *stanza,
+    WockyJingleAction *action, WockyJingleDialect *dialect);
+gboolean wocky_jingle_session_parse (WockyJingleSession *sess,
+    WockyJingleAction action, WockyStanza *stanza, GError **error);
+WockyStanza *wocky_jingle_session_new_message (WockyJingleSession *sess,
+    WockyJingleAction action, WockyNode **sess_node);
 
-void gabble_jingle_session_accept (GabbleJingleSession *sess);
-gboolean gabble_jingle_session_terminate (GabbleJingleSession *sess,
-    JingleReason reason,
+void wocky_jingle_session_accept (WockyJingleSession *sess);
+gboolean wocky_jingle_session_terminate (WockyJingleSession *sess,
+    WockyJingleReason reason,
     const gchar *text,
     GError **error);
-void gabble_jingle_session_remove_content (GabbleJingleSession *sess,
-    GabbleJingleContent *c);
+void wocky_jingle_session_remove_content (WockyJingleSession *sess,
+    WockyJingleContent *c);
 
-GabbleJingleContent *
-gabble_jingle_session_add_content (GabbleJingleSession *sess,
-    JingleMediaType mtype,
-    JingleContentSenders senders,
+WockyJingleContent *
+wocky_jingle_session_add_content (WockyJingleSession *sess,
+    WockyJingleMediaType mtype,
+    WockyJingleContentSenders senders,
     const char *name,
     const gchar *content_ns,
     const gchar *transport_ns);
 
-GType gabble_jingle_session_get_content_type (GabbleJingleSession *);
-GList *gabble_jingle_session_get_contents (GabbleJingleSession *sess);
-const gchar *gabble_jingle_session_get_peer_resource (
-    GabbleJingleSession *sess);
-const gchar *gabble_jingle_session_get_initiator (
-    GabbleJingleSession *sess);
-const gchar *gabble_jingle_session_get_sid (GabbleJingleSession *sess);
-JingleDialect gabble_jingle_session_get_dialect (GabbleJingleSession *sess);
-
-gboolean gabble_jingle_session_can_modify_contents (GabbleJingleSession *sess);
-gboolean gabble_jingle_session_peer_has_cap (
-    GabbleJingleSession *self,
+GType wocky_jingle_session_get_content_type (WockyJingleSession *);
+GList *wocky_jingle_session_get_contents (WockyJingleSession *sess);
+const gchar *wocky_jingle_session_get_peer_resource (
+    WockyJingleSession *sess);
+const gchar *wocky_jingle_session_get_initiator (
+    WockyJingleSession *sess);
+const gchar *wocky_jingle_session_get_sid (WockyJingleSession *sess);
+WockyJingleDialect wocky_jingle_session_get_dialect (WockyJingleSession *sess);
+
+gboolean wocky_jingle_session_can_modify_contents (WockyJingleSession *sess);
+gboolean wocky_jingle_session_peer_has_cap (
+    WockyJingleSession *self,
     const gchar *cap_or_quirk);
 
-void gabble_jingle_session_send (
-    GabbleJingleSession *sess,
+void wocky_jingle_session_send (
+    WockyJingleSession *sess,
     WockyStanza *stanza);
 
-void gabble_jingle_session_set_local_hold (GabbleJingleSession *sess,
+void wocky_jingle_session_set_local_hold (WockyJingleSession *sess,
     gboolean held);
 
-gboolean gabble_jingle_session_get_remote_hold (GabbleJingleSession *sess);
+gboolean wocky_jingle_session_get_remote_hold (WockyJingleSession *sess);
 
-gboolean gabble_jingle_session_get_remote_ringing (GabbleJingleSession *sess);
+gboolean wocky_jingle_session_get_remote_ringing (WockyJingleSession *sess);
 
-gboolean gabble_jingle_session_defines_action (GabbleJingleSession *sess,
-    JingleAction action);
+gboolean wocky_jingle_session_defines_action (WockyJingleSession *sess,
+    WockyJingleAction action);
 
-WockyContact *gabble_jingle_session_get_peer_contact (GabbleJingleSession *self);
-const gchar *gabble_jingle_session_get_peer_jid (GabbleJingleSession *sess);
+WockyContact *wocky_jingle_session_get_peer_contact (WockyJingleSession *self);
+const gchar *wocky_jingle_session_get_peer_jid (WockyJingleSession *sess);
 
-const gchar *gabble_jingle_session_get_reason_name (JingleReason reason);
+const gchar *wocky_jingle_session_get_reason_name (WockyJingleReason reason);
 
-GabbleJingleFactory *gabble_jingle_session_get_factory (GabbleJingleSession *self);
-WockyPorter *gabble_jingle_session_get_porter (GabbleJingleSession *self);
+WockyJingleFactory *wocky_jingle_session_get_factory (WockyJingleSession *self);
+WockyPorter *wocky_jingle_session_get_porter (WockyJingleSession *self);
 
 #endif /* __JINGLE_SESSION_H__ */
 
diff --git a/src/jingle-share.c b/src/jingle-share.c
index b5fd9c659..ae4e25422 100644
--- a/src/jingle-share.c
+++ b/src/jingle-share.c
@@ -68,7 +68,7 @@
 
 
 G_DEFINE_TYPE (GabbleJingleShare,
-    gabble_jingle_share, GABBLE_TYPE_JINGLE_CONTENT);
+    gabble_jingle_share, WOCKY_TYPE_JINGLE_CONTENT);
 
 /* properties */
 enum
@@ -182,9 +182,9 @@ gabble_jingle_share_dispose (GObject *object)
 }
 
 
-static void parse_description (GabbleJingleContent *content,
+static void parse_description (WockyJingleContent *content,
     WockyNode *desc_node, GError **error);
-static void produce_description (GabbleJingleContent *obj,
+static void produce_description (WockyJingleContent *obj,
     WockyNode *content_node);
 
 
@@ -200,7 +200,7 @@ gabble_jingle_share_get_property (GObject *object,
   switch (property_id)
     {
       case PROP_MEDIA_TYPE:
-        g_value_set_uint (value, JINGLE_MEDIA_TYPE_NONE);
+        g_value_set_uint (value, WOCKY_JINGLE_MEDIA_TYPE_NONE);
         break;
       case PROP_FILENAME:
         g_value_set_string (value, priv->filename);
@@ -232,7 +232,7 @@ gabble_jingle_share_set_property (GObject *object,
         priv->filename = g_value_dup_string (value);
         free_manifest (self);
         /* simulate a media_ready when we know our own filename */
-        _gabble_jingle_content_set_media_ready (GABBLE_JINGLE_CONTENT (self));
+        _wocky_jingle_content_set_media_ready (WOCKY_JINGLE_CONTENT (self));
         break;
       case PROP_FILESIZE:
         priv->filesize = g_value_get_uint64 (value);
@@ -244,17 +244,17 @@ gabble_jingle_share_set_property (GObject *object,
     }
 }
 
-static JingleContentSenders
-get_default_senders (GabbleJingleContent *c)
+static WockyJingleContentSenders
+get_default_senders (WockyJingleContent *c)
 {
-  return JINGLE_CONTENT_SENDERS_INITIATOR;
+  return WOCKY_JINGLE_CONTENT_SENDERS_INITIATOR;
 }
 
 static void
 gabble_jingle_share_class_init (GabbleJingleShareClass *cls)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (cls);
-  GabbleJingleContentClass *content_class = GABBLE_JINGLE_CONTENT_CLASS (cls);
+  WockyJingleContentClass *content_class = WOCKY_JINGLE_CONTENT_CLASS (cls);
 
   g_type_class_add_private (cls, sizeof (GabbleJingleSharePrivate));
 
@@ -271,8 +271,8 @@ gabble_jingle_share_class_init (GabbleJingleShareClass *cls)
   g_object_class_install_property (object_class, PROP_MEDIA_TYPE,
       g_param_spec_uint ("media-type", "media type",
           "irrelevant media type. Will always be NONE.",
-          JINGLE_MEDIA_TYPE_NONE, JINGLE_MEDIA_TYPE_NONE,
-          JINGLE_MEDIA_TYPE_NONE,
+          WOCKY_JINGLE_MEDIA_TYPE_NONE, WOCKY_JINGLE_MEDIA_TYPE_NONE,
+          WOCKY_JINGLE_MEDIA_TYPE_NONE,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_property (object_class, PROP_FILENAME,
@@ -290,7 +290,7 @@ gabble_jingle_share_class_init (GabbleJingleShareClass *cls)
 }
 
 static void
-parse_description (GabbleJingleContent *content,
+parse_description (WockyJingleContent *content,
     WockyNode *desc_node, GError **error)
 {
   GabbleJingleShare *self = GABBLE_JINGLE_SHARE (content);
@@ -438,11 +438,11 @@ parse_description (GabbleJingleContent *content,
           g_free (temp);
         }
     }
-  _gabble_jingle_content_set_media_ready (content);
+  _wocky_jingle_content_set_media_ready (content);
 }
 
 static void
-produce_description (GabbleJingleContent *content, WockyNode *content_node)
+produce_description (WockyJingleContent *content, WockyNode *content_node)
 {
   GabbleJingleShare *self = GABBLE_JINGLE_SHARE (content);
   GabbleJingleSharePrivate *priv = self->priv;
@@ -522,10 +522,10 @@ gabble_jingle_share_get_manifest (GabbleJingleShare *self)
 }
 
 void
-jingle_share_register (GabbleJingleFactory *factory)
+jingle_share_register (WockyJingleFactory *factory)
 {
   /* GTalk video call namespace */
-  gabble_jingle_factory_register_content_type (factory,
+  wocky_jingle_factory_register_content_type (factory,
       NS_GOOGLE_SESSION_SHARE,
       GABBLE_TYPE_JINGLE_SHARE);
 }
diff --git a/src/jingle-share.h b/src/jingle-share.h
index 27d1ecce8..626f038a4 100644
--- a/src/jingle-share.h
+++ b/src/jingle-share.h
@@ -49,13 +49,13 @@ GType gabble_jingle_share_get_type (void);
                               GabbleJingleShareClass))
 
 struct _GabbleJingleShareClass {
-    GabbleJingleContentClass parent_class;
+    WockyJingleContentClass parent_class;
 };
 
 typedef struct _GabbleJingleSharePrivate GabbleJingleSharePrivate;
 
 struct _GabbleJingleShare {
-    GabbleJingleContent parent;
+    WockyJingleContent parent;
     GabbleJingleSharePrivate *priv;
 };
 
@@ -75,7 +75,7 @@ typedef struct {
   GList *entries;
 } GabbleJingleShareManifest;
 
-void jingle_share_register (GabbleJingleFactory *factory);
+void jingle_share_register (WockyJingleFactory *factory);
 
 gchar *gabble_jingle_share_get_source_url (GabbleJingleShare *content);
 gchar *gabble_jingle_share_get_preview_url (GabbleJingleShare *content);
diff --git a/src/jingle-tp-util.c b/src/jingle-tp-util.c
index d6378f45c..212579f20 100644
--- a/src/jingle-tp-util.c
+++ b/src/jingle-tp-util.c
@@ -21,28 +21,28 @@
 
 #include "jingle-tp-util.h"
 
-JingleMediaType
-jingle_media_type_from_tp (TpMediaStreamType type)
+WockyJingleMediaType
+wocky_jingle_media_type_from_tp (TpMediaStreamType type)
 {
   switch (type)
     {
       case TP_MEDIA_STREAM_TYPE_AUDIO:
-        return JINGLE_MEDIA_TYPE_AUDIO;
+        return WOCKY_JINGLE_MEDIA_TYPE_AUDIO;
       case TP_MEDIA_STREAM_TYPE_VIDEO:
-        return JINGLE_MEDIA_TYPE_VIDEO;
+        return WOCKY_JINGLE_MEDIA_TYPE_VIDEO;
       default:
-        g_return_val_if_reached (JINGLE_MEDIA_TYPE_NONE);
+        g_return_val_if_reached (WOCKY_JINGLE_MEDIA_TYPE_NONE);
     }
 }
 
 TpMediaStreamType
-jingle_media_type_to_tp (JingleMediaType type)
+wocky_jingle_media_type_to_tp (WockyJingleMediaType type)
 {
   switch (type)
     {
-      case JINGLE_MEDIA_TYPE_AUDIO:
+      case WOCKY_JINGLE_MEDIA_TYPE_AUDIO:
         return TP_MEDIA_STREAM_TYPE_AUDIO;
-      case JINGLE_MEDIA_TYPE_VIDEO:
+      case WOCKY_JINGLE_MEDIA_TYPE_VIDEO:
         return TP_MEDIA_STREAM_TYPE_VIDEO;
       default:
         g_return_val_if_reached (TP_MEDIA_STREAM_TYPE_AUDIO);
@@ -50,9 +50,9 @@ jingle_media_type_to_tp (JingleMediaType type)
 }
 
 static const gchar * const relay_type_map[] = {
-    /* GABBLE_JINGLE_RELAY_TYPE_UDP */ "udp",
-    /* GABBLE_JINGLE_RELAY_TYPE_TCP */ "tcp",
-    /* GABBLE_JINGLE_RELAY_TYPE_TLS */ "tls",
+    /* WOCKY_JINGLE_RELAY_TYPE_UDP */ "udp",
+    /* WOCKY_JINGLE_RELAY_TYPE_TCP */ "tcp",
+    /* WOCKY_JINGLE_RELAY_TYPE_TLS */ "tls",
 };
 
 GPtrArray *
@@ -65,9 +65,9 @@ gabble_build_tp_relay_info (GPtrArray *relays)
 
   for (i = 0; i < relays->len; i++)
     {
-      GabbleJingleRelay *relay = g_ptr_array_index (relays, i);
+      WockyJingleRelay *relay = g_ptr_array_index (relays, i);
 
-      g_return_val_if_fail (relay->type < GABBLE_N_JINGLE_RELAY_TYPES, tp_relays);
+      g_return_val_if_fail (relay->type < WOCKY_N_JINGLE_RELAY_TYPES, tp_relays);
 
       g_ptr_array_add (tp_relays, tp_asv_new (
           "type", G_TYPE_STRING, relay_type_map[relay->type],
diff --git a/src/jingle-tp-util.h b/src/jingle-tp-util.h
index f573c1132..e26ed55f7 100644
--- a/src/jingle-tp-util.h
+++ b/src/jingle-tp-util.h
@@ -23,8 +23,8 @@
 #include <telepathy-glib/telepathy-glib.h>
 #include "jingle-content.h"
 
-JingleMediaType jingle_media_type_from_tp (TpMediaStreamType type);
-TpMediaStreamType jingle_media_type_to_tp (JingleMediaType type);
+WockyJingleMediaType wocky_jingle_media_type_from_tp (TpMediaStreamType type);
+TpMediaStreamType wocky_jingle_media_type_to_tp (WockyJingleMediaType type);
 
 GPtrArray *gabble_build_tp_relay_info (GPtrArray *relays);
 
diff --git a/src/jingle-transport-google.c b/src/jingle-transport-google.c
index 1e6d888d4..59e166d53 100644
--- a/src/jingle-transport-google.c
+++ b/src/jingle-transport-google.c
@@ -1,5 +1,5 @@
 /*
- * jingle-transport-google.c - Source for GabbleJingleTransportGoogle
+ * jingle-transport-google.c - Source for WockyJingleTransportGoogle
  *
  * Copyright (C) 2008 Collabora Ltd.
  *
@@ -37,9 +37,9 @@
 static void
 transport_iface_init (gpointer g_iface, gpointer iface_data);
 
-G_DEFINE_TYPE_WITH_CODE (GabbleJingleTransportGoogle,
-    gabble_jingle_transport_google, G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (GABBLE_TYPE_JINGLE_TRANSPORT_IFACE,
+G_DEFINE_TYPE_WITH_CODE (WockyJingleTransportGoogle,
+    wocky_jingle_transport_google, G_TYPE_OBJECT,
+    G_IMPLEMENT_INTERFACE (WOCKY_TYPE_JINGLE_TRANSPORT_IFACE,
         transport_iface_init));
 
 /* signal enum */
@@ -60,10 +60,10 @@ enum
   LAST_PROPERTY
 };
 
-struct _GabbleJingleTransportGooglePrivate
+struct _WockyJingleTransportGooglePrivate
 {
-  GabbleJingleContent *content;
-  JingleTransportState state;
+  WockyJingleContent *content;
+  WockyJingleTransportState state;
   gchar *transport_ns;
 
   /* Component names or jingle-share transport 'channels'
@@ -82,11 +82,11 @@ struct _GabbleJingleTransportGooglePrivate
 };
 
 static void
-gabble_jingle_transport_google_init (GabbleJingleTransportGoogle *obj)
+wocky_jingle_transport_google_init (WockyJingleTransportGoogle *obj)
 {
-  GabbleJingleTransportGooglePrivate *priv =
-     G_TYPE_INSTANCE_GET_PRIVATE (obj, GABBLE_TYPE_JINGLE_TRANSPORT_GOOGLE,
-         GabbleJingleTransportGooglePrivate);
+  WockyJingleTransportGooglePrivate *priv =
+     G_TYPE_INSTANCE_GET_PRIVATE (obj, WOCKY_TYPE_JINGLE_TRANSPORT_GOOGLE,
+         WockyJingleTransportGooglePrivate);
   obj->priv = priv;
 
   priv->component_names = g_hash_table_new_full (g_str_hash, g_str_equal,
@@ -96,10 +96,10 @@ gabble_jingle_transport_google_init (GabbleJingleTransportGoogle *obj)
 }
 
 static void
-gabble_jingle_transport_google_dispose (GObject *object)
+wocky_jingle_transport_google_dispose (GObject *object)
 {
-  GabbleJingleTransportGoogle *trans = GABBLE_JINGLE_TRANSPORT_GOOGLE (object);
-  GabbleJingleTransportGooglePrivate *priv = trans->priv;
+  WockyJingleTransportGoogle *trans = WOCKY_JINGLE_TRANSPORT_GOOGLE (object);
+  WockyJingleTransportGooglePrivate *priv = trans->priv;
 
   if (priv->dispose_has_run)
     return;
@@ -119,18 +119,18 @@ gabble_jingle_transport_google_dispose (GObject *object)
   g_free (priv->transport_ns);
   priv->transport_ns = NULL;
 
-  if (G_OBJECT_CLASS (gabble_jingle_transport_google_parent_class)->dispose)
-    G_OBJECT_CLASS (gabble_jingle_transport_google_parent_class)->dispose (object);
+  if (G_OBJECT_CLASS (wocky_jingle_transport_google_parent_class)->dispose)
+    G_OBJECT_CLASS (wocky_jingle_transport_google_parent_class)->dispose (object);
 }
 
 static void
-gabble_jingle_transport_google_get_property (GObject *object,
+wocky_jingle_transport_google_get_property (GObject *object,
                                              guint property_id,
                                              GValue *value,
                                              GParamSpec *pspec)
 {
-  GabbleJingleTransportGoogle *trans = GABBLE_JINGLE_TRANSPORT_GOOGLE (object);
-  GabbleJingleTransportGooglePrivate *priv = trans->priv;
+  WockyJingleTransportGoogle *trans = WOCKY_JINGLE_TRANSPORT_GOOGLE (object);
+  WockyJingleTransportGooglePrivate *priv = trans->priv;
 
   switch (property_id) {
     case PROP_CONTENT:
@@ -149,13 +149,13 @@ gabble_jingle_transport_google_get_property (GObject *object,
 }
 
 static void
-gabble_jingle_transport_google_set_property (GObject *object,
+wocky_jingle_transport_google_set_property (GObject *object,
                                              guint property_id,
                                              const GValue *value,
                                              GParamSpec *pspec)
 {
-  GabbleJingleTransportGoogle *trans = GABBLE_JINGLE_TRANSPORT_GOOGLE (object);
-  GabbleJingleTransportGooglePrivate *priv = trans->priv;
+  WockyJingleTransportGoogle *trans = WOCKY_JINGLE_TRANSPORT_GOOGLE (object);
+  WockyJingleTransportGooglePrivate *priv = trans->priv;
 
   switch (property_id) {
     case PROP_CONTENT:
@@ -175,21 +175,21 @@ gabble_jingle_transport_google_set_property (GObject *object,
 }
 
 static void
-gabble_jingle_transport_google_class_init (GabbleJingleTransportGoogleClass *cls)
+wocky_jingle_transport_google_class_init (WockyJingleTransportGoogleClass *cls)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (cls);
   GParamSpec *param_spec;
 
-  g_type_class_add_private (cls, sizeof (GabbleJingleTransportGooglePrivate));
+  g_type_class_add_private (cls, sizeof (WockyJingleTransportGooglePrivate));
 
-  object_class->get_property = gabble_jingle_transport_google_get_property;
-  object_class->set_property = gabble_jingle_transport_google_set_property;
-  object_class->dispose = gabble_jingle_transport_google_dispose;
+  object_class->get_property = wocky_jingle_transport_google_get_property;
+  object_class->set_property = wocky_jingle_transport_google_set_property;
+  object_class->dispose = wocky_jingle_transport_google_dispose;
 
   /* property definitions */
-  param_spec = g_param_spec_object ("content", "GabbleJingleContent object",
+  param_spec = g_param_spec_object ("content", "WockyJingleContent object",
                                     "Jingle content object using this transport.",
-                                    GABBLE_TYPE_JINGLE_CONTENT,
+                                    WOCKY_TYPE_JINGLE_CONTENT,
                                     G_PARAM_CONSTRUCT_ONLY |
                                     G_PARAM_READWRITE |
                                     G_PARAM_STATIC_NICK |
@@ -208,9 +208,9 @@ gabble_jingle_transport_google_class_init (GabbleJingleTransportGoogleClass *cls
   param_spec = g_param_spec_uint ("state",
                                   "Connection state for the transport.",
                                   "Enum specifying the connection state of the transport.",
-                                  JINGLE_TRANSPORT_STATE_DISCONNECTED,
-                                  JINGLE_TRANSPORT_STATE_CONNECTED,
-                                  JINGLE_TRANSPORT_STATE_DISCONNECTED,
+                                  WOCKY_JINGLE_TRANSPORT_STATE_DISCONNECTED,
+                                  WOCKY_JINGLE_TRANSPORT_STATE_CONNECTED,
+                                  WOCKY_JINGLE_TRANSPORT_STATE_DISCONNECTED,
                                   G_PARAM_READWRITE |
                                   G_PARAM_STATIC_NAME |
                                   G_PARAM_STATIC_NICK |
@@ -229,11 +229,11 @@ gabble_jingle_transport_google_class_init (GabbleJingleTransportGoogleClass *cls
 }
 
 static void
-parse_candidates (GabbleJingleTransportIface *obj,
+parse_candidates (WockyJingleTransportIface *obj,
     WockyNode *transport_node, GError **error)
 {
-  GabbleJingleTransportGoogle *t = GABBLE_JINGLE_TRANSPORT_GOOGLE (obj);
-  GabbleJingleTransportGooglePrivate *priv = t->priv;
+  WockyJingleTransportGoogle *t = WOCKY_JINGLE_TRANSPORT_GOOGLE (obj);
+  WockyJingleTransportGooglePrivate *priv = t->priv;
   GList *candidates = NULL;
   WockyNodeIter i;
   WockyNode *node;
@@ -244,9 +244,9 @@ parse_candidates (GabbleJingleTransportIface *obj,
       const gchar *name, *address, *user, *pass, *str;
       guint port, net, gen, component;
       int pref;
-      JingleTransportProtocol proto;
-      JingleCandidateType ctype;
-      JingleCandidate *c;
+      WockyJingleTransportProtocol proto;
+      WockyJingleCandidateType ctype;
+      WockyJingleCandidate *c;
 
       name = wocky_node_get_attribute (node, "name");
       if (name == NULL)
@@ -276,7 +276,7 @@ parse_candidates (GabbleJingleTransportIface *obj,
 
       if (!wocky_strdiff (str, "udp"))
         {
-          proto = JINGLE_TRANSPORT_PROTOCOL_UDP;
+          proto = WOCKY_JINGLE_TRANSPORT_PROTOCOL_UDP;
         }
       else if (!wocky_strdiff (str, "tcp"))
         {
@@ -284,7 +284,7 @@ parse_candidates (GabbleJingleTransportIface *obj,
           if (port == 443)
               break;
 
-          proto = JINGLE_TRANSPORT_PROTOCOL_TCP;
+          proto = WOCKY_JINGLE_TRANSPORT_PROTOCOL_TCP;
         }
       else if (!wocky_strdiff (str, "ssltcp"))
         {
@@ -293,7 +293,7 @@ parse_candidates (GabbleJingleTransportIface *obj,
               break;
 
           /* we really don't care about "ssltcp" otherwise */
-          proto = JINGLE_TRANSPORT_PROTOCOL_TCP;
+          proto = WOCKY_JINGLE_TRANSPORT_PROTOCOL_TCP;
         }
       else
         {
@@ -314,15 +314,15 @@ parse_candidates (GabbleJingleTransportIface *obj,
 
       if (!wocky_strdiff (str, "local"))
         {
-          ctype = JINGLE_CANDIDATE_TYPE_LOCAL;
+          ctype = WOCKY_JINGLE_CANDIDATE_TYPE_LOCAL;
         }
       else if (!wocky_strdiff (str, "stun"))
         {
-          ctype = JINGLE_CANDIDATE_TYPE_STUN;
+          ctype = WOCKY_JINGLE_CANDIDATE_TYPE_STUN;
         }
       else if (!wocky_strdiff (str, "relay"))
         {
-          ctype = JINGLE_CANDIDATE_TYPE_RELAY;
+          ctype = WOCKY_JINGLE_CANDIDATE_TYPE_RELAY;
         }
       else
         {
@@ -353,7 +353,7 @@ parse_candidates (GabbleJingleTransportIface *obj,
       if (str != NULL)
           component = atoi (str);
 
-      c = jingle_candidate_new (proto, ctype, NULL, component,
+      c = wocky_jingle_candidate_new (proto, ctype, NULL, component,
           address, port, gen, pref, user, pass, net);
 
       candidates = g_list_append (candidates, c);
@@ -378,11 +378,11 @@ parse_candidates (GabbleJingleTransportIface *obj,
 }
 
 static void
-transmit_candidates (GabbleJingleTransportGoogle *transport,
+transmit_candidates (WockyJingleTransportGoogle *transport,
     const gchar *name,
     GList *candidates)
 {
-  GabbleJingleTransportGooglePrivate *priv = transport->priv;
+  WockyJingleTransportGooglePrivate *priv = transport->priv;
   GList *li;
   WockyStanza *msg;
   WockyNode *trans_node, *sess_node;
@@ -390,15 +390,15 @@ transmit_candidates (GabbleJingleTransportGoogle *transport,
   if (candidates == NULL)
     return;
 
-  msg = gabble_jingle_session_new_message (priv->content->session,
-    JINGLE_ACTION_TRANSPORT_INFO, &sess_node);
+  msg = wocky_jingle_session_new_message (priv->content->session,
+    WOCKY_JINGLE_ACTION_TRANSPORT_INFO, &sess_node);
 
-  gabble_jingle_content_produce_node (priv->content, sess_node, FALSE, TRUE,
+  wocky_jingle_content_produce_node (priv->content, sess_node, FALSE, TRUE,
       &trans_node);
 
   for (li = candidates; li; li = li->next)
     {
-      JingleCandidate *c = (JingleCandidate *) li->data;
+      WockyJingleCandidate *c = (WockyJingleCandidate *) li->data;
       gchar port_str[16], pref_str[16], comp_str[16], *type_str, *proto_str;
       WockyNode *cnode;
 
@@ -407,13 +407,13 @@ transmit_candidates (GabbleJingleTransportGoogle *transport,
       sprintf (comp_str, "%d", c->component);
 
       switch (c->type) {
-        case JINGLE_CANDIDATE_TYPE_LOCAL:
+        case WOCKY_JINGLE_CANDIDATE_TYPE_LOCAL:
           type_str = "local";
           break;
-        case JINGLE_CANDIDATE_TYPE_STUN:
+        case WOCKY_JINGLE_CANDIDATE_TYPE_STUN:
           type_str = "stun";
           break;
-        case JINGLE_CANDIDATE_TYPE_RELAY:
+        case WOCKY_JINGLE_CANDIDATE_TYPE_RELAY:
           type_str = "relay";
           break;
         default:
@@ -421,11 +421,11 @@ transmit_candidates (GabbleJingleTransportGoogle *transport,
       }
 
       switch (c->protocol) {
-        case JINGLE_TRANSPORT_PROTOCOL_UDP:
+        case WOCKY_JINGLE_TRANSPORT_PROTOCOL_UDP:
           proto_str = "udp";
           break;
-        case JINGLE_TRANSPORT_PROTOCOL_TCP:
-          if ((c->port == 443) && (c->type == JINGLE_CANDIDATE_TYPE_RELAY))
+        case WOCKY_JINGLE_TRANSPORT_PROTOCOL_TCP:
+          if ((c->port == 443) && (c->type == WOCKY_JINGLE_CANDIDATE_TYPE_RELAY))
             proto_str = "ssltcp";
           else
             proto_str = "tcp";
@@ -452,7 +452,7 @@ transmit_candidates (GabbleJingleTransportGoogle *transport,
     }
 
   wocky_porter_send_iq_async (
-      gabble_jingle_session_get_porter (priv->content->session), msg,
+      wocky_jingle_session_get_porter (priv->content->session), msg,
       NULL, NULL, NULL);
   g_object_unref (msg);
 }
@@ -462,22 +462,22 @@ transmit_candidates (GabbleJingleTransportGoogle *transport,
  * stanzas containing non-rtp candidates.
  */
 static void
-group_and_transmit_candidates (GabbleJingleTransportGoogle *transport,
+group_and_transmit_candidates (WockyJingleTransportGoogle *transport,
     GList *candidates)
 {
-  GabbleJingleTransportGooglePrivate *priv = transport->priv;
+  WockyJingleTransportGooglePrivate *priv = transport->priv;
   GList *all_candidates = NULL;
-  JingleMediaType media;
+  WockyJingleMediaType media;
   GList *li;
   GList *cands;
 
   for (li = candidates; li != NULL; li = g_list_next (li))
     {
-      JingleCandidate *c = li->data;
+      WockyJingleCandidate *c = li->data;
 
       for (cands = all_candidates; cands != NULL;  cands = g_list_next (cands))
         {
-          JingleCandidate *c2 = ((GList *) cands->data)->data;
+          WockyJingleCandidate *c2 = ((GList *) cands->data)->data;
 
           if (c->component == c2->component)
             {
@@ -500,7 +500,7 @@ group_and_transmit_candidates (GabbleJingleTransportGoogle *transport,
       GHashTableIter iter;
       gpointer key, value;
       gchar *name = NULL;
-      JingleCandidate *c = ((GList *) cands->data)->data;
+      WockyJingleCandidate *c = ((GList *) cands->data)->data;
 
       g_hash_table_iter_init (&iter, priv->component_names);
       while (g_hash_table_iter_next (&iter, &key, &value))
@@ -525,13 +525,13 @@ group_and_transmit_candidates (GabbleJingleTransportGoogle *transport,
   g_list_free (all_candidates);
 }
 
-/* Takes in a list of slice-allocated JingleCandidate structs */
+/* Takes in a list of slice-allocated WockyJingleCandidate structs */
 static void
-new_local_candidates (GabbleJingleTransportIface *obj, GList *new_candidates)
+new_local_candidates (WockyJingleTransportIface *obj, GList *new_candidates)
 {
-  GabbleJingleTransportGoogle *transport =
-    GABBLE_JINGLE_TRANSPORT_GOOGLE (obj);
-  GabbleJingleTransportGooglePrivate *priv = transport->priv;
+  WockyJingleTransportGoogle *transport =
+    WOCKY_JINGLE_TRANSPORT_GOOGLE (obj);
+  WockyJingleTransportGooglePrivate *priv = transport->priv;
 
   priv->local_candidates = g_list_concat (priv->local_candidates,
       new_candidates);
@@ -544,11 +544,11 @@ new_local_candidates (GabbleJingleTransportIface *obj, GList *new_candidates)
 }
 
 static void
-send_candidates (GabbleJingleTransportIface *obj, gboolean all)
+send_candidates (WockyJingleTransportIface *obj, gboolean all)
 {
-  GabbleJingleTransportGoogle *transport =
-    GABBLE_JINGLE_TRANSPORT_GOOGLE (obj);
-  GabbleJingleTransportGooglePrivate *priv = transport->priv;
+  WockyJingleTransportGoogle *transport =
+    WOCKY_JINGLE_TRANSPORT_GOOGLE (obj);
+  WockyJingleTransportGooglePrivate *priv = transport->priv;
 
   if (all)
     {
@@ -569,26 +569,26 @@ send_candidates (GabbleJingleTransportIface *obj, gboolean all)
 }
 
 static GList *
-get_local_candidates (GabbleJingleTransportIface *iface)
+get_local_candidates (WockyJingleTransportIface *iface)
 {
-  GabbleJingleTransportGoogle *transport =
-    GABBLE_JINGLE_TRANSPORT_GOOGLE (iface);
-  GabbleJingleTransportGooglePrivate *priv = transport->priv;
+  WockyJingleTransportGoogle *transport =
+    WOCKY_JINGLE_TRANSPORT_GOOGLE (iface);
+  WockyJingleTransportGooglePrivate *priv = transport->priv;
 
   return priv->local_candidates;
 }
 
 static GList *
-get_remote_candidates (GabbleJingleTransportIface *iface)
+get_remote_candidates (WockyJingleTransportIface *iface)
 {
-  GabbleJingleTransportGoogle *transport =
-    GABBLE_JINGLE_TRANSPORT_GOOGLE (iface);
-  GabbleJingleTransportGooglePrivate *priv = transport->priv;
+  WockyJingleTransportGoogle *transport =
+    WOCKY_JINGLE_TRANSPORT_GOOGLE (iface);
+  WockyJingleTransportGooglePrivate *priv = transport->priv;
 
   return priv->remote_candidates;
 }
 
-static JingleTransportType
+static WockyJingleTransportType
 get_transport_type (void)
 {
   return JINGLE_TRANSPORT_GOOGLE_P2P;
@@ -597,7 +597,7 @@ get_transport_type (void)
 static void
 transport_iface_init (gpointer g_iface, gpointer iface_data)
 {
-  GabbleJingleTransportIfaceClass *klass = (GabbleJingleTransportIfaceClass *) g_iface;
+  WockyJingleTransportIfaceClass *klass = (WockyJingleTransportIfaceClass *) g_iface;
 
   klass->parse_candidates = parse_candidates;
 
@@ -615,10 +615,10 @@ transport_iface_init (gpointer g_iface, gpointer iface_data)
 /* Returns FALSE if the component name already exists */
 gboolean
 jingle_transport_google_set_component_name (
-    GabbleJingleTransportGoogle *transport,
+    WockyJingleTransportGoogle *transport,
     const gchar *name, guint component_id)
 {
-  GabbleJingleTransportGooglePrivate *priv = transport->priv;
+  WockyJingleTransportGooglePrivate *priv = transport->priv;
 
   if (g_hash_table_lookup_extended (priv->component_names, name, NULL, NULL))
       return FALSE;
@@ -630,15 +630,15 @@ jingle_transport_google_set_component_name (
 }
 
 void
-jingle_transport_google_register (GabbleJingleFactory *factory)
+jingle_transport_google_register (WockyJingleFactory *factory)
 {
   /* GTalk libjingle0.3 dialect */
-  gabble_jingle_factory_register_transport (factory, "",
-      GABBLE_TYPE_JINGLE_TRANSPORT_GOOGLE);
+  wocky_jingle_factory_register_transport (factory, "",
+      WOCKY_TYPE_JINGLE_TRANSPORT_GOOGLE);
 
   /* GTalk libjingle0.4 dialect */
-  gabble_jingle_factory_register_transport (factory,
+  wocky_jingle_factory_register_transport (factory,
       NS_GOOGLE_TRANSPORT_P2P,
-      GABBLE_TYPE_JINGLE_TRANSPORT_GOOGLE);
+      WOCKY_TYPE_JINGLE_TRANSPORT_GOOGLE);
 }
 
diff --git a/src/jingle-transport-google.h b/src/jingle-transport-google.h
index bfab8f0fb..ee2313969 100644
--- a/src/jingle-transport-google.h
+++ b/src/jingle-transport-google.h
@@ -1,5 +1,5 @@
 /*
- * jingle-transport-google.h - Header for GabbleJingleTransportGoogle
+ * jingle-transport-google.h - Header for WockyJingleTransportGoogle
  * Copyright (C) 2008 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
@@ -26,42 +26,42 @@
 
 G_BEGIN_DECLS
 
-typedef struct _GabbleJingleTransportGoogleClass GabbleJingleTransportGoogleClass;
+typedef struct _WockyJingleTransportGoogleClass WockyJingleTransportGoogleClass;
 
-GType gabble_jingle_transport_google_get_type (void);
+GType wocky_jingle_transport_google_get_type (void);
 
 /* TYPE MACROS */
-#define GABBLE_TYPE_JINGLE_TRANSPORT_GOOGLE \
-  (gabble_jingle_transport_google_get_type ())
-#define GABBLE_JINGLE_TRANSPORT_GOOGLE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_JINGLE_TRANSPORT_GOOGLE, \
-                              GabbleJingleTransportGoogle))
-#define GABBLE_JINGLE_TRANSPORT_GOOGLE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_JINGLE_TRANSPORT_GOOGLE, \
-                           GabbleJingleTransportGoogleClass))
-#define GABBLE_IS_JINGLE_TRANSPORT_GOOGLE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_JINGLE_TRANSPORT_GOOGLE))
-#define GABBLE_IS_JINGLE_TRANSPORT_GOOGLE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_JINGLE_TRANSPORT_GOOGLE))
-#define GABBLE_JINGLE_TRANSPORT_GOOGLE_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_JINGLE_TRANSPORT_GOOGLE, \
-                              GabbleJingleTransportGoogleClass))
+#define WOCKY_TYPE_JINGLE_TRANSPORT_GOOGLE \
+  (wocky_jingle_transport_google_get_type ())
+#define WOCKY_JINGLE_TRANSPORT_GOOGLE(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), WOCKY_TYPE_JINGLE_TRANSPORT_GOOGLE, \
+                              WockyJingleTransportGoogle))
+#define WOCKY_JINGLE_TRANSPORT_GOOGLE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), WOCKY_TYPE_JINGLE_TRANSPORT_GOOGLE, \
+                           WockyJingleTransportGoogleClass))
+#define WOCKY_IS_JINGLE_TRANSPORT_GOOGLE(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), WOCKY_TYPE_JINGLE_TRANSPORT_GOOGLE))
+#define WOCKY_IS_JINGLE_TRANSPORT_GOOGLE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), WOCKY_TYPE_JINGLE_TRANSPORT_GOOGLE))
+#define WOCKY_JINGLE_TRANSPORT_GOOGLE_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), WOCKY_TYPE_JINGLE_TRANSPORT_GOOGLE, \
+                              WockyJingleTransportGoogleClass))
 
-struct _GabbleJingleTransportGoogleClass {
+struct _WockyJingleTransportGoogleClass {
     GObjectClass parent_class;
 };
 
-typedef struct _GabbleJingleTransportGooglePrivate GabbleJingleTransportGooglePrivate;
+typedef struct _WockyJingleTransportGooglePrivate WockyJingleTransportGooglePrivate;
 
-struct _GabbleJingleTransportGoogle {
+struct _WockyJingleTransportGoogle {
     GObject parent;
-    GabbleJingleTransportGooglePrivate *priv;
+    WockyJingleTransportGooglePrivate *priv;
 };
 
-void jingle_transport_google_register (GabbleJingleFactory *factory);
+void jingle_transport_google_register (WockyJingleFactory *factory);
 
 gboolean jingle_transport_google_set_component_name (
-    GabbleJingleTransportGoogle *transport,
+    WockyJingleTransportGoogle *transport,
     const gchar *name, guint component_id);
 
 #endif /* __JINGLE_TRANSPORT_GOOGLE_H__ */
diff --git a/src/jingle-transport-iceudp.c b/src/jingle-transport-iceudp.c
index e7eb41f70..55b3f396c 100644
--- a/src/jingle-transport-iceudp.c
+++ b/src/jingle-transport-iceudp.c
@@ -1,5 +1,5 @@
 /*
- * jingle-transport-iceudp.c - Source for GabbleJingleTransportIceUdp
+ * jingle-transport-iceudp.c - Source for WockyJingleTransportIceUdp
  *
  * Copyright (C) 2008 Collabora Ltd.
  *
@@ -37,9 +37,9 @@
 static void
 transport_iface_init (gpointer g_iface, gpointer iface_data);
 
-G_DEFINE_TYPE_WITH_CODE (GabbleJingleTransportIceUdp,
-    gabble_jingle_transport_iceudp, G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (GABBLE_TYPE_JINGLE_TRANSPORT_IFACE,
+G_DEFINE_TYPE_WITH_CODE (WockyJingleTransportIceUdp,
+    wocky_jingle_transport_iceudp, G_TYPE_OBJECT,
+    G_IMPLEMENT_INTERFACE (WOCKY_TYPE_JINGLE_TRANSPORT_IFACE,
         transport_iface_init));
 
 /* signal enum */
@@ -60,10 +60,10 @@ enum
   LAST_PROPERTY
 };
 
-struct _GabbleJingleTransportIceUdpPrivate
+struct _WockyJingleTransportIceUdpPrivate
 {
-  GabbleJingleContent *content;
-  JingleTransportState state;
+  WockyJingleContent *content;
+  WockyJingleTransportState state;
   gchar *transport_ns;
 
   GList *local_candidates;
@@ -85,11 +85,11 @@ struct _GabbleJingleTransportIceUdpPrivate
 };
 
 static void
-gabble_jingle_transport_iceudp_init (GabbleJingleTransportIceUdp *obj)
+wocky_jingle_transport_iceudp_init (WockyJingleTransportIceUdp *obj)
 {
-  GabbleJingleTransportIceUdpPrivate *priv =
-     G_TYPE_INSTANCE_GET_PRIVATE (obj, GABBLE_TYPE_JINGLE_TRANSPORT_ICEUDP,
-         GabbleJingleTransportIceUdpPrivate);
+  WockyJingleTransportIceUdpPrivate *priv =
+     G_TYPE_INSTANCE_GET_PRIVATE (obj, WOCKY_TYPE_JINGLE_TRANSPORT_ICEUDP,
+         WockyJingleTransportIceUdpPrivate);
   obj->priv = priv;
 
   priv->id_sequence = 1;
@@ -97,10 +97,10 @@ gabble_jingle_transport_iceudp_init (GabbleJingleTransportIceUdp *obj)
 }
 
 static void
-gabble_jingle_transport_iceudp_dispose (GObject *object)
+wocky_jingle_transport_iceudp_dispose (GObject *object)
 {
-  GabbleJingleTransportIceUdp *trans = GABBLE_JINGLE_TRANSPORT_ICEUDP (object);
-  GabbleJingleTransportIceUdpPrivate *priv = trans->priv;
+  WockyJingleTransportIceUdp *trans = WOCKY_JINGLE_TRANSPORT_ICEUDP (object);
+  WockyJingleTransportIceUdpPrivate *priv = trans->priv;
 
   if (priv->dispose_has_run)
     return;
@@ -123,18 +123,18 @@ gabble_jingle_transport_iceudp_dispose (GObject *object)
   g_free (priv->pwd);
   priv->pwd = NULL;
 
-  if (G_OBJECT_CLASS (gabble_jingle_transport_iceudp_parent_class)->dispose)
-    G_OBJECT_CLASS (gabble_jingle_transport_iceudp_parent_class)->dispose (object);
+  if (G_OBJECT_CLASS (wocky_jingle_transport_iceudp_parent_class)->dispose)
+    G_OBJECT_CLASS (wocky_jingle_transport_iceudp_parent_class)->dispose (object);
 }
 
 static void
-gabble_jingle_transport_iceudp_get_property (GObject *object,
+wocky_jingle_transport_iceudp_get_property (GObject *object,
                                              guint property_id,
                                              GValue *value,
                                              GParamSpec *pspec)
 {
-  GabbleJingleTransportIceUdp *trans = GABBLE_JINGLE_TRANSPORT_ICEUDP (object);
-  GabbleJingleTransportIceUdpPrivate *priv = trans->priv;
+  WockyJingleTransportIceUdp *trans = WOCKY_JINGLE_TRANSPORT_ICEUDP (object);
+  WockyJingleTransportIceUdpPrivate *priv = trans->priv;
 
   switch (property_id) {
     case PROP_CONTENT:
@@ -153,13 +153,13 @@ gabble_jingle_transport_iceudp_get_property (GObject *object,
 }
 
 static void
-gabble_jingle_transport_iceudp_set_property (GObject *object,
+wocky_jingle_transport_iceudp_set_property (GObject *object,
                                              guint property_id,
                                              const GValue *value,
                                              GParamSpec *pspec)
 {
-  GabbleJingleTransportIceUdp *trans = GABBLE_JINGLE_TRANSPORT_ICEUDP (object);
-  GabbleJingleTransportIceUdpPrivate *priv = trans->priv;
+  WockyJingleTransportIceUdp *trans = WOCKY_JINGLE_TRANSPORT_ICEUDP (object);
+  WockyJingleTransportIceUdpPrivate *priv = trans->priv;
 
   switch (property_id) {
     case PROP_CONTENT:
@@ -179,21 +179,21 @@ gabble_jingle_transport_iceudp_set_property (GObject *object,
 }
 
 static void
-gabble_jingle_transport_iceudp_class_init (GabbleJingleTransportIceUdpClass *cls)
+wocky_jingle_transport_iceudp_class_init (WockyJingleTransportIceUdpClass *cls)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (cls);
   GParamSpec *param_spec;
 
-  g_type_class_add_private (cls, sizeof (GabbleJingleTransportIceUdpPrivate));
+  g_type_class_add_private (cls, sizeof (WockyJingleTransportIceUdpPrivate));
 
-  object_class->get_property = gabble_jingle_transport_iceudp_get_property;
-  object_class->set_property = gabble_jingle_transport_iceudp_set_property;
-  object_class->dispose = gabble_jingle_transport_iceudp_dispose;
+  object_class->get_property = wocky_jingle_transport_iceudp_get_property;
+  object_class->set_property = wocky_jingle_transport_iceudp_set_property;
+  object_class->dispose = wocky_jingle_transport_iceudp_dispose;
 
   /* property definitions */
-  param_spec = g_param_spec_object ("content", "GabbleJingleContent object",
+  param_spec = g_param_spec_object ("content", "WockyJingleContent object",
                                     "Jingle content object using this transport.",
-                                    GABBLE_TYPE_JINGLE_CONTENT,
+                                    WOCKY_TYPE_JINGLE_CONTENT,
                                     G_PARAM_CONSTRUCT_ONLY |
                                     G_PARAM_READWRITE |
                                     G_PARAM_STATIC_NICK |
@@ -212,9 +212,9 @@ gabble_jingle_transport_iceudp_class_init (GabbleJingleTransportIceUdpClass *cls
   param_spec = g_param_spec_uint ("state",
                                   "Connection state for the transport.",
                                   "Enum specifying the connection state of the transport.",
-                                  JINGLE_TRANSPORT_STATE_DISCONNECTED,
-                                  JINGLE_TRANSPORT_STATE_CONNECTED,
-                                  JINGLE_TRANSPORT_STATE_DISCONNECTED,
+                                  WOCKY_JINGLE_TRANSPORT_STATE_DISCONNECTED,
+                                  WOCKY_JINGLE_TRANSPORT_STATE_CONNECTED,
+                                  WOCKY_JINGLE_TRANSPORT_STATE_DISCONNECTED,
                                   G_PARAM_READWRITE |
                                   G_PARAM_STATIC_NAME |
                                   G_PARAM_STATIC_NICK |
@@ -233,11 +233,11 @@ gabble_jingle_transport_iceudp_class_init (GabbleJingleTransportIceUdpClass *cls
 }
 
 static void
-parse_candidates (GabbleJingleTransportIface *obj,
+parse_candidates (WockyJingleTransportIface *obj,
     WockyNode *transport_node, GError **error)
 {
-  GabbleJingleTransportIceUdp *t = GABBLE_JINGLE_TRANSPORT_ICEUDP (obj);
-  GabbleJingleTransportIceUdpPrivate *priv = t->priv;
+  WockyJingleTransportIceUdp *t = WOCKY_JINGLE_TRANSPORT_ICEUDP (obj);
+  WockyJingleTransportIceUdpPrivate *priv = t->priv;
   gboolean node_contains_a_candidate = FALSE;
   GList *candidates = NULL;
   WockyNodeIter i;
@@ -251,9 +251,9 @@ parse_candidates (GabbleJingleTransportIface *obj,
       const gchar *id, *address, *user, *pass, *str;
       guint port, net, gen, component = 1;
       gdouble pref;
-      JingleTransportProtocol proto;
-      JingleCandidateType ctype;
-      JingleCandidate *c;
+      WockyJingleTransportProtocol proto;
+      WockyJingleCandidateType ctype;
+      WockyJingleCandidate *c;
 
       node_contains_a_candidate = TRUE;
 
@@ -288,7 +288,7 @@ parse_candidates (GabbleJingleTransportIface *obj,
 
       if (!wocky_strdiff (str, "udp"))
         {
-          proto = JINGLE_TRANSPORT_PROTOCOL_UDP;
+          proto = WOCKY_JINGLE_TRANSPORT_PROTOCOL_UDP;
         }
       else
         {
@@ -314,18 +314,18 @@ parse_candidates (GabbleJingleTransportIface *obj,
 
       if (!wocky_strdiff (str, "host"))
         {
-          ctype = JINGLE_CANDIDATE_TYPE_LOCAL;
+          ctype = WOCKY_JINGLE_CANDIDATE_TYPE_LOCAL;
         }
       else if (!wocky_strdiff (str, "srflx") || !wocky_strdiff (str, "prflx"))
         {
           /* FIXME Strictly speaking a prflx candidate should be a different
            * type, but the TP spec has now way to distinguish and it doesn't
            * matter much anyway.. */
-          ctype = JINGLE_CANDIDATE_TYPE_STUN;
+          ctype = WOCKY_JINGLE_CANDIDATE_TYPE_STUN;
         }
       else if (!wocky_strdiff (str, "relay"))
         {
-          ctype = JINGLE_CANDIDATE_TYPE_RELAY;
+          ctype = WOCKY_JINGLE_CANDIDATE_TYPE_RELAY;
         }
       else
         {
@@ -384,7 +384,7 @@ parse_candidates (GabbleJingleTransportIface *obj,
           priv->pwd = g_strdup (pass);
         }
 
-      c = jingle_candidate_new (proto, ctype, id, component,
+      c = wocky_jingle_candidate_new (proto, ctype, id, component,
           address, port, gen, pref, user, pass, net);
 
       candidates = g_list_append (candidates, c);
@@ -416,17 +416,17 @@ parse_candidates (GabbleJingleTransportIface *obj,
 }
 
 static void
-inject_candidates (GabbleJingleTransportIface *obj,
+inject_candidates (WockyJingleTransportIface *obj,
     WockyNode *transport_node)
 {
-  GabbleJingleTransportIceUdp *self = GABBLE_JINGLE_TRANSPORT_ICEUDP (obj);
-  GabbleJingleTransportIceUdpPrivate *priv = self->priv;
+  WockyJingleTransportIceUdp *self = WOCKY_JINGLE_TRANSPORT_ICEUDP (obj);
+  WockyJingleTransportIceUdpPrivate *priv = self->priv;
   const gchar *username = NULL;
 
   for (; priv->pending_candidates != NULL;
       priv->pending_candidates = priv->pending_candidates->next)
     {
-      JingleCandidate *c = (JingleCandidate *) priv->pending_candidates->data;
+      WockyJingleCandidate *c = (WockyJingleCandidate *) priv->pending_candidates->data;
       gchar port_str[16], pref_str[16], comp_str[16], id_str[16],
           *type_str, *proto_str;
       WockyNode *cnode;
@@ -448,13 +448,13 @@ inject_candidates (GabbleJingleTransportIface *obj,
       sprintf (id_str, "%d", priv->id_sequence++);
 
       switch (c->type) {
-        case JINGLE_CANDIDATE_TYPE_LOCAL:
+        case WOCKY_JINGLE_CANDIDATE_TYPE_LOCAL:
           type_str = "host";
           break;
-        case JINGLE_CANDIDATE_TYPE_STUN:
+        case WOCKY_JINGLE_CANDIDATE_TYPE_STUN:
           type_str = "srflx";
           break;
-        case JINGLE_CANDIDATE_TYPE_RELAY:
+        case WOCKY_JINGLE_CANDIDATE_TYPE_RELAY:
           type_str = "relay";
           break;
         default:
@@ -463,10 +463,10 @@ inject_candidates (GabbleJingleTransportIface *obj,
       }
 
       switch (c->protocol) {
-        case JINGLE_TRANSPORT_PROTOCOL_UDP:
+        case WOCKY_JINGLE_TRANSPORT_PROTOCOL_UDP:
           proto_str = "udp";
           break;
-        case JINGLE_TRANSPORT_PROTOCOL_TCP:
+        case WOCKY_JINGLE_TRANSPORT_PROTOCOL_TCP:
           DEBUG ("ignoring TCP candidate");
           continue;
         default:
@@ -499,26 +499,26 @@ inject_candidates (GabbleJingleTransportIface *obj,
  * @all.
  */
 static void
-send_candidates (GabbleJingleTransportIface *iface,
+send_candidates (WockyJingleTransportIface *iface,
     gboolean all G_GNUC_UNUSED)
 {
-  GabbleJingleTransportIceUdp *self = GABBLE_JINGLE_TRANSPORT_ICEUDP (iface);
-  GabbleJingleTransportIceUdpPrivate *priv = self->priv;
+  WockyJingleTransportIceUdp *self = WOCKY_JINGLE_TRANSPORT_ICEUDP (iface);
+  WockyJingleTransportIceUdpPrivate *priv = self->priv;
 
   while (priv->pending_candidates != NULL)
     {
       WockyNode *trans_node, *sess_node;
       WockyStanza *msg;
 
-      msg = gabble_jingle_session_new_message (priv->content->session,
-          JINGLE_ACTION_TRANSPORT_INFO, &sess_node);
+      msg = wocky_jingle_session_new_message (priv->content->session,
+          WOCKY_JINGLE_ACTION_TRANSPORT_INFO, &sess_node);
 
-      gabble_jingle_content_produce_node (priv->content, sess_node, FALSE,
+      wocky_jingle_content_produce_node (priv->content, sess_node, FALSE,
           TRUE, &trans_node);
       inject_candidates (iface, trans_node);
 
       wocky_porter_send_iq_async (
-          gabble_jingle_session_get_porter (priv->content->session), msg,
+          wocky_jingle_session_get_porter (priv->content->session), msg,
           NULL, NULL, NULL);
       g_object_unref (msg);
     }
@@ -526,13 +526,13 @@ send_candidates (GabbleJingleTransportIface *iface,
   DEBUG ("sent all pending candidates");
 }
 
-/* Takes in a list of slice-allocated JingleCandidate structs */
+/* Takes in a list of slice-allocated WockyJingleCandidate structs */
 static void
-new_local_candidates (GabbleJingleTransportIface *obj, GList *new_candidates)
+new_local_candidates (WockyJingleTransportIface *obj, GList *new_candidates)
 {
-  GabbleJingleTransportIceUdp *transport =
-    GABBLE_JINGLE_TRANSPORT_ICEUDP (obj);
-  GabbleJingleTransportIceUdpPrivate *priv = transport->priv;
+  WockyJingleTransportIceUdp *transport =
+    WOCKY_JINGLE_TRANSPORT_ICEUDP (obj);
+  WockyJingleTransportIceUdpPrivate *priv = transport->priv;
 
   priv->local_candidates = g_list_concat (priv->local_candidates,
       new_candidates);
@@ -545,38 +545,38 @@ new_local_candidates (GabbleJingleTransportIface *obj, GList *new_candidates)
 }
 
 static GList *
-get_remote_candidates (GabbleJingleTransportIface *iface)
+get_remote_candidates (WockyJingleTransportIface *iface)
 {
-  GabbleJingleTransportIceUdp *transport =
-    GABBLE_JINGLE_TRANSPORT_ICEUDP (iface);
-  GabbleJingleTransportIceUdpPrivate *priv = transport->priv;
+  WockyJingleTransportIceUdp *transport =
+    WOCKY_JINGLE_TRANSPORT_ICEUDP (iface);
+  WockyJingleTransportIceUdpPrivate *priv = transport->priv;
 
   return priv->remote_candidates;
 }
 
 static GList *
-get_local_candidates (GabbleJingleTransportIface *iface)
+get_local_candidates (WockyJingleTransportIface *iface)
 {
-  GabbleJingleTransportIceUdp *transport =
-    GABBLE_JINGLE_TRANSPORT_ICEUDP (iface);
-  GabbleJingleTransportIceUdpPrivate *priv = transport->priv;
+  WockyJingleTransportIceUdp *transport =
+    WOCKY_JINGLE_TRANSPORT_ICEUDP (iface);
+  WockyJingleTransportIceUdpPrivate *priv = transport->priv;
 
   return priv->local_candidates;
 }
 
-static JingleTransportType
+static WockyJingleTransportType
 get_transport_type (void)
 {
   return JINGLE_TRANSPORT_ICE_UDP;
 }
 
 static gboolean
-get_credentials (GabbleJingleTransportIface *iface,
+get_credentials (WockyJingleTransportIface *iface,
       gchar **ufrag, gchar **pwd)
 {
-  GabbleJingleTransportIceUdp *transport =
-    GABBLE_JINGLE_TRANSPORT_ICEUDP (iface);
-  GabbleJingleTransportIceUdpPrivate *priv = transport->priv;
+  WockyJingleTransportIceUdp *transport =
+    WOCKY_JINGLE_TRANSPORT_ICEUDP (iface);
+  WockyJingleTransportIceUdpPrivate *priv = transport->priv;
 
   if (!priv->ufrag || !priv->pwd)
     return FALSE;
@@ -593,7 +593,7 @@ get_credentials (GabbleJingleTransportIface *iface,
 static void
 transport_iface_init (gpointer g_iface, gpointer iface_data)
 {
-  GabbleJingleTransportIfaceClass *klass = (GabbleJingleTransportIfaceClass *) g_iface;
+  WockyJingleTransportIfaceClass *klass = (WockyJingleTransportIfaceClass *) g_iface;
 
   klass->parse_candidates = parse_candidates;
 
@@ -608,10 +608,10 @@ transport_iface_init (gpointer g_iface, gpointer iface_data)
 }
 
 void
-jingle_transport_iceudp_register (GabbleJingleFactory *factory)
+jingle_transport_iceudp_register (WockyJingleFactory *factory)
 {
-  gabble_jingle_factory_register_transport (factory,
+  wocky_jingle_factory_register_transport (factory,
       NS_JINGLE_TRANSPORT_ICEUDP,
-      GABBLE_TYPE_JINGLE_TRANSPORT_ICEUDP);
+      WOCKY_TYPE_JINGLE_TRANSPORT_ICEUDP);
 }
 
diff --git a/src/jingle-transport-iceudp.h b/src/jingle-transport-iceudp.h
index 8f7324371..35540a0fe 100644
--- a/src/jingle-transport-iceudp.h
+++ b/src/jingle-transport-iceudp.h
@@ -1,5 +1,5 @@
 /*
- * jingle-transport-iceudp.h - Header for GabbleJingleTransportIceUdp
+ * jingle-transport-iceudp.h - Header for WockyJingleTransportIceUdp
  * Copyright (C) 2008 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
@@ -26,39 +26,39 @@
 
 G_BEGIN_DECLS
 
-typedef struct _GabbleJingleTransportIceUdpClass GabbleJingleTransportIceUdpClass;
+typedef struct _WockyJingleTransportIceUdpClass WockyJingleTransportIceUdpClass;
 
-GType gabble_jingle_transport_iceudp_get_type (void);
+GType wocky_jingle_transport_iceudp_get_type (void);
 
 /* TYPE MACROS */
-#define GABBLE_TYPE_JINGLE_TRANSPORT_ICEUDP \
-  (gabble_jingle_transport_iceudp_get_type ())
-#define GABBLE_JINGLE_TRANSPORT_ICEUDP(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_JINGLE_TRANSPORT_ICEUDP, \
-                              GabbleJingleTransportIceUdp))
-#define GABBLE_JINGLE_TRANSPORT_ICEUDP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_JINGLE_TRANSPORT_ICEUDP, \
-                           GabbleJingleTransportIceUdpClass))
-#define GABBLE_IS_JINGLE_TRANSPORT_ICEUDP(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_JINGLE_TRANSPORT_ICEUDP))
-#define GABBLE_IS_JINGLE_TRANSPORT_ICEUDP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_JINGLE_TRANSPORT_ICEUDP))
-#define GABBLE_JINGLE_TRANSPORT_ICEUDP_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_JINGLE_TRANSPORT_ICEUDP, \
-                              GabbleJingleTransportIceUdpClass))
+#define WOCKY_TYPE_JINGLE_TRANSPORT_ICEUDP \
+  (wocky_jingle_transport_iceudp_get_type ())
+#define WOCKY_JINGLE_TRANSPORT_ICEUDP(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), WOCKY_TYPE_JINGLE_TRANSPORT_ICEUDP, \
+                              WockyJingleTransportIceUdp))
+#define WOCKY_JINGLE_TRANSPORT_ICEUDP_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), WOCKY_TYPE_JINGLE_TRANSPORT_ICEUDP, \
+                           WockyJingleTransportIceUdpClass))
+#define WOCKY_IS_JINGLE_TRANSPORT_ICEUDP(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), WOCKY_TYPE_JINGLE_TRANSPORT_ICEUDP))
+#define WOCKY_IS_JINGLE_TRANSPORT_ICEUDP_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), WOCKY_TYPE_JINGLE_TRANSPORT_ICEUDP))
+#define WOCKY_JINGLE_TRANSPORT_ICEUDP_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), WOCKY_TYPE_JINGLE_TRANSPORT_ICEUDP, \
+                              WockyJingleTransportIceUdpClass))
 
-struct _GabbleJingleTransportIceUdpClass {
+struct _WockyJingleTransportIceUdpClass {
     GObjectClass parent_class;
 };
 
-typedef struct _GabbleJingleTransportIceUdpPrivate GabbleJingleTransportIceUdpPrivate;
+typedef struct _WockyJingleTransportIceUdpPrivate WockyJingleTransportIceUdpPrivate;
 
-struct _GabbleJingleTransportIceUdp {
+struct _WockyJingleTransportIceUdp {
     GObject parent;
-    GabbleJingleTransportIceUdpPrivate *priv;
+    WockyJingleTransportIceUdpPrivate *priv;
 };
 
-void jingle_transport_iceudp_register (GabbleJingleFactory *factory);
+void jingle_transport_iceudp_register (WockyJingleFactory *factory);
 
 #endif /* __JINGLE_TRANSPORT_ICEUDP_H__ */
 
diff --git a/src/jingle-transport-iface.c b/src/jingle-transport-iface.c
index 7a1ca9bf3..491a0fb3c 100644
--- a/src/jingle-transport-iface.c
+++ b/src/jingle-transport-iface.c
@@ -26,12 +26,12 @@
 #include "jingle-content.h"
 #include "jingle-session.h"
 
-GabbleJingleTransportIface *
-gabble_jingle_transport_iface_new (GType type,
-                                   GabbleJingleContent *content,
+WockyJingleTransportIface *
+wocky_jingle_transport_iface_new (GType type,
+                                   WockyJingleContent *content,
                                    const gchar *transport_ns)
 {
-  g_return_val_if_fail (g_type_is_a (type, GABBLE_TYPE_JINGLE_TRANSPORT_IFACE),
+  g_return_val_if_fail (g_type_is_a (type, WOCKY_TYPE_JINGLE_TRANSPORT_IFACE),
       NULL);
 
   return g_object_new (type,
@@ -41,25 +41,25 @@ gabble_jingle_transport_iface_new (GType type,
 }
 
 void
-gabble_jingle_transport_iface_parse_candidates (GabbleJingleTransportIface *self,
+wocky_jingle_transport_iface_parse_candidates (WockyJingleTransportIface *self,
     WockyNode *node, GError **error)
 {
-  void (*virtual_method)(GabbleJingleTransportIface *,
+  void (*virtual_method)(WockyJingleTransportIface *,
       WockyNode *, GError **) =
-    GABBLE_JINGLE_TRANSPORT_IFACE_GET_CLASS (self)->parse_candidates;
+    WOCKY_JINGLE_TRANSPORT_IFACE_GET_CLASS (self)->parse_candidates;
 
   g_assert (virtual_method != NULL);
   return virtual_method (self, node, error);
 }
 
-/* Takes in a list of slice-allocated JingleCandidate structs */
+/* Takes in a list of slice-allocated WockyJingleCandidate structs */
 void
-gabble_jingle_transport_iface_new_local_candidates (GabbleJingleTransportIface *self,
+wocky_jingle_transport_iface_new_local_candidates (WockyJingleTransportIface *self,
     GList *candidates)
 {
-  void (*virtual_method)(GabbleJingleTransportIface *,
+  void (*virtual_method)(WockyJingleTransportIface *,
       GList *) =
-    GABBLE_JINGLE_TRANSPORT_IFACE_GET_CLASS (self)->new_local_candidates;
+    WOCKY_JINGLE_TRANSPORT_IFACE_GET_CLASS (self)->new_local_candidates;
 
   g_assert (virtual_method != NULL);
   virtual_method (self, candidates);
@@ -69,12 +69,12 @@ gabble_jingle_transport_iface_new_local_candidates (GabbleJingleTransportIface *
  * session-initiate, session-accept, content-add or content-accept action.
  */
 void
-gabble_jingle_transport_iface_inject_candidates (
-    GabbleJingleTransportIface *self,
+wocky_jingle_transport_iface_inject_candidates (
+    WockyJingleTransportIface *self,
     WockyNode *transport_node)
 {
-  void (*virtual_method)(GabbleJingleTransportIface *, WockyNode *) =
-      GABBLE_JINGLE_TRANSPORT_IFACE_GET_CLASS (self)->inject_candidates;
+  void (*virtual_method)(WockyJingleTransportIface *, WockyNode *) =
+      WOCKY_JINGLE_TRANSPORT_IFACE_GET_CLASS (self)->inject_candidates;
 
   if (virtual_method != NULL)
     virtual_method (self, transport_node);
@@ -82,12 +82,12 @@ gabble_jingle_transport_iface_inject_candidates (
 
 /* Transmits outstanding or all candidates (if applicable and @all is set). */
 void
-gabble_jingle_transport_iface_send_candidates (
-    GabbleJingleTransportIface *self,
+wocky_jingle_transport_iface_send_candidates (
+    WockyJingleTransportIface *self,
     gboolean all)
 {
-  void (*virtual_method) (GabbleJingleTransportIface *, gboolean) =
-      GABBLE_JINGLE_TRANSPORT_IFACE_GET_CLASS (self)->send_candidates;
+  void (*virtual_method) (WockyJingleTransportIface *, gboolean) =
+      WOCKY_JINGLE_TRANSPORT_IFACE_GET_CLASS (self)->send_candidates;
 
   if (virtual_method != NULL)
     virtual_method (self, all);
@@ -97,15 +97,15 @@ gabble_jingle_transport_iface_send_candidates (
  * {session,content}-accept, and is connected.
  */
 gboolean
-gabble_jingle_transport_iface_can_accept (GabbleJingleTransportIface *self)
+wocky_jingle_transport_iface_can_accept (WockyJingleTransportIface *self)
 {
-  JingleTransportState state;
-  gboolean (*m) (GabbleJingleTransportIface *) =
-      GABBLE_JINGLE_TRANSPORT_IFACE_GET_CLASS (self)->can_accept;
+  WockyJingleTransportState state;
+  gboolean (*m) (WockyJingleTransportIface *) =
+      WOCKY_JINGLE_TRANSPORT_IFACE_GET_CLASS (self)->can_accept;
 
   g_object_get (self, "state", &state, NULL);
 
-  if (state != JINGLE_TRANSPORT_STATE_CONNECTED)
+  if (state != WOCKY_JINGLE_TRANSPORT_STATE_CONNECTED)
     return FALSE;
 
   /* Only Raw UDP *needs* candidates in order to accept. */
@@ -116,33 +116,33 @@ gabble_jingle_transport_iface_can_accept (GabbleJingleTransportIface *self)
 }
 
 GList *
-gabble_jingle_transport_iface_get_remote_candidates (
-    GabbleJingleTransportIface *self)
+wocky_jingle_transport_iface_get_remote_candidates (
+    WockyJingleTransportIface *self)
 {
-  GList * (*virtual_method)(GabbleJingleTransportIface *) =
-    GABBLE_JINGLE_TRANSPORT_IFACE_GET_CLASS (self)->get_remote_candidates;
+  GList * (*virtual_method)(WockyJingleTransportIface *) =
+    WOCKY_JINGLE_TRANSPORT_IFACE_GET_CLASS (self)->get_remote_candidates;
 
   g_assert (virtual_method != NULL);
   return virtual_method (self);
 }
 
 GList *
-gabble_jingle_transport_iface_get_local_candidates (
-    GabbleJingleTransportIface *self)
+wocky_jingle_transport_iface_get_local_candidates (
+    WockyJingleTransportIface *self)
 {
-  GList * (*virtual_method)(GabbleJingleTransportIface *) =
-    GABBLE_JINGLE_TRANSPORT_IFACE_GET_CLASS (self)->get_local_candidates;
+  GList * (*virtual_method)(WockyJingleTransportIface *) =
+    WOCKY_JINGLE_TRANSPORT_IFACE_GET_CLASS (self)->get_local_candidates;
 
   g_assert (virtual_method != NULL);
   return virtual_method (self);
 }
 
 gboolean
-jingle_transport_get_credentials (GabbleJingleTransportIface *self,
+jingle_transport_get_credentials (WockyJingleTransportIface *self,
     gchar **ufrag, gchar **pwd)
 {
-  GabbleJingleTransportIfaceClass *klass =
-      GABBLE_JINGLE_TRANSPORT_IFACE_GET_CLASS (self);
+  WockyJingleTransportIfaceClass *klass =
+      WOCKY_JINGLE_TRANSPORT_IFACE_GET_CLASS (self);
 
   if (klass->get_credentials)
     return klass->get_credentials (self, ufrag, pwd);
@@ -150,18 +150,18 @@ jingle_transport_get_credentials (GabbleJingleTransportIface *self,
     return FALSE;
 }
 
-JingleTransportType
-gabble_jingle_transport_iface_get_transport_type (GabbleJingleTransportIface *self)
+WockyJingleTransportType
+wocky_jingle_transport_iface_get_transport_type (WockyJingleTransportIface *self)
 {
-  JingleTransportType (*virtual_method)(void) =
-    GABBLE_JINGLE_TRANSPORT_IFACE_GET_CLASS (self)->get_transport_type;
+  WockyJingleTransportType (*virtual_method)(void) =
+    WOCKY_JINGLE_TRANSPORT_IFACE_GET_CLASS (self)->get_transport_type;
 
   g_assert (virtual_method != NULL);
   return virtual_method ();
 }
 
 static void
-gabble_jingle_transport_iface_base_init (gpointer klass)
+wocky_jingle_transport_iface_base_init (gpointer klass)
 {
   static gboolean initialized = FALSE;
 
@@ -171,9 +171,9 @@ gabble_jingle_transport_iface_base_init (gpointer klass)
 
       param_spec = g_param_spec_object (
           "content",
-          "GabbleJingleContent object",
+          "WockyJingleContent object",
           "Jingle content that's using this jingle transport object.",
-          GABBLE_TYPE_JINGLE_CONTENT,
+          WOCKY_TYPE_JINGLE_CONTENT,
           G_PARAM_CONSTRUCT_ONLY |
           G_PARAM_READWRITE |
           G_PARAM_STATIC_NAME |
@@ -197,9 +197,9 @@ gabble_jingle_transport_iface_base_init (gpointer klass)
           "state",
           "Connection state for the transport.",
           "Enum specifying the connection state of the transport.",
-          JINGLE_TRANSPORT_STATE_DISCONNECTED,
-          JINGLE_TRANSPORT_STATE_CONNECTED,
-          JINGLE_TRANSPORT_STATE_DISCONNECTED,
+          WOCKY_JINGLE_TRANSPORT_STATE_DISCONNECTED,
+          WOCKY_JINGLE_TRANSPORT_STATE_CONNECTED,
+          WOCKY_JINGLE_TRANSPORT_STATE_DISCONNECTED,
           G_PARAM_READWRITE |
           G_PARAM_STATIC_NAME |
           G_PARAM_STATIC_NICK |
@@ -212,14 +212,14 @@ gabble_jingle_transport_iface_base_init (gpointer klass)
 }
 
 GType
-gabble_jingle_transport_iface_get_type (void)
+wocky_jingle_transport_iface_get_type (void)
 {
   static GType type = 0;
 
   if (type == 0) {
     static const GTypeInfo info = {
-      sizeof (GabbleJingleTransportIfaceClass),
-      gabble_jingle_transport_iface_base_init,   /* base_init */
+      sizeof (WockyJingleTransportIfaceClass),
+      wocky_jingle_transport_iface_base_init,   /* base_init */
       NULL,   /* base_finalize */
       NULL,   /* class_init */
       NULL,   /* class_finalize */
@@ -229,20 +229,20 @@ gabble_jingle_transport_iface_get_type (void)
       NULL    /* instance_init */
     };
 
-    type = g_type_register_static (G_TYPE_INTERFACE, "GabbleJingleTransportIface",
+    type = g_type_register_static (G_TYPE_INTERFACE, "WockyJingleTransportIface",
         &info, 0);
   }
 
   return type;
 }
 
-JingleCandidate *
-jingle_candidate_new (JingleTransportProtocol protocol,
-    JingleCandidateType type, const gchar *id, int component,
+WockyJingleCandidate *
+wocky_jingle_candidate_new (WockyJingleTransportProtocol protocol,
+    WockyJingleCandidateType type, const gchar *id, int component,
     const gchar *address, int port, int generation, int preference,
     const gchar *username, const gchar *password, int network)
 {
-  JingleCandidate *c = g_slice_new0 (JingleCandidate);
+  WockyJingleCandidate *c = g_slice_new0 (WockyJingleCandidate);
 
   c->protocol = protocol;
   c->type = type;
@@ -260,14 +260,14 @@ jingle_candidate_new (JingleTransportProtocol protocol,
 }
 
 void
-jingle_candidate_free (JingleCandidate *c)
+wocky_jingle_candidate_free (WockyJingleCandidate *c)
 {
     g_free (c->id);
     g_free (c->address);
     g_free (c->username);
     g_free (c->password);
 
-    g_slice_free (JingleCandidate, c);
+    g_slice_free (WockyJingleCandidate, c);
 }
 
 void
@@ -275,8 +275,8 @@ jingle_transport_free_candidates (GList *candidates)
 {
   while (candidates != NULL)
     {
-      JingleCandidate *c = (JingleCandidate *) candidates->data;
-      jingle_candidate_free (c);
+      WockyJingleCandidate *c = (WockyJingleCandidate *) candidates->data;
+      wocky_jingle_candidate_free (c);
       candidates = g_list_remove (candidates, c);
     }
 }
diff --git a/src/jingle-transport-iface.h b/src/jingle-transport-iface.h
index dc59d5394..fa198555e 100644
--- a/src/jingle-transport-iface.h
+++ b/src/jingle-transport-iface.h
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GABBLE_JINGLE_TRANSPORT_IFACE_H__
-#define __GABBLE_JINGLE_TRANSPORT_IFACE_H__
+#ifndef __WOCKY_JINGLE_TRANSPORT_IFACE_H__
+#define __WOCKY_JINGLE_TRANSPORT_IFACE_H__
 
 #include <glib-object.h>
 #include <wocky/wocky.h>
@@ -30,80 +30,80 @@ G_BEGIN_DECLS
 
 typedef enum
 {
-  JINGLE_TRANSPORT_STATE_DISCONNECTED,
-  JINGLE_TRANSPORT_STATE_CONNECTING,
-  JINGLE_TRANSPORT_STATE_CONNECTED
-} JingleTransportState;
+  WOCKY_JINGLE_TRANSPORT_STATE_DISCONNECTED,
+  WOCKY_JINGLE_TRANSPORT_STATE_CONNECTING,
+  WOCKY_JINGLE_TRANSPORT_STATE_CONNECTED
+} WockyJingleTransportState;
 
-typedef struct _GabbleJingleTransportIface GabbleJingleTransportIface;
-typedef struct _GabbleJingleTransportIfaceClass GabbleJingleTransportIfaceClass;
+typedef struct _WockyJingleTransportIface WockyJingleTransportIface;
+typedef struct _WockyJingleTransportIfaceClass WockyJingleTransportIfaceClass;
 
-struct _GabbleJingleTransportIfaceClass {
+struct _WockyJingleTransportIfaceClass {
   GTypeInterface parent;
 
-  void (*parse_candidates) (GabbleJingleTransportIface *,
+  void (*parse_candidates) (WockyJingleTransportIface *,
     WockyNode *, GError **);
 
-  void (*new_local_candidates) (GabbleJingleTransportIface *, GList *);
-  void (*inject_candidates) (GabbleJingleTransportIface *,
+  void (*new_local_candidates) (WockyJingleTransportIface *, GList *);
+  void (*inject_candidates) (WockyJingleTransportIface *,
       WockyNode *transport_node);
-  void (*send_candidates) (GabbleJingleTransportIface *, gboolean all);
-  gboolean (*can_accept) (GabbleJingleTransportIface *);
+  void (*send_candidates) (WockyJingleTransportIface *, gboolean all);
+  gboolean (*can_accept) (WockyJingleTransportIface *);
 
-  GList * (*get_remote_candidates) (GabbleJingleTransportIface *);
-  GList * (*get_local_candidates) (GabbleJingleTransportIface *);
-  gboolean (*get_credentials) (GabbleJingleTransportIface *,
+  GList * (*get_remote_candidates) (WockyJingleTransportIface *);
+  GList * (*get_local_candidates) (WockyJingleTransportIface *);
+  gboolean (*get_credentials) (WockyJingleTransportIface *,
       gchar **ufrag, gchar **pwd);
 
-  JingleTransportType (*get_transport_type) (void);
+  WockyJingleTransportType (*get_transport_type) (void);
 };
 
-GType gabble_jingle_transport_iface_get_type (void);
+GType wocky_jingle_transport_iface_get_type (void);
 
 /* TYPE MACROS */
-#define GABBLE_TYPE_JINGLE_TRANSPORT_IFACE \
-  (gabble_jingle_transport_iface_get_type ())
-#define GABBLE_JINGLE_TRANSPORT_IFACE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_JINGLE_TRANSPORT_IFACE, GabbleJingleTransportIface))
-#define GABBLE_IS_JINGLE_TRANSPORT_IFACE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_JINGLE_TRANSPORT_IFACE))
-#define GABBLE_JINGLE_TRANSPORT_IFACE_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GABBLE_TYPE_JINGLE_TRANSPORT_IFACE,\
-                              GabbleJingleTransportIfaceClass))
-
-void gabble_jingle_transport_iface_parse_candidates (GabbleJingleTransportIface *,
+#define WOCKY_TYPE_JINGLE_TRANSPORT_IFACE \
+  (wocky_jingle_transport_iface_get_type ())
+#define WOCKY_JINGLE_TRANSPORT_IFACE(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), WOCKY_TYPE_JINGLE_TRANSPORT_IFACE, WockyJingleTransportIface))
+#define WOCKY_IS_JINGLE_TRANSPORT_IFACE(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), WOCKY_TYPE_JINGLE_TRANSPORT_IFACE))
+#define WOCKY_JINGLE_TRANSPORT_IFACE_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), WOCKY_TYPE_JINGLE_TRANSPORT_IFACE,\
+                              WockyJingleTransportIfaceClass))
+
+void wocky_jingle_transport_iface_parse_candidates (WockyJingleTransportIface *,
     WockyNode *, GError **);
 
-void gabble_jingle_transport_iface_new_local_candidates (
-    GabbleJingleTransportIface *self,
+void wocky_jingle_transport_iface_new_local_candidates (
+    WockyJingleTransportIface *self,
     GList *candidates);
-void gabble_jingle_transport_iface_inject_candidates (
-    GabbleJingleTransportIface *self,
+void wocky_jingle_transport_iface_inject_candidates (
+    WockyJingleTransportIface *self,
     WockyNode *transport_node);
-void gabble_jingle_transport_iface_send_candidates (
-    GabbleJingleTransportIface *self,
+void wocky_jingle_transport_iface_send_candidates (
+    WockyJingleTransportIface *self,
     gboolean all);
-gboolean gabble_jingle_transport_iface_can_accept (
-    GabbleJingleTransportIface *self);
+gboolean wocky_jingle_transport_iface_can_accept (
+    WockyJingleTransportIface *self);
 
-GList *gabble_jingle_transport_iface_get_remote_candidates (GabbleJingleTransportIface *);
-GList *gabble_jingle_transport_iface_get_local_candidates (GabbleJingleTransportIface *);
-JingleTransportType gabble_jingle_transport_iface_get_transport_type (GabbleJingleTransportIface *);
-gboolean jingle_transport_get_credentials (GabbleJingleTransportIface *,
+GList *wocky_jingle_transport_iface_get_remote_candidates (WockyJingleTransportIface *);
+GList *wocky_jingle_transport_iface_get_local_candidates (WockyJingleTransportIface *);
+WockyJingleTransportType wocky_jingle_transport_iface_get_transport_type (WockyJingleTransportIface *);
+gboolean jingle_transport_get_credentials (WockyJingleTransportIface *,
     gchar **ufrag, gchar **pwd);
 
-GabbleJingleTransportIface *gabble_jingle_transport_iface_new (
-    GType type, GabbleJingleContent *content, const gchar *transport_ns);
+WockyJingleTransportIface *wocky_jingle_transport_iface_new (
+    GType type, WockyJingleContent *content, const gchar *transport_ns);
 
-JingleCandidate *jingle_candidate_new (JingleTransportProtocol protocol,
-    JingleCandidateType type, const gchar *id, int component,
+WockyJingleCandidate *wocky_jingle_candidate_new (WockyJingleTransportProtocol protocol,
+    WockyJingleCandidateType type, const gchar *id, int component,
     const gchar *address, int port, int generation, int preference,
     const gchar *username, const gchar *password, int network);
 
-void jingle_candidate_free (JingleCandidate *c);
+void wocky_jingle_candidate_free (WockyJingleCandidate *c);
 void jingle_transport_free_candidates (GList *candidates);
 
 
 G_END_DECLS
 
-#endif /* #ifndef __GABBLE_JINGLE_TRANSPORT_IFACE_H__ */
+#endif /* #ifndef __WOCKY_JINGLE_TRANSPORT_IFACE_H__ */
diff --git a/src/jingle-transport-rawudp.c b/src/jingle-transport-rawudp.c
index 711cc6888..668a8afd9 100644
--- a/src/jingle-transport-rawudp.c
+++ b/src/jingle-transport-rawudp.c
@@ -1,5 +1,5 @@
 /*
- * jingle-transport-rawudp.c - Source for GabbleJingleTransportRawUdp
+ * jingle-transport-rawudp.c - Source for WockyJingleTransportRawUdp
  *
  * Copyright (C) 2008 Collabora Ltd.
  *
@@ -38,9 +38,9 @@
 static void
 transport_iface_init (gpointer g_iface, gpointer iface_data);
 
-G_DEFINE_TYPE_WITH_CODE (GabbleJingleTransportRawUdp,
-    gabble_jingle_transport_rawudp, G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (GABBLE_TYPE_JINGLE_TRANSPORT_IFACE,
+G_DEFINE_TYPE_WITH_CODE (WockyJingleTransportRawUdp,
+    wocky_jingle_transport_rawudp, G_TYPE_OBJECT,
+    G_IMPLEMENT_INTERFACE (WOCKY_TYPE_JINGLE_TRANSPORT_IFACE,
         transport_iface_init));
 
 /* signal enum */
@@ -61,10 +61,10 @@ enum
   LAST_PROPERTY
 };
 
-struct _GabbleJingleTransportRawUdpPrivate
+struct _WockyJingleTransportRawUdpPrivate
 {
-  GabbleJingleContent *content;
-  JingleTransportState state;
+  WockyJingleContent *content;
+  WockyJingleTransportState state;
   gchar *transport_ns;
 
   GList *local_candidates;
@@ -73,21 +73,21 @@ struct _GabbleJingleTransportRawUdpPrivate
 };
 
 static void
-gabble_jingle_transport_rawudp_init (GabbleJingleTransportRawUdp *obj)
+wocky_jingle_transport_rawudp_init (WockyJingleTransportRawUdp *obj)
 {
-  GabbleJingleTransportRawUdpPrivate *priv =
-     G_TYPE_INSTANCE_GET_PRIVATE (obj, GABBLE_TYPE_JINGLE_TRANSPORT_RAWUDP,
-         GabbleJingleTransportRawUdpPrivate);
+  WockyJingleTransportRawUdpPrivate *priv =
+     G_TYPE_INSTANCE_GET_PRIVATE (obj, WOCKY_TYPE_JINGLE_TRANSPORT_RAWUDP,
+         WockyJingleTransportRawUdpPrivate);
   obj->priv = priv;
 
   priv->dispose_has_run = FALSE;
 }
 
 static void
-gabble_jingle_transport_rawudp_dispose (GObject *object)
+wocky_jingle_transport_rawudp_dispose (GObject *object)
 {
-  GabbleJingleTransportRawUdp *trans = GABBLE_JINGLE_TRANSPORT_RAWUDP (object);
-  GabbleJingleTransportRawUdpPrivate *priv = trans->priv;
+  WockyJingleTransportRawUdp *trans = WOCKY_JINGLE_TRANSPORT_RAWUDP (object);
+  WockyJingleTransportRawUdpPrivate *priv = trans->priv;
 
   if (priv->dispose_has_run)
     return;
@@ -104,18 +104,18 @@ gabble_jingle_transport_rawudp_dispose (GObject *object)
   g_free (priv->transport_ns);
   priv->transport_ns = NULL;
 
-  if (G_OBJECT_CLASS (gabble_jingle_transport_rawudp_parent_class)->dispose)
-    G_OBJECT_CLASS (gabble_jingle_transport_rawudp_parent_class)->dispose (object);
+  if (G_OBJECT_CLASS (wocky_jingle_transport_rawudp_parent_class)->dispose)
+    G_OBJECT_CLASS (wocky_jingle_transport_rawudp_parent_class)->dispose (object);
 }
 
 static void
-gabble_jingle_transport_rawudp_get_property (GObject *object,
+wocky_jingle_transport_rawudp_get_property (GObject *object,
                                              guint property_id,
                                              GValue *value,
                                              GParamSpec *pspec)
 {
-  GabbleJingleTransportRawUdp *trans = GABBLE_JINGLE_TRANSPORT_RAWUDP (object);
-  GabbleJingleTransportRawUdpPrivate *priv = trans->priv;
+  WockyJingleTransportRawUdp *trans = WOCKY_JINGLE_TRANSPORT_RAWUDP (object);
+  WockyJingleTransportRawUdpPrivate *priv = trans->priv;
 
   switch (property_id) {
     case PROP_CONTENT:
@@ -134,13 +134,13 @@ gabble_jingle_transport_rawudp_get_property (GObject *object,
 }
 
 static void
-gabble_jingle_transport_rawudp_set_property (GObject *object,
+wocky_jingle_transport_rawudp_set_property (GObject *object,
                                              guint property_id,
                                              const GValue *value,
                                              GParamSpec *pspec)
 {
-  GabbleJingleTransportRawUdp *trans = GABBLE_JINGLE_TRANSPORT_RAWUDP (object);
-  GabbleJingleTransportRawUdpPrivate *priv = trans->priv;
+  WockyJingleTransportRawUdp *trans = WOCKY_JINGLE_TRANSPORT_RAWUDP (object);
+  WockyJingleTransportRawUdpPrivate *priv = trans->priv;
 
   switch (property_id) {
     case PROP_CONTENT:
@@ -160,21 +160,21 @@ gabble_jingle_transport_rawudp_set_property (GObject *object,
 }
 
 static void
-gabble_jingle_transport_rawudp_class_init (GabbleJingleTransportRawUdpClass *cls)
+wocky_jingle_transport_rawudp_class_init (WockyJingleTransportRawUdpClass *cls)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (cls);
   GParamSpec *param_spec;
 
-  g_type_class_add_private (cls, sizeof (GabbleJingleTransportRawUdpPrivate));
+  g_type_class_add_private (cls, sizeof (WockyJingleTransportRawUdpPrivate));
 
-  object_class->get_property = gabble_jingle_transport_rawudp_get_property;
-  object_class->set_property = gabble_jingle_transport_rawudp_set_property;
-  object_class->dispose = gabble_jingle_transport_rawudp_dispose;
+  object_class->get_property = wocky_jingle_transport_rawudp_get_property;
+  object_class->set_property = wocky_jingle_transport_rawudp_set_property;
+  object_class->dispose = wocky_jingle_transport_rawudp_dispose;
 
   /* property definitions */
-  param_spec = g_param_spec_object ("content", "GabbleJingleContent object",
+  param_spec = g_param_spec_object ("content", "WockyJingleContent object",
                                     "Jingle content object using this transport.",
-                                    GABBLE_TYPE_JINGLE_CONTENT,
+                                    WOCKY_TYPE_JINGLE_CONTENT,
                                     G_PARAM_CONSTRUCT_ONLY |
                                     G_PARAM_READWRITE |
                                     G_PARAM_STATIC_NICK |
@@ -193,9 +193,9 @@ gabble_jingle_transport_rawudp_class_init (GabbleJingleTransportRawUdpClass *cls
   param_spec = g_param_spec_uint ("state",
                                   "Connection state for the transport.",
                                   "Enum specifying the connection state of the transport.",
-                                  JINGLE_TRANSPORT_STATE_DISCONNECTED,
-                                  JINGLE_TRANSPORT_STATE_CONNECTED,
-                                  JINGLE_TRANSPORT_STATE_DISCONNECTED,
+                                  WOCKY_JINGLE_TRANSPORT_STATE_DISCONNECTED,
+                                  WOCKY_JINGLE_TRANSPORT_STATE_CONNECTED,
+                                  WOCKY_JINGLE_TRANSPORT_STATE_DISCONNECTED,
                                   G_PARAM_READWRITE |
                                   G_PARAM_STATIC_NAME |
                                   G_PARAM_STATIC_NICK |
@@ -214,11 +214,11 @@ gabble_jingle_transport_rawudp_class_init (GabbleJingleTransportRawUdpClass *cls
 }
 
 static void
-parse_candidates (GabbleJingleTransportIface *obj,
+parse_candidates (WockyJingleTransportIface *obj,
     WockyNode *transport_node, GError **error)
 {
-  GabbleJingleTransportRawUdp *t = GABBLE_JINGLE_TRANSPORT_RAWUDP (obj);
-  GabbleJingleTransportRawUdpPrivate *priv = t->priv;
+  WockyJingleTransportRawUdp *t = WOCKY_JINGLE_TRANSPORT_RAWUDP (obj);
+  WockyJingleTransportRawUdpPrivate *priv = t->priv;
   GList *candidates = NULL;
   WockyNodeIter i;
   WockyNode *node;
@@ -236,7 +236,7 @@ parse_candidates (GabbleJingleTransportIface *obj,
     {
       const gchar *id, *ip, *str;
       guint port, gen, component = 1;
-      JingleCandidate *c;
+      WockyJingleCandidate *c;
 
       str = wocky_node_get_attribute (node, "component");
       if (str != NULL)
@@ -266,8 +266,8 @@ parse_candidates (GabbleJingleTransportIface *obj,
           break;
       gen = atoi (str);
 
-      c = jingle_candidate_new (JINGLE_TRANSPORT_PROTOCOL_UDP,
-          JINGLE_CANDIDATE_TYPE_LOCAL, id, component, ip, port,
+      c = wocky_jingle_candidate_new (WOCKY_JINGLE_TRANSPORT_PROTOCOL_UDP,
+          WOCKY_JINGLE_CANDIDATE_TYPE_LOCAL, id, component, ip, port,
           gen, 1.0, NULL, NULL, 0);
 
       candidates = g_list_append (candidates, c);
@@ -289,12 +289,12 @@ parse_candidates (GabbleJingleTransportIface *obj,
 }
 
 static void
-inject_candidates (GabbleJingleTransportIface *obj,
+inject_candidates (WockyJingleTransportIface *obj,
     WockyNode *transport_node)
 {
-  GabbleJingleTransportRawUdp *self = GABBLE_JINGLE_TRANSPORT_RAWUDP (obj);
-  GabbleJingleTransportRawUdpPrivate *priv = self->priv;
-  JingleCandidate *c;
+  WockyJingleTransportRawUdp *self = WOCKY_JINGLE_TRANSPORT_RAWUDP (obj);
+  WockyJingleTransportRawUdpPrivate *priv = self->priv;
+  WockyJingleCandidate *c;
   GList *li;
   gchar port_str[16], comp_str[16];
   WockyNode *cnode;
@@ -306,7 +306,7 @@ inject_candidates (GabbleJingleTransportIface *obj,
 
   for (li = priv->local_candidates; li != NULL; li = li->next)
     {
-      c = (JingleCandidate *) li->data;
+      c = (WockyJingleCandidate *) li->data;
       sprintf (port_str, "%d", c->port);
       sprintf (comp_str, "%d", c->component);
 
@@ -321,13 +321,13 @@ inject_candidates (GabbleJingleTransportIface *obj,
     }
 }
 
-/* Takes in a list of slice-allocated JingleCandidate structs */
+/* Takes in a list of slice-allocated WockyJingleCandidate structs */
 static void
-new_local_candidates (GabbleJingleTransportIface *obj, GList *new_candidates)
+new_local_candidates (WockyJingleTransportIface *obj, GList *new_candidates)
 {
-  GabbleJingleTransportRawUdp *transport =
-    GABBLE_JINGLE_TRANSPORT_RAWUDP (obj);
-  GabbleJingleTransportRawUdpPrivate *priv = transport->priv;
+  WockyJingleTransportRawUdp *transport =
+    WOCKY_JINGLE_TRANSPORT_RAWUDP (obj);
+  WockyJingleTransportRawUdpPrivate *priv = transport->priv;
 
   if (priv->local_candidates != NULL)
     {
@@ -340,34 +340,34 @@ new_local_candidates (GabbleJingleTransportIface *obj, GList *new_candidates)
 }
 
 static gboolean
-can_accept (GabbleJingleTransportIface *iface)
+can_accept (WockyJingleTransportIface *iface)
 {
-  GabbleJingleTransportRawUdp *self = GABBLE_JINGLE_TRANSPORT_RAWUDP (iface);
+  WockyJingleTransportRawUdp *self = WOCKY_JINGLE_TRANSPORT_RAWUDP (iface);
 
   return (self->priv->local_candidates != NULL);
 }
 
 static GList *
-get_local_candidates (GabbleJingleTransportIface *iface)
+get_local_candidates (WockyJingleTransportIface *iface)
 {
-  GabbleJingleTransportRawUdp *transport =
-    GABBLE_JINGLE_TRANSPORT_RAWUDP (iface);
-  GabbleJingleTransportRawUdpPrivate *priv = transport->priv;
+  WockyJingleTransportRawUdp *transport =
+    WOCKY_JINGLE_TRANSPORT_RAWUDP (iface);
+  WockyJingleTransportRawUdpPrivate *priv = transport->priv;
 
   return priv->local_candidates;
 }
 
 static GList *
-get_remote_candidates (GabbleJingleTransportIface *iface)
+get_remote_candidates (WockyJingleTransportIface *iface)
 {
-  GabbleJingleTransportRawUdp *transport =
-    GABBLE_JINGLE_TRANSPORT_RAWUDP (iface);
-  GabbleJingleTransportRawUdpPrivate *priv = transport->priv;
+  WockyJingleTransportRawUdp *transport =
+    WOCKY_JINGLE_TRANSPORT_RAWUDP (iface);
+  WockyJingleTransportRawUdpPrivate *priv = transport->priv;
 
   return priv->remote_candidates;
 }
 
-static JingleTransportType
+static WockyJingleTransportType
 get_transport_type (void)
 {
   DEBUG ("called");
@@ -378,7 +378,7 @@ get_transport_type (void)
 static void
 transport_iface_init (gpointer g_iface, gpointer iface_data)
 {
-  GabbleJingleTransportIfaceClass *klass = (GabbleJingleTransportIfaceClass *) g_iface;
+  WockyJingleTransportIfaceClass *klass = (WockyJingleTransportIfaceClass *) g_iface;
 
   klass->parse_candidates = parse_candidates;
 
@@ -395,10 +395,10 @@ transport_iface_init (gpointer g_iface, gpointer iface_data)
 }
 
 void
-jingle_transport_rawudp_register (GabbleJingleFactory *factory)
+jingle_transport_rawudp_register (WockyJingleFactory *factory)
 {
-  gabble_jingle_factory_register_transport (factory,
+  wocky_jingle_factory_register_transport (factory,
       NS_JINGLE_TRANSPORT_RAWUDP,
-      GABBLE_TYPE_JINGLE_TRANSPORT_RAWUDP);
+      WOCKY_TYPE_JINGLE_TRANSPORT_RAWUDP);
 }
 
diff --git a/src/jingle-transport-rawudp.h b/src/jingle-transport-rawudp.h
index 060f854dc..ff10815a1 100644
--- a/src/jingle-transport-rawudp.h
+++ b/src/jingle-transport-rawudp.h
@@ -1,5 +1,5 @@
 /*
- * jingle-transport-rawudp.h - Header for GabbleJingleTransportRawUdp
+ * jingle-transport-rawudp.h - Header for WockyJingleTransportRawUdp
  * Copyright (C) 2008 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
@@ -26,39 +26,39 @@
 
 G_BEGIN_DECLS
 
-typedef struct _GabbleJingleTransportRawUdpClass GabbleJingleTransportRawUdpClass;
+typedef struct _WockyJingleTransportRawUdpClass WockyJingleTransportRawUdpClass;
 
-GType gabble_jingle_transport_rawudp_get_type (void);
+GType wocky_jingle_transport_rawudp_get_type (void);
 
 /* TYPE MACROS */
-#define GABBLE_TYPE_JINGLE_TRANSPORT_RAWUDP \
-  (gabble_jingle_transport_rawudp_get_type ())
-#define GABBLE_JINGLE_TRANSPORT_RAWUDP(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_JINGLE_TRANSPORT_RAWUDP, \
-                              GabbleJingleTransportRawUdp))
-#define GABBLE_JINGLE_TRANSPORT_RAWUDP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_JINGLE_TRANSPORT_RAWUDP, \
-                           GabbleJingleTransportRawUdpClass))
-#define GABBLE_IS_JINGLE_TRANSPORT_RAWUDP(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_JINGLE_TRANSPORT_RAWUDP))
-#define GABBLE_IS_JINGLE_TRANSPORT_RAWUDP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_JINGLE_TRANSPORT_RAWUDP))
-#define GABBLE_JINGLE_TRANSPORT_RAWUDP_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_JINGLE_TRANSPORT_RAWUDP, \
-                              GabbleJingleTransportRawUdpClass))
+#define WOCKY_TYPE_JINGLE_TRANSPORT_RAWUDP \
+  (wocky_jingle_transport_rawudp_get_type ())
+#define WOCKY_JINGLE_TRANSPORT_RAWUDP(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), WOCKY_TYPE_JINGLE_TRANSPORT_RAWUDP, \
+                              WockyJingleTransportRawUdp))
+#define WOCKY_JINGLE_TRANSPORT_RAWUDP_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), WOCKY_TYPE_JINGLE_TRANSPORT_RAWUDP, \
+                           WockyJingleTransportRawUdpClass))
+#define WOCKY_IS_JINGLE_TRANSPORT_RAWUDP(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), WOCKY_TYPE_JINGLE_TRANSPORT_RAWUDP))
+#define WOCKY_IS_JINGLE_TRANSPORT_RAWUDP_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), WOCKY_TYPE_JINGLE_TRANSPORT_RAWUDP))
+#define WOCKY_JINGLE_TRANSPORT_RAWUDP_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), WOCKY_TYPE_JINGLE_TRANSPORT_RAWUDP, \
+                              WockyJingleTransportRawUdpClass))
 
-struct _GabbleJingleTransportRawUdpClass {
+struct _WockyJingleTransportRawUdpClass {
     GObjectClass parent_class;
 };
 
-typedef struct _GabbleJingleTransportRawUdpPrivate GabbleJingleTransportRawUdpPrivate;
+typedef struct _WockyJingleTransportRawUdpPrivate WockyJingleTransportRawUdpPrivate;
 
-struct _GabbleJingleTransportRawUdp {
+struct _WockyJingleTransportRawUdp {
     GObject parent;
-    GabbleJingleTransportRawUdpPrivate *priv;
+    WockyJingleTransportRawUdpPrivate *priv;
 };
 
-void jingle_transport_rawudp_register (GabbleJingleFactory *factory);
+void jingle_transport_rawudp_register (WockyJingleFactory *factory);
 
 #endif /* __JINGLE_TRANSPORT_RAWUDP_H__ */
 
diff --git a/src/jingle-types.h b/src/jingle-types.h
index 14934aae6..a62008f3f 100644
--- a/src/jingle-types.h
+++ b/src/jingle-types.h
@@ -20,107 +20,107 @@
 #ifndef GABBLE_JINGLE_ENUMS_H
 #define GABBLE_JINGLE_ENUMS_H
 
-typedef struct _GabbleJingleFactory GabbleJingleFactory;
-typedef struct _GabbleJingleSession GabbleJingleSession;
-typedef struct _GabbleJingleContent GabbleJingleContent;
-typedef struct _GabbleJingleTransportGoogle GabbleJingleTransportGoogle;
-typedef struct _GabbleJingleTransportRawUdp GabbleJingleTransportRawUdp;
-typedef struct _GabbleJingleTransportIceUdp GabbleJingleTransportIceUdp;
-typedef struct _GabbleJingleMediaRtp GabbleJingleMediaRtp;
+typedef struct _WockyJingleFactory WockyJingleFactory;
+typedef struct _WockyJingleSession WockyJingleSession;
+typedef struct _WockyJingleContent WockyJingleContent;
+typedef struct _WockyJingleTransportGoogle WockyJingleTransportGoogle;
+typedef struct _WockyJingleTransportRawUdp WockyJingleTransportRawUdp;
+typedef struct _WockyJingleTransportIceUdp WockyJingleTransportIceUdp;
+typedef struct _WockyJingleMediaRtp WockyJingleMediaRtp;
 typedef struct _GabbleJingleShare GabbleJingleShare;
-typedef struct _JingleCandidate JingleCandidate;
+typedef struct _WockyJingleCandidate WockyJingleCandidate;
 
 typedef enum { /*< skip >*/
   /* not a jingle message */
-  JINGLE_DIALECT_ERROR,
+  WOCKY_JINGLE_DIALECT_ERROR,
   /* old libjingle3 gtalk variant */
-  JINGLE_DIALECT_GTALK3,
+  WOCKY_JINGLE_DIALECT_GTALK3,
   /* new gtalk variant */
-  JINGLE_DIALECT_GTALK4,
+  WOCKY_JINGLE_DIALECT_GTALK4,
   /* jingle in the old 0.15 version days */
-  JINGLE_DIALECT_V015,
+  WOCKY_JINGLE_DIALECT_V015,
   /* current jingle standard */
-  JINGLE_DIALECT_V032
-} JingleDialect;
+  WOCKY_JINGLE_DIALECT_V032
+} WockyJingleDialect;
 
-#define JINGLE_IS_GOOGLE_DIALECT(d)\
-    ((d == JINGLE_DIALECT_GTALK3) || (d == JINGLE_DIALECT_GTALK4))
+#define WOCKY_JINGLE_DIALECT_IS_GOOGLE(d)\
+    ((d == WOCKY_JINGLE_DIALECT_GTALK3) || (d == WOCKY_JINGLE_DIALECT_GTALK4))
 
 typedef enum { /*< skip >*/
-  JINGLE_STATE_INVALID = -1,
-  JINGLE_STATE_PENDING_CREATED = 0,
-  JINGLE_STATE_PENDING_INITIATE_SENT,
-  JINGLE_STATE_PENDING_INITIATED,
-  JINGLE_STATE_PENDING_ACCEPT_SENT,
-  JINGLE_STATE_ACTIVE,
-  JINGLE_STATE_ENDED,
-  MAX_JINGLE_STATES
-} JingleState;
+  WOCKY_JINGLE_STATE_INVALID = -1,
+  WOCKY_JINGLE_STATE_PENDING_CREATED = 0,
+  WOCKY_JINGLE_STATE_PENDING_INITIATE_SENT,
+  WOCKY_JINGLE_STATE_PENDING_INITIATED,
+  WOCKY_JINGLE_STATE_PENDING_ACCEPT_SENT,
+  WOCKY_JINGLE_STATE_ACTIVE,
+  WOCKY_JINGLE_STATE_ENDED,
+  WOCKY_N_JINGLE_STATES
+} WockyJingleState;
 
 typedef enum { /*< skip >*/
-  JINGLE_ACTION_UNKNOWN,
-  JINGLE_ACTION_CONTENT_ACCEPT,
-  JINGLE_ACTION_CONTENT_ADD,
-  JINGLE_ACTION_CONTENT_MODIFY,
-  JINGLE_ACTION_CONTENT_REMOVE,
-  JINGLE_ACTION_CONTENT_REPLACE,
-  JINGLE_ACTION_CONTENT_REJECT,
-  JINGLE_ACTION_SESSION_ACCEPT,
-  JINGLE_ACTION_SESSION_INFO,
-  JINGLE_ACTION_SESSION_INITIATE,
-  JINGLE_ACTION_SESSION_TERMINATE,
-  JINGLE_ACTION_TRANSPORT_INFO,
-  JINGLE_ACTION_TRANSPORT_ACCEPT,
-  JINGLE_ACTION_DESCRIPTION_INFO,
-  JINGLE_ACTION_INFO
-} JingleAction;
+  WOCKY_JINGLE_ACTION_UNKNOWN,
+  WOCKY_JINGLE_ACTION_CONTENT_ACCEPT,
+  WOCKY_JINGLE_ACTION_CONTENT_ADD,
+  WOCKY_JINGLE_ACTION_CONTENT_MODIFY,
+  WOCKY_JINGLE_ACTION_CONTENT_REMOVE,
+  WOCKY_JINGLE_ACTION_CONTENT_REPLACE,
+  WOCKY_JINGLE_ACTION_CONTENT_REJECT,
+  WOCKY_JINGLE_ACTION_SESSION_ACCEPT,
+  WOCKY_JINGLE_ACTION_SESSION_INFO,
+  WOCKY_JINGLE_ACTION_SESSION_INITIATE,
+  WOCKY_JINGLE_ACTION_SESSION_TERMINATE,
+  WOCKY_JINGLE_ACTION_TRANSPORT_INFO,
+  WOCKY_JINGLE_ACTION_TRANSPORT_ACCEPT,
+  WOCKY_JINGLE_ACTION_DESCRIPTION_INFO,
+  WOCKY_JINGLE_ACTION_INFO
+} WockyJingleAction;
 
 typedef enum { /*< skip >*/
-  JINGLE_CONTENT_SENDERS_NONE,
-  JINGLE_CONTENT_SENDERS_INITIATOR,
-  JINGLE_CONTENT_SENDERS_RESPONDER,
-  JINGLE_CONTENT_SENDERS_BOTH
-} JingleContentSenders;
+  WOCKY_JINGLE_CONTENT_SENDERS_NONE,
+  WOCKY_JINGLE_CONTENT_SENDERS_INITIATOR,
+  WOCKY_JINGLE_CONTENT_SENDERS_RESPONDER,
+  WOCKY_JINGLE_CONTENT_SENDERS_BOTH
+} WockyJingleContentSenders;
 
 typedef enum { /*< skip >*/
   JINGLE_TRANSPORT_UNKNOWN,
   JINGLE_TRANSPORT_GOOGLE_P2P,
   JINGLE_TRANSPORT_RAW_UDP,
   JINGLE_TRANSPORT_ICE_UDP,
-} JingleTransportType;
+} WockyJingleTransportType;
 
 typedef enum { /*< skip >*/
-  JINGLE_TRANSPORT_PROTOCOL_UDP,
-  JINGLE_TRANSPORT_PROTOCOL_TCP
-} JingleTransportProtocol;
+  WOCKY_JINGLE_TRANSPORT_PROTOCOL_UDP,
+  WOCKY_JINGLE_TRANSPORT_PROTOCOL_TCP
+} WockyJingleTransportProtocol;
 
 typedef enum { /*< skip >*/
-  JINGLE_CANDIDATE_TYPE_LOCAL,
-  JINGLE_CANDIDATE_TYPE_STUN,
-  JINGLE_CANDIDATE_TYPE_RELAY
-} JingleCandidateType;
+  WOCKY_JINGLE_CANDIDATE_TYPE_LOCAL,
+  WOCKY_JINGLE_CANDIDATE_TYPE_STUN,
+  WOCKY_JINGLE_CANDIDATE_TYPE_RELAY
+} WockyJingleCandidateType;
 
 typedef enum
 {
-  JINGLE_REASON_UNKNOWN,
-  JINGLE_REASON_ALTERNATIVE_SESSION,
-  JINGLE_REASON_BUSY,
-  JINGLE_REASON_CANCEL,
-  JINGLE_REASON_CONNECTIVITY_ERROR,
-  JINGLE_REASON_DECLINE,
-  JINGLE_REASON_EXPIRED,
-  JINGLE_REASON_FAILED_APPLICATION,
-  JINGLE_REASON_FAILED_TRANSPORT,
-  JINGLE_REASON_GENERAL_ERROR,
-  JINGLE_REASON_GONE,
-  JINGLE_REASON_INCOMPATIBLE_PARAMETERS,
-  JINGLE_REASON_MEDIA_ERROR,
-  JINGLE_REASON_SECURITY_ERROR,
-  JINGLE_REASON_SUCCESS,
-  JINGLE_REASON_TIMEOUT,
-  JINGLE_REASON_UNSUPPORTED_APPLICATIONS,
-  JINGLE_REASON_UNSUPPORTED_TRANSPORTS
-} JingleReason;
+  WOCKY_JINGLE_REASON_UNKNOWN,
+  WOCKY_JINGLE_REASON_ALTERNATIVE_SESSION,
+  WOCKY_JINGLE_REASON_BUSY,
+  WOCKY_JINGLE_REASON_CANCEL,
+  WOCKY_JINGLE_REASON_CONNECTIVITY_ERROR,
+  WOCKY_JINGLE_REASON_DECLINE,
+  WOCKY_JINGLE_REASON_EXPIRED,
+  WOCKY_JINGLE_REASON_FAILED_APPLICATION,
+  WOCKY_JINGLE_REASON_FAILED_TRANSPORT,
+  WOCKY_JINGLE_REASON_GENERAL_ERROR,
+  WOCKY_JINGLE_REASON_GONE,
+  WOCKY_JINGLE_REASON_INCOMPATIBLE_PARAMETERS,
+  WOCKY_JINGLE_REASON_MEDIA_ERROR,
+  WOCKY_JINGLE_REASON_SECURITY_ERROR,
+  WOCKY_JINGLE_REASON_SUCCESS,
+  WOCKY_JINGLE_REASON_TIMEOUT,
+  WOCKY_JINGLE_REASON_UNSUPPORTED_APPLICATIONS,
+  WOCKY_JINGLE_REASON_UNSUPPORTED_TRANSPORTS
+} WockyJingleReason;
 
 
 #endif /* GABBLE_JINGLE_ENUMS_H */
diff --git a/src/media-channel-hold.c b/src/media-channel-hold.c
index ca8241c34..b4dc26c5a 100644
--- a/src/media-channel-hold.c
+++ b/src/media-channel-hold.c
@@ -80,7 +80,7 @@ stream_hold_state_changed (GabbleMediaStream *stream G_GNUC_UNUSED,
           priv->hold_state = TP_LOCAL_HOLD_STATE_UNHELD;
 
           if (priv->session != NULL)
-            gabble_jingle_session_set_local_hold (priv->session, FALSE);
+            wocky_jingle_session_set_local_hold (priv->session, FALSE);
 
           break;
 
@@ -174,7 +174,7 @@ stream_hold_state_changed (GabbleMediaStream *stream G_GNUC_UNUSED,
 
       /* Tell the peer what's happened. */
       if (priv->session != NULL)
-        gabble_jingle_session_set_local_hold (priv->session, FALSE);
+        wocky_jingle_session_set_local_hold (priv->session, FALSE);
     }
 
   tp_svc_channel_interface_hold_emit_hold_state_changed (self,
@@ -235,7 +235,7 @@ gabble_media_channel_request_hold (TpSvcChannelInterfaceHold *iface,
 {
   GabbleMediaChannel *self = GABBLE_MEDIA_CHANNEL (iface);
   GabbleMediaChannelPrivate *priv = self->priv;
-  GabbleJingleSession *session = priv->session;
+  WockyJingleSession *session = priv->session;
   guint i;
   TpLocalHoldState old_state = priv->hold_state;
 
@@ -251,7 +251,7 @@ gabble_media_channel_request_hold (TpSvcChannelInterfaceHold *iface,
         }
 
       if (priv->hold_state == TP_LOCAL_HOLD_STATE_UNHELD && session != NULL)
-        gabble_jingle_session_set_local_hold (session, TRUE);
+        wocky_jingle_session_set_local_hold (session, TRUE);
 
       priv->hold_state = TP_LOCAL_HOLD_STATE_PENDING_HOLD;
     }
@@ -328,16 +328,16 @@ gabble_media_channel_hold_iface_init (gpointer g_iface,
  */
 
 static void
-remote_state_changed_cb (GabbleJingleSession *session,
+remote_state_changed_cb (WockyJingleSession *session,
     GabbleMediaChannel *self)
 {
   GabbleMediaChannelPrivate *priv = self->priv;
   TpChannelCallStateFlags call_state = 0;
 
-  if (gabble_jingle_session_get_remote_hold (session))
+  if (wocky_jingle_session_get_remote_hold (session))
     call_state |= TP_CHANNEL_CALL_STATE_HELD;
 
-  if (gabble_jingle_session_get_remote_ringing (session))
+  if (wocky_jingle_session_get_remote_ringing (session))
     call_state |= TP_CHANNEL_CALL_STATE_RINGING;
 
   DEBUG ("Call state changed to %u (current state %u)", call_state,
@@ -394,7 +394,7 @@ gabble_media_channel_call_state_iface_init (gpointer g_iface,
 void
 gabble_media_channel_hold_new_stream (GabbleMediaChannel *chan,
     GabbleMediaStream *stream,
-    GabbleJingleMediaRtp *content)
+    WockyJingleMediaRtp *content)
 {
   GObject *chan_o = (GObject *) chan;
 
diff --git a/src/media-channel-internal.h b/src/media-channel-internal.h
index ff931b567..76bba4c15 100644
--- a/src/media-channel-internal.h
+++ b/src/media-channel-internal.h
@@ -43,7 +43,7 @@ struct _GabbleMediaChannelPrivate
   TpHandle peer;
   gboolean peer_in_rp;
 
-  GabbleJingleSession *session;
+  WockyJingleSession *session;
 
   /* array of referenced GabbleMediaStream*.  Always non-NULL. */
   GPtrArray *streams;
@@ -79,7 +79,7 @@ void gabble_media_channel_hold_latch_to_session (GabbleMediaChannel *chan);
 
 void gabble_media_channel_hold_new_stream (GabbleMediaChannel *chan,
     GabbleMediaStream *stream,
-    GabbleJingleMediaRtp *content);
+    WockyJingleMediaRtp *content);
 void gabble_media_channel_hold_stream_closed (GabbleMediaChannel *chan,
     GabbleMediaStream *stream);
 
diff --git a/src/media-channel.c b/src/media-channel.c
index 6b5ebd328..56fb3f259 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -142,7 +142,7 @@ const TpPropertySignature channel_property_signatures[NUM_CHAN_PROPS] = {
 
 typedef struct {
     GabbleMediaChannel *self;
-    GabbleJingleContent *content;
+    WockyJingleContent *content;
     gulong removed_id;
     gchar *name;
     const gchar *nat_traversal;
@@ -202,20 +202,20 @@ gabble_media_channel_init (GabbleMediaChannel *self)
       G_CONNECT_SWAPPED);
 }
 
-static void session_state_changed_cb (GabbleJingleSession *session,
+static void session_state_changed_cb (WockyJingleSession *session,
     GParamSpec *arg1, GabbleMediaChannel *channel);
-static void session_terminated_cb (GabbleJingleSession *session,
-    gboolean local_terminator, JingleReason reason, const gchar *text,
+static void session_terminated_cb (WockyJingleSession *session,
+    gboolean local_terminator, WockyJingleReason reason, const gchar *text,
     gpointer user_data);
-static void session_new_content_cb (GabbleJingleSession *session,
-    GabbleJingleContent *c, gpointer user_data);
+static void session_new_content_cb (WockyJingleSession *session,
+    WockyJingleContent *c, gpointer user_data);
 static void create_stream_from_content (GabbleMediaChannel *chan,
-    GabbleJingleContent *c, gboolean initial);
+    WockyJingleContent *c, gboolean initial);
 static gboolean contact_is_media_capable (GabbleMediaChannel *chan, TpHandle peer,
     gboolean *wait, GError **error);
 static void stream_creation_data_cancel (gpointer p, gpointer unused);
-static void session_content_rejected_cb (GabbleJingleSession *session,
-    GabbleJingleContent *c, JingleReason reason, const gchar *message,
+static void session_content_rejected_cb (WockyJingleSession *session,
+    WockyJingleContent *c, WockyJingleReason reason, const gchar *message,
     gpointer user_data);
 
 static void
@@ -224,14 +224,14 @@ create_initial_streams (GabbleMediaChannel *chan)
   GabbleMediaChannelPrivate *priv = chan->priv;
   GList *contents, *li;
 
-  contents = gabble_jingle_session_get_contents (priv->session);
+  contents = wocky_jingle_session_get_contents (priv->session);
 
   for (li = contents; li; li = li->next)
     {
-      GabbleJingleContent *c = li->data;
+      WockyJingleContent *c = li->data;
 
       /* I'm so sorry. */
-      if (G_OBJECT_TYPE (c) == GABBLE_TYPE_JINGLE_MEDIA_RTP)
+      if (G_OBJECT_TYPE (c) == WOCKY_TYPE_JINGLE_MEDIA_RTP)
         {
           guint media_type;
 
@@ -239,10 +239,10 @@ create_initial_streams (GabbleMediaChannel *chan)
 
           switch (media_type)
             {
-            case JINGLE_MEDIA_TYPE_AUDIO:
+            case WOCKY_JINGLE_MEDIA_TYPE_AUDIO:
               priv->initial_audio = TRUE;
               break;
-            case JINGLE_MEDIA_TYPE_VIDEO:
+            case WOCKY_JINGLE_MEDIA_TYPE_VIDEO:
               priv->initial_video = TRUE;
               break;
             default:
@@ -297,11 +297,11 @@ _latch_to_session (GabbleMediaChannel *chan)
 static void
 create_session (GabbleMediaChannel *chan,
     const gchar *jid,
-    JingleDialect dialect)
+    WockyJingleDialect dialect)
 {
   GabbleMediaChannelPrivate *priv = chan->priv;
   gboolean local_hold = (priv->hold_state != TP_LOCAL_HOLD_STATE_UNHELD);
-  GabbleJingleFactory *jf;
+  WockyJingleFactory *jf;
 
   g_assert (priv->session == NULL);
 
@@ -310,7 +310,7 @@ create_session (GabbleMediaChannel *chan,
   jf = gabble_jingle_mint_get_factory (priv->conn->jingle_mint);
   g_return_if_fail (jf != NULL);
   priv->session = g_object_ref (
-      gabble_jingle_factory_create_session (jf, jid, dialect, local_hold));
+      wocky_jingle_factory_create_session (jf, jid, dialect, local_hold));
 
   _latch_to_session (chan);
 }
@@ -325,7 +325,7 @@ gabble_media_channel_constructor (GType type, guint n_props,
   TpDBusDaemon *bus;
   TpIntset *set;
   TpHandleRepoIface *contact_handles;
-  GabbleJingleInfo *ji;
+  WockyJingleInfo *ji;
   const gchar *relay_token;
   GList *stun_servers;
 
@@ -347,7 +347,7 @@ gabble_media_channel_constructor (GType type, guint n_props,
   if (priv->session != NULL)
     {
       priv->peer = ensure_handle_from_contact (priv->conn,
-          gabble_jingle_session_get_peer_contact (priv->session));
+          wocky_jingle_session_get_peer_contact (priv->session));
       g_return_val_if_fail (priv->peer != 0, NULL);
       priv->creator = priv->peer;
     }
@@ -377,10 +377,10 @@ gabble_media_channel_constructor (GType type, guint n_props,
 
   /* Set up Google relay related properties */
   ji = gabble_jingle_mint_get_info (priv->conn->jingle_mint);
-  stun_servers = gabble_jingle_info_get_stun_servers (ji);
+  stun_servers = wocky_jingle_info_get_stun_servers (ji);
   if (stun_servers != NULL)
     {
-      GabbleStunServer *stun_server = stun_servers->data;
+      WockyStunServer *stun_server = stun_servers->data;
 
       g_object_set (obj,
           "stun-server", stun_server->address,
@@ -390,7 +390,7 @@ gabble_media_channel_constructor (GType type, guint n_props,
       g_list_free (stun_servers);
     }
 
-  relay_token = gabble_jingle_info_get_google_relay_token (ji);
+  relay_token = wocky_jingle_info_get_google_relay_token (ji);
 
   if (relay_token != NULL)
     {
@@ -455,7 +455,7 @@ gabble_media_channel_constructor (GType type, guint n_props,
   /* If this is a Google session, let's set ImmutableStreams */
   if (priv->session != NULL)
     {
-      priv->immutable_streams = !gabble_jingle_session_can_modify_contents (priv->session);
+      priv->immutable_streams = !wocky_jingle_session_can_modify_contents (priv->session);
     }
   /* If there's no session yet, but we know who the peer will be, and we have
    * presence for them, we can set ImmutableStreams using the same algorithm as
@@ -868,9 +868,9 @@ gabble_media_channel_class_init (GabbleMediaChannelClass *gabble_media_channel_c
   g_object_class_install_property (object_class, PROP_GTALK_P2P_RELAY_TOKEN,
       param_spec);
 
-  param_spec = g_param_spec_object ("session", "GabbleJingleSession object",
+  param_spec = g_param_spec_object ("session", "WockyJingleSession object",
       "Jingle session associated with this media channel object.",
-      GABBLE_TYPE_JINGLE_SESSION,
+      WOCKY_TYPE_JINGLE_SESSION,
       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE |
       G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB);
   g_object_class_install_property (object_class, PROP_SESSION, param_spec);
@@ -1037,8 +1037,8 @@ gabble_media_channel_close (GabbleMediaChannel *self)
       priv->closed = TRUE;
 
       if (priv->session != NULL)
-        gabble_jingle_session_terminate (priv->session,
-            JINGLE_REASON_UNKNOWN, NULL, NULL);
+        wocky_jingle_session_terminate (priv->session,
+            WOCKY_JINGLE_REASON_UNKNOWN, NULL, NULL);
 
       tp_svc_channel_emit_closed (self);
     }
@@ -1261,7 +1261,7 @@ _find_stream_by_id (GabbleMediaChannel *chan,
 
 static GabbleMediaStream *
 _find_stream_by_content (GabbleMediaChannel *chan,
-    GabbleJingleContent *content)
+    WockyJingleContent *content)
 {
   GabbleMediaChannelPrivate *priv;
   guint i;
@@ -1273,7 +1273,7 @@ _find_stream_by_content (GabbleMediaChannel *chan,
   for (i = 0; i < priv->streams->len; i++)
     {
       GabbleMediaStream *stream = g_ptr_array_index (priv->streams, i);
-      GabbleJingleContent *c = GABBLE_JINGLE_CONTENT (
+      WockyJingleContent *c = WOCKY_JINGLE_CONTENT (
           gabble_media_stream_get_content (stream));
 
       if (content == c)
@@ -1304,7 +1304,7 @@ gabble_media_channel_remove_streams (TpSvcChannelTypeStreamedMedia *iface,
 
   priv = obj->priv;
 
-  if (!gabble_jingle_session_can_modify_contents (priv->session))
+  if (!wocky_jingle_session_can_modify_contents (priv->session))
     {
       GError e = { TP_ERROR, TP_ERROR_NOT_IMPLEMENTED,
           "Streams can't be removed from Google Talk calls" };
@@ -1349,7 +1349,7 @@ gabble_media_channel_remove_streams (TpSvcChannelTypeStreamedMedia *iface,
   if (stream_objs->len > 0)
     {
       GabbleMediaStream *stream;
-      GabbleJingleMediaRtp *c;
+      WockyJingleMediaRtp *c;
 
       for (i = 0; i < stream_objs->len; i++)
         {
@@ -1358,8 +1358,8 @@ gabble_media_channel_remove_streams (TpSvcChannelTypeStreamedMedia *iface,
 
           /* FIXME: make sure session emits content-removed, on which we can
            * delete it from the list */
-          gabble_jingle_session_remove_content (priv->session,
-              (GabbleJingleContent *) c);
+          wocky_jingle_session_remove_content (priv->session,
+              (WockyJingleContent *) c);
         }
     }
 
@@ -1424,15 +1424,15 @@ gabble_media_channel_request_stream_direction (TpSvcChannelTypeStreamedMedia *if
 
   if (stream_direction == TP_MEDIA_STREAM_DIRECTION_NONE)
     {
-      if (gabble_jingle_session_can_modify_contents (priv->session))
+      if (wocky_jingle_session_can_modify_contents (priv->session))
         {
-          GabbleJingleMediaRtp *c;
+          WockyJingleMediaRtp *c;
 
           DEBUG ("request for NONE direction; removing stream");
 
           c = gabble_media_stream_get_content (stream);
-          gabble_jingle_session_remove_content (priv->session,
-              (GabbleJingleContent *) c);
+          wocky_jingle_session_remove_content (priv->session,
+              (WockyJingleContent *) c);
 
           tp_svc_channel_type_streamed_media_return_from_request_stream_direction (
               context);
@@ -1464,7 +1464,7 @@ typedef struct {
     /* number of streams requested == number of content objects */
     guint len;
     /* array of @len borrowed pointers */
-    GabbleJingleContent **contents;
+    WockyJingleContent **contents;
     /* accumulates borrowed pointers to streams. Initially @len NULL pointers;
      * when the stream for contents[i] is created, it is stored at streams[i].
      */
@@ -1506,7 +1506,7 @@ pending_stream_request_new (GPtrArray *contents,
 static gboolean
 pending_stream_request_maybe_satisfy (PendingStreamRequest *p,
                                       GabbleMediaChannel *channel,
-                                      GabbleJingleContent *content,
+                                      WockyJingleContent *content,
                                       GabbleMediaStream *stream)
 {
   guint i;
@@ -1537,7 +1537,7 @@ pending_stream_request_maybe_satisfy (PendingStreamRequest *p,
 static gboolean
 pending_stream_request_maybe_fail (PendingStreamRequest *p,
                                    GabbleMediaChannel *channel,
-                                   GabbleJingleContent *content)
+                                   WockyJingleContent *content)
 {
   guint i;
 
@@ -1587,7 +1587,7 @@ _gabble_media_channel_request_contents (GabbleMediaChannel *chan,
 {
   GabbleMediaChannelPrivate *priv = chan->priv;
   gboolean want_audio, want_video;
-  JingleDialect dialect;
+  WockyJingleDialect dialect;
   guint idx;
   const gchar *peer_resource;
   const gchar *transport_ns = NULL;
@@ -1619,7 +1619,7 @@ _gabble_media_channel_request_contents (GabbleMediaChannel *chan,
   /* existing call; the recipient and the mode has already been decided */
   if (priv->session != NULL)
     {
-      peer_resource = gabble_jingle_session_get_peer_resource (priv->session);
+      peer_resource = wocky_jingle_session_get_peer_resource (priv->session);
 
       if (peer_resource[0] != '\0')
         DEBUG ("existing call, using peer resource %s", peer_resource);
@@ -1627,7 +1627,7 @@ _gabble_media_channel_request_contents (GabbleMediaChannel *chan,
         DEBUG ("existing call, using bare JID");
 
       /* is a google call... we have no other option */
-      if (!gabble_jingle_session_can_modify_contents (priv->session))
+      if (!wocky_jingle_session_can_modify_contents (priv->session))
         {
           g_set_error (error, TP_ERROR, TP_ERROR_NOT_AVAILABLE,
               "Streams can't be added to ongoing Google Talk calls");
@@ -1638,7 +1638,7 @@ _gabble_media_channel_request_contents (GabbleMediaChannel *chan,
        * one channel type (video or audio) will be added later */
       if (NULL == jingle_pick_best_content_type (priv->conn, peer,
           peer_resource,
-          want_audio ? JINGLE_MEDIA_TYPE_AUDIO : JINGLE_MEDIA_TYPE_VIDEO))
+          want_audio ? WOCKY_JINGLE_MEDIA_TYPE_AUDIO : WOCKY_JINGLE_MEDIA_TYPE_VIDEO))
         {
           g_set_error (error, TP_ERROR, TP_ERROR_NOT_AVAILABLE,
               "member does not have the desired audio/video capabilities");
@@ -1649,8 +1649,8 @@ _gabble_media_channel_request_contents (GabbleMediaChannel *chan,
       /* We assume we already picked the best possible transport ns for the
        * previous streams, so we just reuse that one */
         {
-          GList *contents = gabble_jingle_session_get_contents (priv->session);
-          GabbleJingleContent *c;
+          GList *contents = wocky_jingle_session_get_contents (priv->session);
+          WockyJingleContent *c;
 
           /* If we have a session, we must have at least one content. */
           g_assert (contents != NULL);
@@ -1658,7 +1658,7 @@ _gabble_media_channel_request_contents (GabbleMediaChannel *chan,
           c = contents->data;
           g_list_free (contents);
 
-          transport_ns = gabble_jingle_content_get_transport_ns (c);
+          transport_ns = wocky_jingle_content_get_transport_ns (c);
         }
     }
   /* no existing call; we should choose a recipient and a mode */
@@ -1716,13 +1716,13 @@ _gabble_media_channel_request_contents (GabbleMediaChannel *chan,
   for (idx = 0; idx < media_types->len; idx++)
     {
       guint media_type = g_array_index (media_types, guint, idx);
-      GabbleJingleContent *c;
+      WockyJingleContent *c;
       const gchar *content_ns;
 
       content_ns = jingle_pick_best_content_type (priv->conn, peer,
           peer_resource,
           media_type == TP_MEDIA_STREAM_TYPE_AUDIO ?
-            JINGLE_MEDIA_TYPE_AUDIO : JINGLE_MEDIA_TYPE_VIDEO);
+            WOCKY_JINGLE_MEDIA_TYPE_AUDIO : WOCKY_JINGLE_MEDIA_TYPE_VIDEO);
 
       /* if we got this far, resource should be capable enough, so we
        * should not fail in choosing ns */
@@ -1731,10 +1731,10 @@ _gabble_media_channel_request_contents (GabbleMediaChannel *chan,
 
       DEBUG ("Creating new jingle content with ns %s : %s", content_ns, transport_ns);
 
-      c = gabble_jingle_session_add_content (priv->session,
+      c = wocky_jingle_session_add_content (priv->session,
           media_type == TP_MEDIA_STREAM_TYPE_AUDIO ?
-            JINGLE_MEDIA_TYPE_AUDIO : JINGLE_MEDIA_TYPE_VIDEO,
-            JINGLE_CONTENT_SENDERS_BOTH, NULL, content_ns, transport_ns);
+            WOCKY_JINGLE_MEDIA_TYPE_AUDIO : WOCKY_JINGLE_MEDIA_TYPE_VIDEO,
+            WOCKY_JINGLE_CONTENT_SENDERS_BOTH, NULL, content_ns, transport_ns);
 
       /* The stream is created in "new-content" callback, and appended to
        * priv->streams. This is now guaranteed to happen asynchronously (adding
@@ -1909,7 +1909,7 @@ media_channel_request_streams (GabbleMediaChannel *self,
   g_ptr_array_unref (contents);
 
   /* signal acceptance */
-  gabble_jingle_session_accept (priv->session);
+  wocky_jingle_session_accept (priv->session);
 
   return;
 
@@ -2152,7 +2152,7 @@ gabble_media_channel_add_member (GObject *obj,
               (GFunc) gabble_media_stream_accept_pending_local_send, NULL);
 
           /* signal acceptance */
-          gabble_jingle_session_accept (priv->session);
+          wocky_jingle_session_accept (priv->session);
 
           return TRUE;
         }
@@ -2189,24 +2189,24 @@ gabble_media_channel_remove_member (GObject *obj,
     }
   else
     {
-      JingleReason jingle_reason = JINGLE_REASON_UNKNOWN;
+      WockyJingleReason wocky_jingle_reason = WOCKY_JINGLE_REASON_UNKNOWN;
 
       switch (reason)
         {
         case TP_CHANNEL_GROUP_CHANGE_REASON_NONE:
-          jingle_reason = JINGLE_REASON_UNKNOWN;
+          wocky_jingle_reason = WOCKY_JINGLE_REASON_UNKNOWN;
           break;
         case TP_CHANNEL_GROUP_CHANGE_REASON_OFFLINE:
-          jingle_reason = JINGLE_REASON_GONE;
+          wocky_jingle_reason = WOCKY_JINGLE_REASON_GONE;
           break;
         case TP_CHANNEL_GROUP_CHANGE_REASON_BUSY:
-          jingle_reason = JINGLE_REASON_BUSY;
+          wocky_jingle_reason = WOCKY_JINGLE_REASON_BUSY;
           break;
         case TP_CHANNEL_GROUP_CHANGE_REASON_ERROR:
-          jingle_reason = JINGLE_REASON_GENERAL_ERROR;
+          wocky_jingle_reason = WOCKY_JINGLE_REASON_GENERAL_ERROR;
           break;
         case TP_CHANNEL_GROUP_CHANGE_REASON_NO_ANSWER:
-          jingle_reason = JINGLE_REASON_TIMEOUT;
+          wocky_jingle_reason = WOCKY_JINGLE_REASON_TIMEOUT;
           break;
         default:
           g_set_error (error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
@@ -2215,7 +2215,7 @@ gabble_media_channel_remove_member (GObject *obj,
           return FALSE;
         }
 
-      gabble_jingle_session_terminate (priv->session, jingle_reason, message,
+      wocky_jingle_session_terminate (priv->session, wocky_jingle_reason, message,
           error);
     }
 
@@ -2245,24 +2245,24 @@ copy_stream_list (GabbleMediaChannel *channel)
 /* return TRUE when the jingle reason is reason enough to raise a
  * StreamError */
 static gboolean
-extract_media_stream_error_from_jingle_reason (JingleReason jingle_reason,
+extract_media_stream_error_from_jingle_reason (WockyJingleReason wocky_jingle_reason,
     TpMediaStreamError *stream_error)
 {
   TpMediaStreamError _stream_error;
 
   /* TODO: Make a better mapping with more distinction of possible errors */
-  switch (jingle_reason)
+  switch (wocky_jingle_reason)
     {
-    case JINGLE_REASON_CONNECTIVITY_ERROR:
+    case WOCKY_JINGLE_REASON_CONNECTIVITY_ERROR:
       _stream_error = TP_MEDIA_STREAM_ERROR_NETWORK_ERROR;
       break;
-    case JINGLE_REASON_MEDIA_ERROR:
+    case WOCKY_JINGLE_REASON_MEDIA_ERROR:
       _stream_error = TP_MEDIA_STREAM_ERROR_MEDIA_ERROR;
       break;
-    case JINGLE_REASON_FAILED_APPLICATION:
+    case WOCKY_JINGLE_REASON_FAILED_APPLICATION:
       _stream_error = TP_MEDIA_STREAM_ERROR_CODEC_NEGOTIATION_FAILED;
       break;
-    case JINGLE_REASON_GENERAL_ERROR:
+    case WOCKY_JINGLE_REASON_GENERAL_ERROR:
       _stream_error = TP_MEDIA_STREAM_ERROR_UNKNOWN;
       break;
     default:
@@ -2280,42 +2280,42 @@ extract_media_stream_error_from_jingle_reason (JingleReason jingle_reason,
   return TRUE;
 }
 
-static JingleReason
+static WockyJingleReason
 media_stream_error_to_jingle_reason (TpMediaStreamError stream_error)
 {
   switch (stream_error)
     {
     case TP_MEDIA_STREAM_ERROR_NETWORK_ERROR:
-      return JINGLE_REASON_CONNECTIVITY_ERROR;
+      return WOCKY_JINGLE_REASON_CONNECTIVITY_ERROR;
     case TP_MEDIA_STREAM_ERROR_MEDIA_ERROR:
-      return  JINGLE_REASON_MEDIA_ERROR;
+      return  WOCKY_JINGLE_REASON_MEDIA_ERROR;
     case TP_MEDIA_STREAM_ERROR_CODEC_NEGOTIATION_FAILED:
-      return JINGLE_REASON_FAILED_APPLICATION;
+      return WOCKY_JINGLE_REASON_FAILED_APPLICATION;
     default:
-      return JINGLE_REASON_GENERAL_ERROR;
+      return WOCKY_JINGLE_REASON_GENERAL_ERROR;
     }
 }
 
 static TpChannelGroupChangeReason
-jingle_reason_to_group_change_reason (JingleReason jingle_reason)
+wocky_jingle_reason_to_group_change_reason (WockyJingleReason wocky_jingle_reason)
 {
-  switch (jingle_reason)
+  switch (wocky_jingle_reason)
     {
-    case JINGLE_REASON_BUSY:
+    case WOCKY_JINGLE_REASON_BUSY:
       return TP_CHANNEL_GROUP_CHANGE_REASON_BUSY;
-    case JINGLE_REASON_GONE:
+    case WOCKY_JINGLE_REASON_GONE:
       return TP_CHANNEL_GROUP_CHANGE_REASON_OFFLINE;
-    case JINGLE_REASON_TIMEOUT:
+    case WOCKY_JINGLE_REASON_TIMEOUT:
       return TP_CHANNEL_GROUP_CHANGE_REASON_NO_ANSWER;
-    case JINGLE_REASON_CONNECTIVITY_ERROR:
-    case JINGLE_REASON_FAILED_APPLICATION:
-    case JINGLE_REASON_FAILED_TRANSPORT:
-    case JINGLE_REASON_GENERAL_ERROR:
-    case JINGLE_REASON_MEDIA_ERROR:
-    case JINGLE_REASON_SECURITY_ERROR:
-    case JINGLE_REASON_INCOMPATIBLE_PARAMETERS:
-    case JINGLE_REASON_UNSUPPORTED_APPLICATIONS:
-    case JINGLE_REASON_UNSUPPORTED_TRANSPORTS:
+    case WOCKY_JINGLE_REASON_CONNECTIVITY_ERROR:
+    case WOCKY_JINGLE_REASON_FAILED_APPLICATION:
+    case WOCKY_JINGLE_REASON_FAILED_TRANSPORT:
+    case WOCKY_JINGLE_REASON_GENERAL_ERROR:
+    case WOCKY_JINGLE_REASON_MEDIA_ERROR:
+    case WOCKY_JINGLE_REASON_SECURITY_ERROR:
+    case WOCKY_JINGLE_REASON_INCOMPATIBLE_PARAMETERS:
+    case WOCKY_JINGLE_REASON_UNSUPPORTED_APPLICATIONS:
+    case WOCKY_JINGLE_REASON_UNSUPPORTED_TRANSPORTS:
       return TP_CHANNEL_GROUP_CHANGE_REASON_ERROR;
     default:
       return TP_CHANNEL_GROUP_CHANGE_REASON_NONE;
@@ -2323,9 +2323,9 @@ jingle_reason_to_group_change_reason (JingleReason jingle_reason)
 }
 
 static void
-session_terminated_cb (GabbleJingleSession *session,
+session_terminated_cb (WockyJingleSession *session,
                        gboolean local_terminator,
-                       JingleReason jingle_reason,
+                       WockyJingleReason wocky_jingle_reason,
                        const gchar *text,
                        gpointer user_data)
 {
@@ -2333,7 +2333,7 @@ session_terminated_cb (GabbleJingleSession *session,
   GabbleMediaChannelPrivate *priv = channel->priv;
   TpGroupMixin *mixin = TP_GROUP_MIXIN (channel);
   guint terminator;
-  JingleState state;
+  WockyJingleState state;
   TpIntset *set;
 
   DEBUG ("called");
@@ -2355,7 +2355,7 @@ session_terminated_cb (GabbleJingleSession *session,
 
   tp_group_mixin_change_members ((GObject *) channel,
       text, NULL, set, NULL, NULL, terminator,
-      jingle_reason_to_group_change_reason (jingle_reason));
+      wocky_jingle_reason_to_group_change_reason (wocky_jingle_reason));
 
   tp_intset_destroy (set);
 
@@ -2374,7 +2374,7 @@ session_terminated_cb (GabbleJingleSession *session,
     guint i;
     TpMediaStreamError stream_error = TP_MEDIA_STREAM_ERROR_UNKNOWN;
     gboolean is_error = extract_media_stream_error_from_jingle_reason (
-        jingle_reason, &stream_error);
+        wocky_jingle_reason, &stream_error);
 
     for (i = 0; i < tmp->len; i++)
       {
@@ -2413,14 +2413,14 @@ session_terminated_cb (GabbleJingleSession *session,
 
 
 static void
-session_state_changed_cb (GabbleJingleSession *session,
+session_state_changed_cb (WockyJingleSession *session,
                           GParamSpec *arg1,
                           GabbleMediaChannel *channel)
 {
   GObject *as_object = (GObject *) channel;
   GabbleMediaChannelPrivate *priv = channel->priv;
   TpGroupMixin *mixin = TP_GROUP_MIXIN (channel);
-  JingleState state;
+  WockyJingleState state;
   TpIntset *set;
 
   DEBUG ("called");
@@ -2431,8 +2431,8 @@ session_state_changed_cb (GabbleJingleSession *session,
 
   set = tp_intset_new_containing (priv->peer);
 
-  if (state >= JINGLE_STATE_PENDING_INITIATE_SENT &&
-      state < JINGLE_STATE_ACTIVE &&
+  if (state >= WOCKY_JINGLE_STATE_PENDING_INITIATE_SENT &&
+      state < WOCKY_JINGLE_STATE_ACTIVE &&
       !tp_handle_set_is_member (mixin->members, priv->peer))
     {
       /* The first time we send anything to the other user, they materialise
@@ -2447,7 +2447,7 @@ session_state_changed_cb (GabbleJingleSession *session,
       tp_group_mixin_change_flags (as_object, 0, TP_CHANNEL_GROUP_FLAG_CAN_ADD);
     }
 
-  if (state == JINGLE_STATE_ACTIVE &&
+  if (state == WOCKY_JINGLE_STATE_ACTIVE &&
       priv->creator == mixin->self_handle)
     {
 
@@ -2512,7 +2512,7 @@ stream_error_cb (GabbleMediaStream *stream,
                  GabbleMediaChannel *chan)
 {
   GabbleMediaChannelPrivate *priv = chan->priv;
-  GabbleJingleMediaRtp *c;
+  WockyJingleMediaRtp *c;
   GList *contents;
   guint id;
 
@@ -2521,9 +2521,9 @@ stream_error_cb (GabbleMediaStream *stream,
   tp_svc_channel_type_streamed_media_emit_stream_error (chan, id, errno,
       message);
 
-  contents = gabble_jingle_session_get_contents (priv->session);
+  contents = wocky_jingle_session_get_contents (priv->session);
 
-  if (gabble_jingle_session_can_modify_contents (priv->session) &&
+  if (wocky_jingle_session_can_modify_contents (priv->session) &&
       g_list_length (contents) > 1)
     {
       /* remove stream from session (removal will be signalled
@@ -2532,11 +2532,11 @@ stream_error_cb (GabbleMediaStream *stream,
       c = gabble_media_stream_get_content (stream);
 
       if (errno == TP_MEDIA_STREAM_ERROR_CODEC_NEGOTIATION_FAILED)
-        gabble_jingle_content_reject ((GabbleJingleContent *) c,
-            JINGLE_REASON_FAILED_APPLICATION);
+        wocky_jingle_content_reject ((WockyJingleContent *) c,
+            WOCKY_JINGLE_REASON_FAILED_APPLICATION);
       else
-        gabble_jingle_session_remove_content (priv->session,
-            (GabbleJingleContent *) c);
+        wocky_jingle_session_remove_content (priv->session,
+            (WockyJingleContent *) c);
     }
   else
     {
@@ -2546,7 +2546,7 @@ stream_error_cb (GabbleMediaStream *stream,
        * Talk-using peer.)
        */
       DEBUG ("Terminating call in response to stream error");
-      gabble_jingle_session_terminate (priv->session,
+      wocky_jingle_session_terminate (priv->session,
           media_stream_error_to_jingle_reason (errno), message, NULL);
     }
 
@@ -2596,7 +2596,7 @@ stream_direction_changed_cb (GabbleMediaStream *stream,
 
 static void
 construct_stream (GabbleMediaChannel *chan,
-                  GabbleJingleContent *c,
+                  WockyJingleContent *c,
                   const gchar *name,
                   const gchar *nat_traversal,
                   const GPtrArray *relays,
@@ -2689,7 +2689,7 @@ construct_stream (GabbleMediaChannel *chan,
   stream_direction_changed_cb (stream, NULL, chan);
 
   gabble_media_channel_hold_new_stream (chan, stream,
-      GABBLE_JINGLE_MEDIA_RTP (c));
+      WOCKY_JINGLE_MEDIA_RTP (c));
 
   if (priv->ready)
     {
@@ -2765,7 +2765,7 @@ google_relay_session_cb (GPtrArray *relays,
 }
 
 static void
-content_removed_cb (GabbleJingleContent *content,
+content_removed_cb (WockyJingleContent *content,
                     StreamCreationData *d)
 {
 
@@ -2805,7 +2805,7 @@ content_removed_cb (GabbleJingleContent *content,
 
 static void
 create_stream_from_content (GabbleMediaChannel *self,
-                            GabbleJingleContent *c,
+                            WockyJingleContent *c,
                             gboolean initial)
 {
   gchar *name;
@@ -2815,7 +2815,7 @@ create_stream_from_content (GabbleMediaChannel *self,
       "name", &name,
       NULL);
 
-  if (G_OBJECT_TYPE (c) != GABBLE_TYPE_JINGLE_MEDIA_RTP)
+  if (G_OBJECT_TYPE (c) != WOCKY_TYPE_JINGLE_MEDIA_RTP)
     {
       DEBUG ("ignoring non MediaRtp content '%s'", name);
       g_free (name);
@@ -2840,7 +2840,7 @@ create_stream_from_content (GabbleMediaChannel *self,
   self->priv->stream_creation_datas = g_list_prepend (
       self->priv->stream_creation_datas, d);
 
-  switch (gabble_jingle_content_get_transport_type (c))
+  switch (wocky_jingle_content_get_transport_type (c))
     {
       case JINGLE_TRANSPORT_GOOGLE_P2P:
         /* See if our server is Google, and if it is, ask them for a relay.
@@ -2848,7 +2848,7 @@ create_stream_from_content (GabbleMediaChannel *self,
          * don't yet know whether there will be RTCP. */
         d->nat_traversal = "gtalk-p2p";
         DEBUG ("Attempting to create Google relay session");
-        gabble_jingle_info_create_google_relay_session (
+        wocky_jingle_info_create_google_relay_session (
             gabble_jingle_mint_get_info (self->priv->conn->jingle_mint),
             2, google_relay_session_cb, d);
         return;
@@ -2868,8 +2868,8 @@ create_stream_from_content (GabbleMediaChannel *self,
 }
 
 static void
-session_content_rejected_cb (GabbleJingleSession *session,
-    GabbleJingleContent *c, JingleReason reason, const gchar *message,
+session_content_rejected_cb (WockyJingleSession *session,
+    WockyJingleContent *c, WockyJingleReason reason, const gchar *message,
     gpointer user_data)
 {
   GabbleMediaChannel *chan = GABBLE_MEDIA_CHANNEL (user_data);
@@ -2892,8 +2892,8 @@ session_content_rejected_cb (GabbleJingleSession *session,
 }
 
 static void
-session_new_content_cb (GabbleJingleSession *session,
-    GabbleJingleContent *c, gpointer user_data)
+session_new_content_cb (WockyJingleSession *session,
+    WockyJingleContent *c, gpointer user_data)
 {
   GabbleMediaChannel *chan = GABBLE_MEDIA_CHANNEL (user_data);
 
@@ -2974,7 +2974,7 @@ gabble_media_channel_error (TpSvcMediaSessionHandler *iface,
   GabbleMediaChannelPrivate *priv;
   GPtrArray *tmp;
   guint i;
-  JingleState state;
+  WockyJingleState state;
 
   g_assert (GABBLE_IS_MEDIA_CHANNEL (self));
 
@@ -3001,16 +3001,16 @@ gabble_media_channel_error (TpSvcMediaSessionHandler *iface,
 
   g_object_get (priv->session, "state", &state, NULL);
 
-  if (state == JINGLE_STATE_ENDED)
+  if (state == WOCKY_JINGLE_STATE_ENDED)
     {
       tp_svc_media_session_handler_return_from_error (context);
       return;
     }
-  else if (state == JINGLE_STATE_PENDING_CREATED)
+  else if (state == WOCKY_JINGLE_STATE_PENDING_CREATED)
     {
       /* shortcut to prevent sending remove actions if we haven't sent an
        * initiate yet */
-      g_object_set (self, "state", JINGLE_STATE_ENDED, NULL);
+      g_object_set (self, "state", WOCKY_JINGLE_STATE_ENDED, NULL);
       tp_svc_media_session_handler_return_from_error (context);
       return;
     }
diff --git a/src/media-factory.c b/src/media-factory.c
index 8ccfc9b54..c17e5dde1 100644
--- a/src/media-factory.c
+++ b/src/media-factory.c
@@ -261,7 +261,7 @@ media_channel_closed_cb (GabbleMediaChannel *chan, gpointer user_data)
  */
 static GabbleMediaChannel *
 new_media_channel (GabbleMediaFactory *fac,
-                   GabbleJingleSession *sess,
+                   WockyJingleSession *sess,
                    TpHandle maybe_peer,
                    gboolean peer_in_rp,
                    gboolean initial_audio,
@@ -360,7 +360,7 @@ call_channel_initialized (GObject *source,
  */
 static void
 new_call_channel (GabbleMediaFactory *self,
-  GabbleJingleSession *sess,
+  WockyJingleSession *sess,
   TpHandle peer,
   gboolean initial_audio,
   const gchar *initial_audio_name,
@@ -442,7 +442,7 @@ gabble_media_factory_close_all (GabbleMediaFactory *fac)
 
 static void
 new_jingle_session_cb (GabbleJingleMint *jm,
-    GabbleJingleSession *sess,
+    WockyJingleSession *sess,
     gpointer data)
 {
   GabbleMediaFactory *self = GABBLE_MEDIA_FACTORY (data);
@@ -450,8 +450,8 @@ new_jingle_session_cb (GabbleJingleMint *jm,
   TpHandleRepoIface *contacts;
   TpHandle peer;
 
-  if (gabble_jingle_session_get_content_type (sess) !=
-      GABBLE_TYPE_JINGLE_MEDIA_RTP)
+  if (wocky_jingle_session_get_content_type (sess) !=
+      WOCKY_TYPE_JINGLE_MEDIA_RTP)
     return;
 
   if (gabble_muc_factory_handle_jingle_session (priv->conn->muc_factory, sess))
@@ -462,7 +462,7 @@ new_jingle_session_cb (GabbleJingleMint *jm,
 
   contacts = tp_base_connection_get_handles (TP_BASE_CONNECTION (priv->conn),
       TP_HANDLE_TYPE_CONTACT);
-  peer = tp_handle_ensure (contacts, gabble_jingle_session_get_peer_jid (sess),
+  peer = tp_handle_ensure (contacts, wocky_jingle_session_get_peer_jid (sess),
       NULL, NULL);
 
   if (self->priv->use_call_channels)
@@ -481,11 +481,11 @@ new_jingle_session_cb (GabbleJingleMint *jm,
 
       /* FIXME: we need this detection to properly adjust nat-traversal on
        * the channel. We hope all contents will have the same transport... */
-      cs = gabble_jingle_session_get_contents (sess);
+      cs = wocky_jingle_session_get_contents (sess);
 
       if (cs != NULL)
         {
-          GabbleJingleContent *c = cs->data;
+          WockyJingleContent *c = cs->data;
           gchar *ns;
 
           g_object_get (c, "transport-ns", &ns, NULL);
diff --git a/src/media-stream.c b/src/media-stream.c
index d347c78eb..761eadf9b 100644
--- a/src/media-stream.c
+++ b/src/media-stream.c
@@ -90,7 +90,7 @@ enum
 
 struct _GabbleMediaStreamPrivate
 {
-  GabbleJingleContent *content;
+  WockyJingleContent *content;
 
   GabbleMediaSessionMode mode;
   TpDBusDaemon *dbus_daemon;
@@ -140,26 +140,26 @@ static void push_remote_candidates (GabbleMediaStream *stream);
 static void push_playing (GabbleMediaStream *stream);
 static void push_sending (GabbleMediaStream *stream);
 
-static void new_remote_candidates_cb (GabbleJingleContent *content,
+static void new_remote_candidates_cb (WockyJingleContent *content,
     GList *clist, GabbleMediaStream *stream);
-static void new_remote_media_description_cb (GabbleJingleContent *content,
-    JingleMediaDescription *md, GabbleMediaStream *stream);
-static void content_state_changed_cb (GabbleJingleContent *c,
+static void new_remote_media_description_cb (WockyJingleContent *content,
+    WockyJingleMediaDescription *md, GabbleMediaStream *stream);
+static void content_state_changed_cb (WockyJingleContent *c,
      GParamSpec *pspec, GabbleMediaStream *stream);
-static void content_senders_changed_cb (GabbleJingleContent *c,
+static void content_senders_changed_cb (WockyJingleContent *c,
      GParamSpec *pspec, GabbleMediaStream *stream);
-static void remote_state_changed_cb (GabbleJingleSession *session,
+static void remote_state_changed_cb (WockyJingleSession *session,
     GabbleMediaStream *stream);
-static void content_removed_cb (GabbleJingleContent *content,
+static void content_removed_cb (WockyJingleContent *content,
       GabbleMediaStream *stream);
-static void update_direction (GabbleMediaStream *stream, GabbleJingleContent *c);
+static void update_direction (GabbleMediaStream *stream, WockyJingleContent *c);
 static void update_sending (GabbleMediaStream *stream, gboolean start_sending);
 
 GabbleMediaStream *
 gabble_media_stream_new (
     TpDBusDaemon *dbus_daemon,
     const gchar *object_path,
-    GabbleJingleContent *content,
+    WockyJingleContent *content,
     const gchar *name,
     guint id,
     const gchar *nat_traversal,
@@ -169,7 +169,7 @@ gabble_media_stream_new (
   GPtrArray *empty = NULL;
   GabbleMediaStream *result;
 
-  g_return_val_if_fail (GABBLE_IS_JINGLE_MEDIA_RTP (content), NULL);
+  g_return_val_if_fail (WOCKY_IS_JINGLE_MEDIA_RTP (content), NULL);
 
   if (relay_info == NULL)
     {
@@ -241,13 +241,13 @@ _get_initial_codecs_and_candidates (gpointer user_data)
 {
   GabbleMediaStream *stream = GABBLE_MEDIA_STREAM (user_data);
   GabbleMediaStreamPrivate *priv = stream->priv;
-  JingleMediaDescription *md;
+  WockyJingleMediaDescription *md;
 
   priv->initial_getter_id = 0;
 
   /* we can immediately get the codecs if we're responder */
-  md = gabble_jingle_media_rtp_get_remote_media_description (
-      GABBLE_JINGLE_MEDIA_RTP (priv->content));
+  md = wocky_jingle_media_rtp_get_remote_media_description (
+      WOCKY_JINGLE_MEDIA_RTP (priv->content));
   if (md != NULL)
     new_remote_media_description_cb (priv->content, md, stream);
 
@@ -255,7 +255,7 @@ _get_initial_codecs_and_candidates (gpointer user_data)
    * us (e.g. specified in session-initiate/content-add), we don't want to
    * miss them */
   new_remote_candidates_cb (priv->content,
-      gabble_jingle_content_get_remote_candidates (priv->content), stream);
+      wocky_jingle_content_get_remote_candidates (priv->content), stream);
 
   return FALSE;
 }
@@ -267,7 +267,7 @@ gabble_media_stream_constructor (GType type, guint n_props,
   GObject *obj;
   GabbleMediaStream *stream;
   GabbleMediaStreamPrivate *priv;
-  GabbleJingleFactory *jf;
+  WockyJingleFactory *jf;
   GList *stun_servers;
 
   /* call base class constructor */
@@ -281,12 +281,12 @@ gabble_media_stream_constructor (GType type, guint n_props,
   /* STUN servers are needed as soon as the stream appears, so there's little
    * point in waiting for them - either they've already been resolved, or
    * we're too late to use them for this stream */
-  jf = gabble_jingle_session_get_factory (priv->content->session);
-  stun_servers = gabble_jingle_info_get_stun_servers (
-      gabble_jingle_factory_get_jingle_info (jf));
+  jf = wocky_jingle_session_get_factory (priv->content->session);
+  stun_servers = wocky_jingle_info_get_stun_servers (
+      wocky_jingle_factory_get_jingle_info (jf));
   while (stun_servers != NULL)
     {
-      GabbleStunServer *stun_server = stun_servers->data;
+      WockyStunServer *stun_server = stun_servers->data;
       GValueArray *va = tp_value_array_build (2,
           G_TYPE_STRING, stun_server->address,
           G_TYPE_UINT, (guint) stun_server->port,
@@ -303,7 +303,7 @@ gabble_media_stream_constructor (GType type, guint n_props,
 
   update_direction (stream, priv->content);
 
-  /* MediaStream is created as soon as GabbleJingleContent is
+  /* MediaStream is created as soon as WockyJingleContent is
    * created, but we want to let it parse the initiation (if
    * initiated by remote end) before we pick up initial
    * codecs and candidates.
@@ -447,7 +447,7 @@ gabble_media_stream_set_property (GObject      *object,
               "locally-created", &locally_created,
               NULL);
 
-          if (jtype == JINGLE_MEDIA_TYPE_VIDEO)
+          if (jtype == WOCKY_JINGLE_MEDIA_TYPE_VIDEO)
             priv->media_type = TP_MEDIA_STREAM_TYPE_VIDEO;
           else
             priv->media_type = TP_MEDIA_STREAM_TYPE_AUDIO;
@@ -622,9 +622,9 @@ gabble_media_stream_class_init (GabbleMediaStreamClass *gabble_media_stream_clas
       G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NICK);
   g_object_class_install_property (object_class, PROP_LOCAL_HOLD, param_spec);
 
-  param_spec = g_param_spec_object ("content", "GabbleJingleContent object",
+  param_spec = g_param_spec_object ("content", "WockyJingleContent object",
                                     "Jingle content signalling this media stream.",
-                                    GABBLE_TYPE_JINGLE_CONTENT,
+                                    WOCKY_TYPE_JINGLE_CONTENT,
                                     G_PARAM_CONSTRUCT_ONLY |
                                     G_PARAM_READWRITE |
                                     G_PARAM_STATIC_NICK |
@@ -902,7 +902,7 @@ gabble_media_stream_new_native_candidate (TpSvcMediaStreamHandler *iface,
 {
   GabbleMediaStream *self = GABBLE_MEDIA_STREAM (iface);
   GabbleMediaStreamPrivate *priv;
-  JingleState state;
+  WockyJingleState state;
   GList *li = NULL;
   guint i;
 
@@ -914,9 +914,9 @@ gabble_media_stream_new_native_candidate (TpSvcMediaStreamHandler *iface,
 
   /* FIXME: maybe this should be an assertion in case the channel
    * isn't closed early enough right now? */
-  if (state > JINGLE_STATE_ACTIVE)
+  if (state > WOCKY_JINGLE_STATE_ACTIVE)
     {
-      DEBUG ("state > JINGLE_STATE_ACTIVE, doing nothing");
+      DEBUG ("state > WOCKY_JINGLE_STATE_ACTIVE, doing nothing");
       tp_svc_media_stream_handler_return_from_new_native_candidate (context);
       return;
     }
@@ -926,7 +926,7 @@ gabble_media_stream_new_native_candidate (TpSvcMediaStreamHandler *iface,
       GValueArray *transport;
       guint component;
       const gchar *addr;
-      JingleCandidate *c;
+      WockyJingleCandidate *c;
 
       transport = g_ptr_array_index (transports, i);
       component = g_value_get_uint (g_value_array_get_nth (transport, 0));
@@ -946,7 +946,7 @@ gabble_media_stream_new_native_candidate (TpSvcMediaStreamHandler *iface,
           continue;
         }
 
-      c = jingle_candidate_new (
+      c = wocky_jingle_candidate_new (
           /* protocol */
           g_value_get_uint (g_value_array_get_nth (transport, 3)),
           /* candidate type, we're relying on 1:1 candidate type mapping */
@@ -974,7 +974,7 @@ gabble_media_stream_new_native_candidate (TpSvcMediaStreamHandler *iface,
     }
 
   if (li != NULL)
-    gabble_jingle_content_add_candidates (priv->content, li);
+    wocky_jingle_content_add_candidates (priv->content, li);
 
   tp_svc_media_stream_handler_return_from_new_native_candidate (context);
 }
@@ -1035,7 +1035,7 @@ pass_local_codecs (GabbleMediaStream *stream,
 {
   GabbleMediaStreamPrivate *priv = stream->priv;
   guint i;
-  JingleMediaDescription *md;
+  WockyJingleMediaDescription *md;
   const GPtrArray *hdrexts;
   GHashTable *fbs;
   GError *wocky_error = NULL;
@@ -1043,7 +1043,7 @@ pass_local_codecs (GabbleMediaStream *stream,
   DEBUG ("putting list of %d supported codecs from stream-engine into cache",
       codecs->len);
 
-  md = jingle_media_description_new ();
+  md = wocky_jingle_media_description_new ();
 
   fbs = g_value_get_boxed (&priv->local_feedback_messages);
 
@@ -1055,7 +1055,7 @@ pass_local_codecs (GabbleMediaStream *stream,
       guint id, clock_rate, channels;
       gchar *name;
       GHashTable *params;
-      JingleCodec *c;
+      WockyJingleCodec *c;
       GValueArray *fb_codec;
 
       g_value_init (&codec, codec_struct_type);
@@ -1105,7 +1105,7 @@ pass_local_codecs (GabbleMediaStream *stream,
                       subtype = g_value_get_string (val);
 
                       c->feedback_msgs = g_list_append (c->feedback_msgs,
-                          jingle_feedback_message_new (type, subtype));
+                          wocky_jingle_feedback_message_new (type, subtype));
                     }
                 }
             }
@@ -1131,7 +1131,7 @@ pass_local_codecs (GabbleMediaStream *stream,
           GValueArray *hdrext;
           guint id;
           guint direction;
-          JingleContentSenders senders;
+          WockyJingleContentSenders senders;
           gchar *uri;
           gchar *params;
 
@@ -1160,34 +1160,34 @@ pass_local_codecs (GabbleMediaStream *stream,
           switch (direction)
             {
             case TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL:
-              senders = JINGLE_CONTENT_SENDERS_BOTH;
+              senders = WOCKY_JINGLE_CONTENT_SENDERS_BOTH;
               break;
             case TP_MEDIA_STREAM_DIRECTION_NONE:
-              senders = JINGLE_CONTENT_SENDERS_NONE;
+              senders = WOCKY_JINGLE_CONTENT_SENDERS_NONE;
               break;
             case TP_MEDIA_STREAM_DIRECTION_SEND:
-              senders = initiated_by_us ? JINGLE_CONTENT_SENDERS_INITIATOR :
-              JINGLE_CONTENT_SENDERS_RESPONDER;
+              senders = initiated_by_us ? WOCKY_JINGLE_CONTENT_SENDERS_INITIATOR :
+              WOCKY_JINGLE_CONTENT_SENDERS_RESPONDER;
               break;
             case TP_MEDIA_STREAM_DIRECTION_RECEIVE:
-              senders = initiated_by_us ? JINGLE_CONTENT_SENDERS_RESPONDER :
-              JINGLE_CONTENT_SENDERS_INITIATOR;
+              senders = initiated_by_us ? WOCKY_JINGLE_CONTENT_SENDERS_RESPONDER :
+              WOCKY_JINGLE_CONTENT_SENDERS_INITIATOR;
               break;
             default:
               g_assert_not_reached ();
             }
 
           md->hdrexts = g_list_append (md->hdrexts,
-              jingle_rtp_header_extension_new (id, senders, uri));
+              wocky_jingle_rtp_header_extension_new (id, senders, uri));
         }
       /* Can only be used once */
       g_value_reset (&priv->local_rtp_hdrexts);
     }
 
-  jingle_media_description_simplify (md);
+  wocky_jingle_media_description_simplify (md);
 
   if (jingle_media_rtp_set_local_media_description (
-          GABBLE_JINGLE_MEDIA_RTP (priv->content), md, ready, &wocky_error))
+          WOCKY_JINGLE_MEDIA_RTP (priv->content), md, ready, &wocky_error))
     return TRUE;
 
   g_set_error_literal (error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
@@ -1218,7 +1218,7 @@ gabble_media_stream_set_local_codecs (TpSvcMediaStreamHandler *iface,
 
   priv->local_codecs_set = TRUE;
 
-  if (gabble_jingle_content_is_created_by_us (self->priv->content))
+  if (wocky_jingle_content_is_created_by_us (self->priv->content))
     {
       if (!pass_local_codecs (self, codecs, self->priv->created_locally,
           &error))
@@ -1252,17 +1252,17 @@ gabble_media_stream_stream_state (TpSvcMediaStreamHandler *iface,
 {
   GabbleMediaStream *self = GABBLE_MEDIA_STREAM (iface);
   GabbleMediaStreamPrivate *priv = self->priv;
-  JingleTransportState ts = JINGLE_TRANSPORT_STATE_DISCONNECTED;
+  WockyJingleTransportState ts = WOCKY_JINGLE_TRANSPORT_STATE_DISCONNECTED;
 
   switch (connection_state) {
     case TP_MEDIA_STREAM_STATE_DISCONNECTED:
-      ts = JINGLE_TRANSPORT_STATE_DISCONNECTED;
+      ts = WOCKY_JINGLE_TRANSPORT_STATE_DISCONNECTED;
       break;
     case TP_MEDIA_STREAM_STATE_CONNECTING:
-      ts = JINGLE_TRANSPORT_STATE_CONNECTING;
+      ts = WOCKY_JINGLE_TRANSPORT_STATE_CONNECTING;
       break;
     case TP_MEDIA_STREAM_STATE_CONNECTED:
-      ts = JINGLE_TRANSPORT_STATE_CONNECTED;
+      ts = WOCKY_JINGLE_TRANSPORT_STATE_CONNECTED;
       break;
     default:
       DEBUG ("ignoring unknown connection state %u", connection_state);
@@ -1270,7 +1270,7 @@ gabble_media_stream_stream_state (TpSvcMediaStreamHandler *iface,
   }
 
   g_object_set (self, "connection-state", connection_state, NULL);
-  gabble_jingle_content_set_transport_state (priv->content, ts);
+  wocky_jingle_content_set_transport_state (priv->content, ts);
 
 OUT:
   tp_svc_media_stream_handler_return_from_stream_state (context);
@@ -1432,7 +1432,7 @@ gabble_media_stream_close (GabbleMediaStream *stream)
 }
 
 static void
-insert_feedback_message (JingleFeedbackMessage *fb, GPtrArray *fb_msgs)
+insert_feedback_message (WockyJingleFeedbackMessage *fb, GPtrArray *fb_msgs)
 {
   GValueArray *msg;
 
@@ -1446,8 +1446,8 @@ insert_feedback_message (JingleFeedbackMessage *fb, GPtrArray *fb_msgs)
 }
 
 static void
-new_remote_media_description_cb (GabbleJingleContent *content,
-    JingleMediaDescription *md, GabbleMediaStream *stream)
+new_remote_media_description_cb (WockyJingleContent *content,
+    WockyJingleMediaDescription *md, GabbleMediaStream *stream)
 {
   GabbleMediaStreamPrivate *priv;
   GList *li;
@@ -1506,7 +1506,7 @@ new_remote_media_description_cb (GabbleJingleContent *content,
   for (li = md->codecs; li; li = li->next)
     {
       GValue codec = { 0, };
-      JingleCodec *c = li->data;
+      WockyJingleCodec *c = li->data;
 
       g_value_init (&codec, codec_struct_type);
       g_value_take_boxed (&codec,
@@ -1557,7 +1557,7 @@ new_remote_media_description_cb (GabbleJingleContent *content,
 
   for (li = md->hdrexts; li; li = li->next)
     {
-      JingleRtpHeaderExtension *h = li->data;
+      WockyJingleRtpHeaderExtension *h = li->data;
       TpMediaStreamDirection direction;
 
       if (!have_initiator)
@@ -1569,17 +1569,17 @@ new_remote_media_description_cb (GabbleJingleContent *content,
 
       switch (h->senders)
         {
-        case JINGLE_CONTENT_SENDERS_BOTH:
+        case WOCKY_JINGLE_CONTENT_SENDERS_BOTH:
           direction = TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL;
           break;
-        case JINGLE_CONTENT_SENDERS_NONE:
+        case WOCKY_JINGLE_CONTENT_SENDERS_NONE:
           direction = TP_MEDIA_STREAM_DIRECTION_NONE;
           break;
-        case JINGLE_CONTENT_SENDERS_INITIATOR:
+        case WOCKY_JINGLE_CONTENT_SENDERS_INITIATOR:
           direction = initiated_by_us ? TP_MEDIA_STREAM_DIRECTION_SEND :
           TP_MEDIA_STREAM_DIRECTION_RECEIVE;
           break;
-        case JINGLE_CONTENT_SENDERS_RESPONDER:
+        case WOCKY_JINGLE_CONTENT_SENDERS_RESPONDER:
           direction = initiated_by_us ? TP_MEDIA_STREAM_DIRECTION_RECEIVE :
           TP_MEDIA_STREAM_DIRECTION_SEND;
           break;
@@ -1637,7 +1637,7 @@ push_remote_media_description (GabbleMediaStream *stream)
 }
 
 static void
-new_remote_candidates_cb (GabbleJingleContent *content,
+new_remote_candidates_cb (WockyJingleContent *content,
     GList *clist, GabbleMediaStream *stream)
 {
   GabbleMediaStreamPrivate *priv = stream->priv;
@@ -1654,7 +1654,7 @@ new_remote_candidates_cb (GabbleJingleContent *content,
       GValue candidate = { 0, };
       GPtrArray *transports;
       GValue transport = { 0, };
-      JingleCandidate *c = li->data;
+      WockyJingleCandidate *c = li->data;
       GType transport_struct_type = TP_STRUCT_TYPE_MEDIA_STREAM_HANDLER_TRANSPORT;
       GType candidate_struct_type = TP_STRUCT_TYPE_MEDIA_STREAM_HANDLER_CANDIDATE;
 
@@ -1666,7 +1666,7 @@ new_remote_candidates_cb (GabbleJingleContent *content,
           0, c->component,
           1, c->address,
           2, c->port,
-          3, c->protocol == JINGLE_TRANSPORT_PROTOCOL_UDP ? 0 : 1,
+          3, c->protocol == WOCKY_JINGLE_TRANSPORT_PROTOCOL_UDP ? 0 : 1,
           4, "RTP",
           5, "AVP",
           6, (gdouble) (c->preference / 65536.0),
@@ -1704,19 +1704,19 @@ new_remote_candidates_cb (GabbleJingleContent *content,
 }
 
 static void
-content_state_changed_cb (GabbleJingleContent *c,
+content_state_changed_cb (WockyJingleContent *c,
                           GParamSpec *pspec,
                           GabbleMediaStream *stream)
 {
   GabbleMediaStreamPrivate *priv = stream->priv;
-  JingleContentState state;
+  WockyJingleContentState state;
 
   g_object_get (c, "state", &state, NULL);
 
   DEBUG ("called");
 
   switch (state) {
-    case JINGLE_CONTENT_STATE_ACKNOWLEDGED:
+    case WOCKY_JINGLE_CONTENT_STATE_ACKNOWLEDGED:
       /* connected stream means we can play, but sending is determined
        * by content senders (in update_senders) */
       stream->playing = TRUE;
@@ -1724,7 +1724,7 @@ content_state_changed_cb (GabbleJingleContent *c,
       push_playing (stream);
       push_sending (stream);
       break;
-    case JINGLE_CONTENT_STATE_REMOVING:
+    case WOCKY_JINGLE_CONTENT_STATE_REMOVING:
       stream->playing = FALSE;
       priv->sending = FALSE;
       push_playing (stream);
@@ -1816,12 +1816,12 @@ push_sending (GabbleMediaStream *stream)
 }
 
 static void
-update_direction (GabbleMediaStream *stream, GabbleJingleContent *c)
+update_direction (GabbleMediaStream *stream, WockyJingleContent *c)
 {
   CombinedStreamDirection new_combined_dir;
   TpMediaStreamDirection requested_dir, current_dir;
   TpMediaStreamPendingSend pending_send;
-  JingleContentSenders senders;
+  WockyJingleContentSenders senders;
   gboolean local_initiator;
 
   DEBUG ("called");
@@ -1830,15 +1830,15 @@ update_direction (GabbleMediaStream *stream, GabbleJingleContent *c)
   g_object_get (c->session, "local-initiator", &local_initiator, NULL);
 
   switch (senders) {
-      case JINGLE_CONTENT_SENDERS_INITIATOR:
+      case WOCKY_JINGLE_CONTENT_SENDERS_INITIATOR:
         requested_dir = local_initiator ?
           TP_MEDIA_STREAM_DIRECTION_SEND : TP_MEDIA_STREAM_DIRECTION_RECEIVE;
         break;
-      case JINGLE_CONTENT_SENDERS_RESPONDER:
+      case WOCKY_JINGLE_CONTENT_SENDERS_RESPONDER:
         requested_dir = local_initiator ?
           TP_MEDIA_STREAM_DIRECTION_RECEIVE : TP_MEDIA_STREAM_DIRECTION_SEND;
         break;
-      case JINGLE_CONTENT_SENDERS_BOTH:
+      case WOCKY_JINGLE_CONTENT_SENDERS_BOTH:
         requested_dir = TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL;
         break;
       default:
@@ -1870,7 +1870,7 @@ update_direction (GabbleMediaStream *stream, GabbleJingleContent *c)
 }
 
 static void
-content_senders_changed_cb (GabbleJingleContent *c,
+content_senders_changed_cb (WockyJingleContent *c,
                             GParamSpec *pspec,
                             GabbleMediaStream *stream)
 {
@@ -1878,20 +1878,20 @@ content_senders_changed_cb (GabbleJingleContent *c,
 }
 
 static void
-remote_state_changed_cb (GabbleJingleSession *session,
+remote_state_changed_cb (WockyJingleSession *session,
     GabbleMediaStream *stream)
 {
   GabbleMediaStreamPrivate *priv = stream->priv;
   gboolean old_hold = priv->on_hold;
 
-  priv->on_hold = gabble_jingle_session_get_remote_hold (session);
+  priv->on_hold = wocky_jingle_session_get_remote_hold (session);
 
   if (old_hold != priv->on_hold)
     push_sending (stream);
 }
 
 static void
-content_removed_cb (GabbleJingleContent *content, GabbleMediaStream *stream)
+content_removed_cb (WockyJingleContent *content, GabbleMediaStream *stream)
 {
   gabble_media_stream_close (stream);
 }
@@ -1905,7 +1905,7 @@ gabble_media_stream_change_direction (GabbleMediaStream *stream,
   CombinedStreamDirection new_combined_dir;
   TpMediaStreamDirection current_dir;
   TpMediaStreamPendingSend pending_send;
-  JingleContentSenders senders;
+  WockyJingleContentSenders senders;
   gboolean local_initiator;
 
   current_dir = COMBINED_DIRECTION_GET_DIRECTION (stream->combined_direction);
@@ -1927,7 +1927,7 @@ gabble_media_stream_change_direction (GabbleMediaStream *stream,
   new_combined_dir = MAKE_COMBINED_DIRECTION (requested_dir, pending_send);
   if (new_combined_dir != stream->combined_direction)
     {
-      JingleContentState state;
+      WockyJingleContentState state;
       gboolean start_sending;
 
       g_object_set (stream, "combined-direction", new_combined_dir, NULL);
@@ -1938,7 +1938,7 @@ gabble_media_stream_change_direction (GabbleMediaStream *stream,
        * This appears to be the meaning of Acknowledged. :-)
        */
       g_object_get (stream->priv->content, "state", &state, NULL);
-      start_sending = (state == JINGLE_CONTENT_STATE_ACKNOWLEDGED);
+      start_sending = (state == WOCKY_JINGLE_CONTENT_STATE_ACKNOWLEDGED);
 
       update_sending (stream, start_sending);
     }
@@ -1955,23 +1955,23 @@ gabble_media_stream_change_direction (GabbleMediaStream *stream,
     {
       case TP_MEDIA_STREAM_DIRECTION_SEND:
         senders = local_initiator ?
-          JINGLE_CONTENT_SENDERS_INITIATOR : JINGLE_CONTENT_SENDERS_RESPONDER;
+          WOCKY_JINGLE_CONTENT_SENDERS_INITIATOR : WOCKY_JINGLE_CONTENT_SENDERS_RESPONDER;
         break;
 
       case TP_MEDIA_STREAM_DIRECTION_RECEIVE:
         senders = local_initiator ?
-          JINGLE_CONTENT_SENDERS_RESPONDER : JINGLE_CONTENT_SENDERS_INITIATOR;
+          WOCKY_JINGLE_CONTENT_SENDERS_RESPONDER : WOCKY_JINGLE_CONTENT_SENDERS_INITIATOR;
         break;
 
       case TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL:
-        senders = JINGLE_CONTENT_SENDERS_BOTH;
+        senders = WOCKY_JINGLE_CONTENT_SENDERS_BOTH;
         break;
 
       default:
         g_assert_not_reached ();
     }
 
-  if (!gabble_jingle_content_change_direction (priv->content, senders))
+  if (!wocky_jingle_content_change_direction (priv->content, senders))
     {
       g_set_error (error, TP_ERROR, TP_ERROR_NOT_AVAILABLE,
           "stream direction invalid for the Jingle dialect in use");
@@ -2048,13 +2048,13 @@ stream_handler_iface_init (gpointer g_iface, gpointer iface_data)
 #undef IMPLEMENT
 }
 
-GabbleJingleMediaRtp *
+WockyJingleMediaRtp *
 gabble_media_stream_get_content (GabbleMediaStream *self)
 {
   /* FIXME: we should fix this whole class up. It relies throughout on
-   *        self->priv->content actually secretly being a GabbleJingleMediaRtp.
+   *        self->priv->content actually secretly being a WockyJingleMediaRtp.
    */
-  return GABBLE_JINGLE_MEDIA_RTP (self->priv->content);
+  return WOCKY_JINGLE_MEDIA_RTP (self->priv->content);
 }
 
 void
diff --git a/src/media-stream.h b/src/media-stream.h
index 277399d07..1543a9dae 100644
--- a/src/media-stream.h
+++ b/src/media-stream.h
@@ -99,7 +99,7 @@ void gabble_media_stream_accept_pending_local_send (GabbleMediaStream *stream);
 GabbleMediaStream *gabble_media_stream_new (
     TpDBusDaemon *dbus_daemon,
     const gchar *object_path,
-    GabbleJingleContent *content,
+    WockyJingleContent *content,
     const gchar *name,
     guint id,
     const gchar *nat_traversal,
@@ -110,7 +110,7 @@ TpMediaStreamType gabble_media_stream_get_media_type (GabbleMediaStream *self);
 void gabble_media_stream_add_dtmf_player (GabbleMediaStream *self,
     TpDTMFPlayer *dtmf_player);
 
-GabbleJingleMediaRtp *gabble_media_stream_get_content (GabbleMediaStream *self);
+WockyJingleMediaRtp *gabble_media_stream_get_content (GabbleMediaStream *self);
 
 void gabble_media_stream_start_telephony_event (GabbleMediaStream *self, guchar event);
 void gabble_media_stream_stop_telephony_event (GabbleMediaStream *self);
diff --git a/src/muc-channel.c b/src/muc-channel.c
index a685b07cf..74cde99a1 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -4059,7 +4059,7 @@ gabble_muc_channel_request_call_finish (GabbleMucChannel *gmuc,
 
 gboolean
 gabble_muc_channel_handle_jingle_session (GabbleMucChannel *self,
-    GabbleJingleSession *session)
+    WockyJingleSession *session)
 {
   GabbleMucChannelPrivate *priv = self->priv;
 
diff --git a/src/muc-channel.h b/src/muc-channel.h
index 21535ac23..0db129ed3 100644
--- a/src/muc-channel.h
+++ b/src/muc-channel.h
@@ -125,7 +125,7 @@ gboolean gabble_muc_channel_request_call_finish (GabbleMucChannel *gmuc,
     GError **error);
 
 gboolean gabble_muc_channel_handle_jingle_session (GabbleMucChannel *channel,
-    GabbleJingleSession *session);
+    WockyJingleSession *session);
 #endif
 
 void gabble_muc_channel_update_configuration_async (
diff --git a/src/muc-factory.c b/src/muc-factory.c
index 47e183a93..0f1dbcb07 100644
--- a/src/muc-factory.c
+++ b/src/muc-factory.c
@@ -1866,7 +1866,7 @@ gabble_muc_factory_ensure_channel (TpChannelManager *manager,
 #ifdef ENABLE_VOIP
 gboolean
 gabble_muc_factory_handle_jingle_session (GabbleMucFactory *self,
-  GabbleJingleSession *session)
+  WockyJingleSession *session)
 {
   GabbleMucFactoryPrivate *priv = self->priv;
   TpHandleRepoIface *room_repo = tp_base_connection_get_handles (
@@ -1874,7 +1874,7 @@ gabble_muc_factory_handle_jingle_session (GabbleMucFactory *self,
   TpHandle room;
 
   room = gabble_get_room_handle_from_jid (room_repo,
-    gabble_jingle_session_get_peer_jid (session));
+    wocky_jingle_session_get_peer_jid (session));
 
   if (room != 0)
     {
diff --git a/src/muc-factory.h b/src/muc-factory.h
index 23c635458..aac76c4c2 100644
--- a/src/muc-factory.h
+++ b/src/muc-factory.h
@@ -76,7 +76,7 @@ void gabble_muc_factory_broadcast_presence (GabbleMucFactory *self);
 
 #ifdef ENABLE_VOIP
 gboolean gabble_muc_factory_handle_jingle_session (GabbleMucFactory *self,
-  GabbleJingleSession *session);
+  WockyJingleSession *session);
 #endif
 
 G_END_DECLS
diff --git a/src/util.c b/src/util.c
index 099f7d8fb..b36f5745a 100644
--- a/src/util.c
+++ b/src/util.c
@@ -814,7 +814,7 @@ jingle_pick_best_resource (GabbleConnection *conn,
     gboolean want_audio,
     gboolean want_video,
     const char **transport_ns,
-    JingleDialect *dialect,
+    WockyJingleDialect *dialect,
     const gchar **resource_out)
 {
   /* We prefer gtalk-p2p to ice, because it can use tcp and https relays (if
@@ -838,7 +838,7 @@ jingle_pick_best_resource (GabbleConnection *conn,
       return FALSE;
     }
 
-  *dialect = JINGLE_DIALECT_ERROR;
+  *dialect = WOCKY_JINGLE_DIALECT_ERROR;
   *transport_ns = NULL;
 
   g_return_val_if_fail (want_audio || want_video, FALSE);
@@ -856,7 +856,7 @@ jingle_pick_best_resource (GabbleConnection *conn,
 
   if (jingle_pick_resource_or_bare_jid (presence, caps, &resource))
     {
-      *dialect = JINGLE_DIALECT_V032;
+      *dialect = WOCKY_JINGLE_DIALECT_V032;
       goto CHOOSE_TRANSPORT;
     }
 
@@ -870,7 +870,7 @@ jingle_pick_best_resource (GabbleConnection *conn,
 
   if (jingle_pick_resource_or_bare_jid (presence, caps, &resource))
     {
-      *dialect = JINGLE_DIALECT_V015;
+      *dialect = WOCKY_JINGLE_DIALECT_V015;
       goto CHOOSE_TRANSPORT;
     }
 
@@ -890,7 +890,7 @@ jingle_pick_best_resource (GabbleConnection *conn,
 
   if (jingle_pick_resource_or_bare_jid (presence, caps, &resource))
     {
-      *dialect = JINGLE_DIALECT_GTALK3;
+      *dialect = WOCKY_JINGLE_DIALECT_GTALK3;
       goto CHOOSE_TRANSPORT;
     }
 
@@ -907,7 +907,7 @@ jingle_pick_best_resource (GabbleConnection *conn,
 
   if (jingle_pick_resource_or_bare_jid (presence, caps, &resource))
     {
-      *dialect = JINGLE_DIALECT_GTALK4;
+      *dialect = WOCKY_JINGLE_DIALECT_GTALK4;
       goto CHOOSE_TRANSPORT;
     }
 
@@ -921,7 +921,7 @@ CHOOSE_TRANSPORT:
 
   success = TRUE;
 
-  if (*dialect == JINGLE_DIALECT_GTALK4 || *dialect == JINGLE_DIALECT_GTALK3)
+  if (*dialect == WOCKY_JINGLE_DIALECT_GTALK4 || *dialect == WOCKY_JINGLE_DIALECT_GTALK3)
     {
       /* the GTalk dialects only support google p2p as transport protocol. */
       *transport_ns = NS_GOOGLE_TRANSPORT_P2P;
@@ -949,20 +949,20 @@ const gchar *
 jingle_pick_best_content_type (GabbleConnection *conn,
   TpHandle peer,
   const gchar *resource,
-  JingleMediaType type)
+  WockyJingleMediaType type)
 {
   GabblePresence *presence;
   const GabbleFeatureFallback content_types[] = {
       /* if $thing is supported, then use it */
         { TRUE, TWICE (NS_JINGLE_RTP) },
-        { type == JINGLE_MEDIA_TYPE_VIDEO,
+        { type == WOCKY_JINGLE_MEDIA_TYPE_VIDEO,
             TWICE (NS_JINGLE_DESCRIPTION_VIDEO) },
-        { type == JINGLE_MEDIA_TYPE_AUDIO,
+        { type == WOCKY_JINGLE_MEDIA_TYPE_AUDIO,
             TWICE (NS_JINGLE_DESCRIPTION_AUDIO) },
       /* odd Google ones: if $thing is supported, use $other_thing */
-        { type == JINGLE_MEDIA_TYPE_AUDIO,
+        { type == WOCKY_JINGLE_MEDIA_TYPE_AUDIO,
           NS_GOOGLE_FEAT_VOICE, NS_GOOGLE_SESSION_PHONE },
-        { type == JINGLE_MEDIA_TYPE_VIDEO,
+        { type == WOCKY_JINGLE_MEDIA_TYPE_VIDEO,
           NS_GOOGLE_FEAT_VIDEO, NS_GOOGLE_SESSION_VIDEO },
         { FALSE, NULL, NULL }
   };
@@ -988,23 +988,23 @@ jingle_pick_best_content_type (GabbleConnection *conn,
 }
 
 static TpCallStreamCandidateType
-tp_candidate_type_from_jingle (JingleCandidateType type)
+tp_candidate_type_from_jingle (WockyJingleCandidateType type)
 {
   switch (type)
     {
     default:
       /* Consider UNKNOWN as LOCAL/HOST */
-    case JINGLE_CANDIDATE_TYPE_LOCAL:
+    case WOCKY_JINGLE_CANDIDATE_TYPE_LOCAL:
       return TP_CALL_STREAM_CANDIDATE_TYPE_HOST;
-    case JINGLE_CANDIDATE_TYPE_STUN:
+    case WOCKY_JINGLE_CANDIDATE_TYPE_STUN:
       return TP_CALL_STREAM_CANDIDATE_TYPE_SERVER_REFLEXIVE;
-    case JINGLE_CANDIDATE_TYPE_RELAY:
+    case WOCKY_JINGLE_CANDIDATE_TYPE_RELAY:
       return TP_CALL_STREAM_CANDIDATE_TYPE_RELAY;
     }
 }
 
 /**
- * @candidates: (element-type JingleCandidate): candidates
+ * @candidates: (element-type WockyJingleCandidate): candidates
  *
  * Returns: (transfer full): a GABBLE_ARRAY_TYPE_CANDIDATE_LIST, i.e.
  *  a(usqa{sv})
@@ -1019,7 +1019,7 @@ gabble_call_candidates_to_array (GList *candidates)
 
   for (c = candidates; c != NULL; c = g_list_next (c))
     {
-        JingleCandidate *cand = (JingleCandidate *) c->data;
+        WockyJingleCandidate *cand = (WockyJingleCandidate *) c->data;
         GValueArray *a;
         GHashTable *info;
 
diff --git a/src/util.h b/src/util.h
index cfea342d5..594205c00 100644
--- a/src/util.h
+++ b/src/util.h
@@ -83,13 +83,13 @@ gboolean jingle_pick_best_resource (GabbleConnection *conn,
     gboolean want_audio,
     gboolean want_video,
     const char **transport_ns,
-    JingleDialect *dialect,
+    WockyJingleDialect *dialect,
     const gchar **resource_out);
 
 const gchar *jingle_pick_best_content_type (GabbleConnection *conn,
     TpHandle peer,
     const gchar *resource,
-    JingleMediaType type);
+    WockyJingleMediaType type);
 
 GPtrArray *gabble_call_candidates_to_array (GList *candidates);
 #endif
diff --git a/tests/twisted/main-debug.c b/tests/twisted/main-debug.c
index cebf89aef..56334c591 100644
--- a/tests/twisted/main-debug.c
+++ b/tests/twisted/main-debug.c
@@ -108,7 +108,7 @@ main (int argc,
       "stun", "udp", "stunning.localhost", "resolves-to-5.4.3.2", 1);
 
 #ifdef ENABLE_VOIP
-  gabble_jingle_info_set_test_mode ();
+  wocky_jingle_info_set_test_mode ();
 #endif
 
 #ifdef ENABLE_JINGLE_FILE_TRANSFER
author	Will Thompson <will.thompson@collabora.co.uk>	2012-02-21 16:11:32 +0000
committer	Will Thompson <will.thompson@collabora.co.uk>	2012-12-11 16:47:19 +0000
commit	efc093b82db19196d66e02100316295c0cc7e92e (patch)
tree	175d69adcb0289d26365b16a689197a19c98b6bb
parent	0f1435f548071f873d7626643f250b04b53931c9 (diff)