Delete LmMessage{,Type,SubType} typedefs

46 files changed, 278 insertions, 322 deletions

diff --git a/lib/loudmouth/lm-connection.c b/lib/loudmouth/lm-connection.c
index 72191b911..6fbffdf7b 100644
--- a/lib/loudmouth/lm-connection.c
+++ b/lib/loudmouth/lm-connection.c
@@ -41,14 +41,14 @@ stanza_cb (WockyPorter *self,
 typedef struct
 {
   LmMessageHandler *handler;
-  LmMessageType type;
+  WockyStanzaType type;
   LmHandlerPriority priority;
 } delayed_handler;
 
 void
 lm_connection_register_message_handler (LmConnection *connection,
     LmMessageHandler *handler,
-    LmMessageType type,
+    WockyStanzaType type,
     LmHandlerPriority priority)
 {
   if (connection->porter == NULL)
@@ -84,7 +84,7 @@ lm_connection_register_message_handler (LmConnection *connection,
 void
 lm_connection_unregister_message_handler (LmConnection *connection,
     LmMessageHandler *handler,
-    LmMessageType type)
+    WockyStanzaType type)
 {
   if (handler->handler_id == 0)
     return;
diff --git a/lib/loudmouth/lm-connection.h b/lib/loudmouth/lm-connection.h
index b2c0ba05c..a849c4bfa 100644
--- a/lib/loudmouth/lm-connection.h
+++ b/lib/loudmouth/lm-connection.h
@@ -43,12 +43,12 @@ LmConnection * lm_connection_new (void);
 
 void lm_connection_register_message_handler (LmConnection *connection,
     LmMessageHandler *handler,
-    LmMessageType type,
+    WockyStanzaType type,
     LmHandlerPriority priority);
 
 void lm_connection_unregister_message_handler (LmConnection *connection,
     LmMessageHandler *handler,
-    LmMessageType type);
+    WockyStanzaType type);
 
 void lm_connection_unref (LmConnection *connection);
 
diff --git a/lib/loudmouth/lm-message-handler.h b/lib/loudmouth/lm-message-handler.h
index 63feecc00..74dcd3407 100644
--- a/lib/loudmouth/lm-message-handler.h
+++ b/lib/loudmouth/lm-message-handler.h
@@ -34,7 +34,7 @@ typedef enum {
 
 typedef LmHandlerResult (*LmHandleMessageFunction) (LmMessageHandler *handler,
     LmConnection *connection,
-    LmMessage *message,
+    WockyStanza *message,
     gpointer user_data);
 
 struct _LmMessageHandler
diff --git a/lib/loudmouth/lm-message.h b/lib/loudmouth/lm-message.h
index 8564e6d9f..e6b990e73 100644
--- a/lib/loudmouth/lm-message.h
+++ b/lib/loudmouth/lm-message.h
@@ -23,48 +23,4 @@
 
 #include <wocky/wocky-stanza.h>
 
-G_BEGIN_DECLS
-
-typedef WockyStanza LmMessage;
-
-typedef WockyStanzaType LmMessageType;
-
-#define LM_MESSAGE_TYPE_MESSAGE         WOCKY_STANZA_TYPE_MESSAGE
-#define LM_MESSAGE_TYPE_PRESENCE        WOCKY_STANZA_TYPE_PRESENCE
-#define LM_MESSAGE_TYPE_IQ              WOCKY_STANZA_TYPE_IQ
-#define LM_MESSAGE_TYPE_STREAM          WOCKY_STANZA_TYPE_STREAM
-#define LM_MESSAGE_TYPE_STREAM_ERROR    WOCKY_STANZA_TYPE_STREAM_ERROR
-#define LM_MESSAGE_TYPE_STREAM_FEATURES WOCKY_STANZA_TYPE_STREAM_FEATURES
-#define LM_MESSAGE_TYPE_AUTH            WOCKY_STANZA_TYPE_AUTH,
-#define LM_MESSAGE_TYPE_CHALLENGE       WOCKY_STANZA_TYPE_CHALLENGE
-#define LM_MESSAGE_TYPE_RESPONSE        WOCKY_STANZA_TYPE_RESPONSE
-#define LM_MESSAGE_TYPE_SUCCESS         WOCKY_STANZA_TYPE_SUCCESS
-#define LM_MESSAGE_TYPE_FAILURE         WOCKY_STANZA_TYPE_FAILURE
-/*
-#define LM_MESSAGE_TYPE_PROCEED
-#define LM_MESSAGE_TYPE_STARTTLS
-*/
-#define LM_MESSAGE_TYPE_UNKNOWN         WOCKY_STANZA_TYPE_UNKNOWN
-
-typedef WockyStanzaSubType LmMessageSubType;
-
-#define LM_MESSAGE_SUB_TYPE_NOT_SET      WOCKY_STANZA_SUB_TYPE_NONE
-#define LM_MESSAGE_SUB_TYPE_AVAILABLE    WOCKY_STANZA_SUB_TYPE_AVAILABLE
-#define LM_MESSAGE_SUB_TYPE_NORMAL       WOCKY_STANZA_SUB_TYPE_NORMAL
-#define LM_MESSAGE_SUB_TYPE_CHAT         WOCKY_STANZA_SUB_TYPE_CHAT
-#define LM_MESSAGE_SUB_TYPE_GROUPCHAT    WOCKY_STANZA_SUB_TYPE_GROUPCHAT
-#define LM_MESSAGE_SUB_TYPE_HEADLINE     WOCKY_STANZA_SUB_TYPE_HEADLINE
-#define LM_MESSAGE_SUB_TYPE_UNAVAILABLE  WOCKY_STANZA_SUB_TYPE_UNAVAILABLE
-#define LM_MESSAGE_SUB_TYPE_PROBE        WOCKY_STANZA_SUB_TYPE_PROBE
-#define LM_MESSAGE_SUB_TYPE_SUBSCRIBE    WOCKY_STANZA_SUB_TYPE_SUBSCRIBE
-#define LM_MESSAGE_SUB_TYPE_UNSUBSCRIBE  WOCKY_STANZA_SUB_TYPE_UNSUBSCRIBE
-#define LM_MESSAGE_SUB_TYPE_SUBSCRIBED   WOCKY_STANZA_SUB_TYPE_SUBSCRIBED
-#define LM_MESSAGE_SUB_TYPE_UNSUBSCRIBED WOCKY_STANZA_SUB_TYPE_UNSUBSCRIBED
-#define LM_MESSAGE_SUB_TYPE_GET          WOCKY_STANZA_SUB_TYPE_GET
-#define LM_MESSAGE_SUB_TYPE_SET          WOCKY_STANZA_SUB_TYPE_SET
-#define LM_MESSAGE_SUB_TYPE_RESULT       WOCKY_STANZA_SUB_TYPE_RESULT
-#define LM_MESSAGE_SUB_TYPE_ERROR        WOCKY_STANZA_SUB_TYPE_ERROR
-
-G_END_DECLS
-
 #endif /* #ifndef __LM_MESSAGE_H__ */
diff --git a/src/bytestream-factory.c b/src/bytestream-factory.c
index 55f2d4516..c35354ba6 100644
--- a/src/bytestream-factory.c
+++ b/src/bytestream-factory.c
@@ -187,19 +187,19 @@ struct _GabbleBytestreamFactoryPrivate
 
 static LmHandlerResult
 bytestream_factory_msg_data_cb (LmMessageHandler *handler,
-    LmConnection *lmconn, LmMessage *message, gpointer user_data);
+    LmConnection *lmconn, WockyStanza *message, gpointer user_data);
 
 static LmHandlerResult
 bytestream_factory_iq_si_cb (LmMessageHandler *handler, LmConnection *lmconn,
-    LmMessage *message, gpointer user_data);
+    WockyStanza *message, gpointer user_data);
 
 static LmHandlerResult
 bytestream_factory_iq_ibb_cb (LmMessageHandler *handler, LmConnection *lmconn,
-    LmMessage *message, gpointer user_data);
+    WockyStanza *message, gpointer user_data);
 
 static LmHandlerResult
 bytestream_factory_iq_socks5_cb (LmMessageHandler *handler,
-    LmConnection *lmconn, LmMessage *message, gpointer user_data);
+    LmConnection *lmconn, WockyStanza *message, gpointer user_data);
 
 static void query_proxies (GabbleBytestreamFactory *self,
     guint nb_proxies_needed);
@@ -296,8 +296,8 @@ add_proxy_to_list (GabbleBytestreamFactory *self,
 
 static LmHandlerResult
 socks5_proxy_query_reply_cb (GabbleConnection *conn,
-                             LmMessage *sent_msg,
-                             LmMessage *reply_msg,
+                             WockyStanza *sent_msg,
+                             WockyStanza *reply_msg,
                              GObject *obj,
                              gpointer user_data)
 {
@@ -623,22 +623,22 @@ gabble_bytestream_factory_constructor (GType type,
   priv->msg_data_cb = lm_message_handler_new (bytestream_factory_msg_data_cb,
       self, NULL);
   lm_connection_register_message_handler (priv->conn->lmconn,
-      priv->msg_data_cb, LM_MESSAGE_TYPE_MESSAGE, LM_HANDLER_PRIORITY_FIRST);
+      priv->msg_data_cb, WOCKY_STANZA_TYPE_MESSAGE, LM_HANDLER_PRIORITY_FIRST);
 
   priv->iq_si_cb = lm_message_handler_new (bytestream_factory_iq_si_cb, self,
       NULL);
   lm_connection_register_message_handler (priv->conn->lmconn, priv->iq_si_cb,
-      LM_MESSAGE_TYPE_IQ, LM_HANDLER_PRIORITY_FIRST);
+      WOCKY_STANZA_TYPE_IQ, LM_HANDLER_PRIORITY_FIRST);
 
   priv->iq_ibb_cb = lm_message_handler_new (bytestream_factory_iq_ibb_cb, self,
       NULL);
   lm_connection_register_message_handler (priv->conn->lmconn, priv->iq_ibb_cb,
-      LM_MESSAGE_TYPE_IQ, LM_HANDLER_PRIORITY_FIRST);
+      WOCKY_STANZA_TYPE_IQ, LM_HANDLER_PRIORITY_FIRST);
 
   priv->iq_socks5_cb = lm_message_handler_new (bytestream_factory_iq_socks5_cb,
       self, NULL);
   lm_connection_register_message_handler (priv->conn->lmconn,
-      priv->iq_socks5_cb, LM_MESSAGE_TYPE_IQ, LM_HANDLER_PRIORITY_FIRST);
+      priv->iq_socks5_cb, WOCKY_STANZA_TYPE_IQ, LM_HANDLER_PRIORITY_FIRST);
 
   /* Track SOCKS5 proxy available on the connection */
   gabble_signal_connect_weak (priv->conn->disco, "item-found",
@@ -665,19 +665,19 @@ gabble_bytestream_factory_dispose (GObject *object)
   priv->dispose_has_run = TRUE;
 
   lm_connection_unregister_message_handler (priv->conn->lmconn,
-      priv->msg_data_cb, LM_MESSAGE_TYPE_MESSAGE);
+      priv->msg_data_cb, WOCKY_STANZA_TYPE_MESSAGE);
   lm_message_handler_unref (priv->msg_data_cb);
 
   lm_connection_unregister_message_handler (priv->conn->lmconn,
-      priv->iq_si_cb, LM_MESSAGE_TYPE_IQ);
+      priv->iq_si_cb, WOCKY_STANZA_TYPE_IQ);
   lm_message_handler_unref (priv->iq_si_cb);
 
   lm_connection_unregister_message_handler (priv->conn->lmconn,
-      priv->iq_ibb_cb, LM_MESSAGE_TYPE_IQ);
+      priv->iq_ibb_cb, WOCKY_STANZA_TYPE_IQ);
   lm_message_handler_unref (priv->iq_ibb_cb);
 
   lm_connection_unregister_message_handler (priv->conn->lmconn,
-      priv->iq_socks5_cb, LM_MESSAGE_TYPE_IQ);
+      priv->iq_socks5_cb, WOCKY_STANZA_TYPE_IQ);
   lm_message_handler_unref (priv->iq_socks5_cb);
 
   g_hash_table_unref (priv->ibb_bytestreams);
