gibber: remove GibberXmppNode wrapper

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

21 files changed, 172 insertions, 261 deletions

diff --git a/lib/gibber/Makefile.am b/lib/gibber/Makefile.am
index 6a8e51f6..4b6ce8f4 100644
--- a/lib/gibber/Makefile.am
+++ b/lib/gibber/Makefile.am
@@ -26,8 +26,6 @@ HANDWRITTEN_SOURCES =             \
   gibber-bytestream-direct.c      \
   gibber-debug.c                  \
   gibber-debug.h                  \
-  gibber-xmpp-node.c              \
-  gibber-xmpp-node.h              \
   gibber-xmpp-reader.c            \
   gibber-xmpp-reader.h            \
   gibber-xmpp-writer.c            \
diff --git a/lib/gibber/gibber-bytestream-ibb.c b/lib/gibber/gibber-bytestream-ibb.c
index 792d0243..d2f521af 100644
--- a/lib/gibber/gibber-bytestream-ibb.c
+++ b/lib/gibber/gibber-bytestream-ibb.c
@@ -99,7 +99,7 @@ xmpp_connection_received_stanza_cb (GibberXmppConnection *conn,
   GibberBytestreamIBB *self = (GibberBytestreamIBB *) user_data;
   GibberBytestreamIBBPrivate *priv = GIBBER_BYTESTREAM_IBB_GET_PRIVATE (self);
   WockyNode *node = wocky_stanza_get_top_node (stanza);
-  GibberXmppNode *data;
+  WockyNode *data;
   GString *str;
   guchar *decoded;
   gsize len;
@@ -125,7 +125,7 @@ xmpp_connection_received_stanza_cb (GibberXmppConnection *conn,
       return;
     }
 
-  from = gibber_xmpp_node_get_attribute (node, "from");
+  from = wocky_node_get_attribute (node, "from");
   if (from == NULL)
     {
       DEBUG ("got a message without a from field, ignoring");
@@ -431,7 +431,7 @@ gibber_bytestream_ibb_accept (GibberBytestreamIface *bytestream,
   GibberBytestreamIBBPrivate *priv = GIBBER_BYTESTREAM_IBB_GET_PRIVATE (self);
   WockyStanza *stanza;
   WockyNode *node;
-  GibberXmppNode *si;
+  WockyNode *si;
 
   if (priv->state != GIBBER_BYTESTREAM_STATE_LOCAL_PENDING)
     {
@@ -442,7 +442,7 @@ gibber_bytestream_ibb_accept (GibberBytestreamIface *bytestream,
 
   stanza = create_si_accept_iq (self);
   node = wocky_stanza_get_top_node (stanza);
-  si = gibber_xmpp_node_get_child_ns (node, "si", GIBBER_XMPP_NS_SI);
+  si = wocky_node_get_child_ns (node, "si", GIBBER_XMPP_NS_SI);
   g_assert (si != NULL);
 
   if (func != NULL)
diff --git a/lib/gibber/gibber-bytestream-iface.h b/lib/gibber/gibber-bytestream-iface.h
index 38542461..5f17ba70 100644
--- a/lib/gibber/gibber-bytestream-iface.h
+++ b/lib/gibber/gibber-bytestream-iface.h
@@ -24,8 +24,6 @@
 
 #include <wocky/wocky-stanza.h>
 
-#include "gibber-xmpp-node.h"
-
 G_BEGIN_DECLS
 
 typedef enum
@@ -46,7 +44,7 @@ typedef enum
 } GibberBytestreamState;
 
 typedef void (* GibberBytestreamAugmentSiAcceptReply) (
-    GibberXmppNode *si, gpointer user_data);
+    WockyNode *si, gpointer user_data);
 
 typedef struct _GibberBytestreamIface GibberBytestreamIface;
 typedef struct _GibberBytestreamIfaceClass GibberBytestreamIfaceClass;
diff --git a/lib/gibber/gibber-bytestream-oob.c b/lib/gibber/gibber-bytestream-oob.c
index fa7f83b7..51c887cd 100644
--- a/lib/gibber/gibber-bytestream-oob.c
+++ b/lib/gibber/gibber-bytestream-oob.c
@@ -312,7 +312,7 @@ parse_oob_init_iq (GibberBytestreamOOB *self,
                    WockyStanza *stanza)
 {
   GibberBytestreamOOBPrivate *priv = GIBBER_BYTESTREAM_OOB_GET_PRIVATE (self);
-  GibberXmppNode *query_node, *url_node;
+  WockyNode *query_node, *url_node;
   WockyStanzaType type;
   WockyStanzaSubType sub_type;
   const gchar *stream_id, *url;
@@ -324,22 +324,22 @@ parse_oob_init_iq (GibberBytestreamOOB *self,
       sub_type != WOCKY_STANZA_SUB_TYPE_SET)
     return FALSE;
 
-  query_node = gibber_xmpp_node_get_child_ns (node, "query",
+  query_node = wocky_node_get_child_ns (node, "query",
       GIBBER_XMPP_NS_IQ_OOB);
   if (query_node == NULL)
     return FALSE;
 
-  stream_id = gibber_xmpp_node_get_attribute (query_node, "sid");
+  stream_id = wocky_node_get_attribute (query_node, "sid");
   if (stream_id == NULL || strcmp (stream_id, priv->stream_id) != 0)
     return FALSE;
 
-  url_node = gibber_xmpp_node_get_child (query_node, "url");
+  url_node = wocky_node_get_child (query_node, "url");
   if (url_node == NULL)
     return FALSE;
   url = url_node->content;
 
   priv->recipient = TRUE;
-  priv->stream_open_id = g_strdup (gibber_xmpp_node_get_attribute (
+  priv->stream_open_id = g_strdup (wocky_node_get_attribute (
         node, "id"));
 
   connect_to_url (self, url);
@@ -368,7 +368,7 @@ parse_oob_iq_result (GibberBytestreamOOB *self,
     return FALSE;
 
   /* FIXME: we should check if it's the right sender */
-  id = gibber_xmpp_node_get_attribute (node, "id");
+  id = wocky_node_get_attribute (node, "id");
 
   if (id == NULL || strcmp (id, priv->stream_open_id) != 0)
     return FALSE;
@@ -388,7 +388,7 @@ xmpp_connection_received_stanza_cb (GibberXmppConnection *conn,
   const gchar *from;
 
   /* discard invalid stanza */
-  from = gibber_xmpp_node_get_attribute (node, "from");
+  from = wocky_node_get_attribute (node, "from");
   if (from == NULL)
     {
       DEBUG ("got a message without a from field");
@@ -755,7 +755,7 @@ gibber_bytestream_oob_accept (GibberBytestreamIface *bytestream,
   GibberBytestreamOOBPrivate *priv = GIBBER_BYTESTREAM_OOB_GET_PRIVATE (self);
   WockyStanza *stanza;
   WockyNode *node;
-  GibberXmppNode *si;
+  WockyNode *si;
 
   if (priv->state != GIBBER_BYTESTREAM_STATE_LOCAL_PENDING)
     {
@@ -766,7 +766,7 @@ gibber_bytestream_oob_accept (GibberBytestreamIface *bytestream,
 
   stanza = create_si_accept_iq (self);
   node = wocky_stanza_get_top_node (stanza);
-  si = gibber_xmpp_node_get_child_ns (node, "si", GIBBER_XMPP_NS_SI);
+  si = wocky_node_get_child_ns (node, "si", GIBBER_XMPP_NS_SI);
   g_assert (si != NULL);
 
   if (func != NULL)
@@ -990,12 +990,12 @@ gibber_bytestream_oob_initiate (GibberBytestreamIface *bytestream)
   g_free (url);
   node = wocky_stanza_get_top_node (stanza);
 
-  id = gibber_xmpp_node_get_attribute (node, "id");
+  id = wocky_node_get_attribute (node, "id");
   if (id == NULL)
     {
       priv->stream_open_id = gibber_xmpp_connection_new_id (
           priv->xmpp_connection);
-      gibber_xmpp_node_set_attribute (node, "id",
+      wocky_node_set_attribute (node, "id",
           priv->stream_open_id);
     }
   else
diff --git a/lib/gibber/gibber-debug.c b/lib/gibber/gibber-debug.c
index 9aecf0fe..47cc8742 100644
--- a/lib/gibber/gibber-debug.c
+++ b/lib/gibber/gibber-debug.c
@@ -87,7 +87,7 @@ gibber_debug_stanza (DebugFlags flag,
       msg = g_strdup_vprintf (format, args);
       va_end (args);
 
-      node_str = gibber_xmpp_node_to_string (node);
+      node_str = wocky_node_to_string (node);
 
       g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s\n%s", msg, node_str);
 
diff --git a/lib/gibber/gibber-debug.h b/lib/gibber/gibber-debug.h
index d7c1dea6..aeef49af 100644
--- a/lib/gibber/gibber-debug.h
+++ b/lib/gibber/gibber-debug.h
@@ -7,7 +7,6 @@
 #include <glib.h>
 
 #include <wocky/wocky-stanza.h>
-#include "gibber-xmpp-node.h"
 
 G_BEGIN_DECLS
 
diff --git a/lib/gibber/gibber-file-transfer.c b/lib/gibber/gibber-file-transfer.c
index 4e9ca299..7f8d2843 100644
--- a/lib/gibber/gibber-file-transfer.c
+++ b/lib/gibber/gibber-file-transfer.c
@@ -337,7 +337,7 @@ received_stanza_cb (GibberXmppConnection *conn,
   GibberFileTransfer *self = user_data;
   const gchar *id;
 
-  id = gibber_xmpp_node_get_attribute (wocky_stanza_get_top_node (stanza),
+  id = wocky_node_get_attribute (wocky_stanza_get_top_node (stanza),
       "id");
   if (id != NULL && strcmp (id, self->id) == 0)
     GIBBER_FILE_TRANSFER_GET_CLASS (self)->received_stanza (self, stanza);
diff --git a/lib/gibber/gibber-iq-helper.c b/lib/gibber/gibber-iq-helper.c
index 920fd702..24532255 100644
--- a/lib/gibber/gibber-iq-helper.c
+++ b/lib/gibber/gibber-iq-helper.c
@@ -103,7 +103,7 @@ xmpp_connection_received_stanza_cb (GibberXmppConnection *conn,
   const gchar *id;
   ReplyHandlerData *data;
 
-  id = gibber_xmpp_node_get_attribute (node, "id");
+  id = wocky_node_get_attribute (node, "id");
   if (id == NULL)
     return;
 
@@ -116,9 +116,9 @@ xmpp_connection_received_stanza_cb (GibberXmppConnection *conn,
     return;
 
   /* Its subtype have to be "result" or "error" */
-  if (strcmp (gibber_xmpp_node_get_attribute (node, "type"), "result")
+  if (strcmp (wocky_node_get_attribute (node, "type"), "result")
       != 0 &&
-      strcmp (gibber_xmpp_node_get_attribute (node, "type"), "error")
+      strcmp (wocky_node_get_attribute (node, "type"), "error")
       != 0)
     return;
 
@@ -314,11 +314,11 @@ gibber_iq_helper_send_with_reply (GibberIqHelper *self,
 
   priv = GIBBER_IQ_HELPER_GET_PRIVATE (self);
 
-  tmp = gibber_xmpp_node_get_attribute (node, "id");
+  tmp = wocky_node_get_attribute (node, "id");
   if (tmp == NULL)
     {
       id = gibber_xmpp_connection_new_id (priv->xmpp_connection);
-      gibber_xmpp_node_set_attribute (node, "id", id);
+      wocky_node_set_attribute (node, "id", id);
     }
   else
     {
@@ -364,11 +364,11 @@ new_reply (WockyStanza *iq,
       sub_type == WOCKY_STANZA_SUB_TYPE_ERROR, NULL);
   g_return_val_if_fail (strcmp (node->name, "iq") == 0, NULL);
 
-  id = gibber_xmpp_node_get_attribute (node, "id");
+  id = wocky_node_get_attribute (node, "id");
   g_return_val_if_fail (id != NULL, NULL);
 
-  iq_from = gibber_xmpp_node_get_attribute (node, "from");
-  iq_to = gibber_xmpp_node_get_attribute (node, "to");
+  iq_from = wocky_node_get_attribute (node, "from");
+  iq_to = wocky_node_get_attribute (node, "to");
 
   reply = wocky_stanza_build (WOCKY_STANZA_TYPE_IQ,
       sub_type,
diff --git a/lib/gibber/gibber-oob-file-transfer.c b/lib/gibber/gibber-oob-file-transfer.c
index 43a4b37b..b811f8b9 100644
--- a/lib/gibber/gibber-oob-file-transfer.c
+++ b/lib/gibber/gibber-oob-file-transfer.c
@@ -139,8 +139,8 @@ gibber_oob_file_transfer_is_file_offer (WockyStanza *stanza)
 {
   WockyStanzaType type;
   WockyStanzaSubType sub_type;
-  GibberXmppNode *query;
-  GibberXmppNode *url;
+  WockyNode *query;
+  WockyNode *url;
   const gchar *url_content;
 
   wocky_stanza_get_type_info (stanza, &type, &sub_type);
@@ -150,12 +150,12 @@ gibber_oob_file_transfer_is_file_offer (WockyStanza *stanza)
       return FALSE;
     }
 
-  query = gibber_xmpp_node_get_child (wocky_stanza_get_top_node (stanza),
+  query = wocky_node_get_child (wocky_stanza_get_top_node (stanza),
       "query");
   if (query == NULL)
     return FALSE;
 
-  url = gibber_xmpp_node_get_child (query, "url");
+  url = wocky_node_get_child (query, "url");
   if (url == NULL)
     return FALSE;
 
@@ -183,9 +183,9 @@ gibber_oob_file_transfer_new_from_stanza_with_from (
 {
   WockyNode *node = wocky_stanza_get_top_node (stanza);
   GibberOobFileTransfer *self;
-  GibberXmppNode *query;
-  GibberXmppNode *url_node;
-  GibberXmppNode *desc_node;
+  WockyNode *query;
+  WockyNode *url_node;
+  WockyNode *desc_node;
   const gchar *self_id;
   const gchar *type;
   const gchar *id;
@@ -203,7 +203,7 @@ gibber_oob_file_transfer_new_from_stanza_with_from (
       return NULL;
     }
 
-  self_id = gibber_xmpp_node_get_attribute (node, "to");
+  self_id = wocky_node_get_attribute (node, "to");
 
   if (peer_id == NULL)
     {
@@ -219,7 +219,7 @@ gibber_oob_file_transfer_new_from_stanza_with_from (
       return NULL;
     }
 
-  type = gibber_xmpp_node_get_attribute (node, "type");
+  type = wocky_node_get_attribute (node, "type");
 
   if (type == NULL || strcmp (type, "set") != 0)
     {
@@ -228,7 +228,7 @@ gibber_oob_file_transfer_new_from_stanza_with_from (
       return NULL;
     }
 
-  id = gibber_xmpp_node_get_attribute (node, "id");
+  id = wocky_node_get_attribute (node, "id");
 
   if (id == NULL)
     {
@@ -237,7 +237,7 @@ gibber_oob_file_transfer_new_from_stanza_with_from (
       return NULL;
     }
 
-  query = gibber_xmpp_node_get_child (node, "query");
+  query = wocky_node_get_child (node, "query");
 
   if (query == NULL)
     {
@@ -246,7 +246,7 @@ gibber_oob_file_transfer_new_from_stanza_with_from (
       return NULL;
     }
 
-  url_node = gibber_xmpp_node_get_child (query, "url");
+  url_node = wocky_node_get_child (query, "url");
 
   if (url_node == NULL)
     {
@@ -262,7 +262,7 @@ gibber_oob_file_transfer_new_from_stanza_with_from (
       return NULL;
     }
 
-  ft_type = gibber_xmpp_node_get_attribute (url_node, "type");
+  ft_type = wocky_node_get_attribute (url_node, "type");
 
   if (ft_type != NULL && gibber_strdiff (ft_type, "file"))
     {
@@ -286,13 +286,13 @@ gibber_oob_file_transfer_new_from_stanza_with_from (
   filename++; /* move after the last "/" */
   filename = g_uri_unescape_string (filename, NULL);
 
-  desc_node = gibber_xmpp_node_get_child (query, "desc");
+  desc_node = wocky_node_get_child (query, "desc");
   if (desc_node != NULL)
     {
       description = desc_node->content;
     }
 
-  content_type = gibber_xmpp_node_get_attribute (url_node, "mimeType");
+  content_type = wocky_node_get_attribute (url_node, "mimeType");
   if (content_type == NULL)
     {
       content_type = "application/octet-stream";
@@ -309,7 +309,7 @@ gibber_oob_file_transfer_new_from_stanza_with_from (
       "content-type", content_type,
       NULL);
 
-  size = gibber_xmpp_node_get_attribute (url_node, "size");
+  size = wocky_node_get_attribute (url_node, "size");
   if (size != NULL)
     gibber_file_transfer_set_size (GIBBER_FILE_TRANSFER (self),
       g_ascii_strtoull (size, NULL, 0));
@@ -480,9 +480,9 @@ create_transfer_offer (GibberOobFileTransfer *self,
 
   WockyStanza *stanza;
   WockyNode *node;
-  GibberXmppNode *query_node;
-  GibberXmppNode *url_node;
-  GibberXmppNode *desc_node;
+  WockyNode *query_node;
+  WockyNode *url_node;
+  WockyNode *desc_node;
 
   gchar *filename_escaped;
   gchar *url;
@@ -533,15 +533,15 @@ create_transfer_offer (GibberOobFileTransfer *self,
       NULL);
   node = wocky_stanza_get_top_node (stanza);
 
-  query_node = gibber_xmpp_node_add_child_ns (node, "query",
+  query_node = wocky_node_add_child_ns (node, "query",
       GIBBER_XMPP_NS_IQ_OOB);
 
-  url_node = gibber_xmpp_node_add_child_with_content (query_node, "url", url);
-  gibber_xmpp_node_set_attribute (url_node, "type", "file");
-  gibber_xmpp_node_set_attribute (url_node, "mimeType",
+  url_node = wocky_node_add_child_with_content (query_node, "url", url);
+  wocky_node_set_attribute (url_node, "type", "file");
+  wocky_node_set_attribute (url_node, "mimeType",
       GIBBER_FILE_TRANSFER (self)->content_type);
 
-  desc_node = gibber_xmpp_node_add_child_with_content (query_node, "desc",
+  desc_node = wocky_node_add_child_with_content (query_node, "desc",
       GIBBER_FILE_TRANSFER (self)->description);
 
   size = gibber_file_transfer_get_size (GIBBER_FILE_TRANSFER (self));
@@ -551,7 +551,7 @@ create_transfer_offer (GibberOobFileTransfer *self,
     {
       gchar *size_str = g_strdup_printf ("%" G_GUINT64_FORMAT,
           size);
-      gibber_xmpp_node_set_attribute (url_node, "size", size_str);
+      wocky_node_set_attribute (url_node, "size", size_str);
       g_free (size_str);
     }
 
@@ -829,9 +829,9 @@ gibber_oob_file_transfer_cancel (GibberFileTransfer *ft,
   GibberOobFileTransfer *self = GIBBER_OOB_FILE_TRANSFER (ft);
   WockyStanza *stanza;
   WockyNode *node;
-  GibberXmppNode *query;
-  GibberXmppNode *error_node;
-  GibberXmppNode *error_desc;
+  WockyNode *query;
+  WockyNode *error_node;
+  WockyNode *error_desc;
   gchar *code_string;
 
   if (self->priv->cancelled)
@@ -851,25 +851,25 @@ gibber_oob_file_transfer_cancel (GibberFileTransfer *ft,
       NULL);
   node = wocky_stanza_get_top_node (stanza);
 
-  query = gibber_xmpp_node_add_child_ns (node, "query",
+  query = wocky_node_add_child_ns (node, "query",
       GIBBER_XMPP_NS_IQ_OOB);
-  gibber_xmpp_node_add_child_with_content (query, "url", self->priv->url);
+  wocky_node_add_child_with_content (query, "url", self->priv->url);
 
-  error_node = gibber_xmpp_node_add_child (node, "error");
+  error_node = wocky_node_add_child (node, "error");
   code_string = g_strdup_printf ("%d", error_code);
 
   switch (error_code)
     {
       case HTTP_STATUS_CODE_NOT_FOUND:
-        gibber_xmpp_node_set_attribute (error_node, "code", code_string);
-        gibber_xmpp_node_set_attribute (error_node, "type", "cancel");
-        error_desc = gibber_xmpp_node_add_child_ns (error_node,
+        wocky_node_set_attribute (error_node, "code", code_string);
+        wocky_node_set_attribute (error_node, "type", "cancel");
+        error_desc = wocky_node_add_child_ns (error_node,
             "item-not-found", GIBBER_XMPP_NS_STANZAS);
         break;
       case HTTP_STATUS_CODE_NOT_ACCEPTABLE:
-        gibber_xmpp_node_set_attribute (error_node, "code", code_string);
-        gibber_xmpp_node_set_attribute (error_node, "type", "modify");
-        error_desc = gibber_xmpp_node_add_child_ns (error_node,
+        wocky_node_set_attribute (error_node, "code", code_string);
+        wocky_node_set_attribute (error_node, "type", "modify");
+        error_desc = wocky_node_add_child_ns (error_node,
             "not-acceptable", GIBBER_XMPP_NS_STANZAS);
         break;
       default:
@@ -890,12 +890,12 @@ gibber_oob_file_transfer_received_stanza (GibberFileTransfer *ft,
   GibberOobFileTransfer *self = GIBBER_OOB_FILE_TRANSFER (ft);
   WockyNode *node = wocky_stanza_get_top_node (stanza);
   const gchar *type;
-  GibberXmppNode *error_node;
+  WockyNode *error_node;
 
   if (strcmp (node->name, "iq") != 0)
     return;
 
-  type = gibber_xmpp_node_get_attribute (node, "type");
+  type = wocky_node_get_attribute (node, "type");
   if (type == NULL)
     return;
 
@@ -905,7 +905,7 @@ gibber_oob_file_transfer_received_stanza (GibberFileTransfer *ft,
       return;
     }
 
-  error_node = gibber_xmpp_node_get_child (node, "error");
+  error_node = wocky_node_get_child (node, "error");
   if (error_node != NULL)
     {
       GError *error = NULL;
@@ -914,10 +914,10 @@ gibber_oob_file_transfer_received_stanza (GibberFileTransfer *ft,
       self->priv->cancelled = TRUE;
 
       /* FIXME copy the error handling code from gabble */
-      error_code_str = gibber_xmpp_node_get_attribute (error_node, "code");
+      error_code_str = wocky_node_get_attribute (error_node, "code");
       if (error_code_str == NULL)
         /* iChat uses the 'type' attribute to transmit the error code */
-        error_code_str = gibber_xmpp_node_get_attribute (error_node, "type");
+        error_code_str = wocky_node_get_attribute (error_node, "type");
 
       if (error_code_str != NULL && g_ascii_strtoll (error_code_str, NULL,
             10) == HTTP_STATUS_CODE_NOT_ACCEPTABLE)
diff --git a/lib/gibber/gibber-xmpp-error.c b/lib/gibber/gibber-xmpp-error.c
index 20adb94b..1d03238d 100644
--- a/lib/gibber/gibber-xmpp-error.c
+++ b/lib/gibber/gibber-xmpp-error.c
@@ -317,7 +317,7 @@ gibber_xmpp_error_quark (void)
 }
 
 GibberXmppError
-gibber_xmpp_error_from_node (GibberXmppNode *error_node)
+gibber_xmpp_error_from_node (WockyNode *error_node)
 {
   gint i, j;
   const gchar *error_code_str;
@@ -331,7 +331,7 @@ gibber_xmpp_error_from_node (GibberXmppNode *error_node)
        * numbers; the >= 0 test is OK because i is signed */
       for (i = NUM_XMPP_ERRORS - 1; i >= 0; i--)
         {
-          if (gibber_xmpp_node_get_child_ns (error_node, xmpp_errors[i].name,
+          if (wocky_node_get_child_ns (error_node, xmpp_errors[i].name,
                 xmpp_errors[i].namespace))
             {
               return i;
@@ -340,7 +340,7 @@ gibber_xmpp_error_from_node (GibberXmppNode *error_node)
     }
 
   /* Ok, do it the legacy way */
-  error_code_str = gibber_xmpp_node_get_attribute (error_node, "code");
+  error_code_str = wocky_node_get_attribute (error_node, "code");
   if (error_code_str)
     {
       gint error_code;
@@ -382,13 +382,13 @@ gibber_xmpp_error_to_g_error (GibberXmppError error)
 /*
  * See RFC 3920: 4.7 Stream Errors, 9.3 Stanza Errors.
  */
-GibberXmppNode *
+WockyNode *
 gibber_xmpp_error_to_node (GibberXmppError error,
-                           GibberXmppNode *parent_node,
+                           WockyNode *parent_node,
                            const gchar *errmsg)
 {
   const XmppErrorSpec *spec, *extra;
-  GibberXmppNode *error_node, *node;
+  WockyNode *error_node, *node;
   gchar str[6];
 
   g_return_val_if_fail (error != XMPP_ERROR_UNDEFINED_CONDITION &&
@@ -405,29 +405,29 @@ gibber_xmpp_error_to_node (GibberXmppError error,
       spec = &xmpp_errors[error];
     }
 
-  error_node = gibber_xmpp_node_add_child (parent_node, "error");
+  error_node = wocky_node_add_child (parent_node, "error");
 
   sprintf (str, "%d", spec->legacy_errors[0]);
-  gibber_xmpp_node_set_attribute (error_node, "code", str);
+  wocky_node_set_attribute (error_node, "code", str);
 
   if (spec->type)
     {
-      gibber_xmpp_node_set_attribute (error_node, "type", spec->type);
+      wocky_node_set_attribute (error_node, "type", spec->type);
     }
 
-  node = gibber_xmpp_node_add_child_ns (error_node, spec->name,
+  node = wocky_node_add_child_ns (error_node, spec->name,
       GIBBER_XMPP_NS_STANZAS);
 
   if (extra != NULL)
     {
-      node = gibber_xmpp_node_add_child_ns (error_node, extra->name,
+      node = wocky_node_add_child_ns (error_node, extra->name,
           extra->namespace);
     }
 
   if (NULL != errmsg)
     {
-      node = gibber_xmpp_node_add_child (error_node, "text");
-      gibber_xmpp_node_set_content (node, errmsg);
+      node = wocky_node_add_child (error_node, "text");
+      wocky_node_set_content (node, errmsg);
     }
 
   return error_node;
@@ -461,7 +461,7 @@ gibber_message_get_xmpp_error (WockyStanza *msg)
 
   if (sub_type == WOCKY_STANZA_SUB_TYPE_ERROR)
     {
-      GibberXmppNode *error_node = gibber_xmpp_node_get_child (
+      WockyNode *error_node = wocky_node_get_child (
           wocky_stanza_get_top_node (msg), "error");
 
       if (error_node != NULL)
diff --git a/lib/gibber/gibber-xmpp-error.h b/lib/gibber/gibber-xmpp-error.h
index 7552ab77..8e7a540a 100644
--- a/lib/gibber/gibber-xmpp-error.h
+++ b/lib/gibber/gibber-xmpp-error.h
@@ -23,7 +23,6 @@
 
 #include <glib.h>
 #include <wocky/wocky-stanza.h>
-#include "gibber-xmpp-node.h"
 
 typedef enum {
     XMPP_ERROR_UNDEFINED_CONDITION = 0, /* 500 */
@@ -77,9 +76,9 @@ typedef enum {
 GQuark gibber_xmpp_error_quark (void);
 #define GIBBER_XMPP_ERROR (gibber_xmpp_error_quark ())
 
-GibberXmppError gibber_xmpp_error_from_node (GibberXmppNode *error_node);
-GibberXmppNode *gibber_xmpp_error_to_node (GibberXmppError error,
-    GibberXmppNode *parent_node, const gchar *errmsg);
+GibberXmppError gibber_xmpp_error_from_node (WockyNode *error_node);
+WockyNode *gibber_xmpp_error_to_node (GibberXmppError error,
+    WockyNode *parent_node, const gchar *errmsg);
 const gchar *gibber_xmpp_error_string (GibberXmppError error);
 const gchar *gibber_xmpp_error_description (GibberXmppError error);
 GError *gibber_message_get_xmpp_error (WockyStanza *msg);
diff --git a/lib/gibber/gibber-xmpp-node.c b/lib/gibber/gibber-xmpp-node.c
deleted file mode 100644
index 852e8a30..00000000
--- a/lib/gibber/gibber-xmpp-node.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * gibber-xmpp-node.c - Code for Gibber xmpp nodes
- * Copyright (C) 2006 Collabora Ltd.
- * @author Sjoerd Simons <sjoerd@luon.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <glib.h>
-#include <string.h>
-
-#include "gibber-xmpp-node.h"
diff --git a/lib/gibber/gibber-xmpp-node.h b/lib/gibber/gibber-xmpp-node.h
deleted file mode 100644
index 7d2a9f91..00000000
--- a/lib/gibber/gibber-xmpp-node.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * gibber-xmpp-node.h - Header for Gibber xmpp nodes
- * Copyright (C) 2006 Collabora Ltd.
- * @author Sjoerd Simons <sjoerd@luon.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef __GIBBER_XMPP_NODE_H__
-#define __GIBBER_XMPP_NODE_H__
-
-#include <glib.h>
-#include <wocky/wocky-node.h>
-
-G_BEGIN_DECLS
-
-typedef WockyNode GibberXmppNode;
-
-#define gibber_xmpp_node_each_child wocky_node_each_child
-#define gibber_xmpp_node_get_attribute wocky_node_get_attribute
-#define gibber_xmpp_node_get_attribute_ns wocky_node_get_attribute_ns
-#define gibber_xmpp_node_set_attribute wocky_node_set_attribute
-#define gibber_xmpp_node_set_attribute_ns wocky_node_set_attribute_ns
-#define gibber_xmpp_node_set_attribute_n wocky_node_set_attribute_n
-#define gibber_xmpp_node_set_attribute_n_ns wocky_node_set_attribute_n_ns
-#define gibber_xmpp_node_get_child wocky_node_get_child
-#define gibber_xmpp_node_get_child_ns wocky_node_get_child_ns
-#define gibber_xmpp_node_add_child wocky_node_add_child
-#define gibber_xmpp_node_add_child_ns wocky_node_add_child_ns
-#define gibber_xmpp_node_add_child_with_content wocky_node_add_child_with_content
-#define gibber_xmpp_node_add_child_with_content_ns wocky_node_add_child_with_content_ns
-
-#define gibber_xmpp_node_get_ns wocky_node_get_ns
-#define gibber_xmpp_node_get_language wocky_node_get_language
-#define gibber_xmpp_node_set_language wocky_node_set_language
-#define gibber_xmpp_node_set_language_n wocky_node_set_language_n
-#define gibber_xmpp_node_set_content wocky_node_set_content
-#define gibber_xmpp_node_append_content wocky_node_append_content
-#define gibber_xmpp_node_append_content_n wocky_node_append_content_n
-#define gibber_xmpp_node_to_string wocky_node_to_string
-
-#define gibber_xmpp_node_new_ns wocky_node_new
-#define gibber_xmpp_node_free wocky_node_free
-
-G_END_DECLS
-
-#endif /* #ifndef __GIBBER_XMPP_NODE_H__*/
diff --git a/lib/gibber/tests/check-gibber-iq-helper.c b/lib/gibber/tests/check-gibber-iq-helper.c
index 3cbf7f74..c28e8053 100644
--- a/lib/gibber/tests/check-gibber-iq-helper.c
+++ b/lib/gibber/tests/check-gibber-iq-helper.c
@@ -214,7 +214,7 @@ START_TEST (test_send_without_id)
   fail_unless (result);
 
   /* gibber_iq_helper_send_with_reply generated an id */
-  id = gibber_xmpp_node_get_attribute (wocky_stanza_get_top_node (stanza),
+  id = wocky_node_get_attribute (wocky_stanza_get_top_node (stanza),
       "id");
 
   reply = wocky_stanza_build (WOCKY_STANZA_TYPE_IQ,
@@ -260,7 +260,7 @@ START_TEST (test_new_result_reply)
   fail_unless (reply != NULL);
   fail_unless (strcmp (wocky_stanza_get_top_node (reply)->name, "iq") == 0);
   fail_unless (strcmp (
-        gibber_xmpp_node_get_attribute (wocky_stanza_get_top_node (reply),
+        wocky_node_get_attribute (wocky_stanza_get_top_node (reply),
           "type"),
         "result") == 0);
   result = gibber_xmpp_connection_send (xmpp_connection, reply, NULL);
@@ -283,7 +283,7 @@ START_TEST (test_new_error_reply)
   GibberXmppConnection *xmpp_connection = create_xmpp_connection ();
   GibberIqHelper *iq_helper = gibber_iq_helper_new (xmpp_connection);
   WockyStanza *stanza, *reply;
-  GibberXmppNode *error_node, *node;
+  WockyNode *error_node, *node;
   gboolean result;
 
   received_reply = FALSE;
@@ -301,23 +301,23 @@ START_TEST (test_new_error_reply)
       XMPP_ERROR_BAD_REQUEST, "test");
   fail_unless (reply != NULL);
   fail_unless (strcmp (wocky_stanza_get_top_node (reply)->name, "iq") == 0);
-  fail_unless (strcmp (gibber_xmpp_node_get_attribute (
+  fail_unless (strcmp (wocky_node_get_attribute (
           wocky_stanza_get_top_node (reply), "type"),
         "error") == 0);
 
-  error_node = gibber_xmpp_node_get_child (wocky_stanza_get_top_node (reply),
+  error_node = wocky_node_get_child (wocky_stanza_get_top_node (reply),
       "error");
   fail_if (error_node == NULL);
-  fail_if (strcmp (gibber_xmpp_node_get_attribute (error_node, "code"),
+  fail_if (strcmp (wocky_node_get_attribute (error_node, "code"),
         "400") != 0);
-  fail_if (strcmp (gibber_xmpp_node_get_attribute (error_node, "type"),
+  fail_if (strcmp (wocky_node_get_attribute (error_node, "type"),
         "modify") != 0);
 
-  node = gibber_xmpp_node_get_child_ns (error_node, "bad-request",
+  node = wocky_node_get_child_ns (error_node, "bad-request",
       GIBBER_XMPP_NS_STANZAS);
   fail_if (node == NULL);
 
-  node = gibber_xmpp_node_get_child (error_node, "text");
+  node = wocky_node_get_child (error_node, "text");
   fail_if (node == NULL);
   fail_if (strcmp (node->content, "test") != 0);
 
diff --git a/lib/gibber/tests/check-gibber-xmpp-error.c b/lib/gibber/tests/check-gibber-xmpp-error.c
index afd79fde..c0bf5f96 100644
--- a/lib/gibber/tests/check-gibber-xmpp-error.c
+++ b/lib/gibber/tests/check-gibber-xmpp-error.c
@@ -35,7 +35,7 @@ static void
 test_xmpp_error_to_node_with_bad_request (void)
 {
   WockyStanza *stanza;
-  GibberXmppNode *node;
+  WockyNode *node;
   const gchar *code;
   const gchar *type;
 
@@ -49,13 +49,13 @@ test_xmpp_error_to_node_with_bad_request (void)
   fail_if (node == NULL);
   fail_if (strcmp (node->name, "error") != 0);
 
-  code = gibber_xmpp_node_get_attribute (node, "code");
+  code = wocky_node_get_attribute (node, "code");
   fail_if (code == NULL || strcmp (code, "400") != 0);
 
-  type = gibber_xmpp_node_get_attribute (node, "type");
+  type = wocky_node_get_attribute (node, "type");
   fail_if (type == NULL || strcmp (type, "modify") != 0);
 
-  fail_if (gibber_xmpp_node_get_child_ns (node, "bad-request",
+  fail_if (wocky_node_get_child_ns (node, "bad-request",
         "urn:ietf:params:xml:ns:xmpp-stanzas") == NULL);
 
   g_object_unref (stanza);
@@ -65,7 +65,7 @@ static void
 test_xmpp_error_to_node_with_si_bad_profile (void)
 {
   WockyStanza *stanza;
-  GibberXmppNode *node;
+  WockyNode *node;
   const gchar *code;
   const gchar *type;
 
@@ -79,16 +79,16 @@ test_xmpp_error_to_node_with_si_bad_profile (void)
   fail_if (node == NULL);
   fail_if (strcmp (node->name, "error") != 0);
 
-  code = gibber_xmpp_node_get_attribute (node, "code");
+  code = wocky_node_get_attribute (node, "code");
   fail_if (code == NULL || strcmp (code, "400") != 0);
 
-  type = gibber_xmpp_node_get_attribute (node, "type");
+  type = wocky_node_get_attribute (node, "type");
   fail_if (type == NULL || strcmp (type, "modify") != 0);
 
-  fail_if (gibber_xmpp_node_get_child_ns (node, "bad-request",
+  fail_if (wocky_node_get_child_ns (node, "bad-request",
         "urn:ietf:params:xml:ns:xmpp-stanzas") == NULL);
 
-  fail_if (gibber_xmpp_node_get_child_ns (node, "bad-profile",
+  fail_if (wocky_node_get_child_ns (node, "bad-profile",
         "http://jabber.org/protocol/si") == NULL);
 
   g_object_unref (stanza);
diff --git a/lib/gibber/tests/check-gibber-xmpp-node.c b/lib/gibber/tests/check-gibber-xmpp-node.c
index e7663ff8..7ef9e246 100644
--- a/lib/gibber/tests/check-gibber-xmpp-node.c
+++ b/lib/gibber/tests/check-gibber-xmpp-node.c
@@ -10,131 +10,131 @@
 
 START_TEST (test_instantiation)
 {
-  GibberXmppNode *node;
-  node = gibber_xmpp_node_new_ns ("test", "http://example.com/badgers/");
+  WockyNode *node;
+  node = wocky_node_new ("test", "http://example.com/badgers/");
   fail_unless (node != NULL);
 
-  gibber_xmpp_node_free (node);
+  wocky_node_free (node);
 }
 END_TEST
 
 START_TEST (test_language)
 {
-  GibberXmppNode *node;
+  WockyNode *node;
   const gchar *lang;
 
-  node = gibber_xmpp_node_new_ns ("test", "http://example.com/badgers/");
-  lang = gibber_xmpp_node_get_language (node);
+  node = wocky_node_new ("test", "http://example.com/badgers/");
+  lang = wocky_node_get_language (node);
   fail_unless (lang == NULL);
 
-  gibber_xmpp_node_set_language (node, "en");
-  lang = gibber_xmpp_node_get_language (node);
+  wocky_node_set_language (node, "en");
+  lang = wocky_node_get_language (node);
   fail_unless (strcmp (lang, "en") == 0);
 
-  gibber_xmpp_node_set_language (node, NULL);
-  lang = gibber_xmpp_node_get_language (node);
+  wocky_node_set_language (node, NULL);
+  lang = wocky_node_get_language (node);
   fail_unless (lang == NULL);
 
-  gibber_xmpp_node_set_language_n (node, "en-US", 2);
-  lang = gibber_xmpp_node_get_language (node);
+  wocky_node_set_language_n (node, "en-US", 2);
+  lang = wocky_node_get_language (node);
   fail_unless (strcmp (lang, "en") == 0);
 
-  gibber_xmpp_node_set_language_n (node, NULL, 2);
-  lang = gibber_xmpp_node_get_language (node);
+  wocky_node_set_language_n (node, NULL, 2);
+  lang = wocky_node_get_language (node);
   fail_unless (lang == NULL);
 
-  gibber_xmpp_node_free (node);
+  wocky_node_free (node);
 }
 END_TEST
 
 START_TEST (test_namespace)
 {
-  GibberXmppNode *node;
+  WockyNode *node;
   const gchar *ns;
 
-  node = gibber_xmpp_node_new_ns ("test", "foo");
-  ns = gibber_xmpp_node_get_ns (node);
+  node = wocky_node_new ("test", "foo");
+  ns = wocky_node_get_ns (node);
   fail_unless (strcmp (ns, "foo") == 0);
-  gibber_xmpp_node_free (node);
+  wocky_node_free (node);
 }
 END_TEST
 
 
 START_TEST (test_attribute)
 {
-  GibberXmppNode *node;
+  WockyNode *node;
   const gchar *attribute;
 
-  node = gibber_xmpp_node_new_ns ("test", "about:blank");
+  node = wocky_node_new ("test", "about:blank");
 
-  attribute = gibber_xmpp_node_get_attribute (node, "foo");
+  attribute = wocky_node_get_attribute (node, "foo");
   fail_unless (attribute == NULL);
 
-  attribute = gibber_xmpp_node_get_attribute (node, NULL);
+  attribute = wocky_node_get_attribute (node, NULL);
   fail_unless (attribute == NULL);
 
-  attribute = gibber_xmpp_node_get_attribute_ns (node, "foo", "bar");
+  attribute = wocky_node_get_attribute_ns (node, "foo", "bar");
   fail_unless (attribute == NULL);
 
-  gibber_xmpp_node_set_attribute (node, "foo", "baz");
+  wocky_node_set_attribute (node, "foo", "baz");
 
-  attribute = gibber_xmpp_node_get_attribute (node, "foo");
+  attribute = wocky_node_get_attribute (node, "foo");
   fail_unless (strcmp ( attribute, "baz") == 0);
 
-  attribute = gibber_xmpp_node_get_attribute_ns (node, "foo", "bar");
+  attribute = wocky_node_get_attribute_ns (node, "foo", "bar");
   fail_unless (attribute == NULL);
 
-  gibber_xmpp_node_set_attribute_ns (node, "foobar", "barbaz", "bar");
+  wocky_node_set_attribute_ns (node, "foobar", "barbaz", "bar");
 
-  attribute = gibber_xmpp_node_get_attribute (node, "foobar");
+  attribute = wocky_node_get_attribute (node, "foobar");
   fail_unless (strcmp (attribute, "barbaz") == 0);
 
-  attribute = gibber_xmpp_node_get_attribute_ns (node, "foobar", "bar");
+  attribute = wocky_node_get_attribute_ns (node, "foobar", "bar");
   fail_unless (strcmp (attribute, "barbaz") == 0);
 
-  attribute = gibber_xmpp_node_get_attribute_ns (node, "barfoo", "bar");
+  attribute = wocky_node_get_attribute_ns (node, "barfoo", "bar");
   fail_unless (attribute == NULL);
 
-  gibber_xmpp_node_free (node);
+  wocky_node_free (node);
 }
 END_TEST
 
 START_TEST (test_child)
 {
-  GibberXmppNode *node, *child;
+  WockyNode *node, *child;
 
-  node = gibber_xmpp_node_new_ns ("test", "about:blank");
+  node = wocky_node_new ("test", "about:blank");
 
-  child = gibber_xmpp_node_get_child (node, "foo");
+  child = wocky_node_get_child (node, "foo");
   fail_unless (child == NULL);
 
-  gibber_xmpp_node_add_child (node, "foo");
-  child = gibber_xmpp_node_get_child (node, "foo");
+  wocky_node_add_child (node, "foo");
+  child = wocky_node_get_child (node, "foo");
   fail_if (child == NULL);
   fail_unless (strcmp (child->name, "foo") == 0);
 
-  child = gibber_xmpp_node_get_child_ns (node, "foo", "bar");
+  child = wocky_node_get_child_ns (node, "foo", "bar");
   fail_unless (child == NULL);
 
-  gibber_xmpp_node_add_child_ns (node, "foobar", "bar");
-  child = gibber_xmpp_node_get_child_ns (node, "foobar", "foo");
+  wocky_node_add_child_ns (node, "foobar", "bar");
+  child = wocky_node_get_child_ns (node, "foobar", "foo");
   fail_unless (child == NULL);
-  child = gibber_xmpp_node_get_child_ns (node, "foobar", "bar");
+  child = wocky_node_get_child_ns (node, "foobar", "bar");
   fail_if (child == NULL);
   fail_unless (strcmp (child->name, "foobar") == 0);
 
-  gibber_xmpp_node_add_child_with_content (node, "foo2", "blah");
-  child = gibber_xmpp_node_get_child (node, "foo2");
+  wocky_node_add_child_with_content (node, "foo2", "blah");
+  child = wocky_node_get_child (node, "foo2");
   fail_if (child->content == NULL);
   fail_unless (strcmp (child->content, "blah") == 0);
 
-  gibber_xmpp_node_free (node);
+  wocky_node_free (node);
 }
 END_TEST
 
 
 TCase *
-make_gibber_xmpp_node_tcase (void)
+make_wocky_node_tcase (void)
 {
     TCase *tc = tcase_create ("XMPP Node");
     tcase_add_test (tc, test_instantiation);
diff --git a/lib/gibber/tests/check-gibber-xmpp-reader.c b/lib/gibber/tests/check-gibber-xmpp-reader.c
index 8c602503..59b3cf91 100644
--- a/lib/gibber/tests/check-gibber-xmpp-reader.c
+++ b/lib/gibber/tests/check-gibber-xmpp-reader.c
@@ -48,7 +48,7 @@ END_TEST
 START_TEST (test_simple_message)
 {
   GibberXmppReader *reader;
-  GibberXmppNode *node;
+  WockyNode *node;
   gchar *data;
   gsize length;
   gboolean valid;
@@ -88,10 +88,10 @@ START_TEST (test_simple_message)
   node = wocky_stanza_get_top_node (event->stanza);
   fail_if (node == NULL);
   fail_unless (strcmp (node->name, "message") == 0);
-  fail_unless (strcmp (gibber_xmpp_node_get_language (node), "en") == 0);
-  fail_unless (strcmp (gibber_xmpp_node_get_attribute (node, "to"),
+  fail_unless (strcmp (wocky_node_get_language (node), "en") == 0);
+  fail_unless (strcmp (wocky_node_get_attribute (node, "to"),
                        "juliet@example.com") == 0);
-  fail_unless (strcmp (gibber_xmpp_node_get_attribute (node, "id"),
+  fail_unless (strcmp (wocky_node_get_attribute (node, "id"),
                        "0") == 0);
 
   g_object_unref (event->stanza);
@@ -103,10 +103,10 @@ START_TEST (test_simple_message)
 
   node = wocky_stanza_get_top_node (event->stanza);
   fail_unless (strcmp (node->name, "message") == 0);
-  fail_unless (strcmp (gibber_xmpp_node_get_language (node), "en") == 0);
-  fail_unless (strcmp (gibber_xmpp_node_get_attribute (node, "to"),
+  fail_unless (strcmp (wocky_node_get_language (node), "en") == 0);
+  fail_unless (strcmp (wocky_node_get_attribute (node, "to"),
                        "juliet@example.com") == 0);
-  fail_unless (strcmp (gibber_xmpp_node_get_attribute (node, "id"),
+  fail_unless (strcmp (wocky_node_get_attribute (node, "id"),
                        "1") == 0);
 
   g_free (data);
diff --git a/lib/gibber/tests/check-gibber-xmpp-stanza.c b/lib/gibber/tests/check-gibber-xmpp-stanza.c
index 2ed34eff..5e57781b 100644
--- a/lib/gibber/tests/check-gibber-xmpp-stanza.c
+++ b/lib/gibber/tests/check-gibber-xmpp-stanza.c
@@ -38,7 +38,7 @@ START_TEST (test_build_with_html_message)
   WockyStanza *stanza;
   const gchar *body = "Telepathy rocks!",
         *xhtml_ns = "http://www.w3.org/1999/xhtml";
-  GibberXmppNode *node;
+  WockyNode *node;
   const gchar *value;
 
   g_type_init ();
@@ -65,21 +65,21 @@ START_TEST (test_build_with_html_message)
   node = wocky_stanza_get_top_node (stanza);
   fail_if (node == NULL);
   fail_unless (strcmp (node->name, "message") == 0);
-  value = gibber_xmpp_node_get_attribute (node, "type");
+  value = wocky_node_get_attribute (node, "type");
   fail_unless (value == NULL);
-  value = gibber_xmpp_node_get_attribute (node, "from");
+  value = wocky_node_get_attribute (node, "from");
   fail_unless (strcmp (value, "alice@collabora.co.uk") == 0);
-  value = gibber_xmpp_node_get_attribute (node, "to");
+  value = wocky_node_get_attribute (node, "to");
   fail_unless (strcmp (value, "bob@collabora.co.uk") == 0);
 
   /* <html> */
-  node = gibber_xmpp_node_get_child_ns (node, "html", xhtml_ns);
+  node = wocky_node_get_child_ns (node, "html", xhtml_ns);
   fail_if (node == NULL);
 
   /* <body> */
-  node = gibber_xmpp_node_get_child (node, "body");
+  node = wocky_node_get_child (node, "body");
   fail_if (node == NULL);
-  value = gibber_xmpp_node_get_attribute (node, "textcolor");
+  value = wocky_node_get_attribute (node, "textcolor");
   fail_unless (strcmp (value, "red") == 0);
   fail_unless (strcmp (node->content, body) == 0);
 
@@ -145,7 +145,7 @@ START_TEST (test_get_type_info_with_unknown_sub_type)
 
   stanza = wocky_stanza_new ("iq", WOCKY_XMPP_NS_JABBER_CLIENT);
   fail_if (stanza == NULL);
-  gibber_xmpp_node_set_attribute (wocky_stanza_get_top_node (stanza),
+  wocky_node_set_attribute (wocky_stanza_get_top_node (stanza),
       "type", "goat");
 
   wocky_stanza_get_type_info (stanza, NULL, &sub_type);
diff --git a/lib/gibber/tests/check-gibber.h b/lib/gibber/tests/check-gibber.h
index d98d3d08..42d02625 100644
--- a/lib/gibber/tests/check-gibber.h
+++ b/lib/gibber/tests/check-gibber.h
@@ -3,7 +3,7 @@
 
 #include <check.h>
 
-TCase *make_gibber_xmpp_node_tcase (void);
+TCase *make_wocky_node_tcase (void);
 TCase *make_gibber_xmpp_reader_tcase (void);
 TCase *make_gibber_xmpp_connection_tcase (void);
 TCase *make_gibber_r_multicast_packet_tcase (void);
diff --git a/lib/gibber/tests/check-main.c b/lib/gibber/tests/check-main.c
index 075e250a..fd4935e2 100644
--- a/lib/gibber/tests/check-main.c
+++ b/lib/gibber/tests/check-main.c
@@ -17,7 +17,7 @@ make_gibber_suite (void)
 {
     Suite *s = suite_create ("Gibber");
 
-    suite_add_tcase (s, make_gibber_xmpp_node_tcase ());
+    suite_add_tcase (s, make_wocky_node_tcase ());
     suite_add_tcase (s, make_gibber_xmpp_reader_tcase ());
     suite_add_tcase (s, make_gibber_xmpp_connection_tcase ());
     suite_add_tcase (s, make_gibber_r_multicast_packet_tcase ());
diff --git a/lib/gibber/tests/test-xmpp-connection.c b/lib/gibber/tests/test-xmpp-connection.c
index f8ee3d1d..6bb627bc 100644
--- a/lib/gibber/tests/test-xmpp-connection.c
+++ b/lib/gibber/tests/test-xmpp-connection.c
@@ -58,30 +58,30 @@ print_attribute (const gchar *key, const gchar *value, const gchar *pref,
   return TRUE;
 }
 
-static void print_node (GibberXmppNode *node, gint ident);
+static void print_node (WockyNode *node, gint ident);
 
 static gboolean
-print_child (GibberXmppNode *node, gpointer user_data)
+print_child (WockyNode *node, gpointer user_data)
 {
   print_node (node, GPOINTER_TO_INT(user_data));
   return TRUE;
 }
 
 static void
-print_node (GibberXmppNode *node, gint ident)
+print_node (WockyNode *node, gint ident)
 {
   fprintf (treefile, "%*s`-+-- Name: %s (ns: %s)\n", ident - 1, " ",
-      node->name, gibber_xmpp_node_get_ns (node));
+      node->name, wocky_node_get_ns (node));
   wocky_node_each_attribute (node, print_attribute,
       GINT_TO_POINTER(ident));
 
   if (node->content)
     fprintf (treefile, "%*s |-- Content: %s\n", ident, " ", node->content);
-  if (gibber_xmpp_node_get_language (node))
+  if (wocky_node_get_language (node))
     fprintf (treefile, "%*s |-- Language: %s\n", ident, " ",
-      gibber_xmpp_node_get_language (node));
+      wocky_node_get_language (node));
 
-  gibber_xmpp_node_each_child (node, print_child, GINT_TO_POINTER (ident + 2));
+  wocky_node_each_child (node, print_child, GINT_TO_POINTER (ident + 2));
 }
 
 static void