Don't use generic shared function/typedef/struct names;

Remove unneeded #includes;
Cleanup trailing whitespace.

svn path=/trunk/; revision=39823

1 files changed, 274 insertions, 280 deletions

diff --git a/epan/dissectors/packet-xmpp-other.c b/epan/dissectors/packet-xmpp-other.c
index 9e1a24d012..110bf91c8b 100644
--- a/epan/dissectors/packet-xmpp-other.c
+++ b/epan/dissectors/packet-xmpp-other.c
@@ -28,62 +28,56 @@
 #include "config.h"
 #endif
 
-#include<stdio.h>
-#include<string.h>
+#include <string.h>
+
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/proto.h>
-#include <epan/tvbuff.h>
 #include <epan/emem.h>
-#include <epan/conversation.h>
-#include <epan/strutil.h>
-#include <epan/expert.h>
 
 #include <epan/dissectors/packet-xml.h>
 
 #include <packet-xmpp-utils.h>
 #include <packet-xmpp.h>
-#include <packet-xmpp-jingle.h>
 #include <packet-xmpp-other.h>
 
-static void xmpp_disco_items_item(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, element_t *element);
+static void xmpp_disco_items_item(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, xmpp_element_t *element);
 
-static void xmpp_roster_item(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, element_t *element);
+static void xmpp_roster_item(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, xmpp_element_t *element);
 
-static void xmpp_disco_info_identity(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, element_t *element);
-static void xmpp_disco_info_feature(proto_tree *tree, tvbuff_t *tvb, element_t *element);
+static void xmpp_disco_info_identity(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, xmpp_element_t *element);
+static void xmpp_disco_info_feature(proto_tree *tree, tvbuff_t *tvb, xmpp_element_t *element);
 
