diff --git a/source/org/jivesoftware/smack/packet/Authentication.java b/source/org/jivesoftware/smack/packet/Authentication.java
index 83fb3b9a5..678392ab6 100644
--- a/source/org/jivesoftware/smack/packet/Authentication.java
+++ b/source/org/jivesoftware/smack/packet/Authentication.java
@@ -178,7 +178,7 @@ public class Authentication extends IQ {
         this.resource = resource;
     }
 
-    public String getQueryXML() {
+    public String getChildElementXML() {
         StringBuffer buf = new StringBuffer();
         buf.append("<query xmlns=\"jabber:iq:auth\">");
         if (username != null) {
diff --git a/source/org/jivesoftware/smack/packet/IQ.java b/source/org/jivesoftware/smack/packet/IQ.java
index fc0e8e270..9c1c7ba57 100644
--- a/source/org/jivesoftware/smack/packet/IQ.java
+++ b/source/org/jivesoftware/smack/packet/IQ.java
@@ -102,7 +102,7 @@ public class IQ extends Packet {
             buf.append("type=\"").append(getType()).append("\">");
         }
         // Add the query section if there is one.
-        String queryXML = getQueryXML();
+        String queryXML = getChildElementXML();
         if (queryXML != null) {
             buf.append(queryXML);
         }
@@ -116,7 +116,7 @@ public class IQ extends Packet {
     }
 
     /**
-     * Returns the "query" XML section of the IQ packet, or <tt>null</tt> if there
+     * Returns the sub-element XML section of the IQ packet, or <tt>null</tt> if there
      * isn't one.<p>
      *
      * Generally, extensions of this class should override this method. This lets
@@ -125,7 +125,7 @@ public class IQ extends Packet {
      *
      * @return the query section of the IQ XML.
      */
-    public String getQueryXML() {
+    public String getChildElementXML() {
         return null;
     }
 
diff --git a/source/org/jivesoftware/smack/packet/Registration.java b/source/org/jivesoftware/smack/packet/Registration.java
index 48416695c..01b809c5d 100644
--- a/source/org/jivesoftware/smack/packet/Registration.java
+++ b/source/org/jivesoftware/smack/packet/Registration.java
@@ -138,7 +138,7 @@ public class Registration extends IQ {
         this.attributes = attributes;
     }
 
-    public String getQueryXML() {
+    public String getChildElementXML() {
         StringBuffer buf = new StringBuffer();
         buf.append("<query xmlns=\"jabber:iq:register\">");
         if (username != null) {
diff --git a/source/org/jivesoftware/smack/packet/RosterPacket.java b/source/org/jivesoftware/smack/packet/RosterPacket.java
index 6a57c566f..144fa45cc 100644
--- a/source/org/jivesoftware/smack/packet/RosterPacket.java
+++ b/source/org/jivesoftware/smack/packet/RosterPacket.java
@@ -86,7 +86,7 @@ public class RosterPacket extends IQ {
         }
     }
 
-    public String getQueryXML() {
+    public String getChildElementXML() {
         StringBuffer buf = new StringBuffer();
         buf.append("<query xmlns=\"jabber:iq:roster\">");
         synchronized (rosterItems) {