@@ -832,7 +832,7 @@ remove_bytestream (GabbleBytestreamFactory *self,
  * message.
  */
 static gboolean
-streaminit_parse_request (LmMessage *message,
+streaminit_parse_request (WockyStanza *message,
                           WockyNode *si,
                           const gchar **profile,
                           const gchar **from,
@@ -965,7 +965,7 @@ streaminit_parse_request (LmMessage *message,
  * The MIME type is not set - the receiving client will assume
  * application/octet-stream unless the caller sets a MIME type explicitly.
  */
-LmMessage *
+WockyStanza *
 gabble_bytestream_factory_make_stream_init_iq (const gchar *full_jid,
                                                const gchar *stream_id,
                                                const gchar *profile)
@@ -1033,7 +1033,7 @@ static GabbleBytestreamSocks5 *gabble_bytestream_factory_create_socks5 (
 
 static void
 si_tube_received (GabbleBytestreamFactory *self,
-                  LmMessage *msg,
+                  WockyStanza *msg,
                   WockyNode *si,
                   GabbleBytestreamIface *bytestream,
                   TpHandle peer_handle,
@@ -1103,7 +1103,7 @@ si_tube_received (GabbleBytestreamFactory *self,
 static LmHandlerResult
 bytestream_factory_iq_si_cb (LmMessageHandler *handler,
                              LmConnection *lmconn,
-                             LmMessage *msg,
+                             WockyStanza *msg,
                              gpointer user_data)
 {
   GabbleBytestreamFactory *self = GABBLE_BYTESTREAM_FACTORY (user_data);
@@ -1302,7 +1302,7 @@ out:
 
 static gboolean
 handle_ibb_open_iq (GabbleBytestreamFactory *self,
-                    LmMessage *msg)
+                    WockyStanza *msg)
 {
   GabbleBytestreamFactoryPrivate *priv =
     GABBLE_BYTESTREAM_FACTORY_GET_PRIVATE (self);
@@ -1382,7 +1382,7 @@ handle_ibb_open_iq (GabbleBytestreamFactory *self,
 
 static gboolean
 handle_ibb_close_iq (GabbleBytestreamFactory *self,
-                     LmMessage *msg)
+                     WockyStanza *msg)
 {
   GabbleBytestreamFactoryPrivate *priv =
     GABBLE_BYTESTREAM_FACTORY_GET_PRIVATE (self);
@@ -1441,7 +1441,7 @@ handle_ibb_close_iq (GabbleBytestreamFactory *self,
  * Return TRUE if we take responsibility for this message. */
 static gboolean
 handle_ibb_data (GabbleBytestreamFactory *self,
-                 LmMessage *msg,
+                 WockyStanza *msg,
                  gboolean is_iq)
 {
   GabbleBytestreamFactoryPrivate *priv =
@@ -1455,7 +1455,7 @@ handle_ibb_data (GabbleBytestreamFactory *self,
   priv = GABBLE_BYTESTREAM_FACTORY_GET_PRIVATE (self);
 
   wocky_stanza_get_type_info (msg, NULL, &sub_type);
-  if (is_iq && sub_type != LM_MESSAGE_SUB_TYPE_SET)
+  if (is_iq && sub_type != WOCKY_STANZA_SUB_TYPE_SET)
     return FALSE;
 
   data = lm_message_node_get_child_with_namespace (
@@ -1503,7 +1503,7 @@ handle_ibb_data (GabbleBytestreamFactory *self,
 
 static gboolean
 handle_muc_data (GabbleBytestreamFactory *self,
-                 LmMessage *msg)
+                 WockyStanza *msg)
 {
   GabbleBytestreamFactoryPrivate *priv =
     GABBLE_BYTESTREAM_FACTORY_GET_PRIVATE (self);
@@ -1563,7 +1563,7 @@ handle_muc_data (GabbleBytestreamFactory *self,
 static LmHandlerResult
 bytestream_factory_iq_ibb_cb (LmMessageHandler *handler,
                               LmConnection *lmconn,
-                              LmMessage *msg,
+                              WockyStanza *msg,
                               gpointer user_data)
 {
   GabbleBytestreamFactory *self = GABBLE_BYTESTREAM_FACTORY (user_data);
@@ -1589,7 +1589,7 @@ bytestream_factory_iq_ibb_cb (LmMessageHandler *handler,
 static LmHandlerResult
 bytestream_factory_msg_data_cb (LmMessageHandler *handler,
                                 LmConnection *lmconn,
-                                LmMessage *msg,
+                                WockyStanza *msg,
                                 gpointer user_data)
 {
   GabbleBytestreamFactory *self = user_data;
@@ -1605,7 +1605,7 @@ bytestream_factory_msg_data_cb (LmMessageHandler *handler,
 
 static gboolean
 handle_socks5_query_iq (GabbleBytestreamFactory *self,
-                        LmMessage *msg)
+                        WockyStanza *msg)
 {
   GabbleBytestreamFactoryPrivate *priv =
     GABBLE_BYTESTREAM_FACTORY_GET_PRIVATE (self);
@@ -1618,7 +1618,7 @@ handle_socks5_query_iq (GabbleBytestreamFactory *self,
   NodeIter i;
 
   wocky_stanza_get_type_info (msg, NULL, &sub_type);
-  if (sub_type != LM_MESSAGE_SUB_TYPE_SET)
+  if (sub_type != WOCKY_STANZA_SUB_TYPE_SET)
     return FALSE;
 
   query_node = lm_message_node_get_child_with_namespace (
@@ -1688,7 +1688,7 @@ handle_socks5_query_iq (GabbleBytestreamFactory *self,
 static LmHandlerResult
 bytestream_factory_iq_socks5_cb (LmMessageHandler *handler,
                                  LmConnection *lmconn,
-                                 LmMessage *msg,
+                                 WockyStanza *msg,
                                  gpointer user_data)
 {
   GabbleBytestreamFactory *self = GABBLE_BYTESTREAM_FACTORY (user_data);
@@ -1910,7 +1910,7 @@ gabble_bytestream_factory_create_multiple (GabbleBytestreamFactory *self,
 
 static GabbleBytestreamIface *
 streaminit_get_multiple_bytestream (GabbleBytestreamFactory *self,
-                                    LmMessage *reply_msg,
+                                    WockyStanza *reply_msg,
                                     WockyNode *si,
                                     const gchar *stream_id,
                                     TpHandle peer_handle,
@@ -1956,7 +1956,7 @@ streaminit_get_multiple_bytestream (GabbleBytestreamFactory *self,
 
 static GabbleBytestreamIface *
 streaminit_get_bytestream (GabbleBytestreamFactory *self,
-                           LmMessage *reply_msg,
+                           WockyStanza *reply_msg,
                            WockyNode *si,
                            const gchar *stream_id,
                            TpHandle peer_handle,
@@ -2036,8 +2036,8 @@ negotiate_stream_object_destroy_notify_cb (gpointer _data,
 /* Called when we receive the reply of a SI request */
 static LmHandlerResult
 streaminit_reply_cb (GabbleConnection *conn,
-                     LmMessage *sent_msg,
-                     LmMessage *reply_msg,
+                     WockyStanza *sent_msg,
+                     WockyStanza *reply_msg,
                      GObject *obj,
                      gpointer user_data)
 {
@@ -2200,7 +2200,7 @@ END:
  */
 gboolean
 gabble_bytestream_factory_negotiate_stream (GabbleBytestreamFactory *self,
-                                            LmMessage *msg,
+                                            WockyStanza *msg,
                                             const gchar *stream_id,
                                             GabbleBytestreamFactoryNegotiateReplyFunc func,
                                             gpointer user_data,
@@ -2254,7 +2254,7 @@ gabble_bytestream_factory_negotiate_stream (GabbleBytestreamFactory *self,
  * a SI request (XEP-0095).
  *
  */
-LmMessage *
+WockyStanza *
 gabble_bytestream_factory_make_accept_iq (const gchar *full_jid,
                                           const gchar *stream_init_id,
                                           const gchar *stream_method)
@@ -2289,12 +2289,12 @@ gabble_bytestream_factory_make_accept_iq (const gchar *full_jid,
  * a si-multiple SI request.
  *
  */
-LmMessage *
+WockyStanza *
 gabble_bytestream_factory_make_multi_accept_iq (const gchar *full_jid,
                                                 const gchar *stream_init_id,
                                                 GList *stream_methods)
 {
-  LmMessage *msg;
+  WockyStanza *msg;
   WockyNode *multi_node;
   GList *l;
 
diff --git a/src/bytestream-factory.h b/src/bytestream-factory.h
index 4c84a33c2..059b591b1 100644
--- a/src/bytestream-factory.h
+++ b/src/bytestream-factory.h
@@ -73,7 +73,7 @@ typedef struct {
 } GabbleSocks5Proxy;
 
 typedef void (* GabbleBytestreamFactoryNegotiateReplyFunc) (
-    GabbleBytestreamIface *bytestream, const gchar *stream_id, LmMessage *msg,
+    GabbleBytestreamIface *bytestream, const gchar *stream_id, WockyStanza *msg,
     GObject *object, gpointer user_data);
 
 GabbleBytestreamFactory *gabble_bytestream_factory_new (
@@ -89,18 +89,18 @@ GabbleBytestreamIface *gabble_bytestream_factory_create_from_method (
     const gchar *peer_resource, const gchar *self_jid,
     GabbleBytestreamState state);
 
-LmMessage *gabble_bytestream_factory_make_stream_init_iq (
+WockyStanza *gabble_bytestream_factory_make_stream_init_iq (
     const gchar *full_jid, const gchar *stream_id, const gchar *profile);
 
-LmMessage *gabble_bytestream_factory_make_accept_iq (const gchar *full_jid,
+WockyStanza *gabble_bytestream_factory_make_accept_iq (const gchar *full_jid,
     const gchar *stream_init_id, const gchar *stream_method);
 
-LmMessage *gabble_bytestream_factory_make_multi_accept_iq (
+WockyStanza *gabble_bytestream_factory_make_multi_accept_iq (
     const gchar *full_jid, const gchar *stream_init_id,
     GList *stream_methods);
 
 gboolean gabble_bytestream_factory_negotiate_stream (
-    GabbleBytestreamFactory *fac, LmMessage *msg, const gchar *stream_id,
+    GabbleBytestreamFactory *fac, WockyStanza *msg, const gchar *stream_id,
     GabbleBytestreamFactoryNegotiateReplyFunc func,
     gpointer user_data, GObject *object, GError **error);
 
diff --git a/src/bytestream-ibb.c b/src/bytestream-ibb.c
index 8424303f8..52e4ee1d3 100644
--- a/src/bytestream-ibb.c
+++ b/src/bytestream-ibb.c
@@ -81,17 +81,17 @@ struct _GabbleBytestreamIBBPrivate
 
   guint16 seq;
   guint16 last_seq_recv;
-  LmMessage *close_iq_to_ack;
+  WockyStanza *close_iq_to_ack;
 
   /* We can't stop receving IBB data so if user wants to block the bytestream
    * we buffer them until he unblocks it. */
   gboolean read_blocked;
   GString *read_buffer;
-  /* list of reffed (LmMessage *) */
+  /* list of reffed (WockyStanza *) */
   GSList *received_stanzas_not_acked;
 
-  /* (LmMessage *) -> TRUE
-   * We don't keep a ref on the LmMessage as we just use this table to track
+  /* (WockyStanza *) -> TRUE
+   * We don't keep a ref on the WockyStanza as we just use this table to track
    * stanzas waiting for reply. The stanza is never used (and so deferenced). */
   GHashTable *sent_stanzas_not_acked;
   GString *write_buffer;
@@ -375,7 +375,7 @@ static void
 send_close_stanza (GabbleBytestreamIBB *self)
 {
   GabbleBytestreamIBBPrivate *priv = GABBLE_BYTESTREAM_IBB_GET_PRIVATE (self);
-  LmMessage *msg;
+  WockyStanza *msg;
 
   if (priv->close_iq_to_ack != NULL)
     {
@@ -408,8 +408,8 @@ send_data (GabbleBytestreamIBB *self, const gchar *str, guint len,
 
 static LmHandlerResult
 iq_acked_cb (GabbleConnection *conn,
-             LmMessage *sent_msg,
-             LmMessage *reply_msg,
+             WockyStanza *sent_msg,
+             WockyStanza *reply_msg,
              GObject *obj,
              gpointer user_data)
 {
@@ -468,7 +468,7 @@ send_data (GabbleBytestreamIBB *self,
   stanza_count = 0;
   while (sent < len)
     {
-      LmMessage *iq;
+      WockyStanza *iq;
       guint send_now, remaining;
       gchar *seq, *encoded;
       GError *error = NULL;
@@ -610,7 +610,7 @@ gabble_bytestream_ibb_send (GabbleBytestreamIface *iface,
 
 void
 gabble_bytestream_ibb_receive (GabbleBytestreamIBB *self,
-                               LmMessage *msg,
+                               WockyStanza *msg,
                                gboolean is_iq)
 {
   GabbleBytestreamIBBPrivate *priv = GABBLE_BYTESTREAM_IBB_GET_PRIVATE (self);
@@ -714,7 +714,7 @@ gabble_bytestream_ibb_accept (GabbleBytestreamIface *iface,
 {
   GabbleBytestreamIBB *self = GABBLE_BYTESTREAM_IBB (iface);
   GabbleBytestreamIBBPrivate *priv = GABBLE_BYTESTREAM_IBB_GET_PRIVATE (self);
-  LmMessage *msg;
+  WockyStanza *msg;
   WockyNode *si;
 
   if (priv->state != GABBLE_BYTESTREAM_STATE_LOCAL_PENDING)
@@ -750,7 +750,7 @@ gabble_bytestream_ibb_decline (GabbleBytestreamIBB *self,
                                GError *error)
 {
   GabbleBytestreamIBBPrivate *priv = GABBLE_BYTESTREAM_IBB_GET_PRIVATE (self);
-  LmMessage *msg;
+  WockyStanza *msg;
 
   g_return_if_fail (priv->state == GABBLE_BYTESTREAM_STATE_LOCAL_PENDING);
 
@@ -828,8 +828,8 @@ gabble_bytestream_ibb_close (GabbleBytestreamIface *iface,
 
 static LmHandlerResult
 ibb_init_reply_cb (GabbleConnection *conn,
-                   LmMessage *sent_msg,
-                   LmMessage *reply_msg,
+                   WockyStanza *sent_msg,
+                   WockyStanza *reply_msg,
                    GObject *obj,
                    gpointer user_data)
 {
@@ -862,7 +862,7 @@ gabble_bytestream_ibb_initiate (GabbleBytestreamIface *iface)
 {
   GabbleBytestreamIBB *self = GABBLE_BYTESTREAM_IBB (iface);
   GabbleBytestreamIBBPrivate *priv = GABBLE_BYTESTREAM_IBB_GET_PRIVATE (self);
-  LmMessage *msg;
+  WockyStanza *msg;
   gchar *block_size;
 
   if (priv->state != GABBLE_BYTESTREAM_STATE_INITIATING)
@@ -930,7 +930,7 @@ gabble_bytestream_ibb_block_reading (GabbleBytestreamIface *iface,
       for (l = priv->received_stanzas_not_acked; l != NULL;
           l = g_slist_next (l))
         {
-          LmMessage *iq = (LmMessage *) l->data;
+          WockyStanza *iq = (WockyStanza *) l->data;
 
           _gabble_connection_acknowledge_set_iq (priv->conn, iq);
 
@@ -944,7 +944,7 @@ gabble_bytestream_ibb_block_reading (GabbleBytestreamIface *iface,
 
 void
 gabble_bytestream_ibb_close_received (GabbleBytestreamIBB *self,
-                                      LmMessage *iq)
+                                      WockyStanza *iq)
 {
   GabbleBytestreamIBBPrivate *priv = GABBLE_BYTESTREAM_IBB_GET_PRIVATE (self);
 
diff --git a/src/bytestream-ibb.h b/src/bytestream-ibb.h
index 64369a8cb..bc1f57a5f 100644
--- a/src/bytestream-ibb.h
+++ b/src/bytestream-ibb.h
@@ -61,10 +61,10 @@ GType gabble_bytestream_ibb_get_type (void);
                               GabbleBytestreamIBBClass))
 
 void gabble_bytestream_ibb_receive (GabbleBytestreamIBB *ibb,
-   LmMessage *msg, gboolean is_iq);
+   WockyStanza *msg, gboolean is_iq);
 
 void gabble_bytestream_ibb_close_received (GabbleBytestreamIBB *ibb,
-    LmMessage *iq);
+    WockyStanza *iq);
 
 G_END_DECLS
 
diff --git a/src/bytestream-muc.c b/src/bytestream-muc.c
index 1bc137af9..b2fd67bd6 100644
--- a/src/bytestream-muc.c
+++ b/src/bytestream-muc.c
@@ -304,7 +304,7 @@ send_data_to (GabbleBytestreamMuc *self,
       gchar *encoded;
       guint send_now;
       GError *error = NULL;
-      LmMessage *msg;
+      WockyStanza *msg;
       WockyNode *data = NULL;
 
       msg = wocky_stanza_build (WOCKY_STANZA_TYPE_MESSAGE, WOCKY_STANZA_SUB_TYPE_NONE,
@@ -404,7 +404,7 @@ gabble_bytestream_muc_send (GabbleBytestreamIface *iface,
 
 void
 gabble_bytestream_muc_receive (GabbleBytestreamMuc *self,
-                               LmMessage *msg)
+                               WockyStanza *msg)
 {
   GabbleBytestreamMucPrivate *priv = GABBLE_BYTESTREAM_MUC_GET_PRIVATE (self);
   TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
diff --git a/src/bytestream-muc.h b/src/bytestream-muc.h
index 8b882203c..ffc21e6b2 100644
--- a/src/bytestream-muc.h
+++ b/src/bytestream-muc.h
@@ -61,7 +61,7 @@ GType gabble_bytestream_muc_get_type (void);
                               GabbleBytestreamMucClass))
 
 void gabble_bytestream_muc_receive (GabbleBytestreamMuc *bytestream,
-   LmMessage *msg);
+   WockyStanza *msg);
 
 gboolean gabble_bytestream_muc_send_to (GabbleBytestreamMuc *bytestream,
     TpHandle to, guint len, gchar *str);
diff --git a/src/bytestream-multiple.c b/src/bytestream-multiple.c
index 7d5bb2078..a687abb67 100644
--- a/src/bytestream-multiple.c
+++ b/src/bytestream-multiple.c
@@ -387,7 +387,7 @@ gabble_bytestream_multiple_accept (GabbleBytestreamIface *iface,
   GabbleBytestreamMultiple *self = GABBLE_BYTESTREAM_MULTIPLE (iface);
   GabbleBytestreamMultiplePrivate *priv =
       GABBLE_BYTESTREAM_MULTIPLE_GET_PRIVATE (self);
-  LmMessage *msg;
+  WockyStanza *msg;
   WockyNode *si;
   GList *all_methods;
   gchar *current_method;
diff --git a/src/bytestream-socks5.c b/src/bytestream-socks5.c
index 4ddc001d8..c04fbe0d4 100644
--- a/src/bytestream-socks5.c
+++ b/src/bytestream-socks5.c
@@ -178,7 +178,7 @@ struct _GabbleBytestreamSocks5Private
 
   /* Connections to streamhosts are async, so we keep the IQ set message
    * around */
-  LmMessage *msg_for_acknowledge_connection;
+  WockyStanza *msg_for_acknowledge_connection;
 
   Socks5State socks5_state;
   GibberTransport *transport;
@@ -767,8 +767,8 @@ target_got_connect_reply (GabbleBytestreamSocks5 *self)
 
 static LmHandlerResult
 socks5_activation_reply_cb (GabbleConnection *conn,
-                            LmMessage *sent_msg,
-                            LmMessage *reply_msg,
+                            WockyStanza *sent_msg,
+                            WockyStanza *reply_msg,
                             GObject *obj,
                             gpointer user_data)
 {
@@ -808,7 +808,7 @@ initiator_got_connect_reply (GabbleBytestreamSocks5 *self)
 {
   GabbleBytestreamSocks5Private *priv = GABBLE_BYTESTREAM_SOCKS5_GET_PRIVATE (
       self);
-  LmMessage *iq;
+  WockyStanza *iq;
 
   DEBUG ("Got CONNECT reply. SOCKS5 negotiation with proxy is done. "
       "Sending activation IQ");
@@ -1318,7 +1318,7 @@ gabble_bytestream_socks5_add_streamhost (GabbleBytestreamSocks5 *self,
  */
 void
 gabble_bytestream_socks5_connect_to_streamhost (GabbleBytestreamSocks5 *self,
-                                                LmMessage *msg)
+                                                WockyStanza *msg)
 
 {
   GabbleBytestreamSocks5Private *priv =
@@ -1399,7 +1399,7 @@ gabble_bytestream_socks5_accept (GabbleBytestreamIface *iface,
   GabbleBytestreamSocks5 *self = GABBLE_BYTESTREAM_SOCKS5 (iface);
   GabbleBytestreamSocks5Private *priv =
       GABBLE_BYTESTREAM_SOCKS5_GET_PRIVATE (self);
-  LmMessage *msg;
+  WockyStanza *msg;
   WockyNode *si;
 
   if (priv->bytestream_state != GABBLE_BYTESTREAM_STATE_LOCAL_PENDING)
@@ -1436,7 +1436,7 @@ gabble_bytestream_socks5_decline (GabbleBytestreamSocks5 *self,
 {
   GabbleBytestreamSocks5Private *priv =
       GABBLE_BYTESTREAM_SOCKS5_GET_PRIVATE (self);
-  LmMessage *msg;
+  WockyStanza *msg;
 
   g_return_if_fail (priv->bytestream_state ==
       GABBLE_BYTESTREAM_STATE_LOCAL_PENDING);
@@ -1545,8 +1545,8 @@ initiator_connected_to_proxy (GabbleBytestreamSocks5 *self)
 
 static LmHandlerResult
 socks5_init_reply_cb (GabbleConnection *conn,
-                      LmMessage *sent_msg,
-                      LmMessage *reply_msg,
+                      WockyStanza *sent_msg,
+                      WockyStanza *reply_msg,
                       GObject *obj,
                       gpointer user_data)
 {
@@ -1881,7 +1881,7 @@ gabble_bytestream_socks5_initiate (GabbleBytestreamIface *iface)
       GABBLE_BYTESTREAM_SOCKS5_GET_PRIVATE (self);
   gchar *port;
   gint port_num;
-  LmMessage *msg;
+  WockyStanza *msg;
   GSList *ips, *ip;
 
   if (priv->bytestream_state != GABBLE_BYTESTREAM_STATE_INITIATING)
diff --git a/src/bytestream-socks5.h b/src/bytestream-socks5.h
index 4d3853580..ffcbcba22 100644
--- a/src/bytestream-socks5.h
+++ b/src/bytestream-socks5.h
@@ -66,7 +66,7 @@ void gabble_bytestream_socks5_add_streamhost (GabbleBytestreamSocks5 *socks5,
     WockyNode *streamhost_node);
 
 void gabble_bytestream_socks5_connect_to_streamhost (
-    GabbleBytestreamSocks5 *socks5, LmMessage *msg);
+    GabbleBytestreamSocks5 *socks5, WockyStanza *msg);
 
 G_END_DECLS
 
diff --git a/src/conn-aliasing.c b/src/conn-aliasing.c
index 0fcb1819f..83a9f5fa9 100644
--- a/src/conn-aliasing.c
+++ b/src/conn-aliasing.c
@@ -40,7 +40,7 @@
 #include "vcard-manager.h"
 
 static void gabble_conn_aliasing_pep_nick_reply_handler (
-    GabbleConnection *conn, LmMessage *msg, TpHandle handle);
+    GabbleConnection *conn, WockyStanza *msg, TpHandle handle);
 static GQuark gabble_conn_aliasing_pep_alias_quark (void);
 
 static GabbleConnectionAliasSource _gabble_connection_get_cached_remote_alias (
@@ -225,7 +225,7 @@ _cache_negatively (GabbleConnection *self,
 /* Cache pep if successful */
 static void
 aliases_request_cache_pep (GabbleConnection *self,
-                           LmMessage *msg,
+                           WockyStanza *msg,
                            TpHandle handle,
                            GError *error)
 {
@@ -250,7 +250,7 @@ aliases_request_cache_pep (GabbleConnection *self,
 
 static void
 aliases_request_basic_pep_cb (GabbleConnection *self,
-                              LmMessage *msg,
+                              WockyStanza *msg,
                               gpointer user_data,
                               GError *error)
 {
@@ -274,7 +274,7 @@ aliases_request_basic_pep_cb (GabbleConnection *self,
 
 static void
 aliases_request_pep_cb (GabbleConnection *self,
-                        LmMessage *msg,
+                        WockyStanza *msg,
                         gpointer user_data,
                         GError *error)
 {
@@ -335,7 +335,7 @@ typedef struct {
 static void
 pep_request_cb (
     GabbleConnection *conn,
-    LmMessage *msg,
+    WockyStanza *msg,
     gpointer user_data,
     GError *error)
 {
@@ -358,7 +358,7 @@ gabble_do_pep_request (GabbleConnection *self,
 {
   TpBaseConnection *base = (TpBaseConnection *) self;
   const gchar *to;
-  LmMessage *msg;
+  WockyStanza *msg;
   GabbleRequestPipelineItem *pep_request;
   pep_request_ctx *ctx;
 
@@ -483,8 +483,8 @@ gabble_connection_request_aliases (TpSvcConnectionInterfaceAliasing *iface,
 
 static LmHandlerResult
 nick_publish_msg_reply_cb (GabbleConnection *conn,
-                           LmMessage *sent_msg,
-                           LmMessage *reply_msg,
+                           WockyStanza *sent_msg,
+                           WockyStanza *reply_msg,
                            GObject *object,
                            gpointer user_data)
 {
@@ -571,7 +571,7 @@ set_one_alias (
       if (conn->features & GABBLE_CONNECTION_FEATURES_PEP)
         {
           /* Publish nick using PEP */
-          LmMessage *msg;
+          WockyStanza *msg;
           WockyNode *item;
 
           msg = wocky_pep_service_make_publish_stanza (conn->pep_nick, &item);
@@ -736,7 +736,7 @@ pep_nick_node_changed (WockyPepService *pep,
 
 static void
 gabble_conn_aliasing_pep_nick_reply_handler (GabbleConnection *conn,
-                                             LmMessage *msg,
+                                             WockyStanza *msg,
                                              TpHandle handle)
 {
   WockyNode *pubsub_node, *items_node;
diff --git a/src/conn-location.c b/src/conn-location.c
index 47a448d4a..c2e687b44 100644
--- a/src/conn-location.c
+++ b/src/conn-location.c
@@ -76,7 +76,7 @@ build_mapping_tables (void)
 }
 
 static gboolean update_location_from_msg (GabbleConnection *conn,
-    TpHandle contact, LmMessage *msg);
+    TpHandle contact, WockyStanza *msg);
 
 /*
  * get_cached_location:
@@ -317,8 +317,8 @@ add_to_geoloc_node (const gchar *tp_name,
 
 static LmHandlerResult
 set_location_sent_cb (GabbleConnection *conn,
-    LmMessage *sent_msg,
-    LmMessage *reply_msg,
+    WockyStanza *sent_msg,
+    WockyStanza *reply_msg,
     GObject *object,
     gpointer user_data)
 {
@@ -350,7 +350,7 @@ location_set_location (TpSvcConnectionInterfaceLocation *iface,
                        DBusGMethodInvocation *context)
 {
   GabbleConnection *conn = GABBLE_CONNECTION (iface);
-  LmMessage *msg;
+  WockyStanza *msg;
   WockyNode *geoloc;
   WockyNode *item;
   GHashTableIter iter;
@@ -520,7 +520,7 @@ conn_location_properties_setter (GObject *object,
 static gboolean
 update_location_from_msg (GabbleConnection *conn,
                           TpHandle contact,
-                          LmMessage *msg)
+                          WockyStanza *msg)
 {
   WockyNode *node;
   GHashTable *location = g_hash_table_new_full (g_direct_hash, g_direct_equal,
diff --git a/src/conn-olpc.c b/src/conn-olpc.c
index 44074aa61..3bbebab2f 100644
--- a/src/conn-olpc.c
+++ b/src/conn-olpc.c
@@ -48,7 +48,7 @@
 
 static gboolean
 update_activities_properties (GabbleConnection *conn, const gchar *contact,
-    LmMessage *msg);
+    WockyStanza *msg);
 
 /* Returns TRUE if it actually contributed something, else FALSE.
  */
@@ -153,7 +153,7 @@ inspect_room (TpBaseConnection *base,
  * connected.
  */
 static gboolean
-check_publish_reply_msg (LmMessage *reply_msg,
+check_publish_reply_msg (WockyStanza *reply_msg,
                          DBusGMethodInvocation *context)
 {
   GError *error = NULL;
@@ -180,7 +180,7 @@ check_publish_reply_msg (LmMessage *reply_msg,
 }
 
 static gboolean
-check_query_reply_msg (LmMessage *reply_msg,
+check_query_reply_msg (WockyStanza *reply_msg,
                        DBusGMethodInvocation *context)
 {
   GError *error = NULL;
@@ -306,8 +306,8 @@ olpc_buddy_info_get_properties (GabbleSvcOLPCBuddyInfo *iface,
 /* context may be NULL. */
 static LmHandlerResult
 set_properties_reply_cb (GabbleConnection *conn,
-                         LmMessage *sent_msg,
-                         LmMessage *reply_msg,
+                         WockyStanza *sent_msg,
+                         WockyStanza *reply_msg,
                          GObject *object,
                          gpointer user_data)
 {
@@ -327,7 +327,7 @@ transmit_properties (GabbleConnection *conn,
                      GHashTable *properties,
                      DBusGMethodInvocation *context)
 {
-  LmMessage *msg;
+  WockyStanza *msg;
   WockyNode *item, *props_node;
 
   gabble_connection_ensure_capabilities (conn,
@@ -615,7 +615,7 @@ get_buddy_activities (GabbleConnection *conn,
 
 static void
 extract_activities (GabbleConnection *conn,
-                    LmMessage *msg,
+                    WockyStanza *msg,
                     TpHandle sender)
 {
   WockyNode *activities_node;
@@ -893,7 +893,7 @@ upload_activities_pep (GabbleConnection *conn,
 {
   TpBaseConnection *base = (TpBaseConnection *) conn;
   WockyNode *item, *activities;
-  LmMessage *msg;
+  WockyStanza *msg;
   TpHandleSet *my_activities = g_hash_table_lookup
       (conn->olpc_pep_activities, GUINT_TO_POINTER (base->self_handle));
   GError *e = NULL;
@@ -944,8 +944,8 @@ upload_activities_pep (GabbleConnection *conn,
 
 static LmHandlerResult
 set_activities_reply_cb (GabbleConnection *conn,
-                         LmMessage *sent_msg,
-                         LmMessage *reply_msg,
+                         WockyStanza *sent_msg,
+                         WockyStanza *reply_msg,
                          GObject *object,
                          gpointer user_data)
 {
@@ -1400,8 +1400,8 @@ olpc_buddy_info_get_current_activity (GabbleSvcOLPCBuddyInfo *iface,
 
 static LmHandlerResult
 set_current_activity_reply_cb (GabbleConnection *conn,
-                               LmMessage *sent_msg,
-                               LmMessage *reply_msg,
+                               WockyStanza *sent_msg,
+                               WockyStanza *reply_msg,
                                GObject *object,
                                gpointer user_data)
 {
@@ -1449,7 +1449,7 @@ olpc_buddy_info_set_current_activity (GabbleSvcOLPCBuddyInfo *iface,
 {
   GabbleConnection *conn = GABBLE_CONNECTION (iface);
   TpBaseConnection *base = (TpBaseConnection *) conn;
-  LmMessage *msg;
+  WockyStanza *msg;
   WockyNode *item, *publish;
   const gchar *room = "";
 
@@ -1551,8 +1551,8 @@ out:
 
 static LmHandlerResult
 add_activity_reply_cb (GabbleConnection *conn,
-                       LmMessage *sent_msg,
-                       LmMessage *reply_msg,
+                       WockyStanza *sent_msg,
+                       WockyStanza *reply_msg,
                        GObject *object,
                        gpointer user_data)
 {
@@ -1637,7 +1637,7 @@ upload_activity_properties_pep (GabbleConnection *conn,
 {
   TpBaseConnection *base = (TpBaseConnection *) conn;
   WockyNode *publish, *item;
-  LmMessage *msg;
+  WockyStanza *msg;
   GError *e = NULL;
   gboolean ret;
   TpHandleSet *my_activities = g_hash_table_lookup (conn->olpc_pep_activities,
@@ -1683,8 +1683,8 @@ typedef struct {
 
 static LmHandlerResult
 set_activity_properties_activities_reply_cb (GabbleConnection *conn,
-                                             LmMessage *sent_msg,
-                                             LmMessage *reply_msg,
+                                             WockyStanza *sent_msg,
+                                             WockyStanza *reply_msg,
                                              GObject *object,
                                              gpointer user_data)
 {
@@ -1712,8 +1712,8 @@ set_activity_properties_activities_reply_cb (GabbleConnection *conn,
 
 static LmHandlerResult
 set_activity_properties_reply_cb (GabbleConnection *conn,
-                                  LmMessage *sent_msg,
-                                  LmMessage *reply_msg,
+                                  WockyStanza *sent_msg,
+                                  WockyStanza *reply_msg,
                                   GObject *object,
                                   gpointer user_data)
 {
@@ -1800,7 +1800,7 @@ olpc_activity_properties_set_properties (GabbleSvcOLPCActivityProperties *iface,
 {
   GabbleConnection *conn = GABBLE_CONNECTION (iface);
   TpBaseConnection *base = (TpBaseConnection *) conn;
-  LmMessage *msg;
+  WockyStanza *msg;
   const gchar *jid;
   GHashTable *properties_copied;
   GabbleOlpcActivity *activity;
@@ -2101,7 +2101,7 @@ update_activity_properties (GabbleConnection *conn,
 static gboolean
 update_activities_properties (GabbleConnection *conn,
                               const gchar *contact,
-                              LmMessage *msg)
+                              WockyStanza *msg)
 {
   const gchar *room;
   WockyNode *node;
@@ -2187,8 +2187,8 @@ connection_status_changed_cb (GabbleConnection *conn,
 
 static LmHandlerResult
 pseudo_invite_reply_cb (GabbleConnection *conn,
-                        LmMessage *sent_msg,
-                        LmMessage *reply_msg,
+                        WockyStanza *sent_msg,
+                        WockyStanza *reply_msg,
                         GObject *object,
                         gpointer user_data)
 {
@@ -2203,7 +2203,7 @@ pseudo_invite_reply_cb (GabbleConnection *conn,
 
 gboolean
 conn_olpc_process_activity_properties_message (GabbleConnection *conn,
-                                               LmMessage *msg,
+                                               WockyStanza *msg,
                                                const gchar *from)
 {
   TpBaseConnection *base = (TpBaseConnection *) conn;
@@ -2440,8 +2440,8 @@ conn_olpc_process_activity_properties_message (GabbleConnection *conn,
 
 static LmHandlerResult
 closed_pep_reply_cb (GabbleConnection *conn,
-                     LmMessage *sent_msg,
-                     LmMessage *reply_msg,
+                     WockyStanza *sent_msg,
+                     WockyStanza *reply_msg,
                      GObject *object,
                      gpointer user_data)
 {
@@ -2503,7 +2503,7 @@ revoke_invitations (GabbleConnection *conn,
 
 gboolean
 conn_olpc_process_activity_uninvite_message (GabbleConnection *conn,
-                                             LmMessage *msg,
+                                             WockyStanza *msg,
                                              const gchar *from)
 {
   TpHandleRepoIface *room_repo = tp_base_connection_get_handles (
@@ -2655,7 +2655,7 @@ muc_channel_pre_invite_cb (GabbleMucChannel *chan,
   GQuark quark = invitees_quark ();
   TpHandleSet *invitees;
   /* send them the properties */
-  LmMessage *msg;
+  WockyStanza *msg;
   TpHandle handle;
   GError *error = NULL;
 
diff --git a/src/conn-olpc.h b/src/conn-olpc.h
index 11958c40e..691ef4f9b 100644
--- a/src/conn-olpc.h
+++ b/src/conn-olpc.h
@@ -35,13 +35,13 @@ void conn_olpc_activity_properties_init (GabbleConnection *conn);
 void conn_olpc_activity_properties_dispose (GabbleConnection *conn);
 
 gboolean conn_olpc_process_activity_properties_message (GabbleConnection *conn,
-    LmMessage *msg, const gchar *from);
+    WockyStanza *msg, const gchar *from);
 
 gboolean conn_olpc_process_activity_uninvite_message (GabbleConnection *conn,
-    LmMessage *msg, const gchar *from);
+    WockyStanza *msg, const gchar *from);
 
 LmHandlerResult conn_olpc_msg_cb (LmMessageHandler *handler,
-    LmConnection *connection, LmMessage *message, gpointer user_data);
+    LmConnection *connection, WockyStanza *message, gpointer user_data);
 
 #endif /* __CONN_OLPC_H__ */
 
diff --git a/src/conn-presence.c b/src/conn-presence.c
index 574f94b6d..8e1d6728f 100644
--- a/src/conn-presence.c
+++ b/src/conn-presence.c
@@ -124,21 +124,21 @@ static TpPresenceStatusSpec *gabble_statuses = NULL;
 /* prototypes */
 
 static LmHandlerResult set_xep0186_invisible_cb (GabbleConnection *conn,
-    LmMessage *sent_msg, LmMessage *reply_msg, GObject *obj,
+    WockyStanza *sent_msg, WockyStanza *reply_msg, GObject *obj,
     gpointer user_data);
 
 static LmHandlerResult activate_current_privacy_list_cb (
-    GabbleConnection *conn, LmMessage *sent_msg, LmMessage *reply_msg,
+    GabbleConnection *conn, WockyStanza *sent_msg, WockyStanza *reply_msg,
     GObject *obj, gpointer user_data);
 
 static void setup_invisible_privacy_list_async (GabbleConnection *self,
     GAsyncReadyCallback callback, gpointer user_data);
 
 static LmHandlerResult iq_privacy_list_push_cb (LmMessageHandler *handler,
-    LmConnection *connection, LmMessage *message, gpointer user_data);
+    LmConnection *connection, WockyStanza *message, gpointer user_data);
 
 static LmHandlerResult verify_invisible_privacy_list_cb (
-    GabbleConnection *conn, LmMessage *sent_msg, LmMessage *reply_msg,
+    GabbleConnection *conn, WockyStanza *sent_msg, WockyStanza *reply_msg,
     GObject *obj, gpointer user_data);
 
 static void toggle_presence_visibility_async (GabbleConnection *self,
@@ -512,7 +512,7 @@ set_xep0186_invisible (GabbleConnection *self,
           g_object_unref (result);
         }
     }
-  else if (!_gabble_connection_send_with_reply (self, (LmMessage *) iq,
+  else if (!_gabble_connection_send_with_reply (self, (WockyStanza *) iq,
           set_xep0186_invisible_cb, NULL, result, &error))
     {
       g_simple_async_result_set_from_error (result, error);
@@ -527,8 +527,8 @@ set_xep0186_invisible (GabbleConnection *self,
 
 static LmHandlerResult
 set_xep0186_invisible_cb (GabbleConnection *conn,
-    LmMessage *sent_msg,
-    LmMessage *reply_msg,
+    WockyStanza *sent_msg,
+    WockyStanza *reply_msg,
     GObject *obj,
     gpointer user_data)
 {
@@ -608,7 +608,7 @@ activate_current_privacy_list (GabbleConnection *self,
   if (base->status == TP_CONNECTION_STATUS_CONNECTED && invisible)
     {
       if (!gabble_connection_send_presence (self,
-              LM_MESSAGE_SUB_TYPE_UNAVAILABLE, NULL, NULL, &error))
+              WOCKY_STANZA_SUB_TYPE_UNAVAILABLE, NULL, NULL, &error))
         goto ERROR;
     }
   /* If we're still connecting and there's no list to be set, we don't
@@ -626,7 +626,7 @@ activate_current_privacy_list (GabbleConnection *self,
       goto OUT;
     }
 
-  _gabble_connection_send_with_reply (self, (LmMessage *) iq,
+  _gabble_connection_send_with_reply (self, (WockyStanza *) iq,
       activate_current_privacy_list_cb, NULL, result, &error);
 
  ERROR:
@@ -644,8 +644,8 @@ activate_current_privacy_list (GabbleConnection *self,
 
 static LmHandlerResult
 activate_current_privacy_list_cb (GabbleConnection *conn,
-    LmMessage *sent_msg,
-    LmMessage *reply_msg,
+    WockyStanza *sent_msg,
+    WockyStanza *reply_msg,
     GObject *obj,
     gpointer user_data)
 {
@@ -700,8 +700,8 @@ disable_invisible_privacy_list (GabbleConnection *self)
 
 static LmHandlerResult
 create_invisible_privacy_list_reply_cb (GabbleConnection *conn,
-    LmMessage *sent_msg,
-    LmMessage *reply_msg,
+    WockyStanza *sent_msg,
+    WockyStanza *reply_msg,
     GObject *obj,
     gpointer user_data)
 {
@@ -746,7 +746,7 @@ create_invisible_privacy_list_async (GabbleConnection *self,
 
   DEBUG ("Creating '%s'", self->presence_priv->invisible_list_name);
 
-  if (!_gabble_connection_send_with_reply (self, (LmMessage *) iq,
+  if (!_gabble_connection_send_with_reply (self, (WockyStanza *) iq,
           create_invisible_privacy_list_reply_cb, NULL, result, &error))
     {
       g_simple_async_result_set_from_error (result, error);
@@ -937,17 +937,17 @@ iq_shared_status_changed_cb (WockyPorter *porter,
 static LmHandlerResult
 iq_privacy_list_push_cb (LmMessageHandler *handler,
     LmConnection *connection,
-    LmMessage *message,
+    WockyStanza *message,
     gpointer user_data)
 {
   GabbleConnection *conn = GABBLE_CONNECTION (user_data);
   WockyStanzaSubType sub_type;
-  LmMessage *result;
+  WockyStanza *result;
   WockyNode *list_node, *iq;
   const gchar *list_name;
 
   wocky_stanza_get_type_info (message, NULL, &sub_type);
-  if (sub_type != LM_MESSAGE_SUB_TYPE_SET)
+  if (sub_type != WOCKY_STANZA_SUB_TYPE_SET)
     return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
 
   iq = wocky_stanza_get_top_node (message);
@@ -1100,8 +1100,8 @@ get_shared_status_finish (GabbleConnection *self,
 
 static LmHandlerResult
 get_existing_privacy_lists_cb (GabbleConnection *conn,
-    LmMessage *sent_msg,
-    LmMessage *reply_msg,
+    WockyStanza *sent_msg,
+    WockyStanza *reply_msg,
     GObject *obj,
     gpointer user_data)
 {
@@ -1182,7 +1182,7 @@ get_existing_privacy_lists_async (GabbleConnection *self,
         ')',
       NULL);
 
-  if (!_gabble_connection_send_with_reply (self, (LmMessage *) iq,
+  if (!_gabble_connection_send_with_reply (self, (WockyStanza *) iq,
           get_existing_privacy_lists_cb, NULL, result, &error))
     {
       g_simple_async_result_set_from_error (result, error);
@@ -1228,7 +1228,7 @@ setup_invisible_privacy_list_async (GabbleConnection *self,
         ')',
       NULL);
 
-  if (!_gabble_connection_send_with_reply (self, (LmMessage *) iq,
+  if (!_gabble_connection_send_with_reply (self, (WockyStanza *) iq,
           verify_invisible_privacy_list_cb, NULL, result, &error))
     {
       g_simple_async_result_set_from_error (result, error);
@@ -1297,8 +1297,8 @@ is_valid_invisible_list (WockyNode *list_node)
 
 static LmHandlerResult
 verify_invisible_privacy_list_cb (GabbleConnection *conn,
-    LmMessage *sent_msg,
-    LmMessage *reply_msg,
+    WockyStanza *sent_msg,
+    WockyStanza *reply_msg,
     GObject *obj,
     gpointer user_data)
 {
@@ -1371,7 +1371,7 @@ initial_presence_setup_cb (GObject *source_object,
           self, NULL);
 
       lm_connection_register_message_handler (self->lmconn,
-          priv->iq_list_push_cb, LM_MESSAGE_TYPE_IQ,
+          priv->iq_list_push_cb, WOCKY_STANZA_TYPE_IQ,
           LM_HANDLER_PRIORITY_NORMAL);
     }
 
@@ -1585,7 +1585,7 @@ conn_presence_signal_own_presence (GabbleConnection *self,
   GabbleConnectionPresencePrivate *priv = self->presence_priv;
   GabblePresence *presence = self->self_presence;
   TpBaseConnection *base = (TpBaseConnection *) self;
-  LmMessage *message = gabble_presence_as_message (presence, to);
+  WockyStanza *message = gabble_presence_as_message (presence, to);
   gboolean ret;
 
   if (presence->status == GABBLE_PRESENCE_HIDDEN && to == NULL)
diff --git a/src/connection.c b/src/connection.c
index f1e470935..c61a53ff0 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1399,10 +1399,10 @@ gabble_connection_get_session (GabbleConnection *connection)
 /**
  * _gabble_connection_send
  *
- * Send an LmMessage and trap network errors appropriately.
+ * Send an WockyStanza and trap network errors appropriately.
  */
 gboolean
-_gabble_connection_send (GabbleConnection *conn, LmMessage *msg, GError **error)
+_gabble_connection_send (GabbleConnection *conn, WockyStanza *msg, GError **error)
 {
   g_assert (GABBLE_IS_CONNECTION (conn));
 
@@ -1433,7 +1433,7 @@ typedef struct {
     GabbleConnectionMsgReplyFunc reply_func;
 
     GabbleConnection *conn;
-    LmMessage *sent_msg;
+    WockyStanza *sent_msg;
     gpointer user_data;
 
     GObject *object;
@@ -1501,7 +1501,7 @@ message_send_reply_cb (
 /**
  * _gabble_connection_send_with_reply
  *
- * Send a tracked LmMessage and trap network errors appropriately.
+ * Send a tracked WockyStanza and trap network errors appropriately.
  *
  * If object is non-NULL the handler will follow the lifetime of that object,
  * which means that if the object is destroyed the callback will not be invoked.
@@ -1511,7 +1511,7 @@ message_send_reply_cb (
  */
 gboolean
 _gabble_connection_send_with_reply (GabbleConnection *conn,
-                                    LmMessage *msg,
+                                    WockyStanza *msg,
                                     GabbleConnectionMsgReplyFunc reply_func,
                                     GObject *object,
                                     gpointer user_data,
@@ -2299,7 +2299,7 @@ connection_shut_down (TpBaseConnection *base)
 
 void
 gabble_connection_fill_in_caps (GabbleConnection *self,
-    LmMessage *presence_message)
+    WockyStanza *presence_message)
 {
   GabblePresence *presence = self->self_presence;
   WockyNode *node = wocky_stanza_get_top_node (presence_message);
@@ -2355,7 +2355,7 @@ gabble_connection_send_capabilities (GabbleConnection *self,
 {
   TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
       (TpBaseConnection *) self, TP_HANDLE_TYPE_CONTACT);
-  LmMessage *message;
+  WockyStanza *message;
   gboolean ret;
   TpHandle handle;
 
@@ -2391,7 +2391,7 @@ gabble_connection_request_decloak (GabbleConnection *self,
     GError **error)
 {
   GabblePresence *presence = self->self_presence;
-  LmMessage *message = gabble_presence_as_message (presence, to);
+  WockyStanza *message = gabble_presence_as_message (presence, to);
   WockyNode *decloak;
   gboolean ret;
 
@@ -2506,7 +2506,7 @@ gabble_connection_refresh_capabilities (GabbleConnection *self,
  */
 void
 _gabble_connection_acknowledge_set_iq (GabbleConnection *conn,
-                                       LmMessage *iq)
+                                       WockyStanza *iq)
 {
   wocky_porter_acknowledge_iq (wocky_session_get_porter (conn->session),
       iq, NULL);
@@ -3746,19 +3746,19 @@ gabble_connection_ensure_capabilities (GabbleConnection *self,
 
 gboolean
 gabble_connection_send_presence (GabbleConnection *conn,
-                                 LmMessageSubType sub_type,
+                                 WockyStanzaSubType sub_type,
                                  const gchar *contact,
                                  const gchar *status,
                                  GError **error)
 {
-  LmMessage *message;
+  WockyStanza *message;
   gboolean result;
 
   message = wocky_stanza_build (WOCKY_STANZA_TYPE_PRESENCE, sub_type,
       NULL, contact,
       NULL);
 
-  if (LM_MESSAGE_SUB_TYPE_SUBSCRIBE == sub_type)
+  if (WOCKY_STANZA_SUB_TYPE_SUBSCRIBE == sub_type)
     lm_message_node_add_own_nick (
         wocky_stanza_get_top_node (message), conn);
 
diff --git a/src/connection.h b/src/connection.h
index 77fb1e24a..e86a14d98 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -92,8 +92,8 @@ typedef struct _GabbleConnectionMailNotificationPrivate GabbleConnectionMailNoti
 typedef struct _GabbleConnectionPresencePrivate GabbleConnectionPresencePrivate;
 
 typedef LmHandlerResult (*GabbleConnectionMsgReplyFunc) (GabbleConnection *conn,
-                                                         LmMessage *sent_msg,
-                                                         LmMessage *reply_msg,
+                                                         WockyStanza *sent_msg,
+                                                         WockyStanza *reply_msg,
                                                          GObject *object,
                                                          gpointer user_data);
 
@@ -213,13 +213,13 @@ WockyPorter *gabble_connection_dup_porter (GabbleConnection *conn);
 
 gboolean _gabble_connection_set_properties_from_account (
     GabbleConnection *conn, const gchar *account, GError **error);
-gboolean _gabble_connection_send (GabbleConnection *conn, LmMessage *msg,
+gboolean _gabble_connection_send (GabbleConnection *conn, WockyStanza *msg,
     GError **error);
 gboolean _gabble_connection_send_with_reply (GabbleConnection *conn,
-    LmMessage *msg, GabbleConnectionMsgReplyFunc reply_func, GObject *object,
+    WockyStanza *msg, GabbleConnectionMsgReplyFunc reply_func, GObject *object,
     gpointer user_data, GError **error);
 void _gabble_connection_acknowledge_set_iq (GabbleConnection *conn,
-    LmMessage *iq);
+    WockyStanza *iq);
 void gabble_connection_update_last_use (GabbleConnection *conn);
 
 const char *_gabble_connection_find_conference_server (GabbleConnection *);
@@ -230,7 +230,7 @@ void gabble_connection_ensure_capabilities (GabbleConnection *self,
     const GabbleCapabilitySet *ensured);
 
 gboolean gabble_connection_send_presence (GabbleConnection *conn,
-    LmMessageSubType sub_type, const gchar *contact, const gchar *status,
+    WockyStanzaSubType sub_type, const gchar *contact, const gchar *status,
     GError **error);
 
 gboolean gabble_connection_send_capabilities (GabbleConnection *self,
@@ -240,7 +240,7 @@ gboolean gabble_connection_request_decloak (GabbleConnection *self,
     const gchar *to, const gchar *reason, GError **error);
 
 void gabble_connection_fill_in_caps (GabbleConnection *self,
-    LmMessage *presence_message);
+    WockyStanza *presence_message);
 
 gboolean _gabble_connection_invisible_privacy_list_set_active (
     GabbleConnection *self,
diff --git a/src/disco.c b/src/disco.c
index 875375ff4..b77ba90f8 100644
--- a/src/disco.c
+++ b/src/disco.c
@@ -383,8 +383,8 @@ disco_type_to_xmlns (GabbleDiscoType type)
 }
 
 static LmHandlerResult
-request_reply_cb (GabbleConnection *conn, LmMessage *sent_msg,
-                  LmMessage *reply_msg, GObject *object, gpointer user_data)
+request_reply_cb (GabbleConnection *conn, WockyStanza *sent_msg,
+                  WockyStanza *reply_msg, GObject *object, gpointer user_data)
 {
   GabbleDiscoRequest *request = (GabbleDiscoRequest *) user_data;
   GabbleDisco *disco = GABBLE_DISCO (object);
@@ -480,7 +480,7 @@ gabble_disco_request_with_timeout (GabbleDisco *self, GabbleDiscoType type,
 {
   GabbleDiscoPrivate *priv = self->priv;
   GabbleDiscoRequest *request;
-  LmMessage *msg;
+  WockyStanza *msg;
   WockyNode *lm_node;
 
   request = g_slice_new0 (GabbleDiscoRequest);
diff --git a/src/ft-channel.c b/src/ft-channel.c
index d48bc7514..3555fe157 100644
--- a/src/ft-channel.c
+++ b/src/ft-channel.c
@@ -1319,7 +1319,7 @@ set_gtalk_file_collection (
 static void
 bytestream_negotiate_cb (GabbleBytestreamIface *bytestream,
                          const gchar *stream_id,
-                         LmMessage *msg,
+                         WockyStanza *msg,
                          GObject *object,
                          gpointer user_data)
 {
@@ -1444,7 +1444,7 @@ offer_bytestream (GabbleFileTransferChannel *self, const gchar *jid,
                   const gchar *resource, GError **error)
 {
   gboolean result;
-  LmMessage *msg;
+  WockyStanza *msg;
   WockyNode *si_node, *file_node;
   gchar *stream_id, *size_str, *full_jid;
 
diff --git a/src/ft-manager.c b/src/ft-manager.c
index 6e8aefc87..6c658acf2 100644
--- a/src/ft-manager.c
+++ b/src/ft-manager.c
@@ -802,7 +802,7 @@ void gabble_ft_manager_handle_si_request (GabbleFtManager *self,
                                           GabbleBytestreamIface *bytestream,
                                           TpHandle handle,
                                           const gchar *stream_id,
-                                          LmMessage *msg)
+                                          WockyStanza *msg)
 {
   WockyNode *si_node, *file_node, *desc_node;
   const gchar *filename, *size_str, *content_type, *content_hash, *description;
diff --git a/src/ft-manager.h b/src/ft-manager.h
index c5fef4184..4b7e772c2 100644
--- a/src/ft-manager.h
+++ b/src/ft-manager.h
@@ -64,7 +64,7 @@ GabbleFtManager *gabble_ft_manager_new (GabbleConnection *connection);
 
 void gabble_ft_manager_handle_si_request (GabbleFtManager *self,
     GabbleBytestreamIface *bytestream, TpHandle handle, const gchar *stream_id,
-    LmMessage *msg);
+    WockyStanza *msg);
 
 #ifdef G_OS_UNIX
 /* Slight encapsulation violation: this function isn't portable, but we
diff --git a/src/im-channel.c b/src/im-channel.c
index dba3aedba..8627df9b1 100644
--- a/src/im-channel.c
+++ b/src/im-channel.c
@@ -249,7 +249,7 @@ im_channel_send_gone (GabbleIMChannel *self)
       if (chat_states_supported (self, FALSE))
         gabble_message_util_send_chat_state (G_OBJECT (self),
             GABBLE_CONNECTION (tp_base_channel_get_connection (base)),
-            LM_MESSAGE_SUB_TYPE_CHAT, TP_CHANNEL_CHAT_STATE_GONE,
+            WOCKY_STANZA_SUB_TYPE_CHAT, TP_CHANNEL_CHAT_STATE_GONE,
             priv->peer_jid, NULL);
 
       priv->send_gone = FALSE;
@@ -650,7 +650,7 @@ gabble_im_channel_set_chat_state (TpSvcChannelInterfaceChatState *iface,
 
       if (gabble_message_util_send_chat_state (G_OBJECT (self),
               GABBLE_CONNECTION (base_conn),
-              LM_MESSAGE_SUB_TYPE_CHAT, state, priv->peer_jid, &error))
+              WOCKY_STANZA_SUB_TYPE_CHAT, state, priv->peer_jid, &error))
         {
           priv->send_gone = TRUE;
 
diff --git a/src/im-factory.c b/src/im-factory.c
index 6932d2201..cf2188032 100644
--- a/src/im-factory.c
+++ b/src/im-factory.c
@@ -205,7 +205,7 @@ static GabbleIMChannel *get_channel_for_incoming_message (
 static LmHandlerResult
 im_factory_message_cb (LmMessageHandler *handler,
                        LmConnection *lmconn,
-                       LmMessage *message,
+                       WockyStanza *message,
                        gpointer user_data)
 {
   GabbleImFactory *fac = GABBLE_IM_FACTORY (user_data);
@@ -432,7 +432,7 @@ gabble_im_factory_close_all (GabbleImFactory *self)
     {
       DEBUG ("removing callbacks");
       lm_connection_unregister_message_handler (self->priv->conn->lmconn,
-          self->priv->message_cb, LM_MESSAGE_TYPE_MESSAGE);
+          self->priv->message_cb, WOCKY_STANZA_TYPE_MESSAGE);
     }
 
   tp_clear_pointer (&self->priv->message_cb, lm_message_handler_unref);
@@ -454,7 +454,7 @@ connection_status_changed_cb (GabbleConnection *conn,
       self->priv->message_cb = lm_message_handler_new (im_factory_message_cb,
           self, NULL);
       lm_connection_register_message_handler (self->priv->conn->lmconn,
-          self->priv->message_cb, LM_MESSAGE_TYPE_MESSAGE,
+          self->priv->message_cb, WOCKY_STANZA_TYPE_MESSAGE,
           LM_HANDLER_PRIORITY_LAST);
       break;
 
diff --git a/src/message-util.c b/src/message-util.c
index 21b940376..d31dd6a19 100644
--- a/src/message-util.c
+++ b/src/message-util.c
@@ -84,7 +84,7 @@ gabble_message_util_add_chat_state (WockyStanza *stanza,
 WockyStanza *
 gabble_message_util_build_stanza (TpMessage *message,
                                   GabbleConnection *conn,
-                                  LmMessageSubType subtype,
+                                  WockyStanzaSubType subtype,
                                   TpChannelChatState state,
                                   const char *recipient,
                                   gboolean send_nick,
@@ -141,10 +141,10 @@ gabble_message_util_build_stanza (TpMessage *message,
         {
         case TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL:
         case TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION:
-          subtype = LM_MESSAGE_SUB_TYPE_CHAT;
+          subtype = WOCKY_STANZA_SUB_TYPE_CHAT;
           break;
         case TP_CHANNEL_TEXT_MESSAGE_TYPE_NOTICE:
-          subtype = LM_MESSAGE_SUB_TYPE_NORMAL;
+          subtype = WOCKY_STANZA_SUB_TYPE_NORMAL;
           break;
         }
     }
@@ -200,7 +200,7 @@ gabble_message_util_build_stanza (TpMessage *message,
 gboolean
 gabble_message_util_send_chat_state (GObject *obj,
                                      GabbleConnection *conn,
-                                     LmMessageSubType subtype,
+                                     WockyStanzaSubType subtype,
                                      TpChannelChatState state,
                                      const char *recipient,
                                      GError **error)
@@ -307,7 +307,7 @@ _tp_send_error_from_xmpp_error (
 
 
 static gint
-_tp_chat_state_from_message (LmMessage *message)
+_tp_chat_state_from_message (WockyStanza *message)
 {
   WockyNode *node;
 
@@ -354,7 +354,7 @@ _tp_chat_state_from_message (LmMessage *message)
  *  contained no body, chat state or send error; %FALSE otherwise.
  */
 gboolean
-gabble_message_util_parse_incoming_message (LmMessage *message,
+gabble_message_util_parse_incoming_message (WockyStanza *message,
                                             const gchar **from,
                                             time_t *stamp,
                                             TpChannelTextMessageType *msgtype,
diff --git a/src/message-util.h b/src/message-util.h
index 8b63c7adb..45f0d657b 100644
--- a/src/message-util.h
+++ b/src/message-util.h
@@ -35,18 +35,18 @@ void gabble_message_util_add_chat_state (WockyStanza *stanza,
     TpChannelChatState state);
 
 WockyStanza * gabble_message_util_build_stanza (TpMessage *message,
-    GabbleConnection *conn, LmMessageSubType subtype,
+    GabbleConnection *conn, WockyStanzaSubType subtype,
     TpChannelChatState state, const char *recipient, gboolean send_nick,
     gchar **token, GError **error);
 
 gboolean gabble_message_util_send_chat_state (GObject *obj,
-    GabbleConnection *conn, LmMessageSubType subtype, TpChannelChatState state,
+    GabbleConnection *conn, WockyStanzaSubType subtype, TpChannelChatState state,
     const char *recipient, GError **error);
 
 
 #define GABBLE_TEXT_CHANNEL_SEND_NO_ERROR ((TpChannelTextSendError)-1)
 
-gboolean gabble_message_util_parse_incoming_message (LmMessage *message,
+gboolean gabble_message_util_parse_incoming_message (WockyStanza *message,
     const gchar **from, time_t *stamp, TpChannelTextMessageType *msgtype,
     const gchar **id, const gchar **body_ret, gint *state,
     TpChannelTextSendError *send_error, TpDeliveryStatus *delivery_status);
diff --git a/src/muc-channel.c b/src/muc-channel.c
index db2bee01f..5bb87a5a3 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -319,11 +319,11 @@ static void handle_errmsg (GObject *source,
 static void _gabble_muc_channel_handle_subject (GabbleMucChannel *chan,
     TpHandleType handle_type,
     TpHandle sender, GDateTime *datetime, const gchar *subject,
-    LmMessage *msg);
+    WockyStanza *msg);
 static void _gabble_muc_channel_receive (GabbleMucChannel *chan,
     TpChannelTextMessageType msg_type, TpHandleType handle_type,
     TpHandle sender, GDateTime *datetime, const gchar *id, const gchar *text,
-    LmMessage *msg, TpChannelTextSendError send_error,
+    WockyStanza *msg, TpChannelTextSendError send_error,
     TpDeliveryStatus delivery_status);
 
 static void
@@ -2111,7 +2111,7 @@ handle_fill_presence (WockyMuc *muc,
       conn->self_presence->status_message,
       0);
 
-  g_signal_emit (self, signals[PRE_PRESENCE], 0, (LmMessage *) stanza);
+  g_signal_emit (self, signals[PRE_PRESENCE], 0, (WockyStanza *) stanza);
 }
 
 /* connect to wocky-muc:SIG_NICK_CHANGE, which we will receive when the *
@@ -2174,7 +2174,7 @@ update_roster_presence (GabbleMucChannel *gmuc,
     }
 
   gabble_presence_parse_presence_message (conn->presence_cache,
-      handle, member->from, (LmMessage *) member->presence_stanza);
+      handle, member->from, (WockyStanza *) member->presence_stanza);
 
   tp_handle_set_add (members, handle);
   g_hash_table_insert (omap,
@@ -2298,7 +2298,7 @@ handle_presence (GObject *source,
     }
 
   gabble_presence_parse_presence_message (conn->presence_cache,
-    handle, who->from, (LmMessage *) who->presence_stanza);
+    handle, who->from, (WockyStanza *) who->presence_stanza);
 
   /* add the member in quesion */
   tp_handle_set_add (handles, handle);
@@ -2511,7 +2511,7 @@ _gabble_muc_channel_handle_subject (GabbleMucChannel *chan,
                                     TpHandle sender,
                                     GDateTime *datetime,
                                     const gchar *subject,
-                                    LmMessage *msg)
+                                    WockyStanza *msg)
 {
   GabbleMucChannelPrivate *priv;
   const gchar *actor;
@@ -2586,7 +2586,7 @@ _gabble_muc_channel_receive (GabbleMucChannel *chan,
                              GDateTime *datetime,
                              const gchar *id,
                              const gchar *text,
-                             LmMessage *msg,
+                             WockyStanza *msg,
                              TpChannelTextSendError send_error,
                              TpDeliveryStatus error_status)
 {
@@ -2831,7 +2831,7 @@ gabble_muc_channel_send (GObject *obj,
   gchar *id = NULL;
 
   stanza = gabble_message_util_build_stanza (message, gabble_conn,
-      LM_MESSAGE_SUB_TYPE_GROUPCHAT, TP_CHANNEL_CHAT_STATE_ACTIVE,
+      WOCKY_STANZA_SUB_TYPE_GROUPCHAT, TP_CHANNEL_CHAT_STATE_ACTIVE,
       priv->jid, FALSE, &id, &error);
 
   if (stanza != NULL)
@@ -2862,7 +2862,7 @@ gabble_muc_channel_send_invite (GabbleMucChannel *self,
 {
   TpBaseChannel *base = TP_BASE_CHANNEL (self);
   GabbleMucChannelPrivate *priv = self->priv;
-  LmMessage *msg;
+  WockyStanza *msg;
   WockyNode *invite_node;
   gboolean result;
 
@@ -2978,8 +2978,8 @@ gabble_muc_channel_add_member (GObject *obj,
 }
 
 static LmHandlerResult
-kick_request_reply_cb (GabbleConnection *conn, LmMessage *sent_msg,
-                       LmMessage *reply_msg, GObject *object,
+kick_request_reply_cb (GabbleConnection *conn, WockyStanza *sent_msg,
+                       WockyStanza *reply_msg, GObject *object,
                        gpointer user_data)
 {
   if (wocky_stanza_extract_errors (reply_msg, NULL, NULL, NULL, NULL))
@@ -3000,7 +3000,7 @@ gabble_muc_channel_remove_member (GObject *obj,
   TpBaseChannel *base = TP_BASE_CHANNEL (chan);
   GabbleMucChannelPrivate *priv = chan->priv;
   TpGroupMixin *group = TP_GROUP_MIXIN (chan);
-  LmMessage *msg;
+  WockyStanza *msg;
   WockyNode *item_node;
   const gchar *jid, *nick;
   gboolean result;
@@ -3428,7 +3428,7 @@ gabble_muc_channel_set_chat_state (TpSvcChannelInterfaceChatState *iface,
   if (error != NULL ||
       !gabble_message_util_send_chat_state (G_OBJECT (self),
           GABBLE_CONNECTION (tp_base_channel_get_connection (base)),
-          LM_MESSAGE_SUB_TYPE_GROUPCHAT, state, priv->jid, &error))
+          WOCKY_STANZA_SUB_TYPE_GROUPCHAT, state, priv->jid, &error))
     {
       dbus_g_method_return_error (context, error);
       g_error_free (error);
diff --git a/src/muc-factory.c b/src/muc-factory.c
index f5c324968..4469e715f 100644
--- a/src/muc-factory.c
+++ b/src/muc-factory.c
@@ -620,7 +620,7 @@ out:
 
 static gboolean
 process_muc_invite (GabbleMucFactory *fac,
-                    LmMessage *message,
+                    WockyStanza *message,
                     const gchar *from,
                     TpChannelTextSendError send_error)
 {
@@ -693,7 +693,7 @@ process_muc_invite (GabbleMucFactory *fac,
 
 static gboolean
 process_obsolete_invite (GabbleMucFactory *fac,
-                         LmMessage *message,
+                         WockyStanza *message,
                          const gchar *from,
                          const gchar *body,
                          TpChannelTextSendError send_error)
@@ -782,7 +782,7 @@ process_obsolete_invite (GabbleMucFactory *fac,
 static LmHandlerResult
 muc_factory_message_cb (LmMessageHandler *handler,
                         LmConnection *connection,
-                        LmMessage *message,
+                        WockyStanza *message,
                         gpointer user_data)
 {
   GabbleMucFactory *fac = GABBLE_MUC_FACTORY (user_data);
@@ -920,7 +920,7 @@ gabble_muc_factory_close_all (GabbleMucFactory *self)
       DEBUG ("removing callbacks");
 
       lm_connection_unregister_message_handler (priv->conn->lmconn,
-          priv->message_cb, LM_MESSAGE_TYPE_MESSAGE);
+          priv->message_cb, WOCKY_STANZA_TYPE_MESSAGE);
     }
 
   tp_clear_pointer (&priv->message_cb, lm_message_handler_unref);
@@ -944,7 +944,7 @@ connection_status_changed_cb (GabbleConnection *conn,
       priv->message_cb = lm_message_handler_new (muc_factory_message_cb,
           self, NULL);
       lm_connection_register_message_handler (priv->conn->lmconn,
-          priv->message_cb, LM_MESSAGE_TYPE_MESSAGE,
+          priv->message_cb, WOCKY_STANZA_TYPE_MESSAGE,
           LM_HANDLER_PRIORITY_NORMAL);
       break;
 
@@ -1059,7 +1059,7 @@ gabble_muc_factory_handle_si_stream_request (GabbleMucFactory *self,
                                              GabbleBytestreamIface *bytestream,
                                              TpHandle room_handle,
                                              const gchar *stream_id,
-                                             LmMessage *msg)
+                                             WockyStanza *msg)
 {
   GabbleMucFactoryPrivate *priv = self->priv;
   TpHandleRepoIface *room_repo = tp_base_connection_get_handles (
diff --git a/src/muc-factory.h b/src/muc-factory.h
index 4d6b2dedf..e8d680b03 100644
--- a/src/muc-factory.h
+++ b/src/muc-factory.h
@@ -64,7 +64,7 @@ GabbleMucChannel *gabble_muc_factory_find_text_channel (GabbleMucFactory *self,
 
 void gabble_muc_factory_handle_si_stream_request (GabbleMucFactory *self,
     GabbleBytestreamIface *bytestream, TpHandle room_handle,
-    const gchar *stream_id, LmMessage *msg);
+    const gchar *stream_id, WockyStanza *msg);
 
 void gabble_muc_factory_broadcast_presence (GabbleMucFactory *self);
 
diff --git a/src/presence-cache.c b/src/presence-cache.c
index 96a5df581..233b0265a 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -367,7 +367,7 @@ static GabblePresence *_cache_insert (GabblePresenceCache *cache,
 static void gabble_presence_cache_status_changed_cb (GabbleConnection *,
     TpConnectionStatus, TpConnectionStatusReason, gpointer);
 static LmHandlerResult gabble_presence_cache_lm_message_cb (LmMessageHandler*,
-    LmConnection*, LmMessage*, gpointer);
+    LmConnection*, WockyStanza*, gpointer);
 
 static void
 gabble_presence_cache_class_init (GabblePresenceCacheClass *klass)
@@ -686,11 +686,11 @@ gabble_presence_cache_status_changed_cb (GabbleConnection *conn,
 
       lm_connection_register_message_handler (priv->conn->lmconn,
                                               priv->lm_presence_cb,
-                                              LM_MESSAGE_TYPE_PRESENCE,
+                                              WOCKY_STANZA_TYPE_PRESENCE,
                                               LM_HANDLER_PRIORITY_LAST);
       lm_connection_register_message_handler (priv->conn->lmconn,
                                               priv->lm_message_cb,
-                                              LM_MESSAGE_TYPE_MESSAGE,
+                                              WOCKY_STANZA_TYPE_MESSAGE,
                                               LM_HANDLER_PRIORITY_FIRST);
       break;
 
@@ -704,11 +704,11 @@ gabble_presence_cache_status_changed_cb (GabbleConnection *conn,
     case TP_CONNECTION_STATUS_DISCONNECTED:
       if (priv->lm_message_cb != NULL)
         lm_connection_unregister_message_handler (conn->lmconn,
-            priv->lm_message_cb, LM_MESSAGE_TYPE_MESSAGE);
+            priv->lm_message_cb, WOCKY_STANZA_TYPE_MESSAGE);
 
       if (priv->lm_presence_cb != NULL)
         lm_connection_unregister_message_handler (conn->lmconn,
-            priv->lm_presence_cb, LM_MESSAGE_TYPE_PRESENCE);
+            priv->lm_presence_cb, WOCKY_STANZA_TYPE_PRESENCE);
 
       tp_clear_pointer (&priv->lm_message_cb, lm_message_handler_unref);
       tp_clear_pointer (&priv->lm_presence_cb, lm_message_handler_unref);
@@ -1714,7 +1714,7 @@ LmHandlerResult
 gabble_presence_parse_presence_message (GabblePresenceCache *cache,
                          TpHandle handle,
                          const gchar *from,
-                         LmMessage *message)
+                         WockyStanza *message)
 {
   GabblePresenceCachePrivate *priv = cache->priv;
   gint8 priority = 0;
@@ -1864,7 +1864,7 @@ static LmHandlerResult
 _parse_message_message (GabblePresenceCache *cache,
                         TpHandle handle,
                         const gchar *from,
-                        LmMessage *message)
+                        WockyStanza *message)
 {
   WockyStanzaSubType sub_type;
   WockyNode *node;
@@ -1910,7 +1910,7 @@ _parse_message_message (GabblePresenceCache *cache,
 static LmHandlerResult
 gabble_presence_cache_lm_message_cb (LmMessageHandler *handler,
                                      LmConnection *lmconn,
-                                     LmMessage *message,
+                                     WockyStanza *message,
                                      gpointer user_data)
 {
   GabblePresenceCache *cache = GABBLE_PRESENCE_CACHE (user_data);
diff --git a/src/presence-cache.h b/src/presence-cache.h
index 0e5283967..45b2b9863 100644
--- a/src/presence-cache.h
+++ b/src/presence-cache.h
@@ -122,7 +122,7 @@ LmHandlerResult
 gabble_presence_parse_presence_message (GabblePresenceCache *cache,
     TpHandle handle,
     const gchar *from,
-    LmMessage *message);
+    WockyStanza *message);
 
 void gabble_presence_cache_contacts_added_to_olpc_view (
     GabblePresenceCache *cache, TpHandleSet *handles);
diff --git a/src/presence.c b/src/presence.c
index fc536067d..b23656d37 100644
--- a/src/presence.c
+++ b/src/presence.c
@@ -644,21 +644,21 @@ gabble_presence_add_status_and_vcard (GabblePresence *presence,
     }
 }
 
-LmMessage *
+WockyStanza *
 gabble_presence_as_message (GabblePresence *presence,
                             const gchar *to)
 {
   GabblePresencePrivate *priv = presence->priv;
-  LmMessage *message;
-  LmMessageSubType subtype;
+  WockyStanza *message;
+  WockyStanzaSubType subtype;
   Resource *res = priv->resources->data; /* pick first resource */
 
   g_assert (NULL != res);
 
   if (presence->status == GABBLE_PRESENCE_OFFLINE)
-    subtype = LM_MESSAGE_SUB_TYPE_UNAVAILABLE;
+    subtype = WOCKY_STANZA_SUB_TYPE_UNAVAILABLE;
   else
-    subtype = LM_MESSAGE_SUB_TYPE_AVAILABLE;
+    subtype = WOCKY_STANZA_SUB_TYPE_AVAILABLE;
 
   message = wocky_stanza_build (WOCKY_STANZA_TYPE_PRESENCE, subtype,
       NULL, to, NULL);
diff --git a/src/presence.h b/src/presence.h
index 50d6945a5..e2d51814b 100644
--- a/src/presence.h
+++ b/src/presence.h
@@ -115,7 +115,7 @@ gboolean gabble_presence_resource_has_caps (GabblePresence *presence,
     const gchar *resource, GabbleCapabilitySetPredicate predicate,
     gconstpointer user_data);
 
-LmMessage *gabble_presence_as_message (GabblePresence *presence,
+WockyStanza *gabble_presence_as_message (GabblePresence *presence,
     const gchar *to);
 void gabble_presence_add_status_and_vcard (GabblePresence *presence,
   WockyStanza *stanza);
diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index fc8e3ea6f..72eea1bcf 100644
--- a/src/private-tubes-factory.c
+++ b/src/private-tubes-factory.c
@@ -56,7 +56,7 @@ static void tubes_channel_closed_cb (GabbleTubesChannel *chan,
     gpointer user_data);
 
 static LmHandlerResult private_tubes_factory_msg_tube_cb (
-    LmMessageHandler *handler, LmConnection *lmconn, LmMessage *msg,
+    LmMessageHandler *handler, LmConnection *lmconn, WockyStanza *msg,
     gpointer user_data);
 
 static void channel_manager_iface_init (gpointer, gpointer);
@@ -156,7 +156,7 @@ gabble_private_tubes_factory_constructor (GType type,
   priv->msg_tube_cb = lm_message_handler_new (
       private_tubes_factory_msg_tube_cb, self, NULL);
   lm_connection_register_message_handler (priv->conn->lmconn,
-      priv->msg_tube_cb, LM_MESSAGE_TYPE_MESSAGE, LM_HANDLER_PRIORITY_FIRST);
+      priv->msg_tube_cb, WOCKY_STANZA_TYPE_MESSAGE, LM_HANDLER_PRIORITY_FIRST);
 
   self->priv->status_changed_id = g_signal_connect (self->priv->conn,
       "status-changed", (GCallback) connection_status_changed_cb, obj);
@@ -365,7 +365,7 @@ gabble_private_tubes_factory_close_all (GabblePrivateTubesFactory *fac)
 
   if (priv->msg_tube_cb != NULL)
     lm_connection_unregister_message_handler (priv->conn->lmconn,
-        priv->msg_tube_cb, LM_MESSAGE_TYPE_MESSAGE);
+        priv->msg_tube_cb, WOCKY_STANZA_TYPE_MESSAGE);
 
   tp_clear_pointer (&priv->msg_tube_cb, lm_message_handler_unref);
 
@@ -668,7 +668,7 @@ gabble_private_tubes_factory_handle_si_tube_request (
     GabbleBytestreamIface *bytestream,
     TpHandle handle,
     const gchar *stream_id,
-    LmMessage *msg)
+    WockyStanza *msg)
 {
   GabblePrivateTubesFactoryPrivate *priv =
     GABBLE_PRIVATE_TUBES_FACTORY_GET_PRIVATE (self);
@@ -697,7 +697,7 @@ gabble_private_tubes_factory_handle_si_stream_request (
     GabbleBytestreamIface *bytestream,
     TpHandle handle,
     const gchar *stream_id,
-    LmMessage *msg)
+    WockyStanza *msg)
 {
   GabblePrivateTubesFactoryPrivate *priv =
     GABBLE_PRIVATE_TUBES_FACTORY_GET_PRIVATE (self);
@@ -725,7 +725,7 @@ gabble_private_tubes_factory_handle_si_stream_request (
 static LmHandlerResult
 private_tubes_factory_msg_tube_cb (LmMessageHandler *handler,
                                    LmConnection *lmconn,
-                                   LmMessage *msg,
+                                   WockyStanza *msg,
                                    gpointer user_data)
 {
   GabblePrivateTubesFactory *self = GABBLE_PRIVATE_TUBES_FACTORY (user_data);
diff --git a/src/private-tubes-factory.h b/src/private-tubes-factory.h
index f04f1ea4b..e08b56e91 100644
--- a/src/private-tubes-factory.h
+++ b/src/private-tubes-factory.h
@@ -69,12 +69,12 @@ GabblePrivateTubesFactory * gabble_private_tubes_factory_new (
 /* New 1-1 D-Bus tube requested by the remote contact */
 void gabble_private_tubes_factory_handle_si_tube_request (
     GabblePrivateTubesFactory *fac, GabbleBytestreamIface *bytestream,
-    TpHandle handle, const gchar *stream_id, LmMessage *msg);
+    TpHandle handle, const gchar *stream_id, WockyStanza *msg);
 
 /* New connection requested in a existing 1-1 stream tube */
 void gabble_private_tubes_factory_handle_si_stream_request (
     GabblePrivateTubesFactory *fac, GabbleBytestreamIface *bytestream,
-    TpHandle handle, const gchar *stream_id, LmMessage *msg);
+    TpHandle handle, const gchar *stream_id, WockyStanza *msg);
 
 G_END_DECLS
 
diff --git a/src/request-pipeline.c b/src/request-pipeline.c
index 56cddb41a..05f476d8a 100644
--- a/src/request-pipeline.c
+++ b/src/request-pipeline.c
@@ -44,7 +44,7 @@ G_DEFINE_TYPE (GabbleRequestPipeline, gabble_request_pipeline, G_TYPE_OBJECT);
 struct _GabbleRequestPipelineItem
 {
   GabbleRequestPipeline *pipeline;
-  LmMessage *message;
+  WockyStanza *message;
   guint timer_id;
   guint timeout;
   gboolean in_flight;
@@ -292,8 +292,8 @@ gabble_request_pipeline_finalize (GObject *object)
 
 static LmHandlerResult
 response_cb (GabbleConnection *conn,
-             LmMessage *sent,
-             LmMessage *reply,
+             WockyStanza *sent,
+             WockyStanza *reply,
              GObject *object,
              gpointer user_data)
 {
@@ -406,7 +406,7 @@ delayed_run_pipeline (gpointer user_data)
 
 GabbleRequestPipelineItem *
 gabble_request_pipeline_enqueue (GabbleRequestPipeline *pipeline,
-                                 LmMessage *msg,
+                                 WockyStanza *msg,
                                  guint timeout,
                                  GabbleRequestPipelineCb callback,
                                  gpointer user_data)
diff --git a/src/request-pipeline.h b/src/request-pipeline.h
index 5341c5289..1aef56c80 100644
--- a/src/request-pipeline.h
+++ b/src/request-pipeline.h
@@ -32,7 +32,7 @@ typedef struct _GabbleRequestPipelinePrivate GabbleRequestPipelinePrivate;
 typedef struct _GabbleRequestPipelineClass GabbleRequestPipelineClass;
 typedef struct _GabbleRequestPipelineItem GabbleRequestPipelineItem;
 typedef void (*GabbleRequestPipelineCb) (GabbleConnection *conn,
-    LmMessage *msg, gpointer user_data, GError *error);
+    WockyStanza *msg, gpointer user_data, GError *error);
 
 /**
  * GabbleRequestPipelineError:
@@ -78,7 +78,7 @@ struct _GabbleRequestPipeline {
 
 GabbleRequestPipeline *gabble_request_pipeline_new (GabbleConnection *conn);
 GabbleRequestPipelineItem *gabble_request_pipeline_enqueue
-    (GabbleRequestPipeline *pipeline, LmMessage *msg, guint timeout,
+    (GabbleRequestPipeline *pipeline, WockyStanza *msg, guint timeout,
      GabbleRequestPipelineCb callback, gpointer user_data);
 void gabble_request_pipeline_item_cancel (GabbleRequestPipelineItem *req);
 
diff --git a/src/search-channel.c b/src/search-channel.c
index 9c09cc22d..ee4be04f9 100644
--- a/src/search-channel.c
+++ b/src/search-channel.c
@@ -395,8 +395,8 @@ parse_search_field_response (GabbleSearchChannel *chan,
 
 static LmHandlerResult
 query_reply_cb (GabbleConnection *conn,
-                LmMessage *sent_msg,
-                LmMessage *reply_msg,
+                WockyStanza *sent_msg,
+                WockyStanza *reply_msg,
                 GObject *object,
                 gpointer user_data)
 {
@@ -436,7 +436,7 @@ request_search_fields (GabbleSearchChannel *chan)
 {
   TpBaseChannel *base = TP_BASE_CHANNEL (chan);
   TpBaseConnection *base_conn = tp_base_channel_get_connection (base);
-  LmMessage *msg;
+  WockyStanza *msg;
   GError *error = NULL;
 
   msg = wocky_stanza_build (WOCKY_STANZA_TYPE_IQ, WOCKY_STANZA_SUB_TYPE_GET,
@@ -784,8 +784,8 @@ parse_search_results (GabbleSearchChannel *chan,
 
 static LmHandlerResult
 search_reply_cb (GabbleConnection *conn,
-                 LmMessage *sent_msg,
-                 LmMessage *reply_msg,
+                 WockyStanza *sent_msg,
+                 WockyStanza *reply_msg,
                  GObject *object,
                  gpointer user_data)
 {
@@ -954,7 +954,7 @@ do_search (GabbleSearchChannel *chan,
 {
   TpBaseChannel *base = TP_BASE_CHANNEL (chan);
   TpBaseConnection *base_conn = tp_base_channel_get_connection (base);
-  LmMessage *msg;
+  WockyStanza *msg;
   WockyNode *query;
   gboolean ret;
 
diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index 3c4613faa..eada9103a 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -1193,7 +1193,7 @@ gabble_tube_dbus_class_init (GabbleTubeDBusClass *gabble_tube_dbus_class)
 static void
 bytestream_negotiate_cb (GabbleBytestreamIface *bytestream,
                          const gchar *stream_id,
-                         LmMessage *msg,
+                         WockyStanza *msg,
                          GObject *object,
                          gpointer user_data)
 {
@@ -1235,7 +1235,7 @@ gabble_tube_dbus_offer (GabbleTubeDBus *tube,
       gchar *full_jid;
       GabblePresence *presence;
       WockyNode *tube_node, *si_node;
-      LmMessage *msg;
+      WockyStanza *msg;
       gboolean result;
 
       contact_repo = tp_base_connection_get_handles (
diff --git a/src/tube-stream.c b/src/tube-stream.c
index 21a3e62c4..61995aea6 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -432,7 +432,7 @@ extra_bytestream_state_changed_cb (GabbleBytestreamIface *bytestream,
 static void
 extra_bytestream_negotiate_cb (GabbleBytestreamIface *bytestream,
                                const gchar *stream_id,
-                               LmMessage *msg,
+                               WockyStanza *msg,
                                GObject *object,
                                gpointer user_data)
 {
@@ -473,7 +473,7 @@ start_stream_initiation (GabbleTubeStream *self,
 {
   GabbleTubeStreamPrivate *priv;
   WockyNode *node, *si_node;
-  LmMessage *msg;
+  WockyStanza *msg;
   TpHandleRepoIface *contact_repo;
   const gchar *jid;
   gchar *full_jid, *stream_id, *id_str;
@@ -1891,7 +1891,7 @@ gabble_tube_stream_close (GabbleTubeIface *tube, gboolean closed_remotely)
 
   if (!closed_remotely && priv->handle_type == TP_HANDLE_TYPE_CONTACT)
     {
-      LmMessage *msg;
+      WockyStanza *msg;
       const gchar *jid;
       TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
           (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
@@ -2214,7 +2214,7 @@ send_tube_offer (GabbleTubeStream *self,
 {
   GabbleTubeStreamPrivate *priv = GABBLE_TUBE_STREAM_GET_PRIVATE (self);
   WockyNode *tube_node = NULL;
-  LmMessage *msg;
+  WockyStanza *msg;
   TpHandleRepoIface *contact_repo;
   const gchar *jid;
   gboolean result;
diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index 6dab92fe3..03c7c82ce 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -120,7 +120,7 @@ struct _GabbleTubesChannelPrivate
 
 static void update_tubes_presence (GabbleTubesChannel *self);
 
-static void pre_presence_cb (GabbleMucChannel *muc, LmMessage *msg,
+static void pre_presence_cb (GabbleMucChannel *muc, WockyStanza *msg,
     GabbleTubesChannel *self);
 
 static void
@@ -1125,7 +1125,7 @@ publish_tubes_in_node (gpointer key,
 
 static void
 pre_presence_cb (GabbleMucChannel *muc,
-                 LmMessage *msg,
+                 WockyStanza *msg,
                  GabbleTubesChannel *self)
 {
   GabbleTubesChannelPrivate *priv = self->priv;
@@ -1159,7 +1159,7 @@ update_tubes_presence (GabbleTubesChannel *self)
 void
 gabble_tubes_channel_tube_si_offered (GabbleTubesChannel *self,
                                       GabbleBytestreamIface *bytestream,
-                                      LmMessage *msg)
+                                      WockyStanza *msg)
 {
   GabbleTubesChannelPrivate *priv = self->priv;
   const gchar *service, *stream_id;
@@ -1248,7 +1248,7 @@ gabble_tubes_channel_tube_si_offered (GabbleTubesChannel *self,
 void
 gabble_tubes_channel_bytestream_offered (GabbleTubesChannel *self,
                                          GabbleBytestreamIface *bytestream,
-                                         LmMessage *msg)
+                                         WockyStanza *msg)
 {
   GabbleTubesChannelPrivate *priv = self->priv;
   const gchar *stream_id, *tmp;
@@ -1327,7 +1327,7 @@ send_tube_close_msg (GabbleTubesChannel *self,
                      guint tube_id)
 {
   GabbleTubesChannelPrivate *priv = self->priv;
-  LmMessage *msg;
+  WockyStanza *msg;
   const gchar *jid;
   TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
       (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
@@ -1354,7 +1354,7 @@ send_tube_close_msg (GabbleTubesChannel *self,
 
 static void
 tube_msg_offered (GabbleTubesChannel *self,
-                  LmMessage *msg)
+                  WockyStanza *msg)
 {
   GabbleTubesChannelPrivate *priv = self->priv;
   const gchar *service;
@@ -1415,7 +1415,7 @@ tube_msg_offered (GabbleTubesChannel *self,
 
 static void
 tube_msg_close (GabbleTubesChannel *self,
-                LmMessage *msg)
+                WockyStanza *msg)
 {
   GabbleTubesChannelPrivate *priv = self->priv;
   WockyNode *close_node;
@@ -1463,7 +1463,7 @@ tube_msg_close (GabbleTubesChannel *self,
 
 void
 gabble_tubes_channel_tube_msg (GabbleTubesChannel *self,
-                               LmMessage *msg)
+                               WockyStanza *msg)
 {
   WockyNode *node;
 
diff --git a/src/tubes-channel.h b/src/tubes-channel.h
index ad9df21f1..fb59b9c52 100644
--- a/src/tubes-channel.h
+++ b/src/tubes-channel.h
@@ -80,12 +80,12 @@ void gabble_tubes_channel_presence_updated (GabbleTubesChannel *chan,
     TpHandle contact, WockyNode *presence);
 
 void gabble_tubes_channel_tube_si_offered (GabbleTubesChannel *chan,
-    GabbleBytestreamIface *bytestream, LmMessage *msg);
+    GabbleBytestreamIface *bytestream, WockyStanza *msg);
 
 void gabble_tubes_channel_bytestream_offered (GabbleTubesChannel *chan,
-    GabbleBytestreamIface *bytestream, LmMessage *msg);
+    GabbleBytestreamIface *bytestream, WockyStanza *msg);
 
-void gabble_tubes_channel_tube_msg (GabbleTubesChannel *chan, LmMessage *msg);
+void gabble_tubes_channel_tube_msg (GabbleTubesChannel *chan, WockyStanza *msg);
 
 void gabble_tubes_channel_close (GabbleTubesChannel *self);
 
diff --git a/src/vcard-manager.c b/src/vcard-manager.c
index 33f14ae4f..8b846dad1 100644
--- a/src/vcard-manager.c
+++ b/src/vcard-manager.c
@@ -930,7 +930,7 @@ observe_vcard (GabbleConnection *conn,
  */
 static void
 replace_reply_cb (GabbleConnection *conn,
-                  LmMessage *reply_msg,
+                  WockyStanza *reply_msg,
                   gpointer user_data,
                   GError *error)
 {
@@ -1088,12 +1088,12 @@ gabble_vcard_manager_replace_is_significant (GabbleVCardManagerEditInfo *info,
 static WockyNode *vcard_copy (WockyNode *parent, WockyNode *src,
     const gchar *exclude, gboolean *exclude_mattered);
 
-static LmMessage *
+static WockyStanza *
 gabble_vcard_manager_edit_info_apply (GabbleVCardManagerEditInfo *info,
     WockyNode *old_vcard,
     GabbleVCardManager *vcard_manager)
 {
-  LmMessage *msg;
+  WockyStanza *msg;
   WockyNode *vcard_node;
   WockyNode *node;
   GList *iter;
@@ -1279,7 +1279,7 @@ manager_patch_vcard (GabbleVCardManager *self,
                      WockyNode *vcard_node)
 {
   GabbleVCardManagerPrivate *priv = self->priv;
-  LmMessage *msg = NULL;
+  WockyStanza *msg = NULL;
   GList *li;
 
   /* Bail out if we don't have outstanding edits to make, or if we already
@@ -1291,7 +1291,7 @@ manager_patch_vcard (GabbleVCardManager *self,
   /* Apply any unsent edits to the patched vCard */
   for (li = priv->edits; li != NULL; li = li->next)
     {
-      LmMessage *new_msg = gabble_vcard_manager_edit_info_apply (
+      WockyStanza *new_msg = gabble_vcard_manager_edit_info_apply (
           li->data, vcard_node, self);
 
       /* edit_info_apply returns NULL if nothing happened */
@@ -1365,7 +1365,7 @@ is_item_not_found (const GError *error)
 /* Called when a GET request in the pipeline has either succeeded or failed. */
 static void
 pipeline_reply_cb (GabbleConnection *conn,
-                   LmMessage *reply_msg,
+                   WockyStanza *reply_msg,
                    gpointer user_data,
                    GError *error)
 {
@@ -1519,7 +1519,7 @@ request_send (GabbleVCardManagerRequest *request, guint timeout)
   else
     {
       const char *jid;
-      LmMessage *msg;
+      WockyStanza *msg;
 
       request->timer_id =
           g_timeout_add_seconds (request->timeout, timeout_request, request);
diff --git a/tests/test-parse-message.c b/tests/test-parse-message.c
index 882e7d4da..e73ec3dad 100644
--- a/tests/test-parse-message.c
+++ b/tests/test-parse-message.c
@@ -12,7 +12,7 @@
 static void
 test1 (void)
 {
-  LmMessage *msg;
+  WockyStanza *msg;
   gboolean ret;
   const gchar *from;
   time_t stamp;
@@ -47,7 +47,7 @@ test1 (void)
 static void
 test2 (void)
 {
-  LmMessage *msg;
+  WockyStanza *msg;
   gboolean ret;
   const gchar *from;
   time_t stamp;
@@ -81,7 +81,7 @@ test2 (void)
 static void
 test3 (void)
 {
-  LmMessage *msg;
+  WockyStanza *msg;
   gboolean ret;
   const gchar *from;
   time_t stamp;
@@ -115,7 +115,7 @@ test3 (void)
 static void
 test_error (void)
 {
-  LmMessage *msg;
+  WockyStanza *msg;
   gboolean ret;
   const gchar *from;
   time_t stamp;
@@ -152,7 +152,7 @@ test_error (void)
 static void
 test_another_error (void)
 {
-  LmMessage *msg;
+  WockyStanza *msg;
   gboolean ret;
   const gchar *from;
   time_t stamp;
@@ -198,7 +198,7 @@ test_another_error (void)
 static void
 test_yet_another_error (void)
 {
-  LmMessage *msg;
+  WockyStanza *msg;
   gboolean ret;
   const gchar *from;
   time_t stamp;
@@ -243,7 +243,7 @@ test_yet_another_error (void)
 static void
 test_google_offline (void)
 {
-  LmMessage *msg;
+  WockyStanza *msg;
   gboolean ret;
   const gchar *from;
   time_t stamp;