-static void xmpp_bytestreams_streamhost(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element);
-static void xmpp_bytestreams_streamhost_used(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element);
-static void xmpp_bytestreams_activate(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element);
-static void xmpp_bytestreams_udpsuccess(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element);
+static void xmpp_bytestreams_streamhost(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
+static void xmpp_bytestreams_streamhost_used(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
+static void xmpp_bytestreams_activate(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
+static void xmpp_bytestreams_udpsuccess(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
 
-static void xmpp_si_file(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element);
-static void xmpp_si_file_range(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element);
+static void xmpp_si_file(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
+static void xmpp_si_file_range(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
 
-static void xmpp_x_data_field(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element);
-static void xmpp_x_data_field_option(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element);
-static void xmpp_x_data_field_value(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element);
-static void xmpp_x_data_instr(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element);
+static void xmpp_x_data_field(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
+static void xmpp_x_data_field_option(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
+static void xmpp_x_data_field_value(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
+static void xmpp_x_data_instr(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
 
-static void xmpp_muc_history(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element);
+static void xmpp_muc_history(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
 
-static void xmpp_muc_user_item(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element);
-static void xmpp_muc_user_status(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element);
-static void xmpp_muc_user_invite(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element);
+static void xmpp_muc_user_item(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
+static void xmpp_muc_user_status(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
+static void xmpp_muc_user_invite(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
 
-static void xmpp_hashes_hash(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element);
+static void xmpp_hashes_hash(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
 
-static void xmpp_jitsi_inputevt_rmt_ctrl(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element);
+static void xmpp_jitsi_inputevt_rmt_ctrl(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
 
 void
-xmpp_iq_bind(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_iq_bind(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *bind_item;
     proto_tree *bind_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL},
         {"resource", hf_xmpp_iq_bind_resource, FALSE, TRUE, NULL, NULL},
         {"jid", hf_xmpp_iq_bind_jid, FALSE, TRUE, NULL, NULL}
@@ -94,21 +88,21 @@ xmpp_iq_bind(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *ele
     bind_item = proto_tree_add_item(tree, hf_xmpp_iq_bind, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     bind_tree = proto_item_add_subtree(bind_item, ett_xmpp_iq_bind);
 
-    change_elem_to_attrib("resource", "resource", element, transform_func_cdata);
-    change_elem_to_attrib("jid", "jid", element, transform_func_cdata);
+    xmpp_change_elem_to_attrib("resource", "resource", element, xmpp_transform_func_cdata);
+    xmpp_change_elem_to_attrib("jid", "jid", element, xmpp_transform_func_cdata);
 
-    display_attrs(bind_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(bind_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
     xmpp_unknown(bind_tree, tvb, pinfo, element);
 }
 
 void
-xmpp_session(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_session(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *session_item;
     proto_tree *session_tree;
 
-    attr_info attrs_info [] = {
+    xmpp_attr_info attrs_info [] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}
     };
 
@@ -117,89 +111,89 @@ xmpp_session(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *ele
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "SESSION ");
 
-    display_attrs(session_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(session_tree, element, pinfo, tvb, NULL, 0);
+    xmpp_display_attrs(session_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(session_tree, element, pinfo, tvb, NULL, 0);
 }
 
 void
-xmpp_vcard(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_vcard(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *vcard_item;
     proto_tree *vcard_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL},
         {"value", -1, FALSE, FALSE, NULL, NULL}
     };
 
-    element_t *cdata;
+    xmpp_element_t *cdata;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "VCARD ");
 
     vcard_item = proto_tree_add_item(tree, hf_xmpp_vcard, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     vcard_tree = proto_item_add_subtree(vcard_item, ett_xmpp_vcard);
 
-    cdata = get_first_element(element);
+    cdata = xmpp_get_first_element(element);
 
     if(cdata)
     {
-        attr_t *fake_cdata;
-        fake_cdata = ep_init_attr_t(element_to_string(tvb, cdata), cdata->offset, cdata->length);
+        xmpp_attr_t *fake_cdata;
+        fake_cdata = xmpp_ep_init_attr_t(xmpp_element_to_string(tvb, cdata), cdata->offset, cdata->length);
         g_hash_table_insert(element->attrs,"value", fake_cdata);
 
     }
-    display_attrs(vcard_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(vcard_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
 }
 
 void
-xmpp_vcard_x_update(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_vcard_x_update(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *x_item;
     proto_tree *x_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL},
         {"photo", -1, FALSE, FALSE, NULL, NULL}
     };
 
-    element_t *photo;
+    xmpp_element_t *photo;
 
     x_item = proto_tree_add_item(tree, hf_xmpp_vcard_x_update, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     x_tree = proto_item_add_subtree(x_item, ett_xmpp_vcard_x_update);
 
-    if((photo = steal_element_by_name(element, "photo"))!=NULL)
+    if((photo = xmpp_steal_element_by_name(element, "photo"))!=NULL)
     {
-        attr_t *fake_photo = ep_init_attr_t(photo->data?photo->data->value:"", photo->offset, photo->length);
+        xmpp_attr_t *fake_photo = xmpp_ep_init_attr_t(photo->data?photo->data->value:"", photo->offset, photo->length);
         g_hash_table_insert(element->attrs, "photo", fake_photo);
     }
 
-    display_attrs(x_tree, element,pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(x_tree, element,pinfo, tvb, attrs_info, array_length(attrs_info));
 
     xmpp_unknown(x_tree, tvb, pinfo, element);
 }
 
 void
-xmpp_disco_items_query(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, element_t *element)
+xmpp_disco_items_query(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, xmpp_element_t *element)
 {
     proto_item *query_item;
     proto_tree *query_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL},
         {"node", hf_xmpp_query_node, FALSE, TRUE, NULL, NULL}
     };
 
-    element_t *item;
+    xmpp_element_t *item;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "QUERY(disco#items) ");
 
     query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     query_tree = proto_item_add_subtree(query_item, ett_xmpp_query);
 
-    display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
-    while((item = steal_element_by_name(element, "item")) != NULL)
+    while((item = xmpp_steal_element_by_name(element, "item")) != NULL)
     {
         xmpp_disco_items_item(query_tree, tvb, pinfo, item);
     }
@@ -208,12 +202,12 @@ xmpp_disco_items_query(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, elem
 }
 
 static void
-xmpp_disco_items_item(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, element_t *element)
+xmpp_disco_items_item(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, xmpp_element_t *element)
 {
     proto_item *item_item;
     proto_tree *item_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"jid", hf_xmpp_query_item_jid, TRUE, TRUE, NULL, NULL},
         {"name", hf_xmpp_query_item_name, FALSE, TRUE, NULL, NULL},
         {"node", hf_xmpp_query_item_node, FALSE, TRUE, NULL, NULL}
@@ -222,23 +216,23 @@ xmpp_disco_items_item(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, eleme
     item_item = proto_tree_add_item(tree, hf_xmpp_query_item, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     item_tree = proto_item_add_subtree(item_item, ett_xmpp_query_item);
 
-    display_attrs(item_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(item_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
     xmpp_unknown(item_tree, tvb, pinfo, element);
 }
 
 void
-xmpp_roster_query(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, element_t *element)
+xmpp_roster_query(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, xmpp_element_t *element)
 {
     proto_item *query_item;
     proto_tree *query_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL},
         {"ver", -1, FALSE, TRUE, NULL, NULL},
     };
 
-    elem_info elems_info[] = {
+    xmpp_elem_info elems_info[] = {
         {NAME, "item", xmpp_roster_item, MANY},
     };
 
@@ -247,12 +241,12 @@ xmpp_roster_query(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, element_t
     query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     query_tree = proto_item_add_subtree(query_item, ett_xmpp_query);
 
-    display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(query_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
+    xmpp_display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(query_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
 }
 
 static void
-xmpp_roster_item(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, element_t *element)
+xmpp_roster_item(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, xmpp_element_t *element)
 {
     proto_item *item_item;
     proto_tree *item_tree;
@@ -260,64 +254,64 @@ xmpp_roster_item(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, element_t
     const gchar *ask_enums[] = {"subscribe"};
     const gchar *subscription_enums[] = {"both","from","none","remove","to"};
 
-    array_t *ask_enums_array = ep_init_array_t(ask_enums,array_length(ask_enums));
-    array_t *subscription_array = ep_init_array_t(subscription_enums,array_length(subscription_enums));
+    xmpp_array_t *ask_enums_array = xmpp_ep_init_array_t(ask_enums,array_length(ask_enums));
+    xmpp_array_t *subscription_array = xmpp_ep_init_array_t(subscription_enums,array_length(subscription_enums));
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"jid", hf_xmpp_query_item_jid, TRUE, TRUE, NULL, NULL},
         {"name", hf_xmpp_query_item_name, FALSE, TRUE, NULL, NULL},
-        {"ask", hf_xmpp_query_item_ask, FALSE, TRUE, val_enum_list, ask_enums_array},
+        {"ask", hf_xmpp_query_item_ask, FALSE, TRUE, xmpp_val_enum_list, ask_enums_array},
         {"approved", hf_xmpp_query_item_approved, FALSE, TRUE, NULL, NULL},
-        {"subscription", hf_xmpp_query_item_subscription, FALSE, TRUE, val_enum_list, subscription_array},
+        {"subscription", hf_xmpp_query_item_subscription, FALSE, TRUE, xmpp_val_enum_list, subscription_array},
     };
 
-    element_t *group;
+    xmpp_element_t *group;
 
     item_item = proto_tree_add_item(tree, hf_xmpp_query_item, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     item_tree = proto_item_add_subtree(item_item, ett_xmpp_query_item);
 
-    display_attrs(item_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(item_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
-    while((group = steal_element_by_name(element,"group"))!=NULL)
+    while((group = xmpp_steal_element_by_name(element,"group"))!=NULL)
     {
-        proto_tree_add_string(item_tree, hf_xmpp_query_item_group, tvb, group->offset, group->length, elem_cdata(group));
+        proto_tree_add_string(item_tree, hf_xmpp_query_item_group, tvb, group->offset, group->length, xmpp_elem_cdata(group));
     }
 
     xmpp_unknown(item_tree, tvb, pinfo, element);
 }
 
 void
-xmpp_disco_info_query(proto_tree *tree,  tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_disco_info_query(proto_tree *tree,  tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *query_item;
     proto_tree *query_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL},
         {"node", hf_xmpp_query_node, FALSE, TRUE, NULL, NULL}
     };
 
-    element_t *identity, *feature, *x_data;
+    xmpp_element_t *identity, *feature, *x_data;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "QUERY(disco#info) ");
 
     query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     query_tree = proto_item_add_subtree(query_item, ett_xmpp_query);
 
-    display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
 
-    while((identity = steal_element_by_name(element, "identity")) != NULL)
+    while((identity = xmpp_steal_element_by_name(element, "identity")) != NULL)
     {
         xmpp_disco_info_identity(query_tree, tvb, pinfo, identity);
     }
 
-    while((feature = steal_element_by_name(element, "feature")) != NULL)
+    while((feature = xmpp_steal_element_by_name(element, "feature")) != NULL)
     {
         xmpp_disco_info_feature(query_tree, tvb, feature);
     }
 
-    if((x_data = steal_element_by_name_and_attr(element, "x", "xmlns", "jabber:x:data")) != NULL)
+    if((x_data = xmpp_steal_element_by_name_and_attr(element, "x", "xmlns", "jabber:x:data")) != NULL)
     {
         xmpp_x_data(query_tree, tvb, pinfo, x_data);
     }
@@ -326,12 +320,12 @@ xmpp_disco_info_query(proto_tree *tree,  tvbuff_t *tvb, packet_info *pinfo, elem
 }
 
 static void
-xmpp_disco_info_identity(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, element_t *element)
+xmpp_disco_info_identity(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, xmpp_element_t *element)
 {
     proto_item *identity_item;
     proto_tree *identity_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"category", hf_xmpp_query_identity_category, TRUE, TRUE, NULL, NULL},
         {"name", hf_xmpp_query_identity_name, FALSE, TRUE, NULL, NULL},
         {"type", hf_xmpp_query_identity_type, TRUE, TRUE, NULL, NULL}
@@ -340,17 +334,17 @@ xmpp_disco_info_identity(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, el
     identity_item = proto_tree_add_item(tree, hf_xmpp_query_identity, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     identity_tree = proto_item_add_subtree(identity_item, ett_xmpp_query_identity);
 
-    display_attrs(identity_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(identity_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
     xmpp_unknown(identity_tree, tvb, pinfo, element);
 
 }
 
 static void
-xmpp_disco_info_feature(proto_tree *tree, tvbuff_t *tvb, element_t *element)
+xmpp_disco_info_feature(proto_tree *tree, tvbuff_t *tvb, xmpp_element_t *element)
 {
 
-    attr_t *var = get_attr(element, "var");
+    xmpp_attr_t *var = xmpp_get_attr(element, "var");
 
     if(var)
     {
@@ -359,47 +353,47 @@ xmpp_disco_info_feature(proto_tree *tree, tvbuff_t *tvb, element_t *element)
 }
 
 void
-xmpp_bytestreams_query(proto_tree *tree,  tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_bytestreams_query(proto_tree *tree,  tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *query_item;
     proto_tree *query_tree;
 
     const gchar *mode_enums[] = {"tcp", "udp"};
-    array_t *mode_array = ep_init_array_t(mode_enums, array_length(mode_enums));
+    xmpp_array_t *mode_array = xmpp_ep_init_array_t(mode_enums, array_length(mode_enums));
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL},
         {"sid", -1, FALSE, TRUE, NULL, NULL},
-        {"mode", -1, FALSE, TRUE, val_enum_list, mode_array},
+        {"mode", -1, FALSE, TRUE, xmpp_val_enum_list, mode_array},
         {"dstaddr", -1, FALSE, TRUE, NULL, NULL}
     };
 
-    element_t *streamhost, *streamhost_used, *activate, *udpsuccess;
+    xmpp_element_t *streamhost, *streamhost_used, *activate, *udpsuccess;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "QUERY(bytestreams) ");
 
     query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     query_tree = proto_item_add_subtree(query_item, ett_xmpp_query);
 
-    display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
 
-    while((streamhost = steal_element_by_name(element, "streamhost")) != NULL)
+    while((streamhost = xmpp_steal_element_by_name(element, "streamhost")) != NULL)
     {
         xmpp_bytestreams_streamhost(query_tree, tvb, pinfo, streamhost);
     }
 
-    if((streamhost_used = steal_element_by_name(element, "streamhost-used")) != NULL)
+    if((streamhost_used = xmpp_steal_element_by_name(element, "streamhost-used")) != NULL)
     {
         xmpp_bytestreams_streamhost_used(query_tree, tvb, pinfo, streamhost_used);
     }
 
-    if((activate = steal_element_by_name(element, "activate")) != NULL)
+    if((activate = xmpp_steal_element_by_name(element, "activate")) != NULL)
     {
         xmpp_bytestreams_activate(query_tree, tvb, pinfo, activate);
     }
 
-    if((udpsuccess = steal_element_by_name(element, "udpsuccess")) != NULL)
+    if((udpsuccess = xmpp_steal_element_by_name(element, "udpsuccess")) != NULL)
     {
         xmpp_bytestreams_udpsuccess(query_tree, tvb, pinfo, udpsuccess);
     }
@@ -408,12 +402,12 @@ xmpp_bytestreams_query(proto_tree *tree,  tvbuff_t *tvb, packet_info *pinfo, ele
 }
 
 static void
-xmpp_bytestreams_streamhost(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_bytestreams_streamhost(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *sh_item;
     proto_tree *sh_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"jid", -1, TRUE, TRUE, NULL, NULL},
         {"host", -1, TRUE, TRUE, NULL, NULL},
         {"port", -1, FALSE, TRUE, NULL, NULL}
@@ -422,50 +416,50 @@ xmpp_bytestreams_streamhost(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo,
     sh_item = proto_tree_add_item(tree, hf_xmpp_query_streamhost, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     sh_tree = proto_item_add_subtree(sh_item, ett_xmpp_query_streamhost);
 
-    display_attrs(sh_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(sh_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
     xmpp_unknown(sh_tree, tvb, pinfo, element);
 }
 
 static void
-xmpp_bytestreams_streamhost_used(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_bytestreams_streamhost_used(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *shu_item;
     proto_tree *shu_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"jid", -1, TRUE, TRUE, NULL, NULL}
     };
 
     shu_item = proto_tree_add_item(tree, hf_xmpp_query_streamhost_used, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     shu_tree = proto_item_add_subtree(shu_item, ett_xmpp_query_streamhost_used);
 
-    display_attrs(shu_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(shu_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
     xmpp_unknown(shu_tree, tvb, pinfo, element);
 }
 
 static void
-xmpp_bytestreams_activate(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_bytestreams_activate(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
-    proto_tree_add_string(tree, hf_xmpp_query_activate, tvb, element->offset, element->length, elem_cdata(element));
+    proto_tree_add_string(tree, hf_xmpp_query_activate, tvb, element->offset, element->length, xmpp_elem_cdata(element));
     xmpp_unknown(tree, tvb, pinfo, element);
 }
 
 static void
-xmpp_bytestreams_udpsuccess(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_bytestreams_udpsuccess(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *udps_item;
     proto_tree *udps_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"dstaddr", -1, TRUE, TRUE, NULL, NULL}
     };
 
     udps_item = proto_tree_add_item(tree, hf_xmpp_query_udpsuccess, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     udps_tree =proto_item_add_subtree(udps_item, ett_xmpp_query_udpsuccess);
 
-    display_attrs(udps_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(udps_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
     xmpp_unknown(udps_tree, tvb, pinfo, element);
 }
@@ -474,33 +468,33 @@ xmpp_bytestreams_udpsuccess(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo,
 
 /*SI File Transfer*/
 void
-xmpp_si(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_si(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *si_item;
     proto_tree *si_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL},
         {"id", -1, FALSE, FALSE, NULL, NULL},
         {"mime-type", -1, FALSE, TRUE, NULL, NULL},
         {"profile", -1, FALSE, TRUE, NULL, NULL}
     };
 
-    element_t *file, *feature_neg;
+    xmpp_element_t *file, *feature_neg;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "SI ");
 
     si_item = proto_tree_add_item(tree, hf_xmpp_si, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     si_tree = proto_item_add_subtree(si_item, ett_xmpp_si);
 
-    display_attrs(si_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(si_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
-    while((file = steal_element_by_name(element, "file"))!=NULL)
+    while((file = xmpp_steal_element_by_name(element, "file"))!=NULL)
     {
         xmpp_si_file(si_tree, tvb, pinfo, file);
     }
 
-    while((feature_neg = steal_element_by_name(element, "feature"))!=NULL)
+    while((feature_neg = xmpp_steal_element_by_name(element, "feature"))!=NULL)
     {
         xmpp_feature_neg(si_tree, tvb, pinfo, feature_neg);
     }
@@ -511,12 +505,12 @@ xmpp_si(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
 }
 
 static void
-xmpp_si_file(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_si_file(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *file_item;
     proto_tree *file_tree;
 
-    attr_info attrs_info[]  ={
+    xmpp_attr_info attrs_info[]  ={
         {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL},
         {"name", -1, TRUE, TRUE, NULL, NULL},
         {"size", -1, TRUE, TRUE, NULL, NULL},
@@ -525,34 +519,34 @@ xmpp_si_file(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* ele
         {"desc", -1, FALSE, FALSE, NULL, NULL}
     };
 
-    element_t *desc, *range;
+    xmpp_element_t *desc, *range;
 
     file_item = proto_tree_add_item(tree, hf_xmpp_si_file, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     file_tree = proto_item_add_subtree(file_item, ett_xmpp_si_file);
 
-    if((desc = steal_element_by_name(element, "desc"))!=NULL)
+    if((desc = xmpp_steal_element_by_name(element, "desc"))!=NULL)
     {
-         attr_t *fake_desc = ep_init_attr_t(desc->data?desc->data->value:"", desc->offset, desc->length);
+         xmpp_attr_t *fake_desc = xmpp_ep_init_attr_t(desc->data?desc->data->value:"", desc->offset, desc->length);
          g_hash_table_insert(element->attrs, "desc", fake_desc);
     }
 
-    if((range = steal_element_by_name(element, "range"))!=NULL)
+    if((range = xmpp_steal_element_by_name(element, "range"))!=NULL)
     {
         xmpp_si_file_range(file_tree, tvb, pinfo, range);
     }
 
-    display_attrs(file_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(file_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
     xmpp_unknown(file_tree, tvb, pinfo, element);
 }
 
 static void
-xmpp_si_file_range(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_si_file_range(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *range_item;
     proto_tree *range_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"offset", -1, FALSE, TRUE, NULL, NULL},
         {"length", -1, FALSE, TRUE, NULL, NULL}
     };
@@ -560,7 +554,7 @@ xmpp_si_file_range(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_
     range_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "RANGE: ");
     range_tree = proto_item_add_subtree(range_item, ett_xmpp_si_file_range);
 
-    display_attrs(range_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(range_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
     xmpp_unknown(range_tree, tvb, pinfo, element);
 
@@ -568,23 +562,23 @@ xmpp_si_file_range(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_
 
 /*Feature Negotiation*/
 void
-xmpp_feature_neg(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_feature_neg(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *feature_item;
     proto_tree *feature_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}
     };
 
-    element_t *x_data;
+    xmpp_element_t *x_data;
 
     feature_item = proto_tree_add_item(tree, hf_xmpp_iq_feature_neg, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     feature_tree = proto_item_add_subtree(feature_item, ett_xmpp_iq_feature_neg);
 
-    display_attrs(feature_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(feature_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
-    while((x_data = steal_element_by_name_and_attr(element, "x", "xmlns", "jabber:x:data"))!=NULL)
+    while((x_data = xmpp_steal_element_by_name_and_attr(element, "x", "xmlns", "jabber:x:data"))!=NULL)
     {
         xmpp_x_data(feature_tree, tvb, pinfo, x_data);
     }
@@ -595,21 +589,21 @@ xmpp_feature_neg(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t*
 
 /*jabber:x:data*/
 void
-xmpp_x_data(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_x_data(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *x_item;
     proto_tree *x_tree;
 
     const gchar *type_enums[] = {"cancel", "form", "result", "submit"};
-    array_t *type_array = ep_init_array_t(type_enums, array_length(type_enums));
+    xmpp_array_t *type_array = xmpp_ep_init_array_t(type_enums, array_length(type_enums));
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL},
-        {"type", -1, TRUE, TRUE, val_enum_list, type_array},
+        {"type", -1, TRUE, TRUE, xmpp_val_enum_list, type_array},
         {"TITLE", -1, FALSE, TRUE, NULL, NULL}
     };
 
-    elem_info elems_info[] = {
+    xmpp_elem_info elems_info[] = {
         {NAME, "instructions", xmpp_x_data_instr, MANY},
         {NAME, "field", xmpp_x_data_field, MANY},
     };
@@ -618,14 +612,14 @@ xmpp_x_data(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* elem
     x_item = proto_tree_add_item(tree, hf_xmpp_x_data, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     x_tree = proto_item_add_subtree(x_item, ett_xmpp_x_data);
 
-    change_elem_to_attrib("title", "TITLE", element, transform_func_cdata);
+    xmpp_change_elem_to_attrib("title", "TITLE", element, xmpp_transform_func_cdata);
 
-    display_attrs(x_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(x_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
+    xmpp_display_attrs(x_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(x_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
 }
 
 static void
-xmpp_x_data_field(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_x_data_field(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *field_item;
     proto_tree *field_tree;
@@ -634,28 +628,28 @@ xmpp_x_data_field(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t
         "jid-single", "list-multi", "list-single", "text-multi", "text-single",
         "text-private"
     };
-    array_t *type_array = ep_init_array_t(type_enums, array_length(type_enums));
+    xmpp_array_t *type_array = xmpp_ep_init_array_t(type_enums, array_length(type_enums));
 
-    attr_info attrs_info[] =
+    xmpp_attr_info attrs_info[] =
     {
         {"label", -1, FALSE, TRUE, NULL, NULL},
-        {"type", -1, FALSE, TRUE, val_enum_list, type_array},
+        {"type", -1, FALSE, TRUE, xmpp_val_enum_list, type_array},
         {"var", -1, FALSE, TRUE, NULL, NULL}
     };
 
-    element_t /**desc, *required,*/ *value, *option;
+    xmpp_element_t /**desc, *required,*/ *value, *option;
 
     field_item = proto_tree_add_item(tree, hf_xmpp_x_data_field, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     field_tree = proto_item_add_subtree(field_item, ett_xmpp_x_data_field);
 
-    display_attrs(field_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(field_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
-    while((option = steal_element_by_name(element, "option"))!=NULL)
+    while((option = xmpp_steal_element_by_name(element, "option"))!=NULL)
     {
         xmpp_x_data_field_option(field_tree, tvb, pinfo, option);
     }
 
-    while((value = steal_element_by_name(element, "value"))!=NULL)
+    while((value = xmpp_steal_element_by_name(element, "value"))!=NULL)
     {
         xmpp_x_data_field_value(field_tree, tvb, pinfo, value);
     }
@@ -665,79 +659,79 @@ xmpp_x_data_field(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t
 }
 
 static void
-xmpp_x_data_field_option(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_x_data_field_option(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *option_item;
     proto_tree *option_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"label", -1, FALSE, TRUE, NULL, NULL},
         {"value", -1, FALSE, TRUE, NULL, NULL}
     };
 
-    element_t *value;
+    xmpp_element_t *value;
 
     option_item = proto_tree_add_item(tree, hf_xmpp_x_data_field_value, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     option_tree = proto_item_add_subtree(option_item, ett_xmpp_x_data_field_value);
 
-    if((value = steal_element_by_name(element, "value"))!=NULL)
+    if((value = xmpp_steal_element_by_name(element, "value"))!=NULL)
     {
-        attr_t *fake_value = ep_init_attr_t(value->data?value->data->value:"",value->offset, value->length);
+        xmpp_attr_t *fake_value = xmpp_ep_init_attr_t(value->data?value->data->value:"",value->offset, value->length);
         g_hash_table_insert(element->attrs, "value", fake_value);
     }
 
-    display_attrs(option_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(option_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
     xmpp_unknown(option_tree, tvb, pinfo, element);
 }
 
 static void
-xmpp_x_data_field_value(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_x_data_field_value(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *value_item;
     proto_tree *value_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"label", -1, FALSE, TRUE, NULL, NULL},
         {"value", -1, TRUE, TRUE, NULL, NULL}
     };
-    attr_t *fake_value;
+    xmpp_attr_t *fake_value;
 
     value_item = proto_tree_add_item(tree, hf_xmpp_x_data_field_value, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     value_tree = proto_item_add_subtree(value_item, ett_xmpp_x_data_field_value);
 
 
 
-   fake_value = ep_init_attr_t(element->data?element->data->value:"",element->offset, element->length);
+   fake_value = xmpp_ep_init_attr_t(element->data?element->data->value:"",element->offset, element->length);
    g_hash_table_insert(element->attrs, "value", fake_value);
 
 
-    display_attrs(value_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(value_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
     xmpp_unknown(value_tree, tvb, pinfo, element);
 }
 
 static void
-xmpp_x_data_instr(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo _U_, element_t* element)
+xmpp_x_data_instr(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo _U_, xmpp_element_t* element)
 {
-    proto_tree_add_text(tree, tvb, element->offset, element->length, "INSTRUCTIONS: %s",elem_cdata(element));
+    proto_tree_add_text(tree, tvb, element->offset, element->length, "INSTRUCTIONS: %s",xmpp_elem_cdata(element));
 }
 
 /*In-Band Bytestreams*/
 void
-xmpp_ibb_open(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_ibb_open(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *open_item;
     proto_tree *open_tree;
 
     const gchar *stanza_enums[] = {"iq","message"};
-    array_t *stanza_array = ep_init_array_t(stanza_enums, array_length(stanza_enums));
+    xmpp_array_t *stanza_array = xmpp_ep_init_array_t(stanza_enums, array_length(stanza_enums));
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL},
         {"sid", -1, TRUE, TRUE, NULL, NULL},
         {"block-size", -1, TRUE, TRUE, NULL, NULL},
-        {"stanza", -1, FALSE, TRUE, val_enum_list, stanza_array}
+        {"stanza", -1, FALSE, TRUE, xmpp_val_enum_list, stanza_array}
     };
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "IBB-OPEN ");
@@ -745,17 +739,17 @@ xmpp_ibb_open(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *el
     open_item = proto_tree_add_item(tree, hf_xmpp_ibb_open, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     open_tree = proto_item_add_subtree(open_item, ett_xmpp_ibb_open);
 
-    display_attrs(open_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(open_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
     xmpp_unknown(open_tree, tvb, pinfo, element);
 }
 
 void
-xmpp_ibb_close(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_ibb_close(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *close_item;
     proto_tree *close_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL},
         {"sid", -1, TRUE, TRUE, NULL, NULL}
     };
@@ -765,17 +759,17 @@ xmpp_ibb_close(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *e
     close_item = proto_tree_add_item(tree, hf_xmpp_ibb_close, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     close_tree = proto_item_add_subtree(close_item, ett_xmpp_ibb_close);
 
-    display_attrs(close_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(close_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
     xmpp_unknown(close_tree, tvb, pinfo, element);
 }
 
 void
-xmpp_ibb_data(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_ibb_data(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *data_item;
     proto_tree *data_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL},
         {"sid", -1, TRUE, TRUE, NULL, NULL},
         {"seq", -1, TRUE, TRUE, NULL, NULL},
@@ -789,23 +783,23 @@ xmpp_ibb_data(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *el
 
     if(element->data)
     {
-        attr_t *fake_data = ep_init_attr_t(element->data->value, element->offset, element->length);
+        xmpp_attr_t *fake_data = xmpp_ep_init_attr_t(element->data->value, element->offset, element->length);
         g_hash_table_insert(element->attrs, "value", fake_data);
     }
 
-    display_attrs(data_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(data_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
     xmpp_unknown(data_tree, tvb, pinfo, element);
 }
 
 
 /*Delayed Delivery urn:xmpp:delay and jabber:x:delay*/
 void
-xmpp_delay(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_delay(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *delay_item;
     proto_tree *delay_tree;
 
-    attr_info attrs_info[]={
+    xmpp_attr_info attrs_info[]={
         {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL},
         {"from", -1, FALSE, TRUE, NULL, NULL},
         {"stamp", -1, TRUE, TRUE, NULL, NULL},
@@ -817,23 +811,23 @@ xmpp_delay(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *eleme
 
     if(element->data)
     {
-        attr_t *fake_value = ep_init_attr_t(element->data->value, element->offset, element->length);
+        xmpp_attr_t *fake_value = xmpp_ep_init_attr_t(element->data->value, element->offset, element->length);
         g_hash_table_insert(element->attrs, "value", fake_value);
     }
 
-    display_attrs(delay_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(delay_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
     xmpp_unknown(delay_tree, tvb, pinfo, element);
 }
 
 /*Entity Capabilities http://jabber.org/protocol/caps*/
 void
-xmpp_presence_caps(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_presence_caps(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *caps_item;
     proto_tree *caps_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL},
         {"ext", -1, FALSE, FALSE, NULL, NULL},
         {"hash", -1, TRUE, TRUE, NULL, NULL},
@@ -844,19 +838,19 @@ xmpp_presence_caps(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_
     caps_item = proto_tree_add_item(tree, hf_xmpp_presence_caps, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     caps_tree = proto_item_add_subtree(caps_item, ett_xmpp_presence_caps);
 
-    display_attrs(caps_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(caps_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
     xmpp_unknown(caps_tree, tvb, pinfo, element);
 }
 
 /*Message Events jabber:x:event*/
 void
-xmpp_x_event(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_x_event(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *x_item;
     proto_tree *x_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL},
         {"condition", hf_xmpp_x_event_condition, TRUE, TRUE, NULL, NULL},
         {"id", -1, FALSE, TRUE, NULL, NULL}
@@ -864,22 +858,22 @@ xmpp_x_event(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *ele
 
     const gchar *cond_names[] = {"offline", "delivered", "displayed", "composing"};
 
-    attr_t *fake_cond;
+    xmpp_attr_t *fake_cond;
 
-    element_t *cond, *id;
+    xmpp_element_t *cond, *id;
 
     gchar *cond_value = ep_strdup("");
 
     x_item =  proto_tree_add_item(tree, hf_xmpp_x_event, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     x_tree = proto_item_add_subtree(x_item, ett_xmpp_x_event);
 
-    if((id = steal_element_by_name(element, "id"))!=NULL)
+    if((id = xmpp_steal_element_by_name(element, "id"))!=NULL)
     {
-        attr_t *fake_id = ep_init_attr_t(id->data?id->data->value:"", id->offset, id->length);
+        xmpp_attr_t *fake_id = xmpp_ep_init_attr_t(id->data?id->data->value:"", id->offset, id->length);
         g_hash_table_insert(element->attrs, "id", fake_id);
     }
 
-    while((cond = steal_element_by_names(element, cond_names, array_length(cond_names))) != NULL)
+    while((cond = xmpp_steal_element_by_names(element, cond_names, array_length(cond_names))) != NULL)
     {
         if(strcmp(cond_value,"") != 0)
             cond_value = ep_strdup_printf("%s/%s",cond_value, cond->name);
@@ -887,41 +881,41 @@ xmpp_x_event(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *ele
             cond_value = ep_strdup(cond->name);
     }
 
-    fake_cond = ep_init_attr_t(cond_value, element->offset, element->length);
+    fake_cond = xmpp_ep_init_attr_t(cond_value, element->offset, element->length);
     g_hash_table_insert(element->attrs, "condition", fake_cond);
 
 
-    display_attrs(x_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(x_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
     xmpp_unknown(x_tree, tvb, pinfo, element);
 }
 
 /*Multi-User Chat http://jabber.org/protocol/muc*/
 void
-xmpp_muc_x(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_muc_x(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *x_item;
     proto_tree *x_tree;
 
-    attr_info attrs_info [] ={
+    xmpp_attr_info attrs_info [] ={
         {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL},
         {"password", -1, FALSE, TRUE, NULL, NULL}
     };
 
-    element_t *pass, *hist;
+    xmpp_element_t *pass, *hist;
 
     x_item = proto_tree_add_item(tree, hf_xmpp_muc_x, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     x_tree = proto_item_add_subtree(x_item, ett_xmpp_muc_x);
 
-    if((pass = steal_element_by_name(element, "password"))!=NULL)
+    if((pass = xmpp_steal_element_by_name(element, "password"))!=NULL)
     {
-        attr_t *fake_pass = ep_init_attr_t(pass->data?pass->data->value:"",pass->offset, pass->length);
+        xmpp_attr_t *fake_pass = xmpp_ep_init_attr_t(pass->data?pass->data->value:"",pass->offset, pass->length);
         g_hash_table_insert(element->attrs, "password", fake_pass);
     }
 
-    display_attrs(x_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(x_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
-    if((hist = steal_element_by_name(element, "history"))!=NULL)
+    if((hist = xmpp_steal_element_by_name(element, "history"))!=NULL)
     {
         xmpp_muc_history(x_tree, tvb, pinfo, hist);
     }
@@ -930,12 +924,12 @@ xmpp_muc_x(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *eleme
 }
 
 static void
-xmpp_muc_history(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_muc_history(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *hist_item;
     proto_tree *hist_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"maxchars", -1, FALSE, TRUE, NULL, NULL},
         {"maxstanzas", -1, FALSE, TRUE, NULL, NULL},
         {"seconds", -1, FALSE, TRUE, NULL, NULL},
@@ -945,48 +939,48 @@ xmpp_muc_history(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t
     hist_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "HISTORY: ");
     hist_tree = proto_item_add_subtree(hist_item, ett_xmpp_muc_hist);
 
-    display_attrs(hist_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(hist_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
     xmpp_unknown(hist_tree, tvb, pinfo, element);
 }
 
 /*Multi-User Chat http://jabber.org/protocol/muc#user*/
 void
-xmpp_muc_user_x(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_muc_user_x(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *x_item;
     proto_tree *x_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL},
         {"password", -1, FALSE, TRUE, NULL, NULL}
     };
 
-    element_t *item, *status, *invite, *password;
+    xmpp_element_t *item, *status, *invite, *password;
     /*TODO decline destroy*/
 
     x_item = proto_tree_add_item(tree, hf_xmpp_muc_user_x, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     x_tree = proto_item_add_subtree(x_item, ett_xmpp_muc_user_x);
 
-    if((password = steal_element_by_name(element, "password"))!=NULL)
+    if((password = xmpp_steal_element_by_name(element, "password"))!=NULL)
     {
-        attr_t *fake_pass = ep_init_attr_t(password->data?password->data->value:"",password->offset, password->length);
+        xmpp_attr_t *fake_pass = xmpp_ep_init_attr_t(password->data?password->data->value:"",password->offset, password->length);
         g_hash_table_insert(element->attrs, "password", fake_pass);
     }
 
-    display_attrs(x_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(x_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
-    while((item = steal_element_by_name(element, "item"))!=NULL)
+    while((item = xmpp_steal_element_by_name(element, "item"))!=NULL)
     {
         xmpp_muc_user_item(x_tree, tvb, pinfo, item);
     }
 
-    while((status = steal_element_by_name(element, "status"))!=NULL)
+    while((status = xmpp_steal_element_by_name(element, "status"))!=NULL)
     {
         xmpp_muc_user_status(x_tree, tvb, pinfo, status);
     }
 
-    while((invite = steal_element_by_name(element, "invite"))!=NULL)
+    while((invite = xmpp_steal_element_by_name(element, "invite"))!=NULL)
     {
         xmpp_muc_user_invite(x_tree, tvb, pinfo, invite);
     }
@@ -995,99 +989,99 @@ xmpp_muc_user_x(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *
 }
 
 static void
-xmpp_muc_user_item(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_muc_user_item(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *item_item;
     proto_tree *item_tree;
 
     const gchar *affiliation_enums[] = {"admin", "member", "none", "outcast", "owner"};
-    array_t  *affil_array = ep_init_array_t(affiliation_enums, array_length(affiliation_enums));
+    xmpp_array_t  *affil_array = xmpp_ep_init_array_t(affiliation_enums, array_length(affiliation_enums));
 
     const gchar *role_enums[] = {"none", "moderator", "participant", "visitor"};
-    array_t *role_array = ep_init_array_t(role_enums, array_length(role_enums));
+    xmpp_array_t *role_array = xmpp_ep_init_array_t(role_enums, array_length(role_enums));
 
-    attr_info attrs_info [] ={
-        {"affiliation", -1, FALSE, TRUE, val_enum_list, affil_array},
+    xmpp_attr_info attrs_info [] ={
+        {"affiliation", -1, FALSE, TRUE, xmpp_val_enum_list, affil_array},
         {"jid", -1, FALSE, TRUE, NULL, NULL},
         {"nick", -1, FALSE, TRUE, NULL, NULL},
-        {"role", -1, FALSE, TRUE, val_enum_list, role_array},
+        {"role", -1, FALSE, TRUE, xmpp_val_enum_list, role_array},
         {"reason", -1, FALSE, TRUE, NULL, NULL},
         {"actor_jid", -1, FALSE, TRUE, NULL, NULL}
     };
 
-    element_t *reason, *actor;
+    xmpp_element_t *reason, *actor;
     /*TODO continue - it's not clear to me, in schema it's marked as empty, but in examples it has CDATA*/
 
     item_item = proto_tree_add_item(tree, hf_xmpp_muc_user_item, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     item_tree = proto_item_add_subtree(item_item, ett_xmpp_muc_user_item);
 
-    if((reason = steal_element_by_name(element, "reason"))!=NULL)
+    if((reason = xmpp_steal_element_by_name(element, "reason"))!=NULL)
     {
-        attr_t *fake_reason = ep_init_attr_t(reason->data?reason->data->value:"",reason->offset, reason->length);
+        xmpp_attr_t *fake_reason = xmpp_ep_init_attr_t(reason->data?reason->data->value:"",reason->offset, reason->length);
         g_hash_table_insert(element->attrs,"reason",fake_reason);
     }
 
-    if((actor = steal_element_by_name(element, "actor"))!=NULL)
+    if((actor = xmpp_steal_element_by_name(element, "actor"))!=NULL)
     {
-        attr_t *jid = get_attr(actor, "jid");
-        attr_t *fake_actor_jid = ep_init_attr_t(jid?jid->value:"",actor->offset, actor->length);
+        xmpp_attr_t *jid = xmpp_get_attr(actor, "jid");
+        xmpp_attr_t *fake_actor_jid = xmpp_ep_init_attr_t(jid?jid->value:"",actor->offset, actor->length);
         g_hash_table_insert(element->attrs, "actor_jid", fake_actor_jid);
     }
 
-    display_attrs(item_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(item_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
     xmpp_unknown(item_tree, tvb, pinfo, element);
 }
 
 static void
-xmpp_muc_user_status(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_muc_user_status(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
-    attr_t *code = get_attr(element, "code");
+    xmpp_attr_t *code = xmpp_get_attr(element, "code");
     proto_tree_add_text(tree, tvb, element->offset, element->length, "STATUS [code=\"%s\"]",code?code->value:"");
 
     xmpp_unknown(tree, tvb, pinfo, element);
 }
 
 static void
-xmpp_muc_user_invite(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_muc_user_invite(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *invite_item;
     proto_tree *invite_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"from", -1, FALSE, TRUE, NULL, NULL},
         {"to", -1, FALSE, TRUE, NULL, NULL},
         {"reason", -1, FALSE, TRUE, NULL, NULL}
     };
 
-    element_t *reason;
+    xmpp_element_t *reason;
 
     invite_item = proto_tree_add_item(tree, hf_xmpp_muc_user_invite, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     invite_tree = proto_item_add_subtree(invite_item, ett_xmpp_muc_user_invite);
 
-    if((reason = steal_element_by_name(element, "reason"))!=NULL)
+    if((reason = xmpp_steal_element_by_name(element, "reason"))!=NULL)
     {
-        attr_t *fake_reason = ep_init_attr_t(reason->data?reason->data->value:"",reason->offset, reason->length);
+        xmpp_attr_t *fake_reason = xmpp_ep_init_attr_t(reason->data?reason->data->value:"",reason->offset, reason->length);
         g_hash_table_insert(element->attrs, "reason", fake_reason);
     }
 
-    display_attrs(invite_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(invite_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
     xmpp_unknown(invite_tree, tvb, pinfo, element);
 }
 
 /*Multi-User Chat http://jabber.org/protocol/muc#owner*/
 void
-xmpp_muc_owner_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_muc_owner_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *query_item;
     proto_tree *query_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}
     };
 
-    element_t *x_data;
+    xmpp_element_t *x_data;
     /*TODO destroy*/
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "QUERY(muc#owner) ");
@@ -1095,9 +1089,9 @@ xmpp_muc_owner_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, elemen
     query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     query_tree = proto_item_add_subtree(query_item, ett_xmpp_query);
 
-    display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
-    if((x_data = steal_element_by_name_and_attr(element, "x", "xmlns", "jabber:x:data"))!=NULL)
+    if((x_data = xmpp_steal_element_by_name_and_attr(element, "x", "xmlns", "jabber:x:data"))!=NULL)
     {
         xmpp_x_data(query_tree, tvb, pinfo, x_data);
     }
@@ -1108,25 +1102,25 @@ xmpp_muc_owner_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, elemen
 
 /*Multi-User Chat http://jabber.org/protocol/muc#admin*/
 void
-xmpp_muc_admin_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_muc_admin_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *query_item;
     proto_tree *query_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}
     };
 
-    element_t *item;
+    xmpp_element_t *item;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "QUERY(muc#admin) ");
 
     query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     query_tree = proto_item_add_subtree(query_item, ett_xmpp_query);
 
-    display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
-    while((item = steal_element_by_name(element, "item"))!=NULL)
+    while((item = xmpp_steal_element_by_name(element, "item"))!=NULL)
     {
         /*from muc#user, because it is the same except continue element*/
         xmpp_muc_user_item(query_tree, tvb, pinfo, item);
@@ -1137,12 +1131,12 @@ xmpp_muc_admin_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, elemen
 
 /*Last Activity jabber:iq:last*/
 void
-xmpp_last_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_last_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *query_item;
     proto_tree *query_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL},
         {"seconds", -1, FALSE, TRUE, NULL, NULL},
         {"value", -1, FALSE, TRUE, NULL, NULL}
@@ -1155,64 +1149,64 @@ xmpp_last_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *
 
     if(element->data)
     {
-        attr_t *fake_data = ep_init_attr_t(element->data->value, element->data->offset, element->data->length);
+        xmpp_attr_t *fake_data = xmpp_ep_init_attr_t(element->data->value, element->data->offset, element->data->length);
         g_hash_table_insert(element->attrs, "value", fake_data);
     }
 
-    display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(query_tree, element, pinfo, tvb, NULL, 0);
+    xmpp_display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(query_tree, element, pinfo, tvb, NULL, 0);
 }
 
 /*XEP-0092: Software Version jabber:iq:version*/
 void
-xmpp_version_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_version_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
       proto_item *query_item;
     proto_tree *query_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL},
         {"name", -1, FALSE, TRUE, NULL, NULL},
         {"version", -1, FALSE, TRUE, NULL, NULL},
         {"os", -1, FALSE, TRUE, NULL, NULL}
     };
 
-    element_t *name, *version, *os;
+    xmpp_element_t *name, *version, *os;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "QUERY(jabber:iq:version) ");
 
     query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     query_tree = proto_item_add_subtree(query_item, ett_xmpp_query);
 
-    if((name = steal_element_by_name(element,"name"))!=NULL)
+    if((name = xmpp_steal_element_by_name(element,"name"))!=NULL)
     {
-        attr_t *fake_name = ep_init_attr_t(name->data?name->data->value:"", name->offset, name->length);
+        xmpp_attr_t *fake_name = xmpp_ep_init_attr_t(name->data?name->data->value:"", name->offset, name->length);
         g_hash_table_insert(element->attrs, "name", fake_name);
     }
 
-    if((version = steal_element_by_name(element,"version"))!=NULL)
+    if((version = xmpp_steal_element_by_name(element,"version"))!=NULL)
     {
-        attr_t *fake_version = ep_init_attr_t(version->data?version->data->value:"", version->offset, version->length);
+        xmpp_attr_t *fake_version = xmpp_ep_init_attr_t(version->data?version->data->value:"", version->offset, version->length);
         g_hash_table_insert(element->attrs, "version", fake_version);
     }
 
-    if((os = steal_element_by_name(element,"os"))!=NULL)
+    if((os = xmpp_steal_element_by_name(element,"os"))!=NULL)
     {
-        attr_t *fake_os = ep_init_attr_t(os->data?os->data->value:"", os->offset, os->length);
+        xmpp_attr_t *fake_os = xmpp_ep_init_attr_t(os->data?os->data->value:"", os->offset, os->length);
         g_hash_table_insert(element->attrs, "os", fake_os);
     }
 
-    display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(query_tree, element, pinfo, tvb, NULL, 0);
+    xmpp_display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(query_tree, element, pinfo, tvb, NULL, 0);
 }
 /*XEP-0199: XMPP Ping*/
 void
-xmpp_ping(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_ping(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *ping_item;
     proto_tree *ping_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL},
     };
 
@@ -1221,81 +1215,81 @@ xmpp_ping(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *elemen
     ping_item = proto_tree_add_item(tree, hf_xmpp_ping, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     ping_tree = proto_item_add_subtree(ping_item, ett_xmpp_ping);
 
-    display_attrs(ping_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(ping_tree, element, pinfo, tvb, NULL, 0);
+    xmpp_display_attrs(ping_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(ping_tree, element, pinfo, tvb, NULL, 0);
 }
 
 /*XEP-0300: Use of Cryptographic Hash Functions in XMPP urn:xmpp:hashes:0*/
 void
-xmpp_hashes(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element) {
+xmpp_hashes(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element) {
     proto_item *hashes_item;
     proto_tree *hashes_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL},
     };
-    elem_info elems_info[] = {
+    xmpp_elem_info elems_info[] = {
         {NAME, "hash", xmpp_hashes_hash, MANY}
     };
 
     hashes_item = proto_tree_add_item(tree, hf_xmpp_hashes, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     hashes_tree = proto_item_add_subtree(hashes_item, ett_xmpp_hashes);
 
-    display_attrs(hashes_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(hashes_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
+    xmpp_display_attrs(hashes_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(hashes_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
 }
 
 static void
-xmpp_hashes_hash(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_hashes_hash(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *hash_item;
     proto_tree *hash_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"algo", -1, TRUE, TRUE, NULL, NULL},
         {"value", -1, TRUE, TRUE, NULL, NULL}
     };
 
-    attr_t *fake_cdata = ep_init_attr_t(elem_cdata(element), element->offset, element->length);
+    xmpp_attr_t *fake_cdata = xmpp_ep_init_attr_t(xmpp_elem_cdata(element), element->offset, element->length);
     g_hash_table_insert(element->attrs, "value", fake_cdata);
 
     hash_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "HASH");
     hash_tree = proto_item_add_subtree(hash_item, ett_xmpp_hashes_hash);
 
-    display_attrs(hash_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(hash_tree, element, pinfo, tvb, NULL, 0);
+    xmpp_display_attrs(hash_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(hash_tree, element, pinfo, tvb, NULL, 0);
 }
 
 /*http://jitsi.org/protocol/inputevt*/
 void
-xmpp_jitsi_inputevt(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_jitsi_inputevt(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *inputevt_item;
     proto_tree *inputevt_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL},
         {"action", -1, FALSE, TRUE, NULL, NULL}
     };
 
-    elem_info elems_info[] = {
+    xmpp_elem_info elems_info[] = {
         {NAME, "remote-control", xmpp_jitsi_inputevt_rmt_ctrl, MANY}
     };
 
     inputevt_item = proto_tree_add_item(tree, hf_xmpp_jitsi_inputevt, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     inputevt_tree = proto_item_add_subtree(inputevt_item, ett_xmpp_jitsi_inputevt);
 
-    display_attrs(inputevt_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(inputevt_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
+    xmpp_display_attrs(inputevt_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(inputevt_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
 }
 
 static void
-xmpp_jitsi_inputevt_rmt_ctrl(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, element_t *element)
+xmpp_jitsi_inputevt_rmt_ctrl(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element)
 {
     proto_item *rmt_ctrl_item;
     proto_tree *rmt_ctrl_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL},
         {"action", -1, TRUE, TRUE, NULL, NULL},
         {"x", -1, FALSE, TRUE, NULL, NULL},
@@ -1304,18 +1298,18 @@ xmpp_jitsi_inputevt_rmt_ctrl(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo
         {"keycode", -1, FALSE, TRUE, NULL, NULL},
     };
 
-    element_t *action;
+    xmpp_element_t *action;
     const gchar *action_names[] = {"mouse-move","mouse-press", "mouse-release", "key-press", "key-release"};
 
-    if((action = steal_element_by_names(element, action_names, array_length(action_names)))!=NULL)
+    if((action = xmpp_steal_element_by_names(element, action_names, array_length(action_names)))!=NULL)
     {
-        attr_t *fake_action = ep_init_attr_t(action->name, action->offset, action->length);
+        xmpp_attr_t *fake_action = xmpp_ep_init_attr_t(action->name, action->offset, action->length);
         g_hash_table_insert(element->attrs,"action", fake_action);
 
         if(strcmp(action->name,"mouse-move") == 0)
         {
-            attr_t *x = get_attr(action,"x");
-            attr_t *y = get_attr(action,"y");
+            xmpp_attr_t *x = xmpp_get_attr(action,"x");
+            xmpp_attr_t *y = xmpp_get_attr(action,"y");
 
             if(x)
                 g_hash_table_insert(element->attrs,"x",x);
@@ -1323,13 +1317,13 @@ xmpp_jitsi_inputevt_rmt_ctrl(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo
                 g_hash_table_insert(element->attrs,"y",y);
         } else if(strcmp(action->name,"mouse-press") == 0 || strcmp(action->name,"mouse-release") == 0)
         {
-            attr_t *btns = get_attr(action,"btns");
+            xmpp_attr_t *btns = xmpp_get_attr(action,"btns");
 
             if(btns)
                 g_hash_table_insert(element->attrs,"btns",btns);
         } else if(strcmp(action->name,"key-press") == 0 || strcmp(action->name,"key-release") == 0)
         {
-            attr_t *keycode = get_attr(action,"keycode");
+            xmpp_attr_t *keycode = xmpp_get_attr(action,"keycode");
 
             if(keycode)
                 g_hash_table_insert(element->attrs,"keycode",keycode);
@@ -1340,8 +1334,8 @@ xmpp_jitsi_inputevt_rmt_ctrl(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo
     rmt_ctrl_item = proto_tree_add_item(tree, hf_xmpp_jitsi_inputevt_rmt_ctrl, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     rmt_ctrl_tree = proto_item_add_subtree(rmt_ctrl_item, ett_xmpp_jitsi_inputevt_rmt_ctrl);
 
-    display_attrs(rmt_ctrl_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(rmt_ctrl_tree, element, pinfo, tvb, NULL, 0);
+    xmpp_display_attrs(rmt_ctrl_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(rmt_ctrl_tree, element, pinfo, tvb, NULL, 0);
 }
 /*
 * Editor modelines - http://www.wireshark.org/tools/modelines.html