diff --git a/README.md b/README.md index 04b34ef51..c20b68911 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Key Advantages : - Extremely simple to use, yet powerful API. Sending a text message to a user can be accomplished in only a few lines of code: ```java - Connection connection = new XMPPConnection("jabber.org"); + XMPPConnection connection = new TCPConnection("jabber.org"); connection.connect(); connection.login("mtucker", "password"); Chat chat = connection.getChatManager() diff --git a/bosh/src/main/java/org/jivesoftware/smack/BOSHConnection.java b/bosh/src/main/java/org/jivesoftware/smack/BOSHConnection.java index 52c3dd108..10eaf81cc 100644 --- a/bosh/src/main/java/org/jivesoftware/smack/BOSHConnection.java +++ b/bosh/src/main/java/org/jivesoftware/smack/BOSHConnection.java @@ -25,7 +25,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; -import org.jivesoftware.smack.Connection; +import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.ConnectionCreationListener; import org.jivesoftware.smack.ConnectionListener; import org.jivesoftware.smack.PacketCollector; @@ -51,10 +51,10 @@ import org.igniterealtime.jbosh.ComposableBody; * Creates a connection to a XMPP server via HTTP binding. * This is specified in the XEP-0206: XMPP Over BOSH. * - * @see Connection + * @see XMPPConnection * @author Guenther Niess */ -public class BOSHConnection extends Connection { +public class BOSHConnection extends XMPPConnection { /** * The XMPP Over Bosh namespace. diff --git a/core/src/integration-test/java/org/jivesoftware/smack/MessageTest.java b/core/src/integration-test/java/org/jivesoftware/smack/MessageTest.java index f071e06cd..0e7d8f0da 100644 --- a/core/src/integration-test/java/org/jivesoftware/smack/MessageTest.java +++ b/core/src/integration-test/java/org/jivesoftware/smack/MessageTest.java @@ -167,7 +167,7 @@ public class MessageTest extends SmackTestCase { // Send the first message getConnection(0).sendPacket(msg); // Check that the connection that sent the message is still connected - assertTrue("Connection was closed", getConnection(0).isConnected()); + assertTrue("XMPPConnection was closed", getConnection(0).isConnected()); // Check that the message was received Message rcv = (Message) collector.nextResult(1000); assertNotNull("No Message was received", rcv); @@ -175,7 +175,7 @@ public class MessageTest extends SmackTestCase { // Send the second message getConnection(0).sendPacket(msg); // Check that the connection that sent the message is still connected - assertTrue("Connection was closed", getConnection(0).isConnected()); + assertTrue("XMPPConnection was closed", getConnection(0).isConnected()); // Check that the second message was received rcv = (Message) collector.nextResult(1000); assertNotNull("No Message was received", rcv); diff --git a/core/src/integration-test/java/org/jivesoftware/smack/PresenceTest.java b/core/src/integration-test/java/org/jivesoftware/smack/PresenceTest.java index 10ab29d24..a5ede9b4f 100644 --- a/core/src/integration-test/java/org/jivesoftware/smack/PresenceTest.java +++ b/core/src/integration-test/java/org/jivesoftware/smack/PresenceTest.java @@ -35,8 +35,8 @@ public class PresenceTest extends SmackTestCase { } /** - * Connection(0) will send messages to the bareJID of Connection(1) where the user of - * Connection(1) has logged from two different places with different presence priorities. + * XMPPConnection(0) will send messages to the bareJID of XMPPConnection(1) where the user of + * XMPPConnection(1) has logged from two different places with different presence priorities. */ public void testMessageToHighestPriority() { TCPConnection conn = null; diff --git a/core/src/integration-test/java/org/jivesoftware/smack/util/ConnectionUtils.java b/core/src/integration-test/java/org/jivesoftware/smack/util/ConnectionUtils.java index 74426793e..a7a17e087 100644 --- a/core/src/integration-test/java/org/jivesoftware/smack/util/ConnectionUtils.java +++ b/core/src/integration-test/java/org/jivesoftware/smack/util/ConnectionUtils.java @@ -1,6 +1,6 @@ package org.jivesoftware.smack.util; -import org.jivesoftware.smack.Connection; +import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.Roster; import org.jivesoftware.smack.XMPPException; @@ -8,7 +8,7 @@ public class ConnectionUtils { private ConnectionUtils() {} - public static void becomeFriends(Connection con0, Connection con1) throws XMPPException { + public static void becomeFriends(XMPPConnection con0, XMPPConnection con1) throws XMPPException { Roster r0 = con0.getRoster(); Roster r1 = con1.getRoster(); r0.setSubscriptionMode(Roster.SubscriptionMode.accept_all); @@ -17,9 +17,9 @@ public class ConnectionUtils { r1.createEntry(con0.getUser(), "u1", null); } - public static void letsAllBeFriends(Connection[] connections) throws XMPPException { - for (Connection c1 : connections) { - for (Connection c2 : connections) { + public static void letsAllBeFriends(XMPPConnection[] connections) throws XMPPException { + for (XMPPConnection c1 : connections) { + for (XMPPConnection c2 : connections) { if (c1 == c2) continue; becomeFriends(c1, c2); diff --git a/core/src/main/java/org/jivesoftware/smack/AccountManager.java b/core/src/main/java/org/jivesoftware/smack/AccountManager.java index a54c5c98f..9cf1b19e4 100644 --- a/core/src/main/java/org/jivesoftware/smack/AccountManager.java +++ b/core/src/main/java/org/jivesoftware/smack/AccountManager.java @@ -31,13 +31,13 @@ import org.jivesoftware.smack.util.StringUtils; /** * Allows creation and management of accounts on an XMPP server. * - * @see Connection#getAccountManager() + * @see XMPPConnection#getAccountManager() * @author Matt Tucker */ public class AccountManager { private static final Logger LOGGER = Logger.getLogger(AccountManager.class.getName()); - private Connection connection; + private XMPPConnection connection; private Registration info = null; /** @@ -53,7 +53,7 @@ public class AccountManager { * * @param connection a connection to a XMPP server. */ - public AccountManager(Connection connection) { + public AccountManager(XMPPConnection connection) { this.connection = connection; } diff --git a/core/src/main/java/org/jivesoftware/smack/Chat.java b/core/src/main/java/org/jivesoftware/smack/Chat.java index 7124bdd1d..216ff9f06 100644 --- a/core/src/main/java/org/jivesoftware/smack/Chat.java +++ b/core/src/main/java/org/jivesoftware/smack/Chat.java @@ -151,7 +151,7 @@ public class Chat { /** * Delivers a message directly to this chat, which will add the message * to the collector and deliver it to all listeners registered with the - * Chat. This is used by the Connection class to deliver messages + * Chat. This is used by the XMPPConnection class to deliver messages * without a thread ID. * * @param message the message. diff --git a/core/src/main/java/org/jivesoftware/smack/ChatManager.java b/core/src/main/java/org/jivesoftware/smack/ChatManager.java index e36ddbc0e..991e965b8 100644 --- a/core/src/main/java/org/jivesoftware/smack/ChatManager.java +++ b/core/src/main/java/org/jivesoftware/smack/ChatManager.java @@ -108,9 +108,9 @@ public class ChatManager { private Map interceptors = new WeakHashMap(); - private Connection connection; + private XMPPConnection connection; - ChatManager(Connection connection) { + ChatManager(XMPPConnection connection) { this.connection = connection; PacketFilter filter = new PacketFilter() { diff --git a/core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java b/core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java index ae8e227b6..567e56e6a 100644 --- a/core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java +++ b/core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java @@ -63,7 +63,7 @@ public class ConnectionConfiguration implements Cloneable { */ private CallbackHandler callbackHandler; - private boolean debuggerEnabled = Connection.DEBUG_ENABLED; + private boolean debuggerEnabled = XMPPConnection.DEBUG_ENABLED; // Flag that indicates if a reconnection should be attempted when abruptly disconnected private boolean reconnectionAllowed = true; @@ -368,7 +368,7 @@ public class ConnectionConfiguration implements Cloneable { /** * Returns true if the new connection about to be establish is going to be debugged. By - * default the value of {@link Connection#DEBUG_ENABLED} is used. + * default the value of {@link XMPPConnection#DEBUG_ENABLED} is used. * * @return true if the new connection about to be establish is going to be debugged. */ @@ -378,7 +378,7 @@ public class ConnectionConfiguration implements Cloneable { /** * Sets if the new connection about to be establish is going to be debugged. By - * default the value of {@link Connection#DEBUG_ENABLED} is used. + * default the value of {@link XMPPConnection#DEBUG_ENABLED} is used. * * @param debuggerEnabled if the new connection about to be establish is going to be debugged. */ diff --git a/core/src/main/java/org/jivesoftware/smack/ConnectionCreationListener.java b/core/src/main/java/org/jivesoftware/smack/ConnectionCreationListener.java index d2cbbdcd4..0a04bc00c 100644 --- a/core/src/main/java/org/jivesoftware/smack/ConnectionCreationListener.java +++ b/core/src/main/java/org/jivesoftware/smack/ConnectionCreationListener.java @@ -18,9 +18,9 @@ package org.jivesoftware.smack; /** - * Implementors of this interface will be notified when a new {@link Connection} + * Implementors of this interface will be notified when a new {@link XMPPConnection} * has been created. The newly created connection will not be actually connected to - * the server. Use {@link Connection#addConnectionCreationListener(ConnectionCreationListener)} + * the server. Use {@link XMPPConnection#addConnectionCreationListener(ConnectionCreationListener)} * to add new listeners. * * @author Gaston Dombiak @@ -33,6 +33,6 @@ public interface ConnectionCreationListener { * * @param connection the newly created connection. */ - public void connectionCreated(Connection connection); + public void connectionCreated(XMPPConnection connection); } diff --git a/core/src/main/java/org/jivesoftware/smack/ConnectionListener.java b/core/src/main/java/org/jivesoftware/smack/ConnectionListener.java index fa3b45213..1f5b7e71c 100644 --- a/core/src/main/java/org/jivesoftware/smack/ConnectionListener.java +++ b/core/src/main/java/org/jivesoftware/smack/ConnectionListener.java @@ -19,10 +19,10 @@ package org.jivesoftware.smack; /** * Interface that allows for implementing classes to listen for connection closing - * and reconnection events. Listeners are registered with Connection objects. + * and reconnection events. Listeners are registered with XMPPConnection objects. * - * @see Connection#addConnectionListener - * @see Connection#removeConnectionListener + * @see XMPPConnection#addConnectionListener + * @see XMPPConnection#removeConnectionListener * * @author Matt Tucker */ diff --git a/core/src/main/java/org/jivesoftware/smack/Manager.java b/core/src/main/java/org/jivesoftware/smack/Manager.java index 1a9e98b49..0b6d1315d 100644 --- a/core/src/main/java/org/jivesoftware/smack/Manager.java +++ b/core/src/main/java/org/jivesoftware/smack/Manager.java @@ -20,13 +20,13 @@ import java.lang.ref.WeakReference; public abstract class Manager { - final WeakReference weakConnection; + final WeakReference weakConnection; - public Manager(Connection connection) { - weakConnection = new WeakReference(connection); + public Manager(XMPPConnection connection) { + weakConnection = new WeakReference(connection); } - protected final Connection connection() { + protected final XMPPConnection connection() { return weakConnection.get(); } } diff --git a/core/src/main/java/org/jivesoftware/smack/PacketCollector.java b/core/src/main/java/org/jivesoftware/smack/PacketCollector.java index acc04f9fc..718f8e38e 100644 --- a/core/src/main/java/org/jivesoftware/smack/PacketCollector.java +++ b/core/src/main/java/org/jivesoftware/smack/PacketCollector.java @@ -35,14 +35,14 @@ import org.jivesoftware.smack.packet.XMPPError; * older packets are automatically dropped. The default number is retrieved by * {@link SmackConfiguration#getPacketCollectorSize()}. * - * @see Connection#createPacketCollector(PacketFilter) + * @see XMPPConnection#createPacketCollector(PacketFilter) * @author Matt Tucker */ public class PacketCollector { private PacketFilter packetFilter; private ArrayBlockingQueue resultQueue; - private Connection connection; + private XMPPConnection connection; private boolean cancelled = false; /** @@ -52,7 +52,7 @@ public class PacketCollector { * @param connection the connection the collector is tied to. * @param packetFilter determines which packets will be returned by this collector. */ - protected PacketCollector(Connection connection, PacketFilter packetFilter) { + protected PacketCollector(XMPPConnection connection, PacketFilter packetFilter) { this(connection, packetFilter, SmackConfiguration.getPacketCollectorSize()); } @@ -64,7 +64,7 @@ public class PacketCollector { * @param packetFilter determines which packets will be returned by this collector. * @param maxSize the maximum number of packets that will be stored in the collector. */ - protected PacketCollector(Connection connection, PacketFilter packetFilter, int maxSize) { + protected PacketCollector(XMPPConnection connection, PacketFilter packetFilter, int maxSize) { this.connection = connection; this.packetFilter = packetFilter; this.resultQueue = new ArrayBlockingQueue(maxSize); diff --git a/core/src/main/java/org/jivesoftware/smack/PacketInterceptor.java b/core/src/main/java/org/jivesoftware/smack/PacketInterceptor.java index e2df41093..e07f42faf 100644 --- a/core/src/main/java/org/jivesoftware/smack/PacketInterceptor.java +++ b/core/src/main/java/org/jivesoftware/smack/PacketInterceptor.java @@ -21,14 +21,14 @@ import org.jivesoftware.smack.packet.Packet; /** * Provides a mechanism to intercept and modify packets that are going to be - * sent to the server. PacketInterceptors are added to the {@link Connection} + * sent to the server. PacketInterceptors are added to the {@link XMPPConnection} * together with a {@link org.jivesoftware.smack.filter.PacketFilter} so that only * certain packets are intercepted and processed by the interceptor.

* * This allows event-style programming -- every time a new packet is found, * the {@link #interceptPacket(Packet)} method will be called. * - * @see Connection#addPacketInterceptor(PacketInterceptor, org.jivesoftware.smack.filter.PacketFilter) + * @see XMPPConnection#addPacketInterceptor(PacketInterceptor, org.jivesoftware.smack.filter.PacketFilter) * @author Gaston Dombiak */ public interface PacketInterceptor { diff --git a/core/src/main/java/org/jivesoftware/smack/PacketListener.java b/core/src/main/java/org/jivesoftware/smack/PacketListener.java index 501c5623c..b0b4791e6 100644 --- a/core/src/main/java/org/jivesoftware/smack/PacketListener.java +++ b/core/src/main/java/org/jivesoftware/smack/PacketListener.java @@ -26,7 +26,7 @@ import org.jivesoftware.smack.packet.Packet; * opposite approach to the functionality provided by a {@link PacketCollector} * which lets you block while waiting for results. * - * @see Connection#addPacketListener(PacketListener, org.jivesoftware.smack.filter.PacketFilter) + * @see XMPPConnection#addPacketListener(PacketListener, org.jivesoftware.smack.filter.PacketFilter) * @author Matt Tucker */ public interface PacketListener { diff --git a/core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java b/core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java index 5eabfddf2..e43fabee6 100644 --- a/core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java +++ b/core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java @@ -37,7 +37,7 @@ public class ReconnectionManager implements ConnectionListener { private static final Logger LOGGER = Logger.getLogger(ReconnectionManager.class.getName()); // Holds the connection to the server - private Connection connection; + private XMPPConnection connection; private Thread reconnectionThread; private int randomBase = new Random().nextInt(11) + 5; // between 5 and 15 seconds @@ -48,14 +48,14 @@ public class ReconnectionManager implements ConnectionListener { // Create a new PrivacyListManager on every established connection. In the init() // method of PrivacyListManager, we'll add a listener that will delete the // instance when the connection is closed. - Connection.addConnectionCreationListener(new ConnectionCreationListener() { - public void connectionCreated(Connection connection) { + XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() { + public void connectionCreated(XMPPConnection connection) { connection.addConnectionListener(new ReconnectionManager(connection)); } }); } - private ReconnectionManager(Connection connection) { + private ReconnectionManager(XMPPConnection connection) { this.connection = connection; } @@ -117,7 +117,7 @@ public class ReconnectionManager implements ConnectionListener { */ public void run() { // The process will try to reconnect until the connection is established or - // the user cancel the reconnection process {@link Connection#disconnect()} + // the user cancel the reconnection process {@link XMPPConnection#disconnect()} while (ReconnectionManager.this.isReconnectionAllowed()) { // Find how much time we should wait until the next reconnection int remainingSeconds = timeDelay(); @@ -173,7 +173,7 @@ public class ReconnectionManager implements ConnectionListener { } /** - * Fires listeners when The Connection will retry a reconnection. Expressed in seconds. + * Fires listeners when The XMPPConnection will retry a reconnection. Expressed in seconds. * * @param seconds the number of seconds that a reconnection will be attempted in. */ diff --git a/core/src/main/java/org/jivesoftware/smack/Roster.java b/core/src/main/java/org/jivesoftware/smack/Roster.java index 5ca822532..cc33b0c22 100644 --- a/core/src/main/java/org/jivesoftware/smack/Roster.java +++ b/core/src/main/java/org/jivesoftware/smack/Roster.java @@ -52,7 +52,7 @@ import org.jivesoftware.smack.util.StringUtils; * * * @author Matt Tucker - * @see Connection#getRoster() + * @see XMPPConnection#getRoster() */ public class Roster { @@ -62,7 +62,7 @@ public class Roster { */ private static SubscriptionMode defaultSubscriptionMode = SubscriptionMode.accept_all; - private final Connection connection; + private final XMPPConnection connection; private final RosterStore rosterStore; private final Map groups; private final Map entries; @@ -105,7 +105,7 @@ public class Roster { * * @param connection an XMPP connection. */ - Roster(final Connection connection) { + Roster(final XMPPConnection connection) { this.connection = connection; rosterStore = connection.getConfiguration().getRosterStore(); groups = new ConcurrentHashMap(); @@ -138,9 +138,9 @@ public class Roster { // if not connected add listener after successful login if(!this.connection.isConnected()) { - Connection.addConnectionCreationListener(new ConnectionCreationListener() { + XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() { - public void connectionCreated(Connection connection) { + public void connectionCreated(XMPPConnection connection) { if(connection.equals(Roster.this.connection)) { Roster.this.connection.addConnectionListener(connectionListener); } diff --git a/core/src/main/java/org/jivesoftware/smack/RosterEntry.java b/core/src/main/java/org/jivesoftware/smack/RosterEntry.java index 057f49b8d..471f92316 100644 --- a/core/src/main/java/org/jivesoftware/smack/RosterEntry.java +++ b/core/src/main/java/org/jivesoftware/smack/RosterEntry.java @@ -35,7 +35,7 @@ public class RosterEntry { private RosterPacket.ItemType type; private RosterPacket.ItemStatus status; final private Roster roster; - final private Connection connection; + final private XMPPConnection connection; /** * Creates a new roster entry. @@ -47,7 +47,7 @@ public class RosterEntry { * @param connection a connection to the XMPP server. */ RosterEntry(String user, String name, RosterPacket.ItemType type, - RosterPacket.ItemStatus status, Roster roster, Connection connection) { + RosterPacket.ItemStatus status, Roster roster, XMPPConnection connection) { this.user = user; this.name = name; this.type = type; diff --git a/core/src/main/java/org/jivesoftware/smack/RosterGroup.java b/core/src/main/java/org/jivesoftware/smack/RosterGroup.java index 8459eebd8..da9242cc6 100644 --- a/core/src/main/java/org/jivesoftware/smack/RosterGroup.java +++ b/core/src/main/java/org/jivesoftware/smack/RosterGroup.java @@ -36,7 +36,7 @@ import org.jivesoftware.smack.util.StringUtils; public class RosterGroup { private String name; - private Connection connection; + private XMPPConnection connection; private final Set entries; /** @@ -45,7 +45,7 @@ public class RosterGroup { * @param name the name of the group. * @param connection the connection the group belongs to. */ - RosterGroup(String name, Connection connection) { + RosterGroup(String name, XMPPConnection connection) { this.name = name; this.connection = connection; entries = new LinkedHashSet(); diff --git a/core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java b/core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java index 0665521c1..36209ceb2 100644 --- a/core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java +++ b/core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java @@ -61,7 +61,7 @@ public class SASLAuthentication { private static Map> implementedMechanisms = new HashMap>(); private static List mechanismsPreferences = new ArrayList(); - private Connection connection; + private XMPPConnection connection; private Collection serverMechanisms = new ArrayList(); private SASLMechanism currentMechanism = null; /** @@ -170,7 +170,7 @@ public class SASLAuthentication { return answer; } - SASLAuthentication(Connection connection) { + SASLAuthentication(XMPPConnection connection) { super(); this.connection = connection; this.init(); diff --git a/core/src/main/java/org/jivesoftware/smack/Connection.java b/core/src/main/java/org/jivesoftware/smack/XMPPConnection.java similarity index 97% rename from core/src/main/java/org/jivesoftware/smack/Connection.java rename to core/src/main/java/org/jivesoftware/smack/XMPPConnection.java index 957f9a665..9d7cc99ea 100644 --- a/core/src/main/java/org/jivesoftware/smack/Connection.java +++ b/core/src/main/java/org/jivesoftware/smack/XMPPConnection.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.jivesoftware.smack; import java.io.Reader; @@ -47,7 +46,7 @@ import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.Presence; /** - * The abstract Connection class provides an interface for connections to a + * The abstract XMPPConnection class provides an interface for connections to a * XMPP server and implements shared methods which are used by the * different types of connections (e.g. TCPConnection or BoshConnection). * @@ -55,7 +54,7 @@ import org.jivesoftware.smack.packet.Presence; * look like the following: * 

  * // Create a connection to the igniterealtime.org XMPP server.
- * Connection con = new TCPConnection("igniterealtime.org");
+ * XMPPConnection con = new TCPConnection("igniterealtime.org");
  * // Connect to the server
  * con.connect();
  * // Most servers require you to login before performing other tasks.
@@ -77,16 +76,15 @@ import org.jivesoftware.smack.packet.Presence;
  * may be connected, disconnected and then connected again. Listeners of the Connection
  * will be retained accross connections.

  * 

- * If a connected Connection gets disconnected abruptly then it will try to reconnect
+ * If a connected XMPPConnection gets disconnected abruptly then it will try to reconnect
  * again. To stop the reconnection process, use {@link #disconnect()}. Once stopped
  * you can use {@link #connect()} to manually connect to the server.
  * 
- * @see TCPConnection
  * @author Matt Tucker
  * @author Guenther Niess
  */
-public abstract class Connection {
-    private static final Logger LOGGER = Logger.getLogger(Connection.class.getName());
+public abstract class XMPPConnection {
+    private static final Logger LOGGER = Logger.getLogger(XMPPConnection.class.getName());
     
     /** 
      * Counter to uniquely identify connections that are created.
@@ -230,11 +228,11 @@ public abstract class Connection {
     private final ScheduledExecutorService executorService = new ScheduledThreadPoolExecutor(2);
 
     /**
-     * Create a new Connection to a XMPP server.
+     * Create a new XMPPConnection to a XMPP server.
      * 
      * @param configuration The configuration which is used to establish the connection.
      */
-    protected Connection(ConnectionConfiguration configuration) {
+    protected XMPPConnection(ConnectionConfiguration configuration) {
         config = configuration;
     }
 
@@ -482,7 +480,7 @@ public abstract class Connection {
 
     /**
      * Closes the connection by setting presence to unavailable then closing the connection to
-     * the XMPP server. The Connection can still be used for connecting to the server
+     * the XMPP server. The XMPPConnection can still be used for connecting to the server
      * again.

      * 

      * This method cleans up all resources used by the connection. Therefore, the roster,
@@ -497,7 +495,7 @@ public abstract class Connection {
 
     /**
      * Closes the connection. A custom unavailable presence is sent to the server, followed
-     * by closing the stream. The Connection can still be used for connecting to the server
+     * by closing the stream. The XMPPConnection can still be used for connecting to the server
      * again. A custom unavilable presence is useful for communicating offline presence
      * information such as "On vacation". Typically, just the status text of the presence
      * packet is set with online information, but most XMPP servers will deliver the full
@@ -822,7 +820,7 @@ public abstract class Connection {
                 // option
                 try {
                     Constructor constructor = debuggerClass
-                            .getConstructor(Connection.class, Writer.class, Reader.class);
+                            .getConstructor(XMPPConnection.class, Writer.class, Reader.class);
                     debugger = (SmackDebugger) constructor.newInstance(this, writer, reader);
                     reader = debugger.getReader();
                     writer = debugger.getWriter();
@@ -842,7 +840,7 @@ public abstract class Connection {
     /**
      * Set the servers Entity Caps node
      * 
-     * Connection holds this information in order to avoid a dependency to
+     * XMPPConnection holds this information in order to avoid a dependency to
      * smackx where EntityCapsManager lives from smack.
      * 
      * @param node
@@ -854,7 +852,7 @@ public abstract class Connection {
     /**
      * Retrieve the servers Entity Caps node
      * 
-     * Connection holds this information in order to avoid a dependency to
+     * XMPPConnection holds this information in order to avoid a dependency to
      * smackx where EntityCapsManager lives from smack.
      * 
      * @return
diff --git a/core/src/main/java/org/jivesoftware/smack/debugger/ConsoleDebugger.java b/core/src/main/java/org/jivesoftware/smack/debugger/ConsoleDebugger.java
index 64af97968..e900d93f0 100644
--- a/core/src/main/java/org/jivesoftware/smack/debugger/ConsoleDebugger.java
+++ b/core/src/main/java/org/jivesoftware/smack/debugger/ConsoleDebugger.java
@@ -18,7 +18,7 @@ package org.jivesoftware.smack.debugger;
 
 import org.jivesoftware.smack.ConnectionListener;
 import org.jivesoftware.smack.PacketListener;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.util.*;
 
@@ -43,7 +43,7 @@ public class ConsoleDebugger implements SmackDebugger {
     public static boolean printInterpreted = false;
     private SimpleDateFormat dateFormatter = new SimpleDateFormat("hh:mm:ss aaa");
 
-    private Connection connection = null;
+    private XMPPConnection connection = null;
 
     private PacketListener listener = null;
     private ConnectionListener connListener = null;
@@ -53,7 +53,7 @@ public class ConsoleDebugger implements SmackDebugger {
     private ReaderListener readerListener;
     private WriterListener writerListener;
 
-    public ConsoleDebugger(Connection connection, Writer writer, Reader reader) {
+    public ConsoleDebugger(XMPPConnection connection, Writer writer, Reader reader) {
         this.connection = connection;
         this.writer = writer;
         this.reader = reader;
@@ -111,7 +111,7 @@ public class ConsoleDebugger implements SmackDebugger {
         connListener = new ConnectionListener() {
             public void connectionClosed() {
                 System.out.println(
-                        dateFormatter.format(new Date()) + " Connection closed (" +
+                        dateFormatter.format(new Date()) + " XMPPConnection closed (" +
                         connection.hashCode() +
                         ")");
             }
@@ -119,7 +119,7 @@ public class ConsoleDebugger implements SmackDebugger {
             public void connectionClosedOnError(Exception e) {
                 System.out.println(
                         dateFormatter.format(new Date()) +
-                        " Connection closed due to an exception (" +
+                        " XMPPConnection closed due to an exception (" +
                         connection.hashCode() +
                         ")");
                 e.printStackTrace();
@@ -134,13 +134,13 @@ public class ConsoleDebugger implements SmackDebugger {
             }
             public void reconnectionSuccessful() {
                 System.out.println(
-                        dateFormatter.format(new Date()) + " Connection reconnected (" +
+                        dateFormatter.format(new Date()) + " XMPPConnection reconnected (" +
                         connection.hashCode() +
                         ")");
             }
             public void reconnectingIn(int seconds) {
                 System.out.println(
-                        dateFormatter.format(new Date()) + " Connection (" +
+                        dateFormatter.format(new Date()) + " XMPPConnection (" +
                         connection.hashCode() +
                         ") will reconnect in " + seconds);
             }
diff --git a/core/src/main/java/org/jivesoftware/smack/debugger/LiteDebugger.java b/core/src/main/java/org/jivesoftware/smack/debugger/LiteDebugger.java
index 45327d145..392dca30e 100644
--- a/core/src/main/java/org/jivesoftware/smack/debugger/LiteDebugger.java
+++ b/core/src/main/java/org/jivesoftware/smack/debugger/LiteDebugger.java
@@ -39,7 +39,7 @@ public class LiteDebugger implements SmackDebugger {
     private static final String NEWLINE = "\n";
 
     private JFrame frame = null;
-    private Connection connection = null;
+    private XMPPConnection connection = null;
 
     private PacketListener listener = null;
 
@@ -48,7 +48,7 @@ public class LiteDebugger implements SmackDebugger {
     private ReaderListener readerListener;
     private WriterListener writerListener;
 
-    public LiteDebugger(Connection connection, Writer writer, Reader reader) {
+    public LiteDebugger(XMPPConnection connection, Writer writer, Reader reader) {
         this.connection = connection;
         this.writer = writer;
         this.reader = reader;
diff --git a/core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java b/core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java
index 4b9af81c2..dfe9b9c1e 100644
--- a/core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java
+++ b/core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java
@@ -26,7 +26,7 @@ import org.jivesoftware.smack.*;
  * displays XML traffic.

  * 
  * Every implementation of this interface must have a public constructor with the following 
- * arguments: Connection, Writer, Reader.
+ * arguments: XMPPConnection, Writer, Reader.
  * 
  * @author Gaston Dombiak
  */
diff --git a/core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java b/core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java
index bafe689e0..90d91f198 100644
--- a/core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java
+++ b/core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smack.filter;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.util.StringUtils;
@@ -78,7 +78,7 @@ public class IQReplyFilter implements PacketFilter {
      *
      * @param iqPacket An IQ request. Filter for replies to this packet.
      */
-    public IQReplyFilter(IQ iqPacket, Connection conn) {
+    public IQReplyFilter(IQ iqPacket, XMPPConnection conn) {
         to = iqPacket.getTo();
         if (conn.getUser() == null) {
             // We have not yet been assigned a username, this can happen if the connection is
diff --git a/core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketFactory.java b/core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketFactory.java
index 9b559dc64..4bb2308d7 100644
--- a/core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketFactory.java
+++ b/core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketFactory.java
@@ -279,7 +279,7 @@ public class Socks5ProxySocketFactory
       o  X'02' connection not allowed by ruleset
       o  X'03' Network unreachable
       o  X'04' Host unreachable
-      o  X'05' Connection refused
+      o  X'05' XMPPConnection refused
       o  X'06' TTL expired
       o  X'07' Command not supported
       o  X'08' Address type not supported
diff --git a/core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java b/core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
index 2b64c4976..825c78e80 100644
--- a/core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
+++ b/core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
@@ -28,7 +28,7 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.packet.Bind;
 import org.jivesoftware.smack.packet.DefaultPacketExtension;
 import org.jivesoftware.smack.packet.IQ;
@@ -281,7 +281,7 @@ public class PacketParserUtils {
      * @return an IQ object.
      * @throws Exception if an exception occurs while parsing the packet.
      */
-    public static IQ parseIQ(XmlPullParser parser, Connection connection) throws Exception {
+    public static IQ parseIQ(XmlPullParser parser, XMPPConnection connection) throws Exception {
         IQ iqPacket = null;
 
         String id = parser.getAttributeValue("", "id");
diff --git a/core/src/test/java/org/jivesoftware/smack/DummyConnection.java b/core/src/test/java/org/jivesoftware/smack/DummyConnection.java
index 798bdf6e1..d5241acb8 100644
--- a/core/src/test/java/org/jivesoftware/smack/DummyConnection.java
+++ b/core/src/test/java/org/jivesoftware/smack/DummyConnection.java
@@ -23,7 +23,7 @@ import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.ConnectionConfiguration;
 import org.jivesoftware.smack.ConnectionCreationListener;
 import org.jivesoftware.smack.ConnectionListener;
@@ -34,7 +34,7 @@ import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.packet.Presence;
 
 /**
- * A dummy implementation of {@link Connection}, intended to be used during
+ * A dummy implementation of {@link XMPPConnection}, intended to be used during
  * unit tests.
  * 
  * Instances store any packets that are delivered to be send using the
@@ -49,7 +49,7 @@ import org.jivesoftware.smack.packet.Presence;
  * @see Connection
  * @author Guenther Niess
  */
-public class DummyConnection extends Connection {
+public class DummyConnection extends XMPPConnection {
 
     private boolean authenticated = false;
     private boolean anonymous = false;
diff --git a/core/src/test/java/org/jivesoftware/smack/PacketCollectorTest.java b/core/src/test/java/org/jivesoftware/smack/PacketCollectorTest.java
index 104595e84..0ffcefd5f 100644
--- a/core/src/test/java/org/jivesoftware/smack/PacketCollectorTest.java
+++ b/core/src/test/java/org/jivesoftware/smack/PacketCollectorTest.java
@@ -187,7 +187,7 @@ public class PacketCollectorTest
 	
 	class TestPacketCollector extends PacketCollector 
 	{
-		protected TestPacketCollector(Connection conection, PacketFilter packetFilter, int size)
+		protected TestPacketCollector(XMPPConnection conection, PacketFilter packetFilter, int size)
 		{
 			super(conection, packetFilter, size);
 		}
diff --git a/core/src/test/java/org/jivesoftware/smack/RosterTest.java b/core/src/test/java/org/jivesoftware/smack/RosterTest.java
index 81de1ffa8..16405884c 100644
--- a/core/src/test/java/org/jivesoftware/smack/RosterTest.java
+++ b/core/src/test/java/org/jivesoftware/smack/RosterTest.java
@@ -53,7 +53,7 @@ public class RosterTest {
     @Before
     public void setUp() throws Exception {
         // Uncomment this to enable debug output
-        //Connection.DEBUG_ENABLED = true;
+        //XMPPConnection.DEBUG_ENABLED = true;
 
         connection = new DummyConnection();
         connection.connect();
@@ -702,7 +702,7 @@ public class RosterTest {
 
         public synchronized void entriesAdded(Collection addresses) {
             addressesAdded.addAll(addresses);
-            if (Connection.DEBUG_ENABLED) {
+            if (XMPPConnection.DEBUG_ENABLED) {
                 for (String address : addresses) {
                     System.out.println("Roster entry for " + address + " added.");
                 }
@@ -711,7 +711,7 @@ public class RosterTest {
 
         public synchronized void entriesDeleted(Collection addresses) {
             addressesDeleted.addAll(addresses);
-            if (Connection.DEBUG_ENABLED) {
+            if (XMPPConnection.DEBUG_ENABLED) {
                 for (String address : addresses) {
                     System.out.println("Roster entry for " + address + " deleted.");
                 }
@@ -720,7 +720,7 @@ public class RosterTest {
 
         public synchronized void entriesUpdated(Collection addresses) {
             addressesUpdated.addAll(addresses);
-            if (Connection.DEBUG_ENABLED) {
+            if (XMPPConnection.DEBUG_ENABLED) {
                 for (String address : addresses) {
                     System.out.println("Roster entry for " + address + " updated.");
                 }
@@ -728,7 +728,7 @@ public class RosterTest {
         }
 
         public void presenceChanged(Presence presence) {
-            if (Connection.DEBUG_ENABLED) {
+            if (XMPPConnection.DEBUG_ENABLED) {
                 System.out.println("Roster presence changed: " + presence.toXML());
             }
         }
diff --git a/core/src/test/java/org/jivesoftware/smack/RosterVersioningTest.java b/core/src/test/java/org/jivesoftware/smack/RosterVersioningTest.java
index 7d533e29a..827ab4a78 100644
--- a/core/src/test/java/org/jivesoftware/smack/RosterVersioningTest.java
+++ b/core/src/test/java/org/jivesoftware/smack/RosterVersioningTest.java
@@ -57,7 +57,7 @@ public class RosterVersioningTest {
     @Before
     public void setUp() throws Exception {
         // Uncomment this to enable debug output
-        //Connection.DEBUG_ENABLED = true;
+        //XMPPConnection.DEBUG_ENABLED = true;
 
         DefaultRosterStore store = DefaultRosterStore.init(tmpFolder.newFolder("store"));
         populateStore(store);
diff --git a/debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java b/debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
index 25d20d64f..ec93ad470 100644
--- a/debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
+++ b/debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.debugger;
 
 import org.jivesoftware.smack.ConnectionListener;
 import org.jivesoftware.smack.PacketListener;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.debugger.SmackDebugger;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Message;
@@ -113,7 +113,7 @@ public class EnhancedDebugger implements SmackDebugger {
     private JFormattedTextField userField = null;
     private JFormattedTextField statusField = null;
 
-    private Connection connection = null;
+    private XMPPConnection connection = null;
 
     private PacketListener packetReaderListener = null;
     private PacketListener packetWriterListener = null;
@@ -141,7 +141,7 @@ public class EnhancedDebugger implements SmackDebugger {
 
     JTabbedPane tabbedPane;
 
-    public EnhancedDebugger(Connection connection, Writer writer, Reader reader) {
+    public EnhancedDebugger(XMPPConnection connection, Writer writer, Reader reader) {
         this.connection = connection;
         this.writer = writer;
         this.reader = reader;
@@ -570,7 +570,7 @@ public class EnhancedDebugger implements SmackDebugger {
         // Add the Host information
         JPanel connPanel = new JPanel();
         connPanel.setLayout(new GridBagLayout());
-        connPanel.setBorder(BorderFactory.createTitledBorder("Connection information"));
+        connPanel.setBorder(BorderFactory.createTitledBorder("XMPPConnection information"));
 
         JLabel label = new JLabel("Host: ");
         label.setMinimumSize(new java.awt.Dimension(150, 14));
diff --git a/debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java b/debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java
index 0c459e6d6..e9e97442e 100644
--- a/debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java
+++ b/debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java
@@ -121,7 +121,7 @@ public class EnhancedDebuggerWindow {
         if (frame == null) {
             createDebug();
         }
-        debugger.tabbedPane.setName("Connection_" + tabbedPane.getComponentCount());
+        debugger.tabbedPane.setName("XMPPConnection_" + tabbedPane.getComponentCount());
         tabbedPane.add(debugger.tabbedPane, tabbedPane.getComponentCount() - 1);
         tabbedPane.setIconAt(tabbedPane.indexOfComponent(debugger.tabbedPane), connectionCreatedIcon);
         frame.setTitle(
@@ -168,7 +168,7 @@ public class EnhancedDebuggerWindow {
         int index = getInstance().tabbedPane.indexOfComponent(debugger.tabbedPane);
         getInstance().tabbedPane.setToolTipTextAt(
                 index,
-                "Connection closed due to the exception: " + e.getMessage());
+                "XMPPConnection closed due to the exception: " + e.getMessage());
         getInstance().tabbedPane.setIconAt(
                 index,
                 connectionClosedOnErrorIcon);
diff --git a/documentation/connections.html b/documentation/connections.html
index 4ef2f55ff..081e70f1a 100644
--- a/documentation/connections.html
+++ b/documentation/connections.html
@@ -1,13 +1,13 @@
 
 
-    Smack: Connection Management - Jive Software
+    Smack: XMPPConnection Management - Jive Software
     
 
 
 
 
 

-    Smack: Connection Management
+    Smack: XMPPConnection Management
 

 
 

@@ -19,7 +19,7 @@
 

 
 

-    The org.jivesoftware.smack.Connection class manages your connection to an XMPP
+    The org.jivesoftware.smack.XMPPConnection class manages your connection to an XMPP
     server. The default implementation is the org.jivesoftware.smack.XMPPConnection
     class.  Two constructors are mainly used. The first, XMPPConnection(String) takes
     the server name you'd like to connect to as an argument. All default connection settings will
@@ -80,7 +80,7 @@ manager will try to immediately reconnect to the server and increase the delay b
 successive reconnections keep failing.
 

 In case you want to force a reconnection while the reconnetion manager is waiting for the next
-reconnection, you can just use Connection#connect() and a new attempt will be made.
+reconnection, you can just use XMPPConnection#connect() and a new attempt will be made.
 If the manual attempt also failed then the reconnection manager will still continue the
 reconnection job.
 

diff --git a/documentation/debugging.html b/documentation/debugging.html
index 886e79da9..59e7d1cb2 100644
--- a/documentation/debugging.html
+++ b/documentation/debugging.html
@@ -26,7 +26,7 @@ Debugging mode can be enabled in two different ways:
 
 
    
 	
  1. Add the following line of code before creating new connections:
     
-		Connection.DEBUG_ENABLED = true;
    
+		XMPPConnection.DEBUG_ENABLED = true;
    
 
 	
  2. Set the Java system property smack.debugEnabled to true. The 
 		system property can be set on the command line such as:
     
@@ -39,7 +39,7 @@ add the following line to your application before opening new connections:
 
    
 
 
    
-Connection.DEBUG_ENABLED = false;
+XMPPConnection.DEBUG_ENABLED = false;
 
    
 
 
    
@@ -73,7 +73,7 @@ When debugging mode is enabled, a debug window will appear containing tabs for e
 The window will contain the following information:
 
 
      
-    
    • Connection tabs -- each tab shows debugging information related to the connection.
+    
    • XMPPConnection tabs -- each tab shows debugging information related to the connection.
 	
    • Smack info tab -- shows information about Smack (e.g. Smack version, installed components, etc.).
 
    
 
diff --git a/documentation/extensions/disco.html b/documentation/extensions/disco.html
index 35f2f0056..6f8058dd9 100644
--- a/documentation/extensions/disco.html
+++ b/documentation/extensions/disco.html
@@ -34,9 +34,9 @@ discovery request with the information that you previously configured.
    
 Usage
    
 
 In order to configure the supported features by your client you should first obtain the 
-ServiceDiscoveryManager associated with your Connection. To get your ServiceDiscoveryManager
+ServiceDiscoveryManager associated with your XMPPConnection. To get your ServiceDiscoveryManager
 send getInstanceFor(connection) to the class ServiceDiscoveryManager where
-connection is your Connection.
    
+connection is your XMPPConnection.
    
 
 
    Once you have your ServiceDiscoveryManager you will be able to manage the supported features. To
 register a new feature send addFeature(feature) to your ServiceDiscoveryManager
@@ -48,7 +48,7 @@ String that represents the feature to remove.
    
 
 In this example we can see how to add and remove supported features: 
    
 
    
-
          // Obtain the ServiceDiscoveryManager associated with my Connection
+
          // Obtain the ServiceDiscoveryManager associated with my XMPPConnection
       ServiceDiscoveryManager discoManager = ServiceDiscoveryManager.getInstanceFor(connection);
       
       // Register that a new feature is supported by this XMPP entity
@@ -74,7 +74,7 @@ to configure the information providers associated to the items/nodes within the
 In order to configure the associated nodes within the Smack client you will need to create a
 NodeInformationProvider and register it with the ServiceDiscoveryManager. To get 
 your ServiceDiscoveryManager send getInstanceFor(connection) to the class ServiceDiscoveryManager 
-where connection is your Connection.
    
+where connection is your XMPPConnection.
    
 
 
    Once you have your ServiceDiscoveryManager you will be able to register information providers 
 for the XMPP entity's nodes. To register a new node information provider send setNodeInformationProvider(String node, NodeInformationProvider listener) 
@@ -126,7 +126,7 @@ the discovered items.
    
 
 In this example we can see how to discover the items associated with an online catalog service: 
    
 
    
-
          // Obtain the ServiceDiscoveryManager associated with my Connection
+
          // Obtain the ServiceDiscoveryManager associated with my XMPPConnection
       ServiceDiscoveryManager discoManager = ServiceDiscoveryManager.getInstanceFor(connection);
       
       // Get the items of a given XMPP entity
@@ -171,7 +171,7 @@ the discovered information.
    
 
 In this example we can see how to discover the information of a conference room: 
    
 
    
-
          // Obtain the ServiceDiscoveryManager associated with my Connection
+
          // Obtain the ServiceDiscoveryManager associated with my XMPPConnection
       ServiceDiscoveryManager discoManager = ServiceDiscoveryManager.getInstanceFor(connection);
       
       // Get the information of a given XMPP entity
@@ -216,7 +216,7 @@ to publish.
    
 
 In this example we can see how to publish new items: 
    
 
    
-
          // Obtain the ServiceDiscoveryManager associated with my Connection
+
          // Obtain the ServiceDiscoveryManager associated with my XMPPConnection
       ServiceDiscoveryManager discoManager = ServiceDiscoveryManager.getInstanceFor(connection);
       
       // Create a DiscoverItems with the items to publish
diff --git a/documentation/extensions/filetransfer.html b/documentation/extensions/filetransfer.html
index 13bb3281e..f71fcc5df 100644
--- a/documentation/extensions/filetransfer.html
+++ b/documentation/extensions/filetransfer.html
@@ -34,7 +34,7 @@ to enable the user to easily send a file.
 Usage
    
 
 In order to send a file you must first construct an instance of the FileTransferManager
-class. This class has one constructor with one parameter which is your Connection.
+class. This class has one constructor with one parameter which is your XMPPConnection.
 In order to instantiate the manager you should call new FileTransferManager(connection)
 
 
    Once you have your FileTransferManager you will need to create an outgoing
@@ -86,7 +86,7 @@ manager.
    
 Usage
    
 
 In order to recieve a file you must first construct an instance of the FileTransferManager
-class. This class has one constructor with one parameter which is your Connection.
+class. This class has one constructor with one parameter which is your XMPPConnection.
 In order to instantiate the manager you should call new FileTransferManager(connection)
 
 
    Once you have your FileTransferManager you will need to register a listener
diff --git a/documentation/extensions/messageevents.html b/documentation/extensions/messageevents.html
index 474c07247..d91492b3f 100644
--- a/documentation/extensions/messageevents.html
+++ b/documentation/extensions/messageevents.html
@@ -75,14 +75,14 @@ You can receive notification requests for the following events: delivered, displ
 The general idea is to create a new DefaultMessageEventRequestListener that will listen to the event notifications 
 requests and react with custom logic.  Then you will have to add the listener to the 
 MessageEventManager that works on 
-the desired Connection.
+the desired XMPPConnection.
 
    Note that DefaultMessageEventRequestListener is a default implementation of the 
 MessageEventRequestListener interface.
 The class DefaultMessageEventRequestListener automatically sends a delivered notification to the sender of the message 
 if the sender has requested to be notified when the message is delivered. If you decide to create a new class that
 implements the MessageEventRequestListener interface, please remember to send the delivered notification.
    
 
      
-  
    • To create a new MessageEventManager use the MessageEventManager(Connection) constructor. 
+  
    • To create a new MessageEventManager use the MessageEventManager(XMPPConnection) constructor. 
   
      • 
   
    • To create an event notification requests listener create a subclass of DefaultMessageEventRequestListener or
   create a class that implements the MessageEventRequestListener interface.
@@ -178,9 +178,9 @@ will probably want to react to some or all of these events.
      
 
 The general idea is to create a new MessageEventNotificationListener that will listen to the event notifications 
 and react with custom logic.  Then you will have to add the listener to the MessageEventManager that works on 
-the desired Connection.
+the desired XMPPConnection.
 
        
-  
      • To create a new MessageEventManager use the MessageEventManager(Connection) constructor. 
+  
      • To create a new MessageEventManager use the MessageEventManager(XMPPConnection) constructor. 
   
        • 
   
      • To create an event notifications listener create a class that implements the MessageEventNotificationListener 
   interface.
diff --git a/documentation/extensions/muc.html b/documentation/extensions/muc.html
index 961c1017d..f4e4877c8 100644
--- a/documentation/extensions/muc.html
+++ b/documentation/extensions/muc.html
@@ -51,7 +51,7 @@ the form and finally send it back to the server.
        
 
 In this example we can see how to create an instant room: 
        
 
        
-
              // Create a MultiUserChat using a Connection for a room
+
              // Create a MultiUserChat using a XMPPConnection for a room
       MultiUserChat muc = new MultiUserChat(conn1, "myroom@conference.jabber.org");
 
       // Create the room
@@ -65,7 +65,7 @@ In this example we can see how to create an instant room: 
        
 
 In this example we can see how to create a reserved room. The form is completed with default values: 
        
 
        
-
              // Create a MultiUserChat using a Connection for a room
+
              // Create a MultiUserChat using a XMPPConnection for a room
       MultiUserChat muc = new MultiUserChat(conn1, "myroom@conference.jabber.org");
 
       // Create the room
@@ -121,7 +121,7 @@ for a response from the server.
        
 
 In this example we can see how to join a room with a given nickname: 
        
 
        
-
              // Create a MultiUserChat using a Connection for a room
+
              // Create a MultiUserChat using a XMPPConnection for a room
       MultiUserChat muc2 = new MultiUserChat(conn1, "myroom@conference.jabber.org");
 
       // User2 joins the new room
@@ -132,7 +132,7 @@ In this example we can see how to join a room with a given nickname: 
        
 
 In this example we can see how to join a room with a given nickname and password: 
        
 
        
-
              // Create a MultiUserChat using a Connection for a room
+
              // Create a MultiUserChat using a XMPPConnection for a room
       MultiUserChat muc2 = new MultiUserChat(conn1, "myroom@conference.jabber.org");
 
       // User2 joins the new room using a password
@@ -144,7 +144,7 @@ In this example we can see how to join a room with a given nickname and password
 In this example we can see how to join a room with a given nickname specifying the amount of history
 to receive: 
        
 
        
-
              // Create a MultiUserChat using a Connection for a room
+
              // Create a MultiUserChat using a XMPPConnection for a room
       MultiUserChat muc2 = new MultiUserChat(conn1, "myroom@conference.jabber.org");
 
       // User2 joins the new room using a password and specifying
@@ -205,7 +205,7 @@ In this example we can see how to listen for room invitations and decline invita
 
        
 
              // User3 listens for MUC invitations
       MultiUserChat.addInvitationListener(conn3, new InvitationListener() {
-          public void invitationReceived(Connection conn, String room, String inviter, String reason, String password) {
+          public void invitationReceived(XMPPConnection conn, String room, String inviter, String reason, String password) {
               // Reject the invitation
               MultiUserChat.decline(conn, room, inviter, "I'm busy right now");
           }
@@ -224,7 +224,7 @@ A user may want to discover if one of the user's contacts supports the Multi-Use
 Usage
        
 
 In order to discover if one of the user's contacts supports MUC just send 
-isServiceEnabled(Connection connection, String user) to the MultiUserChat 
+isServiceEnabled(XMPPConnection connection, String user) to the MultiUserChat 
 class where user is a fully qualified XMPP ID, e.g. jdoe@example.com. You will receive
 a boolean indicating whether the user supports MUC or not.
        
 
@@ -248,7 +248,7 @@ A user may also want to query a contact regarding which rooms the contact is in.
 Usage
        
 
 In order to get the rooms where a user is in just send
-getJoinedRooms(Connection connection, String user) to the MultiUserChat
+getJoinedRooms(XMPPConnection connection, String user) to the MultiUserChat
 class where user is a fully qualified XMPP ID, e.g. jdoe@example.com. You will get an Iterator
 of Strings as an answer where each String represents a room name.
        
 
@@ -272,7 +272,7 @@ will provide information only for public rooms.
        
 
 Usage
        
 
-In order to discover information about a room just send getRoomInfo(Connection connection, String room)
+In order to discover information about a room just send getRoomInfo(XMPPConnection connection, String room)
 to the MultiUserChat class where room is the XMPP ID of the room, e.g.
 roomName@conference.myserver. You will get a RoomInfo object that contains the discovered room
 information.
        
diff --git a/documentation/extensions/pubsub.html b/documentation/extensions/pubsub.html
index 5279650dc..114737f8f 100644
--- a/documentation/extensions/pubsub.html
+++ b/documentation/extensions/pubsub.html
@@ -47,7 +47,7 @@ a fully configured node.
        
 Create an instant node: 
        
 
        
 
        -      // Create a pubsub manager using an existing Connection
+      // Create a pubsub manager using an existing XMPPConnection
       PubSubManager mgr = new PubSubManager(con);
 
       // Create the node
@@ -58,7 +58,7 @@ Create an instant node: 
        
 Create a node with default configuration and then configure it: 
        
 
        
 
        -      // Create a pubsub manager using an existing Connection
+      // Create a pubsub manager using an existing XMPPConnection
       PubSubManager mgr = new PubSubManager(con);
 
       // Create the node
@@ -77,7 +77,7 @@ Create a node with default configuration and then configure it: 
        
 Create and configure a node: 
        
 
        
 
        -      // Create a pubsub manager using an existing Connection
+      // Create a pubsub manager using an existing XMPPConnection
       PubSubManager mgr = new PubSubManager(con);
 
       // Create the node
@@ -117,7 +117,7 @@ will be dependent on its configuration.
 In this example we publish an item to a node that does not take payload: 
        
 
        
 
        -      // Create a pubsub manager using an existing Connection
+      // Create a pubsub manager using an existing XMPPConnection
       PubSubManager mgr = new PubSubManager(con);
 
       // Get the node
@@ -133,7 +133,7 @@ In this example we publish an item to a node that does not take payload: 
        
 In this example we publish an item to a node that does take payload: 
        
 
        
 
        -      // Create a pubsub manager using an existing Connection
+      // Create a pubsub manager using an existing XMPPConnection
       PubSubManager mgr = new PubSubManager(con);
 
       // Get the node
@@ -174,7 +174,7 @@ In this example we can see how to create a listener and register it and then sub
 messages. 
        
 
        
 
        -      // Create a pubsub manager using an existing Connection
+      // Create a pubsub manager using an existing XMPPConnection
       PubSubManager mgr = new PubSubManager(con);
 
       // Get the node
@@ -212,7 +212,7 @@ In this example we can see how to create a listener, register it and then subscr
 item deletion messages. 
        
 
        
 
        -      // Create a pubsub manager using an existing Connection
+      // Create a pubsub manager using an existing XMPPConnection
       PubSubManager mgr = new PubSubManager(con);
 
       // Get the node
@@ -250,7 +250,7 @@ In this example we can see how to create a listener, register it and then subscr
 node configuration messages. 
        
 
        
 
        -      // Create a pubsub manager using an existing Connection
+      // Create a pubsub manager using an existing XMPPConnection
       PubSubManager mgr = new PubSubManager(con);
 
       // Get the node
@@ -315,7 +315,7 @@ of a LeafNode and call one of the retrieve methods.
 In this example we can see how to retrieve the existing items from a node: 
        
 
        
 
              
-      // Create a pubsub manager using an existing Connection
+      // Create a pubsub manager using an existing XMPPConnection
       PubSubManager mgr = new PubSubManager(con);
 
       // Get the node
@@ -329,7 +329,7 @@ In this example we can see how to retrieve the existing items from a node: 
        
 In this example we can see how to retrieve the last N existing items: 
        
 
        
 
              
-      // Create a pubsub manager using an existing Connection
+      // Create a pubsub manager using an existing XMPPConnection
       PubSubManager mgr = new PubSubManager(con);
 
       // Get the node
@@ -343,7 +343,7 @@ In this example we can see how to retrieve the specified existing items: 
        
 
        
 
              
 
-      // Create a pubsub manager using an existing Connection
+      // Create a pubsub manager using an existing XMPPConnection
       PubSubManager mgr = new PubSubManager(con);
 
       // Get the node
@@ -375,7 +375,7 @@ or Node classes depending on what type of information is required.
 In this example we can see how to get pubsub capabilities: 
        
 
        
 
              
-      // Create a pubsub manager using an existing Connection
+      // Create a pubsub manager using an existing XMPPConnection
       PubSubManager mgr = new PubSubManager(con);
 
       // Get the pubsub features that are supported
@@ -386,7 +386,7 @@ In this example we can see how to get pubsub capabilities: 
        
 In this example we can see how to get pubsub subscriptions for all nodes: 
        
 
        
 
              
-      // Create a pubsub manager using an existing Connection
+      // Create a pubsub manager using an existing XMPPConnection
       PubSubManager mgr = new PubSubManager(con);
 
       // Get all the subscriptions in the pubsub service
@@ -397,7 +397,7 @@ In this example we can see how to get pubsub subscriptions for all nodes: 
        
 In this example we can see how to get all affiliations for the users bare JID on the pubsub service: 
        
 
        
 
              
-      // Create a pubsub manager using an existing Connection
+      // Create a pubsub manager using an existing XMPPConnection
       PubSubManager mgr = new PubSubManager(con);
 
       // Get the affiliations for the users bare JID
@@ -408,7 +408,7 @@ In this example we can see how to get all affiliations for the users bare JID on
 In this example we can see how to get information about the node: 
        
 
        
 
              
-      // Create a pubsub manager using an existing Connection
+      // Create a pubsub manager using an existing XMPPConnection
       PubSubManager mgr = new PubSubManager(con);
       Node node = mgr.getNode("testNode");
       
@@ -420,7 +420,7 @@ In this example we can see how to get information about the node: 
        
 In this example we can see how to discover the node items: 
        
 
        
 
              
-      // Create a pubsub manager using an existing Connection
+      // Create a pubsub manager using an existing XMPPConnection
       PubSubManager mgr = new PubSubManager(con);
       Node node = mgr.getNode("testNode");
       
@@ -432,7 +432,7 @@ In this example we can see how to discover the node items: 
        
 In this example we can see how to get node subscriptions: 
        
 
        
 
              
-      // Create a pubsub manager using an existing Connection
+      // Create a pubsub manager using an existing XMPPConnection
       PubSubManager mgr = new PubSubManager(con);
       Node node = mgr.getNode("testNode");
       
diff --git a/documentation/extensions/rosterexchange.html b/documentation/extensions/rosterexchange.html
index eea23d773..e014da111 100644
--- a/documentation/extensions/rosterexchange.html
+++ b/documentation/extensions/rosterexchange.html
@@ -126,7 +126,7 @@ received.
        
   
      • Create a class that implements the RosterExchangeListener interface.
        • 
   
      • Implement the method entriesReceived(String, Iterator) that will be called when new entries 
   are received with custom logic.
        • 
-  
      • Add the listener to the RosterExchangeManager that works on the desired Connection.
        • 
+  
      • Add the listener to the RosterExchangeManager that works on the desired XMPPConnection.
        • 
 

 
 Example

diff --git a/documentation/extensions/xhtml.html b/documentation/extensions/xhtml.html
index 938d74e3e..f283f57ba 100644
--- a/documentation/extensions/xhtml.html
+++ b/documentation/extensions/xhtml.html
@@ -97,7 +97,7 @@ the message as you do with any other message.

 An XHTML message is like any regular message, therefore to send the message you can follow 
 the usual steps you do in order to send a message. For example, to send a message as part
 of a chat just use the message #send(Message) of Chat or you can use
-the message #send(Packet) of Connection.

+the message #send(Packet) of XMPPConnection.

 
 Example

 
@@ -170,7 +170,7 @@ section explains how to explicitly discover for XHTML support.

 
 Usage

 
-In order to discover if a remote user supports XHTML messages send #isServiceEnabled(Connection 
+In order to discover if a remote user supports XHTML messages send #isServiceEnabled(XMPPConnection 
 connection, String userID) to the class XHTMLManager where connection is the connection 
 to use to perform the service discovery and userID is the user to check (A fully qualified xmpp ID, 
 e.g. jdoe@example.com). This message will return true if the specified user handles XHTML messages.

diff --git a/documentation/gettingstarted.html b/documentation/gettingstarted.html
index 006e4b136..74b19f177 100644
--- a/documentation/gettingstarted.html
+++ b/documentation/gettingstarted.html
@@ -94,10 +94,10 @@ conn2.connect();
 
Note that maximum security will be used when connecting to the server by default (and when possible),
     including use of TLS encryption. The ConnectionConfiguration class provides advanced control
     over the connection created, such as the ability to disable or require encryption. See
-    Connection Management for full details.

+    XMPPConnection Management for full details.

 
 
Once you've created a connection, you should login using a username and password
-with the Connection.login(String username, String password) method.
+with the XMPPConnection.login(String username, String password) method.
 Once you've logged in, you can being chatting with other users by creating
 new Chat or GroupChat objects.
 
@@ -108,7 +108,7 @@ The roster lets you keep track of the availability (presence) of other users. Us
 can be organized into groups such as "Friends" and "Co-workers", and then you
 discover whether each user is online or offline.
 
 
-Retrieve the roster using the Connection.getRoster() method. The roster
+Retrieve the roster using the XMPPConnection.getRoster() method. The roster
 class allows you to find all the roster entries, the groups they belong to, and the
 current presence status of each entry.
 
@@ -130,7 +130,7 @@ and "out fishing":

 // Create a new presence. Pass in false to indicate we're unavailable.
 Presence presence = new Presence(Presence.Type.unavailable);
 presence.setStatus("Gone fishing");
-// Send the packet (assume we have a Connection instance called "con").
+// Send the packet (assume we have a XMPPConnection instance called "con").
 con.sendPacket(presence);

diff --git a/documentation/messaging.html b/documentation/messaging.html index 457c8d6a7..d9f32bc8b 100644 --- a/documentation/messaging.html +++ b/documentation/messaging.html @@ -29,7 +29,7 @@ A chat creates a new thread of messages (using a thread ID) between two users. T following code snippet demonstrates how to create a new Chat with a user and then send them a text message:

-

// Assume we've created a Connection name "connection".
+
// Assume we've created a XMPPConnection name "connection".
 ChatManager chatmanager = connection.getChatManager();
 Chat newChat = chatmanager.createChat("jsmith@jivesoftware.com", new MessageListener() {
@@ -98,7 +98,7 @@ will create a new one that does match.  To get this new chat, you have to regist
 notified when it happens.  You can register a message listener to receive all future messages as
 part of this handler.

 
-
// Assume we've created a Connection name "connection".
+
// Assume we've created a XMPPConnection name "connection".
 ChatManager chatmanager = connection.getChatManager().addChatListener(
     new ChatManagerListener() {
         @Override
diff --git a/documentation/processing.html b/documentation/processing.html
index 3c80d43bf..db1fee6a9 100644
--- a/documentation/processing.html
+++ b/documentation/processing.html
@@ -27,7 +27,7 @@ A packet listener is used for event style programming, while a packet collector
 result queue of packets that you can do polling and blocking operations on. So, a packet 
 listener is useful when you want to take some action whenever a packet happens to come in, 
 while a packet collector is useful when you want to wait for a specific packet to 
-arrive. Packet collectors and listeners can be created using an Connection instance.

+arrive. Packet collectors and listeners can be created using an XMPPConnection instance.

 	
 The org.jivesoftware.smack.filter.PacketFilter interface determines which
 specific packets will be delivered to a PacketCollector or PacketListener.
@@ -42,7 +42,7 @@ listener:

 // user. We use an AndFilter to combine two other filters.
 PacketFilter filter = new AndFilter(new PacketTypeFilter(Message.class), 
         new FromContainsFilter("mary@jivesoftware.com"));
-// Assume we've created a Connection name "connection".
+// Assume we've created a XMPPConnection name "connection".
 
 // First, register a packet collector using the filter we created.
 PacketCollector myCollector = connection.createPacketCollector(filter);
diff --git a/documentation/roster.html b/documentation/roster.html
index 632ad2605..0ac73fd2f 100644
--- a/documentation/roster.html
+++ b/documentation/roster.html
@@ -21,7 +21,7 @@ A roster also allows you to organize users into groups such as "Friends" and
 "Co-workers". Other IM systems refer to the roster as the buddy list, contact list, 
 etc.

 
-A Roster instance is obtained using the Connection.getRoster()
+A Roster instance is obtained using the XMPPConnection.getRoster()
 method.
 
 
Roster Entries

diff --git a/experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java b/experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java
index e6e135f12..b5c57ce8c 100644
--- a/experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java
+++ b/experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java
@@ -20,7 +20,7 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.ConnectionCreationListener;
 import org.jivesoftware.smack.Manager;
 import org.jivesoftware.smack.PacketListener;
@@ -44,12 +44,12 @@ import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
  */
 public class CarbonManager extends Manager {
 
-    private static Map instances =
-            Collections.synchronizedMap(new WeakHashMap());
+    private static Map instances =
+            Collections.synchronizedMap(new WeakHashMap());
 
     static {
-        Connection.addConnectionCreationListener(new ConnectionCreationListener() {
-            public void connectionCreated(Connection connection) {
+        XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() {
+            public void connectionCreated(XMPPConnection connection) {
                 getInstanceFor(connection);
             }
         });
@@ -57,7 +57,7 @@ public class CarbonManager extends Manager {
     
     private volatile boolean enabled_state = false;
 
-    private CarbonManager(Connection connection) {
+    private CarbonManager(XMPPConnection connection) {
         super(connection);
         ServiceDiscoveryManager sdm = ServiceDiscoveryManager.getInstanceFor(connection);
         sdm.addFeature(CarbonExtension.NAMESPACE);
@@ -71,7 +71,7 @@ public class CarbonManager extends Manager {
      *
      * @return a CarbonManager instance
      */
-    public static synchronized CarbonManager getInstanceFor(Connection connection) {
+    public static synchronized CarbonManager getInstanceFor(XMPPConnection connection) {
         CarbonManager carbonManager = instances.get(connection);
 
         if (carbonManager == null) {
diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/CompressionTest.java b/extensions/src/integration-test/java/org/jivesoftware/smackx/CompressionTest.java
index eee75ba78..6c0e2af90 100644
--- a/extensions/src/integration-test/java/org/jivesoftware/smackx/CompressionTest.java
+++ b/extensions/src/integration-test/java/org/jivesoftware/smackx/CompressionTest.java
@@ -51,7 +51,7 @@ public class CompressionTest extends SmackTestCase {
         // Login with the test account
         connection.login("user0", "user0");
 
-        assertTrue("Connection is not using stream compression", connection.isUsingCompression());
+        assertTrue("XMPPConnection is not using stream compression", connection.isUsingCompression());
 
         // Request the version of the server
         Version version = new Version();
diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/MultipleRecipientManagerTest.java b/extensions/src/integration-test/java/org/jivesoftware/smackx/MultipleRecipientManagerTest.java
index c0528f8f9..084869d82 100644
--- a/extensions/src/integration-test/java/org/jivesoftware/smackx/MultipleRecipientManagerTest.java
+++ b/extensions/src/integration-test/java/org/jivesoftware/smackx/MultipleRecipientManagerTest.java
@@ -60,7 +60,7 @@ public class MultipleRecipientManagerTest extends SmackTestCase {
         MultipleRecipientManager.send(getConnection(0), message, to, cc, bcc);
 
         Packet message1 = collector1.nextResult(SmackConfiguration.getPacketReplyTimeout());
-        assertNotNull("Connection 1 never received the message", message1);
+        assertNotNull("XMPPConnection 1 never received the message", message1);
         MultipleRecipientInfo info1 = MultipleRecipientManager.getMultipleRecipientInfo(message1);
         assertNotNull("Message 1 does not contain MultipleRecipientInfo", info1);
         assertFalse("Message 1 should be 'replyable'", info1.shouldNotReply());
@@ -74,7 +74,7 @@ public class MultipleRecipientManagerTest extends SmackTestCase {
         assertEquals("Incorrect CC address", getBareJID(2), address1);
 
         Packet message2 = collector2.nextResult(SmackConfiguration.getPacketReplyTimeout());
-        assertNotNull("Connection 2 never received the message", message2);
+        assertNotNull("XMPPConnection 2 never received the message", message2);
         MultipleRecipientInfo info2 = MultipleRecipientManager.getMultipleRecipientInfo(message2);
         assertNotNull("Message 2 does not contain MultipleRecipientInfo", info2);
         assertFalse("Message 2 should be 'replyable'", info2.shouldNotReply());
@@ -88,7 +88,7 @@ public class MultipleRecipientManagerTest extends SmackTestCase {
         assertEquals("Incorrect CC address", getBareJID(2), address2);
 
         Packet message3 = collector3.nextResult(SmackConfiguration.getPacketReplyTimeout());
-        assertNotNull("Connection 3 never received the message", message3);
+        assertNotNull("XMPPConnection 3 never received the message", message3);
         MultipleRecipientInfo info3 = MultipleRecipientManager.getMultipleRecipientInfo(message3);
         assertNotNull("Message 3 does not contain MultipleRecipientInfo", info3);
         assertFalse("Message 3 should be 'replyable'", info3.shouldNotReply());
@@ -130,7 +130,7 @@ public class MultipleRecipientManagerTest extends SmackTestCase {
         // Get the message and ensure it's ok
         Message message1 =
                 (Message) collector1.nextResult(SmackConfiguration.getPacketReplyTimeout());
-        assertNotNull("Connection 1 never received the message", message1);
+        assertNotNull("XMPPConnection 1 never received the message", message1);
         MultipleRecipientInfo info = MultipleRecipientManager.getMultipleRecipientInfo(message1);
         assertNotNull("Message 1 does not contain MultipleRecipientInfo", info);
         assertFalse("Message 1 should be 'replyable'", info.shouldNotReply());
@@ -144,7 +144,7 @@ public class MultipleRecipientManagerTest extends SmackTestCase {
 
         // Get the reply and ensure it's ok
         reply1 = (Message) collector0.nextResult(SmackConfiguration.getPacketReplyTimeout());
-        assertNotNull("Connection 0 never received the reply", reply1);
+        assertNotNull("XMPPConnection 0 never received the reply", reply1);
         info = MultipleRecipientManager.getMultipleRecipientInfo(reply1);
         assertNotNull("Replied message does not contain MultipleRecipientInfo", info);
         assertFalse("Replied message should be 'replyable'", info.shouldNotReply());
@@ -159,7 +159,7 @@ public class MultipleRecipientManagerTest extends SmackTestCase {
 
         // Get the reply and ensure it's ok
         reply2 = (Message) collector1.nextResult(SmackConfiguration.getPacketReplyTimeout());
-        assertNotNull("Connection 1 never received the reply", reply2);
+        assertNotNull("XMPPConnection 1 never received the reply", reply2);
         info = MultipleRecipientManager.getMultipleRecipientInfo(reply2);
         assertNotNull("Replied message does not contain MultipleRecipientInfo", info);
         assertFalse("Replied message should be 'replyable'", info.shouldNotReply());
@@ -168,19 +168,19 @@ public class MultipleRecipientManagerTest extends SmackTestCase {
 
         // Check that connection2 recevied 3 messages
         message1 = (Message) collector2.nextResult(SmackConfiguration.getPacketReplyTimeout());
-        assertNotNull("Connection2 didn't receive the 1 message", message1);
+        assertNotNull("XMPPConnection2 didn't receive the 1 message", message1);
         message1 = (Message) collector2.nextResult(SmackConfiguration.getPacketReplyTimeout());
-        assertNotNull("Connection2 didn't receive the 2 message", message1);
+        assertNotNull("XMPPConnection2 didn't receive the 2 message", message1);
         message1 = (Message) collector2.nextResult(SmackConfiguration.getPacketReplyTimeout());
-        assertNotNull("Connection2 didn't receive the 3 message", message1);
+        assertNotNull("XMPPConnection2 didn't receive the 3 message", message1);
         message1 = (Message) collector2.nextResult(SmackConfiguration.getPacketReplyTimeout());
-        assertNull("Connection2 received 4 messages", message1);
+        assertNull("XMPPConnection2 received 4 messages", message1);
 
         // Check that connection3 recevied only 1 message (was BCC in the first message)
         message1 = (Message) collector3.nextResult(SmackConfiguration.getPacketReplyTimeout());
-        assertNotNull("Connection3 didn't receive the 1 message", message1);
+        assertNotNull("XMPPConnection3 didn't receive the 1 message", message1);
         message1 = (Message) collector3.nextResult(SmackConfiguration.getPacketReplyTimeout());
-        assertNull("Connection2 received 2 messages", message1);
+        assertNull("XMPPConnection2 received 2 messages", message1);
 
         collector0.cancel();
         collector1.cancel();
@@ -210,7 +210,7 @@ public class MultipleRecipientManagerTest extends SmackTestCase {
         // Get the message and ensure it's ok
         Message message1 =
                 (Message) collector1.nextResult(SmackConfiguration.getPacketReplyTimeout());
-        assertNotNull("Connection 1 never received the message", message1);
+        assertNotNull("XMPPConnection 1 never received the message", message1);
         MultipleRecipientInfo info = MultipleRecipientManager.getMultipleRecipientInfo(message1);
         assertNotNull("Message 1 does not contain MultipleRecipientInfo", info);
         assertTrue("Message 1 should be not 'replyable'", info.shouldNotReply());
@@ -230,15 +230,15 @@ public class MultipleRecipientManagerTest extends SmackTestCase {
 
         // Check that connection2 recevied 1 messages
         message1 = (Message) collector2.nextResult(SmackConfiguration.getPacketReplyTimeout());
-        assertNotNull("Connection2 didn't receive the 1 message", message1);
+        assertNotNull("XMPPConnection2 didn't receive the 1 message", message1);
         message1 = (Message) collector2.nextResult(SmackConfiguration.getPacketReplyTimeout());
-        assertNull("Connection2 received 2 messages", message1);
+        assertNull("XMPPConnection2 received 2 messages", message1);
 
         // Check that connection3 recevied only 1 message (was BCC in the first message)
         message1 = (Message) collector3.nextResult(SmackConfiguration.getPacketReplyTimeout());
-        assertNotNull("Connection3 didn't receive the 1 message", message1);
+        assertNotNull("XMPPConnection3 didn't receive the 1 message", message1);
         message1 = (Message) collector3.nextResult(SmackConfiguration.getPacketReplyTimeout());
-        assertNull("Connection2 received 2 messages", message1);
+        assertNull("XMPPConnection2 received 2 messages", message1);
 
         collector1.cancel();
         collector2.cancel();
diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamTest.java b/extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamTest.java
index 5bc6c058b..d949a2bda 100644
--- a/extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamTest.java
+++ b/extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamTest.java
@@ -18,7 +18,7 @@ import java.io.OutputStream;
 import java.util.Random;
 import java.util.concurrent.SynchronousQueue;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.PacketCollector;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.filter.PacketIDFilter;
@@ -53,9 +53,9 @@ public class InBandBytestreamTest extends SmackTestCase {
      * @throws XMPPException should not happen
      */
     public void testRespondWithErrorOnInBandBytestreamRequest() throws XMPPException {
-        Connection targetConnection = getConnection(0);
+        XMPPConnection targetConnection = getConnection(0);
 
-        Connection initiatorConnection = getConnection(1);
+        XMPPConnection initiatorConnection = getConnection(1);
 
         Open open = new Open("sessionID", 1024);
         open.setFrom(initiatorConnection.getUser());
@@ -78,8 +78,8 @@ public class InBandBytestreamTest extends SmackTestCase {
      */
     public void testInBandBytestreamWithIQStanzas() throws Exception {
 
-        Connection initiatorConnection = getConnection(0);
-        Connection targetConnection = getConnection(1);
+        XMPPConnection initiatorConnection = getConnection(0);
+        XMPPConnection targetConnection = getConnection(1);
 
         // test data
         Random rand = new Random();
@@ -132,8 +132,8 @@ public class InBandBytestreamTest extends SmackTestCase {
      */
     public void testInBandBytestreamWithMessageStanzas() throws Exception {
 
-        Connection initiatorConnection = getConnection(0);
-        Connection targetConnection = getConnection(1);
+        XMPPConnection initiatorConnection = getConnection(0);
+        XMPPConnection targetConnection = getConnection(1);
 
         // test data
         Random rand = new Random();
@@ -188,9 +188,9 @@ public class InBandBytestreamTest extends SmackTestCase {
      */
     public void testBiDirectionalInBandBytestream() throws Exception {
 
-        Connection initiatorConnection = getConnection(0);
+        XMPPConnection initiatorConnection = getConnection(0);
 
-        Connection targetConnection = getConnection(1);
+        XMPPConnection targetConnection = getConnection(1);
 
         // test data
         Random rand = new Random();
diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java b/extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java
index c1c968e9e..7dcb47b72 100644
--- a/extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java
+++ b/extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java
@@ -21,7 +21,7 @@ import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.PacketCollector;
 import org.jivesoftware.smack.SmackConfiguration;
 import org.jivesoftware.smack.XMPPException;
@@ -60,7 +60,7 @@ public class Socks5ByteStreamTest extends SmackTestCase {
      * @throws XMPPException should not happen
      */
     public void testInitializationSocks5FeaturesAndListenerOnStartup() throws XMPPException {
-        Connection connection = getConnection(0);
+        XMPPConnection connection = getConnection(0);
 
         assertTrue(ServiceDiscoveryManager.getInstanceFor(connection).includesFeature(
                         Socks5BytestreamManager.NAMESPACE));
@@ -74,9 +74,9 @@ public class Socks5ByteStreamTest extends SmackTestCase {
      * @throws XMPPException should not happen
      */
     public void testRespondWithErrorOnSocks5BytestreamRequest() throws XMPPException {
-        Connection targetConnection = getConnection(0);
+        XMPPConnection targetConnection = getConnection(0);
 
-        Connection initiatorConnection = getConnection(1);
+        XMPPConnection initiatorConnection = getConnection(1);
 
         Bytestream bytestreamInitiation = Socks5PacketUtils.createBytestreamInitiation(
                         initiatorConnection.getUser(), targetConnection.getUser(), "session_id");
@@ -107,8 +107,8 @@ public class Socks5ByteStreamTest extends SmackTestCase {
 
         assertTrue(socks5Proxy.isRunning());
 
-        Connection initiatorConnection = getConnection(0);
-        Connection targetConnection = getConnection(1);
+        XMPPConnection initiatorConnection = getConnection(0);
+        XMPPConnection targetConnection = getConnection(1);
 
         // test data
         final byte[] data = new byte[] { 1, 2, 3 };
@@ -174,8 +174,8 @@ public class Socks5ByteStreamTest extends SmackTestCase {
 
         assertFalse(Socks5Proxy.getSocks5Proxy().isRunning());
 
-        Connection initiatorConnection = getConnection(0);
-        Connection targetConnection = getConnection(1);
+        XMPPConnection initiatorConnection = getConnection(0);
+        XMPPConnection targetConnection = getConnection(1);
 
         // test data
         final byte[] data = new byte[] { 1, 2, 3 };
@@ -243,7 +243,7 @@ public class Socks5ByteStreamTest extends SmackTestCase {
      */
     public void testBiDirectionalSocks5BytestreamWithRemoteSocks5Proxy() throws Exception {
 
-        Connection initiatorConnection = getConnection(0);
+        XMPPConnection initiatorConnection = getConnection(0);
 
         // disable local socks5 proxy
         SmackConfiguration.setLocalSocks5ProxyEnabled(false);
@@ -251,7 +251,7 @@ public class Socks5ByteStreamTest extends SmackTestCase {
 
         assertFalse(Socks5Proxy.getSocks5Proxy().isRunning());
 
-        Connection targetConnection = getConnection(1);
+        XMPPConnection targetConnection = getConnection(1);
 
         // test data
         final byte[] data = new byte[] { 1, 2, 3 };
diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/muc/MultiUserChatTest.java b/extensions/src/integration-test/java/org/jivesoftware/smackx/muc/MultiUserChatTest.java
index 2ba02598e..2ce5ed188 100644
--- a/extensions/src/integration-test/java/org/jivesoftware/smackx/muc/MultiUserChatTest.java
+++ b/extensions/src/integration-test/java/org/jivesoftware/smackx/muc/MultiUserChatTest.java
@@ -27,7 +27,7 @@ import java.util.TimeZone;
 
 import org.jivesoftware.smack.Chat;
 import org.jivesoftware.smack.ChatManagerListener;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.ConnectionConfiguration;
 import org.jivesoftware.smack.PacketCollector;
 import org.jivesoftware.smack.SmackConfiguration;
@@ -263,7 +263,7 @@ public class MultiUserChatTest extends SmackTestCase {
             // User3 is listening to MUC invitations
             MultiUserChat.addInvitationListener(getConnection(2), new InvitationListener() {
                 public void invitationReceived(
-                    Connection conn,
+                    XMPPConnection conn,
                     String room,
                     String inviter,
                     String reason,
@@ -313,7 +313,7 @@ public class MultiUserChatTest extends SmackTestCase {
             // User3 is listening to MUC invitations
             MultiUserChat.addInvitationListener(getConnection(2), new InvitationListener() {
                 public void invitationReceived(
-                    Connection conn,
+                    XMPPConnection conn,
                     String room,
                     String inviter,
                     String reason,
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java b/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java
index acd5bcebf..291b228d1 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java
@@ -71,7 +71,7 @@ public class MultipleRecipientInfo {
 
     /**
      * Returns true if the received packet should not be replied. Use
-     * {@link MultipleRecipientManager#reply(org.jivesoftware.smack.Connection, org.jivesoftware.smack.packet.Message, org.jivesoftware.smack.packet.Message)}
+     * {@link MultipleRecipientManager#reply(org.jivesoftware.smack.XMPPConnection, org.jivesoftware.smack.packet.Message, org.jivesoftware.smack.packet.Message)}
      * to send replies. 
      *
      * @return true if the received packet should not be replied.
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java b/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java
index 4faf6a7de..d977af437 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java
@@ -17,7 +17,7 @@
 
 package org.jivesoftware.smackx.address;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Packet;
@@ -68,7 +68,7 @@ public class MultipleRecipientManager {
      * @throws XMPPException if server does not support JEP-33: Extended Stanza Addressing and
      *                       some JEP-33 specific features were requested.
      */
-    public static void send(Connection connection, Packet packet, List to, List cc, List bcc)
+    public static void send(XMPPConnection connection, Packet packet, List to, List cc, List bcc)
             throws XMPPException {
         send(connection, packet, to, cc, bcc, null, null, false);
     }
@@ -96,7 +96,7 @@ public class MultipleRecipientManager {
      * @throws XMPPException if server does not support JEP-33: Extended Stanza Addressing and
      *                       some JEP-33 specific features were requested.
      */
-    public static void send(Connection connection, Packet packet, List to, List cc, List bcc,
+    public static void send(XMPPConnection connection, Packet packet, List to, List cc, List bcc,
             String replyTo, String replyRoom, boolean noReply) throws XMPPException {
         String serviceAddress = getMultipleRecipienServiceAddress(connection);
         if (serviceAddress != null) {
@@ -128,7 +128,7 @@ public class MultipleRecipientManager {
      * @throws XMPPException if the original message was not sent to multiple recipients, or the
      *                       original message cannot be replied or reply should be sent to a room.
      */
-    public static void reply(Connection connection, Message original, Message reply)
+    public static void reply(XMPPConnection connection, Message original, Message reply)
             throws XMPPException {
         MultipleRecipientInfo info = getMultipleRecipientInfo(original);
         if (info == null) {
@@ -202,7 +202,7 @@ public class MultipleRecipientManager {
         return extension == null ? null : new MultipleRecipientInfo(extension);
     }
 
-    private static void sendToIndividualRecipients(Connection connection, Packet packet,
+    private static void sendToIndividualRecipients(XMPPConnection connection, Packet packet,
             List to, List cc, List bcc) {
         if (to != null) {
             for (Iterator it = to.iterator(); it.hasNext();) {
@@ -227,7 +227,7 @@ public class MultipleRecipientManager {
         }
     }
 
-    private static void sendThroughService(Connection connection, Packet packet, List to,
+    private static void sendThroughService(XMPPConnection connection, Packet packet, List to,
             List cc, List bcc, String replyTo, String replyRoom, boolean noReply,
             String serviceAddress) {
         // Create multiple recipient extension
@@ -281,7 +281,7 @@ public class MultipleRecipientManager {
      *                   queried.
      * @return the address of the multiple recipients service or null if none was found.
      */
-    private static String getMultipleRecipienServiceAddress(Connection connection) {
+    private static String getMultipleRecipienServiceAddress(XMPPConnection connection) {
         String serviceName = connection.getServiceName();
         String serviceAddress = (String) services.get(serviceName);
         if (serviceAddress == null) {
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/amp/AMPDeliverCondition.java b/extensions/src/main/java/org/jivesoftware/smackx/amp/AMPDeliverCondition.java
index c79b9a4ef..22bdc4702 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/amp/AMPDeliverCondition.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/amp/AMPDeliverCondition.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.amp;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 
 public class AMPDeliverCondition implements AMPExtension.Condition {
 
@@ -27,7 +27,7 @@ public class AMPDeliverCondition implements AMPExtension.Condition {
      * @param connection Smack connection instance
      * @return true if deliver condition is supported.
      */
-    public static boolean isSupported(Connection connection) {
+    public static boolean isSupported(XMPPConnection connection) {
         return AMPManager.isConditionSupported(connection, NAME);
     }
 
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/amp/AMPExpireAtCondition.java b/extensions/src/main/java/org/jivesoftware/smackx/amp/AMPExpireAtCondition.java
index 5eab1b554..ee31f83c4 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/amp/AMPExpireAtCondition.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/amp/AMPExpireAtCondition.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.amp;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.util.XmppDateTime;
 
 import java.util.Date;
@@ -31,7 +31,7 @@ public class AMPExpireAtCondition implements AMPExtension.Condition {
      * @param connection Smack connection instance
      * @return true if expire-at condition is supported.
      */
-    public static boolean isSupported(Connection connection) {
+    public static boolean isSupported(XMPPConnection connection) {
         return AMPManager.isConditionSupported(connection, NAME);
     }
 
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/amp/AMPManager.java b/extensions/src/main/java/org/jivesoftware/smackx/amp/AMPManager.java
index 653476f1b..b445d7cf1 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/amp/AMPManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/amp/AMPManager.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.amp;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.ConnectionCreationListener;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
@@ -38,8 +38,8 @@ public class AMPManager {
     // Enable the AMP support on every established connection
     // The ServiceDiscoveryManager class should have been already initialized
     static {
-        Connection.addConnectionCreationListener(new ConnectionCreationListener() {
-            public void connectionCreated(Connection connection) {
+        XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() {
+            public void connectionCreated(XMPPConnection connection) {
                 AMPManager.setServiceEnabled(connection, true);
             }
         });
@@ -54,7 +54,7 @@ public class AMPManager {
      * @param connection the connection where the service will be enabled or disabled
      * @param enabled indicates if the service will be enabled or disabled
      */
-    public synchronized static void setServiceEnabled(Connection connection, boolean enabled) {
+    public synchronized static void setServiceEnabled(XMPPConnection connection, boolean enabled) {
         if (isServiceEnabled(connection) == enabled)
             return;
 
@@ -72,7 +72,7 @@ public class AMPManager {
      * @param connection the connection to look for AMP support
      * @return a boolean indicating if the AMP support is enabled for the given connection
      */
-    public static boolean isServiceEnabled(Connection connection) {
+    public static boolean isServiceEnabled(XMPPConnection connection) {
         connection.getServiceName();
         return ServiceDiscoveryManager.getInstanceFor(connection).includesFeature(AMPExtension.NAMESPACE);
     }
@@ -83,7 +83,7 @@ public class AMPManager {
      * @param action action to check
      * @return true if this action is supported.
      */
-    public static boolean isActionSupported(Connection connection, AMPExtension.Action action) {
+    public static boolean isActionSupported(XMPPConnection connection, AMPExtension.Action action) {
         String featureName = AMPExtension.NAMESPACE + "?action=" + action.toString();
         return isFeatureSupportedByServer(connection, featureName, AMPExtension.NAMESPACE);
     }
@@ -97,12 +97,12 @@ public class AMPManager {
      * @see AMPExpireAtCondition
      * @see AMPMatchResourceCondition
      */
-    public static boolean isConditionSupported(Connection connection, String conditionName) {
+    public static boolean isConditionSupported(XMPPConnection connection, String conditionName) {
         String featureName = AMPExtension.NAMESPACE + "?condition=" + conditionName;
         return isFeatureSupportedByServer(connection, featureName, AMPExtension.NAMESPACE);
     }
 
-    private static boolean isFeatureSupportedByServer(Connection connection, String featureName, String node) {
+    private static boolean isFeatureSupportedByServer(XMPPConnection connection, String featureName, String node) {
         try {
             ServiceDiscoveryManager discoveryManager = ServiceDiscoveryManager.getInstanceFor(connection);
             DiscoverInfo info = discoveryManager.discoverInfo(connection.getServiceName(), node);
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/amp/AMPMatchResourceCondition.java b/extensions/src/main/java/org/jivesoftware/smackx/amp/AMPMatchResourceCondition.java
index dc7ac766a..b7fcae4da 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/amp/AMPMatchResourceCondition.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/amp/AMPMatchResourceCondition.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.amp;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 
 public class AMPMatchResourceCondition implements AMPExtension.Condition {
 
@@ -27,7 +27,7 @@ public class AMPMatchResourceCondition implements AMPExtension.Condition {
      * @param connection Smack connection instance
      * @return true if match-resource condition is supported.
      */
-    public static boolean isSupported(Connection connection) {
+    public static boolean isSupported(XMPPConnection connection) {
         return AMPManager.isConditionSupported(connection, NAME);
     }
 
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkManager.java b/extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkManager.java
index c7547fffc..6bf85f418 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkManager.java
@@ -17,7 +17,7 @@
 
 package org.jivesoftware.smackx.bookmarks;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smackx.iqprivate.PrivateDataManager;
 
@@ -34,7 +34,7 @@ import java.util.*;
  * @author Alexander Wenckus
  */
 public class BookmarkManager {
-    private static final Map bookmarkManagerMap = new HashMap();
+    private static final Map bookmarkManagerMap = new HashMap();
     static {
         PrivateDataManager.addPrivateDataProvider("storage", "storage:bookmarks",
                 new Bookmarks.Provider());
@@ -48,7 +48,7 @@ public class BookmarkManager {
      * exist it is created.
      * @throws XMPPException Thrown if the connection is null or has not yet been authenticated.
      */
-    public synchronized static BookmarkManager getBookmarkManager(Connection connection)
+    public synchronized static BookmarkManager getBookmarkManager(XMPPConnection connection)
             throws XMPPException
     {
         BookmarkManager manager = (BookmarkManager) bookmarkManagerMap.get(connection);
@@ -70,7 +70,7 @@ public class BookmarkManager {
      * @param connection the connection for persisting and retrieving bookmarks.
      * @throws XMPPException thrown when the connection is null or has not been authenticated.
      */
-    private BookmarkManager(Connection connection) throws XMPPException {
+    private BookmarkManager(XMPPConnection connection) throws XMPPException {
         if(connection == null || !connection.isAuthenticated()) {
             throw new XMPPException("Invalid connection.");
         }
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java b/extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java
index 356b64d9d..71f63b164 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java
@@ -33,7 +33,7 @@ import java.util.List;
  * See the following code sample for saving Bookmarks:
  * 

  * 
- * Connection con = new TCPConnection("jabber.org");
+ * XMPPConnection con = new TCPConnection("jabber.org");
  * con.login("john", "doe");
  * Bookmarks bookmarks = new Bookmarks();
  * 

diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
index d6ad5e51a..d5a6ee7a7 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
@@ -25,7 +25,7 @@ import java.util.Random;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.jivesoftware.smack.AbstractConnectionListener;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.ConnectionCreationListener;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
@@ -96,8 +96,8 @@ public class InBandBytestreamManager implements BytestreamManager {
      * connection
      */
     static {
-        Connection.addConnectionCreationListener(new ConnectionCreationListener() {
-            public void connectionCreated(final Connection connection) {
+        XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() {
+            public void connectionCreated(final XMPPConnection connection) {
                 // create the manager for this connection
                 InBandBytestreamManager.getByteStreamManager(connection);
 
@@ -143,10 +143,10 @@ public class InBandBytestreamManager implements BytestreamManager {
     private final static Random randomGenerator = new Random();
 
     /* stores one InBandBytestreamManager for each XMPP connection */
-    private final static Map managers = new HashMap();
+    private final static Map managers = new HashMap();
 
     /* XMPP connection */
-    private final Connection connection;
+    private final XMPPConnection connection;
 
     /*
      * assigns a user to a listener that is informed if an In-Band Bytestream request for this user
@@ -189,12 +189,12 @@ public class InBandBytestreamManager implements BytestreamManager {
 
     /**
      * Returns the InBandBytestreamManager to handle In-Band Bytestreams for a given
-     * {@link Connection}.
+     * {@link XMPPConnection}.
      * 
      * @param connection the XMPP connection
      * @return the InBandBytestreamManager for the given XMPP connection
      */
-    public static synchronized InBandBytestreamManager getByteStreamManager(Connection connection) {
+    public static synchronized InBandBytestreamManager getByteStreamManager(XMPPConnection connection) {
         if (connection == null)
             return null;
         InBandBytestreamManager manager = managers.get(connection);
@@ -210,7 +210,7 @@ public class InBandBytestreamManager implements BytestreamManager {
      * 
      * @param connection the XMPP connection
      */
-    private InBandBytestreamManager(Connection connection) {
+    private InBandBytestreamManager(XMPPConnection connection) {
         this.connection = connection;
 
         // register bytestream open packet listener
@@ -489,7 +489,7 @@ public class InBandBytestreamManager implements BytestreamManager {
      * 
      * @return the XMPP connection
      */
-    protected Connection getConnection() {
+    protected XMPPConnection getConnection() {
         return this.connection;
     }
 
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java
index 36f9415a5..6e3e39ccc 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.bytestreams.ibb;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smackx.bytestreams.BytestreamRequest;
@@ -70,7 +70,7 @@ public class InBandBytestreamRequest implements BytestreamRequest {
      * @throws XMPPException if stream is invalid.
      */
     public InBandBytestreamSession accept() throws XMPPException {
-        Connection connection = this.manager.getConnection();
+        XMPPConnection connection = this.manager.getConnection();
 
         // create In-Band Bytestream session and store it
         InBandBytestreamSession ibbSession = new InBandBytestreamSession(connection,
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
index ab5909000..17f0b003c 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
@@ -24,7 +24,7 @@ import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.PacketListener;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.filter.AndFilter;
@@ -58,7 +58,7 @@ import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
 public class InBandBytestreamSession implements BytestreamSession {
 
     /* XMPP connection */
-    private final Connection connection;
+    private final XMPPConnection connection;
 
     /* the In-Band Bytestream open request for this session */
     private final Open byteStreamRequest;
@@ -89,7 +89,7 @@ public class InBandBytestreamSession implements BytestreamSession {
      * @param byteStreamRequest the In-Band Bytestream open request for this session
      * @param remoteJID JID of the remote peer
      */
-    protected InBandBytestreamSession(Connection connection, Open byteStreamRequest,
+    protected InBandBytestreamSession(XMPPConnection connection, Open byteStreamRequest,
                     String remoteJID) {
         this.connection = connection;
         this.byteStreamRequest = byteStreamRequest;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
index 0e2299df8..7b392951c 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
@@ -30,7 +30,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeoutException;
 
 import org.jivesoftware.smack.AbstractConnectionListener;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.ConnectionCreationListener;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
@@ -89,9 +89,9 @@ public final class Socks5BytestreamManager implements BytestreamManager {
      * connection
      */
     static {
-        Connection.addConnectionCreationListener(new ConnectionCreationListener() {
+        XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() {
 
-            public void connectionCreated(final Connection connection) {
+            public void connectionCreated(final XMPPConnection connection) {
                 // create the manager for this connection
                 Socks5BytestreamManager.getBytestreamManager(connection);
 
@@ -132,10 +132,10 @@ public final class Socks5BytestreamManager implements BytestreamManager {
     private final static Random randomGenerator = new Random();
 
     /* stores one Socks5BytestreamManager for each XMPP connection */
-    private final static Map managers = new HashMap();
+    private final static Map managers = new HashMap();
 
     /* XMPP connection */
-    private final Connection connection;
+    private final XMPPConnection connection;
 
     /*
      * assigns a user to a listener that is informed if a bytestream request for this user is
@@ -175,7 +175,7 @@ public final class Socks5BytestreamManager implements BytestreamManager {
 
     /**
      * Returns the Socks5BytestreamManager to handle SOCKS5 Bytestreams for a given
-     * {@link Connection}.
+     * {@link XMPPConnection}.
      * 

      * If no manager exists a new is created and initialized.
      * 
@@ -183,7 +183,7 @@ public final class Socks5BytestreamManager implements BytestreamManager {
      *        null
      * @return the Socks5BytestreamManager for the given XMPP connection
      */
-    public static synchronized Socks5BytestreamManager getBytestreamManager(Connection connection) {
+    public static synchronized Socks5BytestreamManager getBytestreamManager(XMPPConnection connection) {
         if (connection == null) {
             return null;
         }
@@ -201,7 +201,7 @@ public final class Socks5BytestreamManager implements BytestreamManager {
      * 
      * @param connection the XMPP connection
      */
-    private Socks5BytestreamManager(Connection connection) {
+    private Socks5BytestreamManager(XMPPConnection connection) {
         this.connection = connection;
         this.initiationListener = new InitiationListener(this);
     }
@@ -284,7 +284,7 @@ public final class Socks5BytestreamManager implements BytestreamManager {
      * service discovery, disabling the listener for SOCKS5 Bytestream initiation requests and
      * resetting its internal state, which includes removing this instance from the managers map.
      * 

-     * To re-enable the SOCKS5 Bytestream feature invoke {@link #getBytestreamManager(Connection)}.
+     * To re-enable the SOCKS5 Bytestream feature invoke {@link #getBytestreamManager(XMPPConnection)}.
      * Using the file transfer API will automatically re-enable the SOCKS5 Bytestream feature.
      */
     public synchronized void disableService() {
@@ -745,7 +745,7 @@ public final class Socks5BytestreamManager implements BytestreamManager {
      * 
      * @return the XMPP connection
      */
-    protected Connection getConnection() {
+    protected XMPPConnection getConnection() {
         return this.connection;
     }
 
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
index 3b08468ce..956722105 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
@@ -20,7 +20,7 @@ import java.io.IOException;
 import java.net.Socket;
 import java.util.concurrent.TimeoutException;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
@@ -37,7 +37,7 @@ import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
 class Socks5ClientForInitiator extends Socks5Client {
 
     /* the XMPP connection used to communicate with the SOCKS5 proxy */
-    private Connection connection;
+    private XMPPConnection connection;
 
     /* the session ID used to activate SOCKS5 stream */
     private String sessionID;
@@ -54,7 +54,7 @@ class Socks5ClientForInitiator extends Socks5Client {
      * @param sessionID the session ID of the SOCKS5 Bytestream
      * @param target the target JID of the SOCKS5 Bytestream
      */
-    public Socks5ClientForInitiator(StreamHost streamHost, String digest, Connection connection,
+    public Socks5ClientForInitiator(StreamHost streamHost, String digest, XMPPConnection connection,
                     String sessionID, String target) {
         super(streamHost, digest);
         this.connection = connection;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
index 4684da8b5..44e228fc0 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
@@ -452,7 +452,7 @@ public class Socks5Proxy {
                 out.write(connectionRequest);
                 out.flush();
 
-                throw new XMPPException("Connection is not allowed");
+                throw new XMPPException("XMPPConnection is not allowed");
             }
 
             connectionRequest[1] = (byte) 0x00; // set return status to 0 (success)
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java b/extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java
index 1293962d1..0c4c00879 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.caps;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.ConnectionCreationListener;
 import org.jivesoftware.smack.ConnectionListener;
 import org.jivesoftware.smack.Manager;
@@ -79,8 +79,8 @@ public class EntityCapsManager extends Manager {
 
     private static boolean autoEnableEntityCaps = true;
 
-    private static Map instances = Collections
-            .synchronizedMap(new WeakHashMap());
+    private static Map instances = Collections
+            .synchronizedMap(new WeakHashMap());
 
     /**
      * Map of (node + '#" + hash algorithm) to DiscoverInfo data
@@ -96,8 +96,8 @@ public class EntityCapsManager extends Manager {
     protected static Map jidCaps = new Cache(10000, -1);
 
     static {
-        Connection.addConnectionCreationListener(new ConnectionCreationListener() {
-            public void connectionCreated(Connection connection) {
+        XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() {
+            public void connectionCreated(XMPPConnection connection) {
                 getInstanceFor(connection);
             }
         });
@@ -219,7 +219,7 @@ public class EntityCapsManager extends Manager {
         ((Cache) caps).setMaxCacheSize(maxCacheSize);
     }
 
-    private EntityCapsManager(Connection connection) {
+    private EntityCapsManager(XMPPConnection connection) {
         super(connection);
         this.sdm = ServiceDiscoveryManager.getInstanceFor(connection);
         instances.put(connection, this);
@@ -317,7 +317,7 @@ public class EntityCapsManager extends Manager {
         sdm.setEntityCapsManager(this);
     }
 
-    public static synchronized EntityCapsManager getInstanceFor(Connection connection) {
+    public static synchronized EntityCapsManager getInstanceFor(XMPPConnection connection) {
         if (SUPPORTED_HASHES.size() <= 0)
             throw new IllegalStateException("No supported hashes for EntityCapsManager");
 
@@ -413,7 +413,7 @@ public class EntityCapsManager extends Manager {
      *            the local users extended info
      */
     public void updateLocalEntityCaps() {
-        Connection connection = connection();
+        XMPPConnection connection = connection();
 
         DiscoverInfo discoverInfo = new DiscoverInfo();
         discoverInfo.setType(IQ.Type.RESULT);
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java b/extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java
index c4e4b94fd..76959f2cc 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java
@@ -22,7 +22,7 @@ import java.util.WeakHashMap;
 
 import org.jivesoftware.smack.Chat;
 import org.jivesoftware.smack.ChatManagerListener;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.Manager;
 import org.jivesoftware.smack.MessageListener;
 import org.jivesoftware.smack.PacketInterceptor;
@@ -38,11 +38,11 @@ import org.jivesoftware.smackx.chatstates.packet.ChatStateExtension;
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 
 /**
- * Handles chat state for all chats on a particular Connection. This class manages both the
+ * Handles chat state for all chats on a particular XMPPConnection. This class manages both the
  * packet extensions and the disco response neccesary for compliance with
  * XEP-0085.
  *
- * NOTE: {@link org.jivesoftware.smackx.chatstates.ChatStateManager#getInstance(org.jivesoftware.smack.Connection)}
+ * NOTE: {@link org.jivesoftware.smackx.chatstates.ChatStateManager#getInstance(org.jivesoftware.smack.XMPPConnection)}
  * needs to be called in order for the listeners to be registered appropriately with the connection.
  * If this does not occur you will not receive the update notifications.
  *
@@ -53,19 +53,19 @@ import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 public class ChatStateManager extends Manager {
     public static final String NAMESPACE = "http://jabber.org/protocol/chatstates";
 
-    private static final Map INSTANCES =
-            new WeakHashMap();
+    private static final Map INSTANCES =
+            new WeakHashMap();
 
     private static final PacketFilter filter = new NotFilter(new PacketExtensionFilter(NAMESPACE));
 
     /**
-     * Returns the ChatStateManager related to the Connection and it will create one if it does
+     * Returns the ChatStateManager related to the XMPPConnection and it will create one if it does
      * not yet exist.
      *
      * @param connection the connection to return the ChatStateManager
      * @return the ChatStateManager related the the connection.
      */
-    public static synchronized ChatStateManager getInstance(final Connection connection) {
+    public static synchronized ChatStateManager getInstance(final XMPPConnection connection) {
             ChatStateManager manager = INSTANCES.get(connection);
             if (manager == null) {
                 manager = new ChatStateManager(connection);
@@ -83,7 +83,7 @@ public class ChatStateManager extends Manager {
     private final Map chatStates =
             new ReferenceMap(ReferenceMap.WEAK, ReferenceMap.HARD);
 
-    private ChatStateManager(Connection connection) {
+    private ChatStateManager(XMPPConnection connection) {
         super(connection);
         connection.getChatManager().addOutgoingMessageInterceptor(outgoingInterceptor, filter);
         connection.getChatManager().addChatListener(incomingInterceptor);
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java b/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java
index f8e3dda76..c9fc38374 100755
--- a/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java
@@ -47,8 +47,8 @@ import java.util.concurrent.ConcurrentHashMap;
  * An AdHocCommandManager is responsible for keeping the list of available
  * commands offered by a service and for processing commands requests.
  *
- * Pass in a Connection instance to
- * {@link #getAddHocCommandsManager(org.jivesoftware.smack.Connection)} in order to
+ * Pass in a XMPPConnection instance to
+ * {@link #getAddHocCommandsManager(org.jivesoftware.smack.XMPPConnection)} in order to
  * get an instance of this class. 
  * 
  * @author Gabriel Guardincerri
@@ -62,11 +62,11 @@ public class AdHocCommandManager extends Manager {
     private static final int SESSION_TIMEOUT = 2 * 60;
 
     /**
-     * Map a Connection with it AdHocCommandManager. This map have a key-value
+     * Map a XMPPConnection with it AdHocCommandManager. This map have a key-value
      * pair for every active connection.
      */
-    private static Map instances =
-            Collections.synchronizedMap(new WeakHashMap());
+    private static Map instances =
+            Collections.synchronizedMap(new WeakHashMap());
 
     /**
      * Register the listener for all the connection creations. When a new
@@ -74,8 +74,8 @@ public class AdHocCommandManager extends Manager {
      * related to that connection.
      */
     static {
-        Connection.addConnectionCreationListener(new ConnectionCreationListener() {
-            public void connectionCreated(Connection connection) {
+        XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() {
+            public void connectionCreated(XMPPConnection connection) {
                 getAddHocCommandsManager(connection);
             }
         });
@@ -88,7 +88,7 @@ public class AdHocCommandManager extends Manager {
      * @param connection the XMPP connection.
      * @return the AdHocCommandManager associated with the connection.
      */
-    public static synchronized AdHocCommandManager getAddHocCommandsManager(Connection connection) {
+    public static synchronized AdHocCommandManager getAddHocCommandsManager(XMPPConnection connection) {
         AdHocCommandManager ahcm = instances.get(connection);
         if (ahcm == null) ahcm = new AdHocCommandManager(connection);
         return ahcm;
@@ -116,7 +116,7 @@ public class AdHocCommandManager extends Manager {
      */
     private Thread sessionsSweeper;
 
-    private AdHocCommandManager(Connection connection) {
+    private AdHocCommandManager(XMPPConnection connection) {
         super(connection);
         this.serviceDiscoveryManager = ServiceDiscoveryManager.getInstanceFor(connection);
         
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java b/extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java
index 2fb866c95..b5a865131 100755
--- a/extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java
@@ -18,7 +18,7 @@
 package org.jivesoftware.smackx.commands;
 
 import org.jivesoftware.smack.SmackConfiguration;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smackx.commands.packet.AdHocCommandData;
@@ -43,7 +43,7 @@ public class RemoteCommand extends AdHocCommand {
     /**
      * The connection that is used to execute this command
      */
-    private Connection connection;
+    private XMPPConnection connection;
 
     /**
      * The full JID of the command host
@@ -71,7 +71,7 @@ public class RemoteCommand extends AdHocCommand {
      * @param node the identifier of the command.
      * @param jid the JID of the host.
      */
-    protected RemoteCommand(Connection connection, String node, String jid) {
+    protected RemoteCommand(XMPPConnection connection, String node, String jid) {
         super();
         this.connection = connection;
         this.jid = jid;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java b/extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
index f9018308b..813bcd166 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
@@ -17,7 +17,7 @@
 
 package org.jivesoftware.smackx.disco;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.ConnectionCreationListener;
 import org.jivesoftware.smack.Manager;
 import org.jivesoftware.smack.PacketListener;
@@ -69,8 +69,8 @@ public class ServiceDiscoveryManager extends Manager {
 
     private EntityCapsManager capsManager;
 
-    private static Map instances =
-            Collections.synchronizedMap(new WeakHashMap());
+    private static Map instances =
+            Collections.synchronizedMap(new WeakHashMap());
 
     private final Set features = new HashSet();
     private DataForm extendedInfo = null;
@@ -79,8 +79,8 @@ public class ServiceDiscoveryManager extends Manager {
 
     // Create a new ServiceDiscoveryManager on every established connection
     static {
-        Connection.addConnectionCreationListener(new ConnectionCreationListener() {
-            public void connectionCreated(Connection connection) {
+        XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() {
+            public void connectionCreated(XMPPConnection connection) {
                 getInstanceFor(connection);
             }
         });
@@ -97,13 +97,13 @@ public class ServiceDiscoveryManager extends Manager {
     }
 
     /**
-     * Creates a new ServiceDiscoveryManager for a given Connection. This means that the 
+     * Creates a new ServiceDiscoveryManager for a given XMPPConnection. This means that the 
      * service manager will respond to any service discovery request that the connection may
      * receive. 
      * 
      * @param connection the connection to which a ServiceDiscoveryManager is going to be created.
      */
-    private ServiceDiscoveryManager(Connection connection) {
+    private ServiceDiscoveryManager(XMPPConnection connection) {
         super(connection);
         // Register the new instance and associate it with the connection 
         instances.put(connection, this);
@@ -115,7 +115,7 @@ public class ServiceDiscoveryManager extends Manager {
         PacketFilter packetFilter = new PacketTypeFilter(DiscoverItems.class);
         PacketListener packetListener = new PacketListener() {
             public void processPacket(Packet packet) {
-                Connection connection = connection();
+                XMPPConnection connection = connection();
                 if (connection == null) return;
                 DiscoverItems discoverItems = (DiscoverItems) packet;
                 // Send back the items defined in the client if the request is of type GET
@@ -152,7 +152,7 @@ public class ServiceDiscoveryManager extends Manager {
         packetFilter = new PacketTypeFilter(DiscoverInfo.class);
         packetListener = new PacketListener() {
             public void processPacket(Packet packet) {
-                Connection connection = connection();
+                XMPPConnection connection = connection();
                 if (connection == null) return;
                 DiscoverInfo discoverInfo = (DiscoverInfo) packet;
                 // Answer the client's supported features if the request is of the GET type
@@ -281,12 +281,12 @@ public class ServiceDiscoveryManager extends Manager {
     }
 
     /**
-     * Returns the ServiceDiscoveryManager instance associated with a given Connection.
+     * Returns the ServiceDiscoveryManager instance associated with a given XMPPConnection.
      * 
      * @param connection the connection used to look for the proper ServiceDiscoveryManager.
-     * @return the ServiceDiscoveryManager associated with a given Connection.
+     * @return the ServiceDiscoveryManager associated with a given XMPPConnection.
      */
-    public static synchronized ServiceDiscoveryManager getInstanceFor(Connection connection) {
+    public static synchronized ServiceDiscoveryManager getInstanceFor(XMPPConnection connection) {
         ServiceDiscoveryManager sdm = instances.get(connection);
         if (sdm == null) {
             sdm = new ServiceDiscoveryManager(connection);
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java
index b791de15c..3581e4313 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java
@@ -17,7 +17,7 @@
 package org.jivesoftware.smackx.filetransfer;
 
 import org.jivesoftware.smack.PacketCollector;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.filter.OrFilter;
 import org.jivesoftware.smack.filter.PacketFilter;
@@ -40,11 +40,11 @@ public class FaultTolerantNegotiator extends StreamNegotiator {
 
     private StreamNegotiator primaryNegotiator;
     private StreamNegotiator secondaryNegotiator;
-    private Connection connection;
+    private XMPPConnection connection;
     private PacketFilter primaryFilter;
     private PacketFilter secondaryFilter;
 
-    public FaultTolerantNegotiator(Connection connection, StreamNegotiator primary,
+    public FaultTolerantNegotiator(XMPPConnection connection, StreamNegotiator primary,
             StreamNegotiator secondary) {
         this.primaryNegotiator = primary;
         this.secondaryNegotiator = secondary;
@@ -64,7 +64,7 @@ public class FaultTolerantNegotiator extends StreamNegotiator {
                 "stream method.");
     }
 
-    final Packet initiateIncomingStream(Connection connection, StreamInitiation initiation) {
+    final Packet initiateIncomingStream(XMPPConnection connection, StreamInitiation initiation) {
         throw new UnsupportedOperationException("Initiation handled by createIncomingStream " +
                 "method");
     }
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java
index 4aaa11820..20cbe4397 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java
@@ -17,7 +17,7 @@
 package org.jivesoftware.smackx.filetransfer;
 
 import org.jivesoftware.smack.PacketListener;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.filter.AndFilter;
 import org.jivesoftware.smack.filter.IQTypeFilter;
 import org.jivesoftware.smack.filter.PacketTypeFilter;
@@ -48,15 +48,15 @@ public class FileTransferManager {
 
 	private List listeners;
 
-	private Connection connection;
+	private XMPPConnection connection;
 
 	/**
 	 * Creates a file transfer manager to initiate and receive file transfers.
 	 * 
 	 * @param connection
-	 *            The Connection that the file transfers will use.
+	 *            The XMPPConnection that the file transfers will use.
 	 */
-	public FileTransferManager(Connection connection) {
+	public FileTransferManager(XMPPConnection connection) {
 		this.connection = connection;
 		this.fileTransferNegotiator = FileTransferNegotiator
 				.getInstanceFor(connection);
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
index 4cc6a8404..8bd0005f3 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
@@ -27,7 +27,7 @@ import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.ConnectionListener;
 import org.jivesoftware.smack.PacketCollector;
 import org.jivesoftware.smack.XMPPException;
@@ -58,8 +58,8 @@ public class FileTransferNegotiator {
             "http://jabber.org/protocol/si/profile/file-transfer",
             "http://jabber.org/protocol/si"};
 
-    private static final Map transferObject =
-            new ConcurrentHashMap();
+    private static final Map transferObject =
+            new ConcurrentHashMap();
 
     private static final String STREAM_INIT_PREFIX = "jsi_";
 
@@ -83,9 +83,9 @@ public class FileTransferNegotiator {
      * @return The IMFileTransferManager
      */
     public static FileTransferNegotiator getInstanceFor(
-            final Connection connection) {
+            final XMPPConnection connection) {
         if (connection == null) {
-            throw new IllegalArgumentException("Connection cannot be null");
+            throw new IllegalArgumentException("XMPPConnection cannot be null");
         }
         if (!connection.isConnected()) {
             return null;
@@ -110,7 +110,7 @@ public class FileTransferNegotiator {
      * @param connection The connection on which to enable or disable the services.
      * @param isEnabled  True to enable, false to disable.
      */
-    public static void setServiceEnabled(final Connection connection,
+    public static void setServiceEnabled(final XMPPConnection connection,
             final boolean isEnabled) {
         ServiceDiscoveryManager manager = ServiceDiscoveryManager
                 .getInstanceFor(connection);
@@ -141,7 +141,7 @@ public class FileTransferNegotiator {
      * @param connection The connection to check
      * @return True if all related services are enabled, false if they are not.
      */
-    public static boolean isServiceEnabled(final Connection connection) {
+    public static boolean isServiceEnabled(final XMPPConnection connection) {
         ServiceDiscoveryManager manager = ServiceDiscoveryManager
                 .getInstanceFor(connection);
 
@@ -200,13 +200,13 @@ public class FileTransferNegotiator {
 
     // non-static
 
-    private final Connection connection;
+    private final XMPPConnection connection;
 
     private final StreamNegotiator byteStreamTransferManager;
 
     private final StreamNegotiator inbandTransferManager;
 
-    private FileTransferNegotiator(final Connection connection) {
+    private FileTransferNegotiator(final XMPPConnection connection) {
         configureConnection(connection);
 
         this.connection = connection;
@@ -214,7 +214,7 @@ public class FileTransferNegotiator {
         inbandTransferManager = new IBBTransferNegotiator(connection);
     }
 
-    private void configureConnection(final Connection connection) {
+    private void configureConnection(final XMPPConnection connection) {
         connection.addConnectionListener(new ConnectionListener() {
             public void connectionClosed() {
                 cleanup(connection);
@@ -238,7 +238,7 @@ public class FileTransferNegotiator {
         });
     }
 
-    private void cleanup(final Connection connection) {
+    private void cleanup(final XMPPConnection connection) {
         if (transferObject.remove(connection) != null) {
             inbandTransferManager.cleanup();
         }
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
index 018b68727..fb938a2ce 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.filetransfer;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.filter.AndFilter;
 import org.jivesoftware.smack.filter.FromMatchesFilter;
@@ -45,7 +45,7 @@ import org.jivesoftware.smackx.si.packet.StreamInitiation;
  */
 public class IBBTransferNegotiator extends StreamNegotiator {
 
-    private Connection connection;
+    private XMPPConnection connection;
 
     private InBandBytestreamManager manager;
 
@@ -54,7 +54,7 @@ public class IBBTransferNegotiator extends StreamNegotiator {
      * 
      * @param connection The connection which this negotiator works on.
      */
-    protected IBBTransferNegotiator(Connection connection) {
+    protected IBBTransferNegotiator(XMPPConnection connection) {
         this.connection = connection;
         this.manager = InBandBytestreamManager.getByteStreamManager(connection);
     }
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
index 5569acd68..32c80f0b9 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
@@ -21,7 +21,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PushbackInputStream;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.filter.AndFilter;
 import org.jivesoftware.smack.filter.FromMatchesFilter;
@@ -44,11 +44,11 @@ import org.jivesoftware.smackx.si.packet.StreamInitiation;
  */
 public class Socks5TransferNegotiator extends StreamNegotiator {
 
-    private Connection connection;
+    private XMPPConnection connection;
 
     private Socks5BytestreamManager manager;
 
-    Socks5TransferNegotiator(Connection connection) {
+    Socks5TransferNegotiator(XMPPConnection connection) {
         this.connection = connection;
         this.manager = Socks5BytestreamManager.getBytestreamManager(this.connection);
     }
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
index b08ba7a4b..72fd4c603 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
@@ -17,7 +17,7 @@
 package org.jivesoftware.smackx.filetransfer;
 
 import org.jivesoftware.smack.PacketCollector;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.packet.IQ;
@@ -77,7 +77,7 @@ public abstract class StreamNegotiator {
         return iq;
     }
 
-    Packet initiateIncomingStream(Connection connection, StreamInitiation initiation) throws XMPPException {
+    Packet initiateIncomingStream(XMPPConnection connection, StreamInitiation initiation) throws XMPPException {
         StreamInitiation response = createInitiationAccept(initiation,
                 getNamespaces());
 
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java b/extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java
index 39655cd28..fb664793f 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java
@@ -17,7 +17,7 @@
 
 package org.jivesoftware.smackx.iqlast;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.ConnectionCreationListener;
 import org.jivesoftware.smack.PacketListener;
 import org.jivesoftware.smack.XMPPException;
@@ -54,7 +54,7 @@ import org.jivesoftware.smackx.iqlast.packet.LastActivity;
  * 

  * 
  * 
- * Connection con = new TCPConnection("jabber.org");
+ * XMPPConnection con = new TCPConnection("jabber.org");
  * con.login("john", "doe");
  * LastActivity activity = LastActivity.getLastActivity(con, "xray@jabber.org/Smack");
  * 

@@ -83,12 +83,12 @@ public class LastActivityManager {
 
     private long lastMessageSent;
 
-    private Connection connection;
+    private XMPPConnection connection;
 
     // Enable the LastActivity support on every established connection
     static {
-        Connection.addConnectionCreationListener(new ConnectionCreationListener() {
-            public void connectionCreated(Connection connection) {
+        XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() {
+            public void connectionCreated(XMPPConnection connection) {
                 new LastActivityManager(connection);
             }
         });
@@ -98,9 +98,9 @@ public class LastActivityManager {
      * Creates a last activity manager to response last activity requests.
      * 
      * @param connection
-     *            The Connection that the last activity requests will use.
+     *            The XMPPConnection that the last activity requests will use.
      */
-    private LastActivityManager(Connection connection) {
+    private LastActivityManager(XMPPConnection connection) {
         this.connection = connection;
 
         // Listen to all the sent messages to reset the idle time on each one
@@ -185,14 +185,14 @@ public class LastActivityManager {
      * 'host') the last activity is the uptime.
      * 
      * @param con
-     *            the current Connection.
+     *            the current XMPPConnection.
      * @param jid
      *            the JID of the user.
      * @return the LastActivity packet of the jid.
      * @throws XMPPException
      *             thrown if a server error has occured.
      */
-    public static LastActivity getLastActivity(Connection con, String jid) throws XMPPException {
+    public static LastActivity getLastActivity(XMPPConnection con, String jid) throws XMPPException {
         LastActivity activity = new LastActivity();
         activity.setTo(jid);
 
@@ -207,7 +207,7 @@ public class LastActivityManager {
      * @param jid a JID to be tested for Last Activity support
      * @return true if Last Activity is supported, otherwise false
      */
-    public static boolean isLastActivitySupported(Connection connection, String jid) {
+    public static boolean isLastActivitySupported(XMPPConnection connection, String jid) {
         try {
             DiscoverInfo result =
                 ServiceDiscoveryManager.getInstanceFor(connection).discoverInfo(jid);
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java b/extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java
index 1b19dbc7a..081d044a9 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.iqlast.packet;
 
 import java.io.IOException;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.provider.IQProvider;
@@ -128,14 +128,14 @@ public class LastActivity extends IQ {
 
     /**
      * Retrieve the last activity of a particular jid.
-     * @param con the current Connection.
+     * @param con the current XMPPConnection.
      * @param jid the JID of the user.
      * @return the LastActivity packet of the jid.
      * @throws XMPPException thrown if a server error has occured.
      * @deprecated This method only retreives the lapsed time since the last logout of a particular jid. 
-     * Replaced by {@link  org.jivesoftware.smackx.iqlast.LastActivityManager#getLastActivity(Connection, String)  getLastActivity}
+     * Replaced by {@link  org.jivesoftware.smackx.iqlast.LastActivityManager#getLastActivity(XMPPConnection, String)  getLastActivity}
      */
-    public static LastActivity getLastActivity(Connection con, String jid) throws XMPPException {
+    public static LastActivity getLastActivity(XMPPConnection con, String jid) throws XMPPException {
         LastActivity activity = new LastActivity();
         jid = StringUtils.parseBareAddress(jid);
         activity.setTo(jid);
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java b/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java
index b56b0de7a..a0d79c32e 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java
@@ -17,7 +17,7 @@
 
 package org.jivesoftware.smackx.iqprivate;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.provider.IQProvider;
@@ -112,7 +112,7 @@ public class PrivateDataManager {
     }
 
 
-    private Connection connection;
+    private XMPPConnection connection;
 
     /**
      * The user to get and set private data for. In most cases, this value should
@@ -129,7 +129,7 @@ public class PrivateDataManager {
      * @param connection an XMPP connection which must have already undergone a
      *      successful login.
      */
-    public PrivateDataManager(Connection connection) {
+    public PrivateDataManager(XMPPConnection connection) {
         if (!connection.isAuthenticated()) {
             throw new IllegalStateException("Must be logged in to XMPP server.");
         }
@@ -148,7 +148,7 @@ public class PrivateDataManager {
      *      successful login.
      * @param user the XMPP address of the user to get and set private data for.
      */
-    public PrivateDataManager(Connection connection, String user) {
+    public PrivateDataManager(XMPPConnection connection, String user) {
         if (!connection.isAuthenticated()) {
             throw new IllegalStateException("Must be logged in to XMPP server.");
         }
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/iqversion/VersionManager.java b/extensions/src/main/java/org/jivesoftware/smackx/iqversion/VersionManager.java
index e47304321..d50b059a6 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/iqversion/VersionManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/iqversion/VersionManager.java
@@ -21,7 +21,7 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.Manager;
 import org.jivesoftware.smack.PacketListener;
 import org.jivesoftware.smack.filter.AndFilter;
@@ -49,12 +49,12 @@ import org.jivesoftware.smackx.iqversion.packet.Version;
  * @author Georg Lukas
  */
 public class VersionManager extends Manager {
-    private static final Map instances =
-            Collections.synchronizedMap(new WeakHashMap());
+    private static final Map instances =
+            Collections.synchronizedMap(new WeakHashMap());
 
     private Version own_version;
 
-    private VersionManager(final Connection connection) {
+    private VersionManager(final XMPPConnection connection) {
         super(connection);
         instances.put(connection, this);
 
@@ -78,7 +78,7 @@ public class VersionManager extends Manager {
         , new AndFilter(new PacketTypeFilter(Version.class), new IQTypeFilter(Type.GET)));
     }
 
-    public static synchronized VersionManager getInstanceFor(Connection connection) {
+    public static synchronized VersionManager getInstanceFor(XMPPConnection connection) {
         VersionManager versionManager = instances.get(connection);
 
         if (versionManager == null) {
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/ConnectionDetachedPacketCollector.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/ConnectionDetachedPacketCollector.java
index 3edacfb55..4d5456056 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/ConnectionDetachedPacketCollector.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/ConnectionDetachedPacketCollector.java
@@ -25,7 +25,7 @@ import org.jivesoftware.smack.packet.Packet;
 
 /**
  * A variant of the {@link org.jivesoftware.smack.PacketCollector} class
- * that does not force attachment to a Connection
+ * that does not force attachment to a XMPPConnection
  * on creation and no filter is required. Used to collect message
  * packets targeted to a group chat room.
  *
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java
index 9c3a7e9b6..ab8066890 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java
@@ -22,9 +22,9 @@ import org.jivesoftware.smackx.disco.packet.DiscoverItems;
  * Hosted rooms by a chat service may be discovered if they are configured to appear in the room
  * directory . The information that may be discovered is the XMPP address of the room and the room
  * name. The address of the room may be used for obtaining more detailed information
- * {@link org.jivesoftware.smackx.muc.MultiUserChat#getRoomInfo(org.jivesoftware.smack.Connection, String)}
+ * {@link org.jivesoftware.smackx.muc.MultiUserChat#getRoomInfo(org.jivesoftware.smack.XMPPConnection, String)}
  * or could be used for joining the room
- * {@link org.jivesoftware.smackx.muc.MultiUserChat#MultiUserChat(org.jivesoftware.smack.Connection, String)}
+ * {@link org.jivesoftware.smackx.muc.MultiUserChat#MultiUserChat(org.jivesoftware.smack.XMPPConnection, String)}
  * and {@link org.jivesoftware.smackx.muc.MultiUserChat#join(String)}.
  *
  * @author Gaston Dombiak
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationListener.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationListener.java
index 13d2e50d4..26987c32c 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationListener.java
@@ -17,7 +17,7 @@
 
 package org.jivesoftware.smackx.muc;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.packet.Message;
 
 /**
@@ -33,14 +33,14 @@ public interface InvitationListener {
      * If the room is password-protected, the invitee will receive a password to use to join
      * the room. If the room is members-only, the the invitee may be added to the member list.
      * 
-     * @param conn the Connection that received the invitation.
+     * @param conn the XMPPConnection that received the invitation.
      * @param room the room that invitation refers to.
      * @param inviter the inviter that sent the invitation. (e.g. crone1@shakespeare.lit).
      * @param reason the reason why the inviter sent the invitation.
      * @param password the password to use when joining the room.
      * @param message the message used by the inviter to send the invitation.
      */
-    public abstract void invitationReceived(Connection conn, String room, String inviter, String reason,
+    public abstract void invitationReceived(XMPPConnection conn, String room, String inviter, String reason,
                                             String password, Message message);
 
 }
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
index cd20514d0..564277519 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
@@ -40,7 +40,7 @@ import org.jivesoftware.smack.PacketCollector;
 import org.jivesoftware.smack.PacketInterceptor;
 import org.jivesoftware.smack.PacketListener;
 import org.jivesoftware.smack.SmackConfiguration;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.filter.AndFilter;
 import org.jivesoftware.smack.filter.FromMatchesFilter;
@@ -80,10 +80,10 @@ public class MultiUserChat {
     private final static String discoNamespace = "http://jabber.org/protocol/muc";
     private final static String discoNode = "http://jabber.org/protocol/muc#rooms";
 
-    private static Map> joinedRooms =
-            new WeakHashMap>();
+    private static Map> joinedRooms =
+            new WeakHashMap>();
 
-    private Connection connection;
+    private XMPPConnection connection;
     private String room;
     private String subject;
     private String nickname = null;
@@ -107,8 +107,8 @@ public class MultiUserChat {
     private List connectionListeners = new ArrayList();
 
     static {
-        Connection.addConnectionCreationListener(new ConnectionCreationListener() {
-            public void connectionCreated(final Connection connection) {
+        XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() {
+            public void connectionCreated(final XMPPConnection connection) {
                 // Set on every established connection that this client supports the Multi-User
                 // Chat protocol. This information will be used when another client tries to
                 // discover whether this client supports MUC or not.
@@ -116,12 +116,12 @@ public class MultiUserChat {
 
                 // Set the NodeInformationProvider that will provide information about the
                 // joined rooms whenever a disco request is received
-                final WeakReference weakRefConnection = new WeakReference(connection);
+                final WeakReference weakRefConnection = new WeakReference(connection);
                 ServiceDiscoveryManager.getInstanceFor(connection).setNodeInformationProvider(
                     discoNode,
                     new NodeInformationProvider() {
                         public List getNodeItems() {
-                            Connection connection = weakRefConnection.get();
+                            XMPPConnection connection = weakRefConnection.get();
                             if (connection == null) return new LinkedList();
                             List answer = new ArrayList();
                             Iterator rooms=MultiUserChat.getJoinedRooms(connection);
@@ -163,7 +163,7 @@ public class MultiUserChat {
      *      "service" is the hostname at which the multi-user chat
      *      service is running. Make sure to provide a valid JID.
      */
-    public MultiUserChat(Connection connection, String room) {
+    public MultiUserChat(XMPPConnection connection, String room) {
         this.connection = connection;
         this.room = room.toLowerCase();
         init();
@@ -176,7 +176,7 @@ public class MultiUserChat {
      * @param user the user to check. A fully qualified xmpp ID, e.g. jdoe@example.com.
      * @return a boolean indicating whether the specified user supports the MUC protocol.
      */
-    public static boolean isServiceEnabled(Connection connection, String user) {
+    public static boolean isServiceEnabled(XMPPConnection connection, String user) {
         try {
             DiscoverInfo result =
                 ServiceDiscoveryManager.getInstanceFor(connection).discoverInfo(user);
@@ -196,7 +196,7 @@ public class MultiUserChat {
      * @param connection the connection used to join the rooms.
      * @return an Iterator on the rooms where the user has joined using a given connection.
      */
-    private static Iterator getJoinedRooms(Connection connection) {
+    private static Iterator getJoinedRooms(XMPPConnection connection) {
         List rooms = joinedRooms.get(connection);
         if (rooms != null) {
             return rooms.iterator();
@@ -213,7 +213,7 @@ public class MultiUserChat {
      * @param user the user to check. A fully qualified xmpp ID, e.g. jdoe@example.com.
      * @return an Iterator on the rooms where the requested user has joined.
      */
-    public static Iterator getJoinedRooms(Connection connection, String user) {
+    public static Iterator getJoinedRooms(XMPPConnection connection, String user) {
         try {
             ArrayList answer = new ArrayList();
             // Send the disco packet to the user
@@ -242,7 +242,7 @@ public class MultiUserChat {
      * @return the discovered information of a given room without actually having to join the room.
      * @throws XMPPException if an error occured while trying to discover information of a room.
      */
-    public static RoomInfo getRoomInfo(Connection connection, String room)
+    public static RoomInfo getRoomInfo(XMPPConnection connection, String room)
             throws XMPPException {
         DiscoverInfo info = ServiceDiscoveryManager.getInstanceFor(connection).discoverInfo(room);
         return new RoomInfo(info);
@@ -255,7 +255,7 @@ public class MultiUserChat {
      * @return a collection with the XMPP addresses of the Multi-User Chat services.
      * @throws XMPPException if an error occured while trying to discover MUC services.
      */
-    public static Collection getServiceNames(Connection connection) throws XMPPException {
+    public static Collection getServiceNames(XMPPConnection connection) throws XMPPException {
         final List answer = new ArrayList();
         ServiceDiscoveryManager discoManager = ServiceDiscoveryManager.getInstanceFor(connection);
         DiscoverItems items = discoManager.discoverItems(connection.getServiceName());
@@ -285,7 +285,7 @@ public class MultiUserChat {
      * @return a collection of HostedRooms.
      * @throws XMPPException if an error occured while trying to discover the information.
      */
-    public static Collection getHostedRooms(Connection connection, String serviceName)
+    public static Collection getHostedRooms(XMPPConnection connection, String serviceName)
             throws XMPPException {
         List answer = new ArrayList();
         ServiceDiscoveryManager discoManager = ServiceDiscoveryManager.getInstanceFor(connection);
@@ -689,7 +689,7 @@ public class MultiUserChat {
      * @param inviter the inviter of the declined invitation.
      * @param reason the reason why the invitee is declining the invitation.
      */
-    public static void decline(Connection conn, String room, String inviter, String reason) {
+    public static void decline(XMPPConnection conn, String room, String inviter, String reason) {
         Message message = new Message(room);
 
         // Create the MUCUser packet that will include the rejection
@@ -711,7 +711,7 @@ public class MultiUserChat {
      * @param conn the connection where the listener will be applied.
      * @param listener an invitation listener.
      */
-    public static void addInvitationListener(Connection conn, InvitationListener listener) {
+    public static void addInvitationListener(XMPPConnection conn, InvitationListener listener) {
         InvitationsMonitor.getInvitationsMonitor(conn).addInvitationListener(listener);
     }
 
@@ -722,7 +722,7 @@ public class MultiUserChat {
      * @param conn the connection where the listener was applied.
      * @param listener an invitation listener.
      */
-    public static void removeInvitationListener(Connection conn, InvitationListener listener) {
+    public static void removeInvitationListener(XMPPConnection conn, InvitationListener listener) {
         InvitationsMonitor.getInvitationsMonitor(conn).removeInvitationListener(listener);
     }
 
@@ -1661,7 +1661,7 @@ public class MultiUserChat {
      * group chat. Only "group chat" messages addressed to this group chat will
      * be delivered to the listener. If you wish to listen for other packets
      * that may be associated with this group chat, you should register a
-     * PacketListener directly with the Connection with the appropriate
+     * PacketListener directly with the XMPPConnection with the appropriate
      * PacketListener.
      *
      * @param listener a packet listener.
@@ -2310,17 +2310,17 @@ public class MultiUserChat {
         // We use a WeakHashMap so that the GC can collect the monitor when the
         // connection is no longer referenced by any object.
         // Note that when the InvitationsMonitor is used, i.e. when there are InvitationListeners, it will add a
-        // PacketListener to the Connection and therefore a strong reference from the Connection to the
+        // PacketListener to the XMPPConnection and therefore a strong reference from the XMPPConnection to the
         // InvitationsMonior will exists, preventing it from beeing gc'ed. After the last InvitationListener is gone,
         // the PacketListener will get removed (cancel()) allowing the garbage collection of the InvitationsMonitor
         // instance.
-        private final static Map> monitors =
-                new WeakHashMap>();
+        private final static Map> monitors =
+                new WeakHashMap>();
 
         // We don't use a synchronized List here because it would break the semantic of (add|remove)InvitationListener
         private final List invitationsListeners =
                 new ArrayList();
-        private Connection connection;
+        private XMPPConnection connection;
         private PacketFilter invitationFilter;
         private PacketListener invitationPacketListener;
 
@@ -2330,7 +2330,7 @@ public class MultiUserChat {
          * @param conn the connection to monitor for room invitations.
          * @return a new or existing InvitationsMonitor for a given connection.
          */
-        public static InvitationsMonitor getInvitationsMonitor(Connection conn) {
+        public static InvitationsMonitor getInvitationsMonitor(XMPPConnection conn) {
             synchronized (monitors) {
                 if (!monitors.containsKey(conn) || monitors.get(conn).get() == null) {
                     // We need to use a WeakReference because the monitor references the
@@ -2351,7 +2351,7 @@ public class MultiUserChat {
          * 
          * @param connection the connection to monitor for possible room invitations
          */
-        private InvitationsMonitor(Connection connection) {
+        private InvitationsMonitor(XMPPConnection connection) {
             this.connection = connection;
         }
 
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/RoomListenerMultiplexor.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/RoomListenerMultiplexor.java
index 15254e5bd..1f5833347 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/RoomListenerMultiplexor.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/RoomListenerMultiplexor.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.muc;
 
 import org.jivesoftware.smack.ConnectionListener;
 import org.jivesoftware.smack.PacketListener;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.util.StringUtils;
@@ -31,9 +31,9 @@ import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * A RoomListenerMultiplexor multiplexes incoming packets on
- * a Connection using a single listener/filter pair.
+ * a XMPPConnection using a single listener/filter pair.
  * A single RoomListenerMultiplexor is created for each
- * {@link org.jivesoftware.smack.Connection} that has joined MUC rooms
+ * {@link org.jivesoftware.smack.XMPPConnection} that has joined MUC rooms
  * within its session.
  *
  * @author Larry Kirschner
@@ -42,10 +42,10 @@ class RoomListenerMultiplexor implements ConnectionListener {
 
     // We use a WeakHashMap so that the GC can collect the monitor when the
     // connection is no longer referenced by any object.
-    private static final Map> monitors =
-            new WeakHashMap>();
+    private static final Map> monitors =
+            new WeakHashMap>();
 
-    private Connection connection;
+    private XMPPConnection connection;
     private RoomMultiplexFilter filter;
     private RoomMultiplexListener listener;
 
@@ -55,7 +55,7 @@ class RoomListenerMultiplexor implements ConnectionListener {
      * @param conn the connection to monitor for room invitations.
      * @return a new or existing RoomListenerMultiplexor for a given connection.
      */
-    public static RoomListenerMultiplexor getRoomMultiplexor(Connection conn) {
+    public static RoomListenerMultiplexor getRoomMultiplexor(XMPPConnection conn) {
         synchronized (monitors) {
             if (!monitors.containsKey(conn) || monitors.get(conn).get() == null) {
                 RoomListenerMultiplexor rm = new RoomListenerMultiplexor(conn, new RoomMultiplexFilter(),
@@ -75,12 +75,12 @@ class RoomListenerMultiplexor implements ConnectionListener {
 
     /**
      * All access should be through
-     * the static method {@link #getRoomMultiplexor(Connection)}.
+     * the static method {@link #getRoomMultiplexor(XMPPConnection)}.
      */
-    private RoomListenerMultiplexor(Connection connection, RoomMultiplexFilter filter,
+    private RoomListenerMultiplexor(XMPPConnection connection, RoomMultiplexFilter filter,
             RoomMultiplexListener listener) {
         if (connection == null) {
-            throw new IllegalArgumentException("Connection is null");
+            throw new IllegalArgumentException("XMPPConnection is null");
         }
         if (filter == null) {
             throw new IllegalArgumentException("Filter is null");
@@ -143,11 +143,11 @@ class RoomListenerMultiplexor implements ConnectionListener {
     }
 
     /**
-     * The single Connection-level PacketFilter used by a {@link RoomListenerMultiplexor}
-     * for all muc chat rooms on an Connection.
+     * The single XMPPConnection-level PacketFilter used by a {@link RoomListenerMultiplexor}
+     * for all muc chat rooms on an XMPPConnection.
      * Each time a muc chat room is added to/removed from an
-     * Connection the address for that chat room
-     * is added to/removed from that Connection's
+     * XMPPConnection the address for that chat room
+     * is added to/removed from that XMPPConnection's
      * RoomMultiplexFilter.
      */
     private static class RoomMultiplexFilter implements PacketFilter {
@@ -178,12 +178,12 @@ class RoomListenerMultiplexor implements ConnectionListener {
     }
 
     /**
-     * The single Connection-level PacketListener
+     * The single XMPPConnection-level PacketListener
      * used by a {@link RoomListenerMultiplexor}
-     * for all muc chat rooms on an Connection.
+     * for all muc chat rooms on an XMPPConnection.
      * Each time a muc chat room is added to/removed from an
-     * Connection the address and listener for that chat room
-     * are added to/removed from that Connection's
+     * XMPPConnection the address and listener for that chat room
+     * are added to/removed from that XMPPConnection's
      * RoomMultiplexListener.
      *
      * @author Larry Kirschner
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java b/extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java
index 2d82d5f1e..d6aab29b3 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.offline;
 
 import org.jivesoftware.smack.PacketCollector;
 import org.jivesoftware.smack.SmackConfiguration;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.filter.AndFilter;
 import org.jivesoftware.smack.filter.PacketExtensionFilter;
@@ -58,11 +58,11 @@ public class OfflineMessageManager {
 
     private final static String namespace = "http://jabber.org/protocol/offline";
 
-    private Connection connection;
+    private XMPPConnection connection;
 
     private PacketFilter packetFilter;
 
-    public OfflineMessageManager(Connection connection) {
+    public OfflineMessageManager(XMPPConnection connection) {
         this.connection = connection;
         packetFilter =
                 new AndFilter(new PacketExtensionFilter("offline", namespace),
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java b/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java
index ed8c94bd1..44fccb0a1 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.jivesoftware.smack.PacketListener;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.filter.PacketExtensionFilter;
 import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.packet.Message;
@@ -62,7 +62,7 @@ public class PEPManager {
 
     private List pepListeners = new ArrayList();
 
-    private Connection connection;
+    private XMPPConnection connection;
 
     private PacketFilter packetFilter = new PacketExtensionFilter("event", "http://jabber.org/protocol/pubsub#event");
     private PacketListener packetListener;
@@ -70,9 +70,9 @@ public class PEPManager {
     /**
      * Creates a new PEP exchange manager.
      *
-     * @param connection a Connection which is used to send and receive messages.
+     * @param connection a XMPPConnection which is used to send and receive messages.
      */
-    public PEPManager(Connection connection) {
+    public PEPManager(XMPPConnection connection) {
         this.connection = connection;
         init();
     }
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java b/extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
index e51ee5558..d25b00443 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
@@ -25,7 +25,7 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.ConnectionCreationListener;
 import org.jivesoftware.smack.ConnectionListener;
 import org.jivesoftware.smack.Manager;
@@ -56,29 +56,29 @@ public class PingManager extends Manager {
 
     private static final Logger LOGGER = Logger.getLogger(PingManager.class.getName());
 
-    private static final Map INSTANCES = Collections
-            .synchronizedMap(new WeakHashMap());
+    private static final Map INSTANCES = Collections
+            .synchronizedMap(new WeakHashMap());
 
     private static final PacketFilter PING_PACKET_FILTER = new AndFilter(
                     new PacketTypeFilter(Ping.class), new IQTypeFilter(Type.GET));
 
     static {
-        Connection.addConnectionCreationListener(new ConnectionCreationListener() {
-            public void connectionCreated(Connection connection) {
+        XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() {
+            public void connectionCreated(XMPPConnection connection) {
                 getInstanceFor(connection);
             }
         });
     }
 
     /**
-     * Retrieves a {@link PingManager} for the specified {@link Connection}, creating one if it doesn't already
+     * Retrieves a {@link PingManager} for the specified {@link XMPPConnection}, creating one if it doesn't already
      * exist.
      * 
      * @param connection
      * The connection the manager is attached to.
      * @return The new or existing manager.
      */
-    public synchronized static PingManager getInstanceFor(Connection connection) {
+    public synchronized static PingManager getInstanceFor(XMPPConnection connection) {
         PingManager pingManager = INSTANCES.get(connection);
         if (pingManager == null) {
             pingManager = new PingManager(connection);
@@ -117,7 +117,7 @@ public class PingManager extends Manager {
      */
     private long lastSuccessfulManualPing = -1;
 
-    private PingManager(Connection connection) {
+    private PingManager(XMPPConnection connection) {
         super(connection);
         ServiceDiscoveryManager sdm = ServiceDiscoveryManager.getInstanceFor(connection);
         sdm.addFeature(PingManager.NAMESPACE);
@@ -308,7 +308,7 @@ public class PingManager extends Manager {
 
         public void run() {
             LOGGER.fine("ServerPingTask run()");
-            Connection connection = connection();
+            XMPPConnection connection = connection();
             if (connection == null) {
                 // connection has been collected by GC
                 // which means we can stop the thread by breaking the loop
@@ -344,7 +344,7 @@ public class PingManager extends Manager {
                     maybeSchedulePingServerTask();
                 }
             } else {
-                LOGGER.warning("ServerPingTask: Connection was not authenticated");
+                LOGGER.warning("ServerPingTask: XMPPConnection was not authenticated");
             }
         }
     };
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java b/extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java
index cfd120d29..05c1b7bbc 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java
@@ -23,7 +23,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.WeakHashMap;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.ConnectionCreationListener;
 import org.jivesoftware.smack.Manager;
 import org.jivesoftware.smack.PacketListener;
@@ -50,8 +50,8 @@ import org.jivesoftware.smackx.privacy.packet.PrivacyItem;
 public class PrivacyListManager extends Manager {
 
     // Keep the list of instances of this class.
-    private static Map instances = Collections
-            .synchronizedMap(new WeakHashMap());
+    private static Map instances = Collections
+            .synchronizedMap(new WeakHashMap());
 
 	private final List listeners = new ArrayList();
 	PacketFilter packetFilter = new AndFilter(new IQTypeFilter(IQ.Type.SET),
@@ -61,8 +61,8 @@ public class PrivacyListManager extends Manager {
         // Create a new PrivacyListManager on every established connection. In the init()
         // method of PrivacyListManager, we'll add a listener that will delete the
         // instance when the connection is closed.
-        Connection.addConnectionCreationListener(new ConnectionCreationListener() {
-            public void connectionCreated(Connection connection) {
+        XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() {
+            public void connectionCreated(XMPPConnection connection) {
                 getInstanceFor(connection);
             }
         });
@@ -74,7 +74,7 @@ public class PrivacyListManager extends Manager {
      *
      * @param connection the XMPP connection.
      */
-	private PrivacyListManager(final Connection connection) {
+	private PrivacyListManager(final XMPPConnection connection) {
         super(connection);
         // Register the new instance and associate it with the connection 
         instances.put(connection, this);
@@ -129,12 +129,12 @@ public class PrivacyListManager extends Manager {
 	}
 
     /**
-     * Returns the PrivacyListManager instance associated with a given Connection.
+     * Returns the PrivacyListManager instance associated with a given XMPPConnection.
      * 
      * @param connection the connection used to look for the proper PrivacyListManager.
-     * @return the PrivacyListManager associated with a given Connection.
+     * @return the PrivacyListManager associated with a given XMPPConnection.
      */
-    public static synchronized PrivacyListManager getInstanceFor(Connection connection) {
+    public static synchronized PrivacyListManager getInstanceFor(XMPPConnection connection) {
         PrivacyListManager plm = instances.get(connection);
         if (plm == null) plm = new PrivacyListManager(connection);
         return plm;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java
index 5a5a78d92..ce4159b7c 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.pubsub;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.packet.PacketExtension;
 
 /**
@@ -25,7 +25,7 @@ import org.jivesoftware.smack.packet.PacketExtension;
  * 
  * Affiliations are retrieved from the {@link PubSubManager#getAffiliations()} method, which 
  * gets affiliations for the calling user, based on the identity that is associated with 
- * the {@link Connection}.
+ * the {@link XMPPConnection}.
  * 
  * @author Robin Collier
  */
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/CollectionNode.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/CollectionNode.java
index 3c530dc85..623bbccdd 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/CollectionNode.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/CollectionNode.java
@@ -16,11 +16,11 @@
  */
 package org.jivesoftware.smackx.pubsub;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 
 public class CollectionNode extends Node
 {
-	CollectionNode(Connection connection, String nodeId)
+	CollectionNode(XMPPConnection connection, String nodeId)
 	{
 		super(connection, nodeId);
 	}
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java
index af34e99bf..601c7e0f1 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ.Type;
 import org.jivesoftware.smackx.disco.packet.DiscoverItems;
@@ -36,7 +36,7 @@ import org.jivesoftware.smackx.pubsub.packet.PubSub;
  */
 public class LeafNode extends Node
 {
-	LeafNode(Connection connection, String nodeName)
+	LeafNode(XMPPConnection connection, String nodeName)
 	{
 		super(connection, nodeName);
 	}
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
index 67337d060..0092e926a 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
@@ -23,7 +23,7 @@ import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.jivesoftware.smack.PacketListener;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.filter.OrFilter;
 import org.jivesoftware.smack.filter.PacketFilter;
@@ -45,7 +45,7 @@ import org.jivesoftware.smackx.xdata.Form;
 
 abstract public class Node
 {
-	protected Connection con;
+	protected XMPPConnection con;
 	protected String id;
 	protected String to;
 	
@@ -60,7 +60,7 @@ abstract public class Node
 	 * @param connection The connection the node is associated with
 	 * @param nodeName The node id
 	 */
-	Node(Connection connection, String nodeName)
+	Node(XMPPConnection connection, String nodeName)
 	{
 		con = connection;
 		id = nodeName;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java
index a02c2f987..df6018ab3 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ.Type;
 import org.jivesoftware.smack.packet.Packet;
@@ -45,7 +45,7 @@ import org.jivesoftware.smackx.xdata.FormField;
  */
 final public class PubSubManager
 {
-	private Connection con;
+	private XMPPConnection con;
 	private String to;
 	private Map nodeMap = new ConcurrentHashMap();
 	
@@ -55,7 +55,7 @@ final public class PubSubManager
 	 * 
 	 * @param connection The XMPP connection
 	 */
-	public PubSubManager(Connection connection)
+	public PubSubManager(XMPPConnection connection)
 	{
 		con = connection;
 		to = "pubsub." + connection.getServiceName();
@@ -68,7 +68,7 @@ final public class PubSubManager
 	 * @param connection The XMPP connection
 	 * @param toAddress The pubsub specific to address (required for some servers)
 	 */
-	public PubSubManager(Connection connection, String toAddress)
+	public PubSubManager(XMPPConnection connection, String toAddress)
 	{
 		con = connection;
 		to = toAddress;
@@ -305,25 +305,25 @@ final public class PubSubManager
 		return request;
 	}
 
-	static Packet sendPubsubPacket(Connection con, String to, Type type, PacketExtension ext)
+	static Packet sendPubsubPacket(XMPPConnection con, String to, Type type, PacketExtension ext)
 		throws XMPPException
 	{
 		return sendPubsubPacket(con, to, type, ext, null);
 	}
 	
-	static Packet sendPubsubPacket(Connection con, String to, Type type, PacketExtension ext, PubSubNamespace ns)
+	static Packet sendPubsubPacket(XMPPConnection con, String to, Type type, PacketExtension ext, PubSubNamespace ns)
 		throws XMPPException
 	{
 		return con.createPacketCollectorAndSend(createPubsubPacket(to, type, ext, ns)).nextResultOrThrow();
 	}
 
-	static Packet sendPubsubPacket(Connection con, String to, Type type, PubSub packet)
+	static Packet sendPubsubPacket(XMPPConnection con, String to, Type type, PubSub packet)
 		throws XMPPException
 	{
 		return sendPubsubPacket(con, to, type, packet, null);
 	}
 
-	static Packet sendPubsubPacket(Connection con, String to, Type type, PubSub packet, PubSubNamespace ns)
+	static Packet sendPubsubPacket(XMPPConnection con, String to, Type type, PubSub packet, PubSubNamespace ns)
 		throws XMPPException
 	{
 		return con.createPacketCollectorAndSend(packet).nextResultOrThrow();
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java b/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java
index 2ee08f725..9e4165da0 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java
@@ -22,7 +22,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.WeakHashMap;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.ConnectionCreationListener;
 import org.jivesoftware.smack.Manager;
 import org.jivesoftware.smack.PacketListener;
@@ -41,12 +41,12 @@ import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
  */
 public class DeliveryReceiptManager extends Manager implements PacketListener {
 
-    private static Map instances =
-            Collections.synchronizedMap(new WeakHashMap());
+    private static Map instances =
+            Collections.synchronizedMap(new WeakHashMap());
 
     static {
-        Connection.addConnectionCreationListener(new ConnectionCreationListener() {
-            public void connectionCreated(Connection connection) {
+        XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() {
+            public void connectionCreated(XMPPConnection connection) {
                 getInstanceFor(connection);
             }
         });
@@ -56,7 +56,7 @@ public class DeliveryReceiptManager extends Manager implements PacketListener {
     private Set receiptReceivedListeners = Collections
             .synchronizedSet(new HashSet());
 
-    private DeliveryReceiptManager(Connection connection) {
+    private DeliveryReceiptManager(XMPPConnection connection) {
         super(connection);
         ServiceDiscoveryManager sdm = ServiceDiscoveryManager.getInstanceFor(connection);
         sdm.addFeature(DeliveryReceipt.NAMESPACE);
@@ -73,7 +73,7 @@ public class DeliveryReceiptManager extends Manager implements PacketListener {
      *
      * @return the DeliveryReceiptManager instance for the given connection
      */
-     public static synchronized DeliveryReceiptManager getInstanceFor(Connection connection) {
+     public static synchronized DeliveryReceiptManager getInstanceFor(XMPPConnection connection) {
         DeliveryReceiptManager receiptManager = instances.get(connection);
 
         if (receiptManager == null) {
@@ -117,7 +117,7 @@ public class DeliveryReceiptManager extends Manager implements PacketListener {
             DeliveryReceiptRequest drr = (DeliveryReceiptRequest)packet.getExtension(
                     DeliveryReceiptRequest.ELEMENT, DeliveryReceipt.NAMESPACE);
             if (drr != null) {
-                Connection connection = connection();
+                XMPPConnection connection = connection();
                 Message ack = new Message(packet.getFrom(), Message.Type.normal);
                 ack.addExtension(new DeliveryReceipt(packet.getPacketID()));
                 connection.sendPacket(ack);
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java b/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java
index 3b860548c..122c9e422 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.search;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.provider.IQProvider;
@@ -55,13 +55,13 @@ public class UserSearch extends IQ {
     /**
      * Returns the form for all search fields supported by the search service.
      *
-     * @param con           the current Connection.
+     * @param con           the current XMPPConnection.
      * @param searchService the search service to use. (ex. search.jivesoftware.com)
      * @return the search form received by the server.
      * @throws org.jivesoftware.smack.XMPPException
      *          thrown if a server error has occurred.
      */
-    public Form getSearchForm(Connection con, String searchService) throws XMPPException {
+    public Form getSearchForm(XMPPConnection con, String searchService) throws XMPPException {
         UserSearch search = new UserSearch();
         search.setType(IQ.Type.GET);
         search.setTo(searchService);
@@ -73,14 +73,14 @@ public class UserSearch extends IQ {
     /**
      * Sends the filled out answer form to be sent and queried by the search service.
      *
-     * @param con           the current Connection.
+     * @param con           the current XMPPConnection.
      * @param searchForm    the Form to send for querying.
      * @param searchService the search service to use. (ex. search.jivesoftware.com)
      * @return ReportedData the data found from the query.
      * @throws org.jivesoftware.smack.XMPPException
      *          thrown if a server error has occurred.
      */
-    public ReportedData sendSearchForm(Connection con, Form searchForm, String searchService) throws XMPPException {
+    public ReportedData sendSearchForm(XMPPConnection con, Form searchForm, String searchService) throws XMPPException {
         UserSearch search = new UserSearch();
         search.setType(IQ.Type.SET);
         search.setTo(searchService);
@@ -93,14 +93,14 @@ public class UserSearch extends IQ {
     /**
      * Sends the filled out answer form to be sent and queried by the search service.
      *
-     * @param con           the current Connection.
+     * @param con           the current XMPPConnection.
      * @param searchForm    the Form to send for querying.
      * @param searchService the search service to use. (ex. search.jivesoftware.com)
      * @return ReportedData the data found from the query.
      * @throws org.jivesoftware.smack.XMPPException
      *          thrown if a server error has occurred.
      */
-    public ReportedData sendSimpleSearchForm(Connection con, Form searchForm, String searchService) throws XMPPException {
+    public ReportedData sendSimpleSearchForm(XMPPConnection con, Form searchForm, String searchService) throws XMPPException {
         SimpleUserSearch search = new SimpleUserSearch();
         search.setForm(searchForm);
         search.setType(IQ.Type.SET);
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearchManager.java b/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearchManager.java
index ea94e2208..7b7e0515c 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearchManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearchManager.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.search;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
@@ -34,7 +34,7 @@ import java.util.List;
  * searching (DataForms or No DataForms), but allows the user to simply use the DataForm model for both
  * types of support.
  * 
- * Connection con = new TCPConnection("jabber.org");
+ * XMPPConnection con = new TCPConnection("jabber.org");
  * con.login("john", "doe");
  * UserSearchManager search = new UserSearchManager(con, "users.jabber.org");
  * Form searchForm = search.getSearchForm();
@@ -48,15 +48,15 @@ import java.util.List;
  */
 public class UserSearchManager {
 
-    private Connection con;
+    private XMPPConnection con;
     private UserSearch userSearch;
 
     /**
      * Creates a new UserSearchManager.
      *
-     * @param con the Connection to use.
+     * @param con the XMPPConnection to use.
      */
-    public UserSearchManager(Connection con) {
+    public UserSearchManager(XMPPConnection con) {
         this.con = con;
         userSearch = new UserSearch();
     }
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java b/extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java
index 3216a1bda..d7ef10a80 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.sharedgroups;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smackx.sharedgroups.packet.SharedGroupsInfo;
@@ -40,7 +40,7 @@ public class SharedGroupManager {
      * @param connection connection to use to get the user's shared groups.
      * @return collection with the shared groups' name of the logged user.
      */
-    public static List getSharedGroups(Connection connection) throws XMPPException {
+    public static List getSharedGroups(XMPPConnection connection) throws XMPPException {
         // Discover the shared groups of the logged user
         SharedGroupsInfo info = new SharedGroupsInfo();
         info.setType(IQ.Type.GET);
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/time/EntityTimeManager.java b/extensions/src/main/java/org/jivesoftware/smackx/time/EntityTimeManager.java
index 68871564c..20a37a81d 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/time/EntityTimeManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/time/EntityTimeManager.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.time;
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.ConnectionCreationListener;
 import org.jivesoftware.smack.Manager;
 import org.jivesoftware.smack.PacketListener;
@@ -35,7 +35,7 @@ import org.jivesoftware.smackx.time.packet.Time;
 
 public class EntityTimeManager extends Manager {
 
-    private static final Map INSTANCES = new WeakHashMap();
+    private static final Map INSTANCES = new WeakHashMap();
 
     private static final PacketFilter TIME_PACKET_FILTER = new AndFilter(new PacketTypeFilter(
                     Time.class), new IQTypeFilter(Type.GET));
@@ -43,8 +43,8 @@ public class EntityTimeManager extends Manager {
     private static boolean autoEnable = true;
 
     static {
-        Connection.addConnectionCreationListener(new ConnectionCreationListener() {
-            public void connectionCreated(Connection connection) {
+        XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() {
+            public void connectionCreated(XMPPConnection connection) {
                 getInstanceFor(connection);
             }
         });
@@ -54,7 +54,7 @@ public class EntityTimeManager extends Manager {
         EntityTimeManager.autoEnable = autoEnable;
     }
 
-    public synchronized static EntityTimeManager getInstanceFor(Connection connection) {
+    public synchronized static EntityTimeManager getInstanceFor(XMPPConnection connection) {
         EntityTimeManager entityTimeManager = INSTANCES.get(connection);
         if (entityTimeManager == null) {
             entityTimeManager = new EntityTimeManager(connection);
@@ -64,7 +64,7 @@ public class EntityTimeManager extends Manager {
 
     private boolean enabled = false;
 
-    private EntityTimeManager(Connection connection) {
+    private EntityTimeManager(XMPPConnection connection) {
         super(connection);
         INSTANCES.put(connection, this);
         if (autoEnable)
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java b/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java
index d399c7606..a45737a86 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java
@@ -33,7 +33,7 @@ import java.util.Map.Entry;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.util.StringUtils;
@@ -508,15 +508,15 @@ public class VCard extends IQ {
     }
 
     /**
-     * Save this vCard for the user connected by 'connection'. Connection should be authenticated
+     * Save this vCard for the user connected by 'connection'. XMPPConnection should be authenticated
      * and not anonymous.

      * 

      * NOTE: the method is asynchronous and does not wait for the returned value.
      *
-     * @param connection the Connection to use.
+     * @param connection the XMPPConnection to use.
      * @throws XMPPException thrown if there was an issue setting the VCard in the server.
      */
-    public void save(Connection connection) throws XMPPException {
+    public void save(XMPPConnection connection) throws XMPPException {
         checkAuthenticated(connection, true);
 
         setType(IQ.Type.SET);
@@ -525,10 +525,10 @@ public class VCard extends IQ {
     }
 
     /**
-     * Load VCard information for a connected user. Connection should be authenticated
+     * Load VCard information for a connected user. XMPPConnection should be authenticated
      * and not anonymous.
      */
-    public void load(Connection connection) throws XMPPException {
+    public void load(XMPPConnection connection) throws XMPPException {
         checkAuthenticated(connection, true);
 
         setFrom(connection.getUser());
@@ -536,16 +536,16 @@ public class VCard extends IQ {
     }
 
     /**
-     * Load VCard information for a given user. Connection should be authenticated and not anonymous.
+     * Load VCard information for a given user. XMPPConnection should be authenticated and not anonymous.
      */
-    public void load(Connection connection, String user) throws XMPPException {
+    public void load(XMPPConnection connection, String user) throws XMPPException {
         checkAuthenticated(connection, false);
 
         setTo(user);
         doLoad(connection, user);
     }
 
-    private void doLoad(Connection connection, String user) throws XMPPException {
+    private void doLoad(XMPPConnection connection, String user) throws XMPPException {
         setType(Type.GET);
         VCard result = (VCard) connection.createPacketCollectorAndSend(this).nextResultOrThrow();
         copyFieldsFrom(result);
@@ -573,15 +573,15 @@ public class VCard extends IQ {
         }
     }
 
-    private void checkAuthenticated(Connection connection, boolean checkForAnonymous) {
+    private void checkAuthenticated(XMPPConnection connection, boolean checkForAnonymous) {
         if (connection == null) {
             throw new IllegalArgumentException("No connection was provided");
         }
         if (!connection.isAuthenticated()) {
-            throw new IllegalArgumentException("Connection is not authenticated");
+            throw new IllegalArgumentException("XMPPConnection is not authenticated");
         }
         if (checkForAnonymous && connection.isAnonymous()) {
-            throw new IllegalArgumentException("Connection cannot be anonymous");
+            throw new IllegalArgumentException("XMPPConnection cannot be anonymous");
         }
     }
 
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java b/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java
index 468778130..e5518871f 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java
@@ -25,7 +25,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.jivesoftware.smack.PacketListener;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.filter.PacketExtensionFilter;
 import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.packet.Message;
@@ -45,7 +45,7 @@ public class MessageEventManager {
     private List messageEventNotificationListeners = new ArrayList();
     private List messageEventRequestListeners = new ArrayList();
 
-    private Connection con;
+    private XMPPConnection con;
 
     private PacketFilter packetFilter = new PacketExtensionFilter("x", "jabber:x:event");
     private PacketListener packetListener;
@@ -53,9 +53,9 @@ public class MessageEventManager {
     /**
      * Creates a new message event manager.
      *
-     * @param con a Connection to a XMPP server.
+     * @param con a XMPPConnection to a XMPP server.
      */
-    public MessageEventManager(Connection con) {
+    public MessageEventManager(XMPPConnection con) {
         this.con = con;
         init();
     }
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLManager.java b/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLManager.java
index fc5908921..2b21c3903 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLManager.java
@@ -18,7 +18,7 @@
 package org.jivesoftware.smackx.xhtmlim;
 
 import org.jivesoftware.smack.ConnectionCreationListener;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
@@ -45,8 +45,8 @@ public class XHTMLManager {
     // Enable the XHTML support on every established connection
     // The ServiceDiscoveryManager class should have been already initialized
     static {
-        Connection.addConnectionCreationListener(new ConnectionCreationListener() {
-            public void connectionCreated(Connection connection) {
+        XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() {
+            public void connectionCreated(XMPPConnection connection) {
                 XHTMLManager.setServiceEnabled(connection, true);
             }
         });
@@ -103,7 +103,7 @@ public class XHTMLManager {
      * @param connection the connection where the service will be enabled or disabled
      * @param enabled indicates if the service will be enabled or disabled 
      */
-    public synchronized static void setServiceEnabled(Connection connection, boolean enabled) {
+    public synchronized static void setServiceEnabled(XMPPConnection connection, boolean enabled) {
         if (isServiceEnabled(connection) == enabled)
             return;
 
@@ -121,7 +121,7 @@ public class XHTMLManager {
      * @param connection the connection to look for XHTML support
      * @return a boolean indicating if the XHTML support is enabled for the given connection
      */
-    public static boolean isServiceEnabled(Connection connection) {
+    public static boolean isServiceEnabled(XMPPConnection connection) {
         return ServiceDiscoveryManager.getInstanceFor(connection).includesFeature(namespace);
     }
 
@@ -132,7 +132,7 @@ public class XHTMLManager {
      * @param userID the user to check. A fully qualified xmpp ID, e.g. jdoe@example.com
      * @return a boolean indicating whether the specified user handles XHTML messages
      */
-    public static boolean isServiceEnabled(Connection connection, String userID) {
+    public static boolean isServiceEnabled(XMPPConnection connection, String userID) {
         try {
             DiscoverInfo result =
                 ServiceDiscoveryManager.getInstanceFor(connection).discoverInfo(userID);
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java
index 6ef55f89a..8d442a557 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.bytestreams.ibb;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smackx.bytestreams.ibb.CloseListener;
@@ -49,7 +49,7 @@ public class CloseListenerTest {
     public void shouldReplyErrorIfSessionIsUnknown() throws Exception {
 
         // mock connection
-        Connection connection = mock(Connection.class);
+        XMPPConnection connection = mock(XMPPConnection.class);
 
         // initialize InBandBytestreamManager to get the CloseListener
         InBandBytestreamManager byteStreamManager = InBandBytestreamManager.getByteStreamManager(connection);
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java
index 1f3930941..7376ca89c 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.bytestreams.ibb;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smackx.bytestreams.ibb.DataListener;
@@ -50,7 +50,7 @@ public class DataListenerTest {
     public void shouldReplyErrorIfSessionIsUnknown() throws Exception {
 
         // mock connection
-        Connection connection = mock(Connection.class);
+        XMPPConnection connection = mock(XMPPConnection.class);
 
         // initialize InBandBytestreamManager to get the DataListener
         InBandBytestreamManager byteStreamManager = InBandBytestreamManager.getByteStreamManager(connection);
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java
index 77e4d2279..7073b9b17 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.bytestreams.ibb;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XMPPError;
@@ -50,7 +50,7 @@ public class InBandBytestreamManagerTest {
     Protocol protocol;
 
     // mocked XMPP connection
-    Connection connection;
+    XMPPConnection connection;
 
     /**
      * Initialize fields used in the tests.
@@ -70,15 +70,15 @@ public class InBandBytestreamManagerTest {
 
     /**
      * Test that
-     * {@link InBandBytestreamManager#getByteStreamManager(Connection)} returns
+     * {@link InBandBytestreamManager#getByteStreamManager(XMPPConnection)} returns
      * one bytestream manager for every connection
      */
     @Test
     public void shouldHaveOneManagerForEveryConnection() {
 
         // mock two connections
-        Connection connection1 = mock(Connection.class);
-        Connection connection2 = mock(Connection.class);
+        XMPPConnection connection1 = mock(XMPPConnection.class);
+        XMPPConnection connection2 = mock(XMPPConnection.class);
 
         // get bytestream manager for the first connection twice
         InBandBytestreamManager conn1ByteStreamManager1 = InBandBytestreamManager.getByteStreamManager(connection1);
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java
index b57b35f45..1401478d3 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.bytestreams.ibb;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
@@ -41,7 +41,7 @@ public class InBandBytestreamRequestTest {
     String targetJID = "target@xmpp-server/Smack";
     String sessionID = "session_id";
 
-    Connection connection;
+    XMPPConnection connection;
     InBandBytestreamManager byteStreamManager;
     Open initBytestream;
 
@@ -52,7 +52,7 @@ public class InBandBytestreamRequestTest {
     public void setup() {
 
         // mock connection
-        connection = mock(Connection.class);
+        connection = mock(XMPPConnection.class);
 
         // initialize InBandBytestreamManager to get the InitiationListener
         byteStreamManager = InBandBytestreamManager.getByteStreamManager(connection);
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java
index 3cd6591c6..93078a257 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java
@@ -23,7 +23,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Random;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.PacketListener;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
@@ -62,7 +62,7 @@ public class InBandBytestreamSessionMessageTest {
     Protocol protocol;
 
     // mocked XMPP connection
-    Connection connection;
+    XMPPConnection connection;
 
     InBandBytestreamManager byteStreamManager;
 
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java
index 43a0cb636..32b81bc93 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java
@@ -23,7 +23,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Random;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.PacketListener;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
@@ -63,7 +63,7 @@ public class InBandBytestreamSessionTest {
     Protocol protocol;
 
     // mocked XMPP connection
-    Connection connection;
+    XMPPConnection connection;
 
     InBandBytestreamManager byteStreamManager;
 
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java
index 03d7cef83..8077a8366 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.bytestreams.ibb;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smackx.bytestreams.BytestreamRequest;
@@ -43,7 +43,7 @@ public class InitiationListenerTest {
     String targetJID = "target@xmpp-server/Smack";
     String sessionID = "session_id";
 
-    Connection connection;
+    XMPPConnection connection;
     InBandBytestreamManager byteStreamManager;
     InitiationListener initiationListener;
     Open initBytestream;
@@ -55,7 +55,7 @@ public class InitiationListenerTest {
     public void setup() {
 
         // mock connection
-        connection = mock(Connection.class);
+        connection = mock(XMPPConnection.class);
 
         // initialize InBandBytestreamManager to get the InitiationListener
         byteStreamManager = InBandBytestreamManager.getByteStreamManager(connection);
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
index f4ad302e9..dcdbfe896 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.bytestreams.socks5;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smackx.bytestreams.BytestreamRequest;
@@ -47,7 +47,7 @@ public class InitiationListenerTest {
     String proxyAddress = "127.0.0.1";
     String sessionID = "session_id";
 
-    Connection connection;
+    XMPPConnection connection;
     Socks5BytestreamManager byteStreamManager;
     InitiationListener initiationListener;
     Bytestream initBytestream;
@@ -59,7 +59,7 @@ public class InitiationListenerTest {
     public void setup() {
 
         // mock connection
-        connection = mock(Connection.class);
+        connection = mock(XMPPConnection.class);
 
         // create service discovery manager for mocked connection
         ServiceDiscoveryManager.getInstanceFor(connection);
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
index 31aeefc2c..7e6a1b4bc 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
@@ -24,7 +24,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.ConnectException;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XMPPError;
@@ -66,7 +66,7 @@ public class Socks5ByteStreamManagerTest {
     Protocol protocol;
 
     // mocked XMPP connection
-    Connection connection;
+    XMPPConnection connection;
 
     /**
      * Initialize fields used in the tests.
@@ -84,15 +84,15 @@ public class Socks5ByteStreamManagerTest {
     }
 
     /**
-     * Test that {@link Socks5BytestreamManager#getBytestreamManager(Connection)} returns one
+     * Test that {@link Socks5BytestreamManager#getBytestreamManager(XMPPConnection)} returns one
      * bytestream manager for every connection
      */
     @Test
     public void shouldHaveOneManagerForEveryConnection() {
 
         // mock two connections
-        Connection connection1 = mock(Connection.class);
-        Connection connection2 = mock(Connection.class);
+        XMPPConnection connection1 = mock(XMPPConnection.class);
+        XMPPConnection connection2 = mock(XMPPConnection.class);
 
         /*
          * create service discovery managers for the connections because the
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java
index eb5502b42..eb107f334 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java
@@ -23,7 +23,7 @@ import java.io.OutputStream;
 import java.net.ServerSocket;
 import java.net.Socket;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Packet;
@@ -55,7 +55,7 @@ public class Socks5ByteStreamRequestTest {
 
     Protocol protocol;
 
-    Connection connection;
+    XMPPConnection connection;
 
     /**
      * Initialize fields used in the tests.
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java
index 8d7c7adb4..e62a7542a 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java
@@ -22,7 +22,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XMPPError;
@@ -60,7 +60,7 @@ public class Socks5ClientForInitiatorTest {
     Protocol protocol;
 
     // mocked XMPP connection
-    Connection connection;
+    XMPPConnection connection;
 
     /**
      * Initialize fields used in the tests.
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java b/extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java
index 9700b23ea..db4d0bdd7 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java
@@ -31,7 +31,7 @@ public class FileTransferNegotiatorTest {
     @Before
     public void setUp() throws Exception {
         // Uncomment this to enable debug output
-        // Connection.DEBUG_ENABLED = true;
+        // XMPPConnection.DEBUG_ENABLED = true;
 
         connection = new DummyConnection();
         connection.connect();
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/ping/KeepaliveTest.java b/extensions/src/test/java/org/jivesoftware/smackx/ping/KeepaliveTest.java
index 00cd61eef..bc4632102 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/ping/KeepaliveTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/ping/KeepaliveTest.java
@@ -25,7 +25,7 @@
 //import java.util.concurrent.CountDownLatch;
 //import java.util.concurrent.TimeUnit;
 //
-//import org.jivesoftware.smack.Connection;
+//import org.jivesoftware.smack.XMPPConnection;
 //import org.jivesoftware.smack.DummyConnection;
 //import org.jivesoftware.smack.PacketInterceptor;
 //import org.jivesoftware.smack.PacketListener;
@@ -157,7 +157,7 @@
 //        return con;
 //    }
 //
-//    private void addInterceptor(final Connection con, final CountDownLatch latch) {
+//    private void addInterceptor(final XMPPConnection con, final CountDownLatch latch) {
 //        con.addPacketInterceptor(new PacketInterceptor() {
 //            @Override
 //            public void interceptPacket(Packet packet) {
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java b/extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java
index b0b3ac382..2e93e0ea1 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java
@@ -45,7 +45,7 @@ public class ItemValidationTest
 	public void setUp() throws Exception
 	{
 		// Uncomment this to enable debug output
-		// Connection.DEBUG_ENABLED = true;
+		// XMPPConnection.DEBUG_ENABLED = true;
 
 		connection = new ThreadedDummyConnection();
 		connection.connect();
diff --git a/extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java b/extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java
index cbb65f1f1..d112e614c 100644
--- a/extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java
+++ b/extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java
@@ -20,7 +20,7 @@ import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 import org.jivesoftware.smack.PacketCollector;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.packet.IQ;
@@ -59,11 +59,11 @@ public class ConnectionUtils {
      * @return a mocked XMPP connection
      * @throws XMPPException 
      */
-    public static Connection createMockedConnection(final Protocol protocol,
+    public static XMPPConnection createMockedConnection(final Protocol protocol,
                     String initiatorJID, String xmppServer) throws XMPPException {
 
         // mock XMPP connection
-        Connection connection = mock(Connection.class);
+        XMPPConnection connection = mock(XMPPConnection.class);
         when(connection.getUser()).thenReturn(initiatorJID);
         when(connection.getServiceName()).thenReturn(xmppServer);
 
diff --git a/extensions/src/test/java/org/jivesoftware/util/Protocol.java b/extensions/src/test/java/org/jivesoftware/util/Protocol.java
index c1da05d0f..0d5e420fa 100644
--- a/extensions/src/test/java/org/jivesoftware/util/Protocol.java
+++ b/extensions/src/test/java/org/jivesoftware/util/Protocol.java
@@ -60,7 +60,7 @@ import org.jivesoftware.smack.packet.Packet;
  *   // create protocol
  *   Protocol protocol = new Protocol();
  *   // create mocked connection
- *   Connection connection = ConnectionUtils.createMockedConnection(protocol, "user@xmpp-server", "xmpp-server");
+ *   XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, "user@xmpp-server", "xmpp-server");
  *   
  *   // add reply packet to protocol
  *   Packet reply = new Packet();
diff --git a/jingle/src/demo/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java b/jingle/src/demo/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java
index 74ac6a067..bad3e8f99 100644
--- a/jingle/src/demo/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java
+++ b/jingle/src/demo/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.jingle.mediaimpl.demo;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.TCPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smackx.jingle.JingleManager;
@@ -42,7 +42,7 @@ public class Demo extends JFrame {
 
 	private static final long serialVersionUID = -6584021277434403855L;
 	private JingleTransportManager transportManager = null;
-    private Connection xmppConnection = null;
+    private XMPPConnection xmppConnection = null;
 
     private String server = null;
     private String user = null;
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java
index 91959d9eb..e112515c6 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.jivesoftware.smack.ConnectionCreationListener;
 import org.jivesoftware.smack.PacketListener;
 import org.jivesoftware.smack.RosterListener;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.packet.IQ;
@@ -96,7 +96,7 @@ import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
  *                               try {
  * 

  *                                           // Connect to a XMPP Server
- *                                           Connection x1 = new TCPConnection("xmpp.com");
+ *                                           XMPPConnection x1 = new TCPConnection("xmpp.com");
  *                                           x1.connect();
  *                                           x1.login("juliet", "juliet");
  * 

@@ -139,7 +139,7 @@ import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
  *                                     try {
  * 

  *                                           // Connect to a XMPP Server
- *                                           Connection x0 = new TCPConnection("xmpp.com");
+ *                                           XMPPConnection x0 = new TCPConnection("xmpp.com");
  *                                           x0.connect();
  *                                           x0.login("romeo", "romeo");
  * 

@@ -194,19 +194,19 @@ public class JingleManager implements JingleSessionListener {
     private List creationListeners = new ArrayList();
 
     // The XMPP connection
-    private Connection connection;
+    private XMPPConnection connection;
 
     // The Media Managers
     private List jingleMediaManagers;
 
      /**
-     * Default constructor with a defined Connection, Transport Resolver and a Media Manager
+     * Default constructor with a defined XMPPConnection, Transport Resolver and a Media Manager
      * If a fully implemented JingleMediaSession is entered, JingleManager manage Jingle signalling and jmf
      *
-     * @param connection             XMPP Connection to be used
+     * @param connection             XMPP XMPPConnection to be used
      * @param jingleMediaManager     an implemeted JingleMediaManager to be used.
      */
-    public JingleManager(Connection connection, List jingleMediaManagers) {
+    public JingleManager(XMPPConnection connection, List jingleMediaManagers) {
         this.connection = connection;
         this.jingleMediaManagers = jingleMediaManagers;
 
@@ -246,7 +246,7 @@ public class JingleManager implements JingleSessionListener {
     /**
      * Setup the jingle system to let the remote clients know we support Jingle.
      * (This used to be a static part of construction.  The problem is a remote client might
-     * attempt a Jingle connection to us after we've created a Connection, but before we've
+     * attempt a Jingle connection to us after we've created a XMPPConnection, but before we've
      * setup an instance of a JingleManager.  We will appear to not support Jingle.  With the new
      * method you just call it once and all new connections will report Jingle support.)
      */
@@ -257,8 +257,8 @@ public class JingleManager implements JingleSessionListener {
         // Enable the Jingle support on every established connection
         // The ServiceDiscoveryManager class should have been already
         // initialized
-        Connection.addConnectionCreationListener(new ConnectionCreationListener() {
-            public void connectionCreated(Connection connection) {
+        XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() {
+            public void connectionCreated(XMPPConnection connection) {
                 JingleManager.setServiceEnabled(connection, true);
             }
         });
@@ -276,7 +276,7 @@ public class JingleManager implements JingleSessionListener {
      *                   disabled
      * @param enabled    indicates if the service will be enabled or disabled
      */
-    public synchronized static void setServiceEnabled(Connection connection, boolean enabled) {
+    public synchronized static void setServiceEnabled(XMPPConnection connection, boolean enabled) {
         if (isServiceEnabled(connection) == enabled) {
             return;
         }
@@ -295,7 +295,7 @@ public class JingleManager implements JingleSessionListener {
      * @return a boolean indicating if the Jingle support is enabled for the
      *         given connection
      */
-    public static boolean isServiceEnabled(Connection connection) {
+    public static boolean isServiceEnabled(XMPPConnection connection) {
         return ServiceDiscoveryManager.getInstanceFor(connection).includesFeature(Jingle.NAMESPACE);
     }
 
@@ -308,7 +308,7 @@ public class JingleManager implements JingleSessionListener {
      * @return a boolean indicating whether the specified user handles Jingle
      *         messages
      */
-    public static boolean isServiceEnabled(Connection connection, String userID) {
+    public static boolean isServiceEnabled(XMPPConnection connection, String userID) {
         try {
             DiscoverInfo result = ServiceDiscoveryManager.getInstanceFor(connection).discoverInfo(userID);
             return result.containsFeature(Jingle.NAMESPACE);
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiator.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiator.java
index d205102e7..314be081d 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiator.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiator.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smackx.jingle.listeners.JingleListener;
@@ -43,7 +43,7 @@ public abstract class JingleNegotiator {
 
 	private static final Logger LOGGER = Logger.getLogger(JingleNegotiator.class.getName());
 
-	//private Connection connection; // The connection associated
+	//private XMPPConnection connection; // The connection associated
 
     protected JingleSession session;
 
@@ -99,7 +99,7 @@ public abstract class JingleNegotiator {
        this.state = stateIs;
     }
 
-    public Connection getConnection() {
+    public XMPPConnection getConnection() {
         if (session != null) {
             return session.getConnection();
         } else {
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java
index 024463540..954b88c13 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java
@@ -25,7 +25,7 @@ import java.util.logging.Logger;
 
 import org.jivesoftware.smack.ConnectionListener;
 import org.jivesoftware.smack.PacketListener;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.packet.IQ;
@@ -61,7 +61,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
 	private static final Logger LOGGER = Logger.getLogger(JingleSession.class.getName());
 
 	// static
-    private static final HashMap sessions = new HashMap();
+    private static final HashMap sessions = new HashMap();
 
     private static final Random randomGenerator = new Random();
 
@@ -85,7 +85,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
 
     private List contentNegotiators;
 
-    private Connection connection;
+    private XMPPConnection connection;
 
     private String sessionInitPacketID;
     
@@ -95,7 +95,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
      * Full featured JingleSession constructor
      * 
      * @param conn
-     *            the Connection which is used
+     *            the XMPPConnection which is used
      * @param initiator
      *            the initiator JID
      * @param responder
@@ -105,7 +105,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
      * @param jingleMediaManager
      *            the jingleMediaManager
      */
-    public JingleSession(Connection conn, String initiator, String responder, String sessionid,
+    public JingleSession(XMPPConnection conn, String initiator, String responder, String sessionid,
             List jingleMediaManagers) {
         super();
 
@@ -139,7 +139,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
      * @param jingleMediaManager
      *            the jingleMediaManager
      */
-    public JingleSession(Connection conn, JingleSessionRequest request, String initiator, String responder,
+    public JingleSession(XMPPConnection conn, JingleSessionRequest request, String initiator, String responder,
             List jingleMediaManagers) {
         this(conn, initiator, responder, generateSessionId(), jingleMediaManagers);
         //sessionRequest = request; // unused
@@ -154,7 +154,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
         return initiator;
     }
 
-    public Connection getConnection() {
+    public XMPPConnection getConnection() {
         return connection;
     }
 
@@ -578,7 +578,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
      * @param connection
      *            The connection to clean up
      */
-    private void unregisterInstanceFor(Connection connection) {
+    private void unregisterInstanceFor(XMPPConnection connection) {
         synchronized (sessions) {
             sessions.remove(connection);
         }
@@ -600,9 +600,9 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
      *            A XMPP connection
      * @return a Jingle session
      */
-    public static JingleSession getInstanceFor(Connection con) {
+    public static JingleSession getInstanceFor(XMPPConnection con) {
         if (con == null) {
-            throw new IllegalArgumentException("Connection cannot be null");
+            throw new IllegalArgumentException("XMPPConnection cannot be null");
         }
 
         JingleSession result = null;
@@ -621,7 +621,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
      * @param connection
      *            The connection to set up
      */
-    private void installConnectionListeners(final Connection connection) {
+    private void installConnectionListeners(final XMPPConnection connection) {
         if (connection != null) {
             connectionListener = new ConnectionListener() {
                 public void connectionClosed() {
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java
index 006164ac4..d0b7891de 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.jingle.nat;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smackx.jingle.JingleSession;
 
@@ -37,7 +37,7 @@ import java.util.Random;
  */
 public class BridgedResolver extends TransportResolver {
 
-    Connection connection;
+    XMPPConnection connection;
 
     Random random = new Random();
 
@@ -45,9 +45,9 @@ public class BridgedResolver extends TransportResolver {
 
     /**
      * Constructor.
-     * A Bridged Resolver need a Connection to connect to a RTP Bridge.
+     * A Bridged Resolver need a XMPPConnection to connect to a RTP Bridge.
      */
-    public BridgedResolver(Connection connection) {
+    public BridgedResolver(XMPPConnection connection) {
         super();
         this.connection = connection;
     }
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedTransportManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedTransportManager.java
index f273a3a16..3dd2e4f44 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedTransportManager.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedTransportManager.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.jingle.nat;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smackx.jingle.JingleSession;
 import org.jivesoftware.smackx.jingle.listeners.CreatedJingleSessionListener;
@@ -32,9 +32,9 @@ import org.jivesoftware.smackx.jingle.media.PayloadType;
  */
 public class BridgedTransportManager extends JingleTransportManager implements JingleSessionListener, CreatedJingleSessionListener {
 
-    Connection xmppConnection;
+    XMPPConnection xmppConnection;
 
-    public BridgedTransportManager(Connection xmppConnection) {
+    public BridgedTransportManager(XMPPConnection xmppConnection) {
         super();
         this.xmppConnection = xmppConnection;
     }
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICEResolver.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICEResolver.java
index 14a82e7ef..f0c1e269f 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICEResolver.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICEResolver.java
@@ -26,7 +26,7 @@ import java.util.Map;
 import java.util.Random;
 import java.util.logging.Logger;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smackx.jingle.JingleSession;
 
@@ -45,7 +45,7 @@ public class ICEResolver extends TransportResolver {
 
 	private static final Logger LOGGER = Logger.getLogger(ICEResolver.class.getName());
 
-    Connection connection;
+    XMPPConnection connection;
     Random random = new Random();
     long sid;
     String server;
@@ -53,7 +53,7 @@ public class ICEResolver extends TransportResolver {
     static Map negociatorsMap = new HashMap();
     //ICENegociator iceNegociator = null;
 
-    public ICEResolver(Connection connection, String server, int port) {
+    public ICEResolver(XMPPConnection connection, String server, int port) {
         super();
         this.connection = connection;
         this.server = server;
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICETransportManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICETransportManager.java
index da86a5a9f..a89c490d0 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICETransportManager.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICETransportManager.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.jingle.nat;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smackx.jingle.JingleSession;
 import org.jivesoftware.smackx.jingle.listeners.CreatedJingleSessionListener;
@@ -27,7 +27,7 @@ public class ICETransportManager extends JingleTransportManager implements Jingl
 
     ICEResolver iceResolver = null;
 
-    public ICETransportManager(Connection xmppConnection, String server, int port) {
+    public ICETransportManager(XMPPConnection xmppConnection, String server, int port) {
         iceResolver = new ICEResolver(xmppConnection, server, port);
         try {
             iceResolver.initializeAndWait();
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/RTPBridge.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/RTPBridge.java
index 9296275f6..96f53e4d2 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/RTPBridge.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/RTPBridge.java
@@ -24,7 +24,7 @@ import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.logging.Logger;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.PacketCollector;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
@@ -387,7 +387,7 @@ public class RTPBridge extends IQ {
      * @param sessionID
      * @return
      */
-    public static RTPBridge getRTPBridge(Connection connection, String sessionID) {
+    public static RTPBridge getRTPBridge(XMPPConnection connection, String sessionID) {
 
         if (!connection.isConnected()) {
             return null;
@@ -412,7 +412,7 @@ public class RTPBridge extends IQ {
      * @param connection
      * @return
      */
-    public static boolean serviceAvailable(Connection connection) {
+    public static boolean serviceAvailable(XMPPConnection connection) {
 
         if (!connection.isConnected()) {
             return false;
@@ -454,7 +454,7 @@ public class RTPBridge extends IQ {
      * @param connection
      * @return
      */
-    public static RTPBridge relaySession(Connection connection, String sessionID, String pass, TransportCandidate proxyCandidate, TransportCandidate localCandidate) {
+    public static RTPBridge relaySession(XMPPConnection connection, String sessionID, String pass, TransportCandidate proxyCandidate, TransportCandidate localCandidate) {
 
         if (!connection.isConnected()) {
             return null;
@@ -488,7 +488,7 @@ public class RTPBridge extends IQ {
      * @param xmppConnection
      * @return public IP String or null if not found
      */
-    public static String getPublicIP(Connection xmppConnection) {
+    public static String getPublicIP(XMPPConnection xmppConnection) {
 
         if (!xmppConnection.isConnected()) {
             return null;
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUN.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUN.java
index e50cc2bda..8e0b4cf5f 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUN.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUN.java
@@ -21,7 +21,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.PacketCollector;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
@@ -183,7 +183,7 @@ public class STUN extends IQ {
      * @param connection
      * @return
      */
-    public static STUN getSTUNServer(Connection connection) {
+    public static STUN getSTUNServer(XMPPConnection connection) {
 
         if (!connection.isConnected()) {
             return null;
@@ -208,7 +208,7 @@ public class STUN extends IQ {
      * @param xmppConnection
      * @return
      */
-    public static boolean serviceAvailable(Connection connection) {
+    public static boolean serviceAvailable(XMPPConnection connection) {
 
         if (!connection.isConnected()) {
             return false;
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java
index addd4a6a1..0128a3677 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java
@@ -28,7 +28,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smackx.jingle.JingleSession;
 import org.jivesoftware.smackx.jingle.nat.TransportResolverListener.Checker;
 
@@ -59,7 +59,7 @@ public abstract class TransportCandidate {
 
     private String sessionId;
 
-    private Connection connection;
+    private XMPPConnection connection;
 
     private TransportCandidate symmetric;
 
@@ -155,20 +155,20 @@ public abstract class TransportCandidate {
     }
 
     /**
-     * Get the Connection use to send or receive this candidate
+     * Get the XMPPConnection use to send or receive this candidate
      *
      * @return
      */
-    public Connection getConnection() {
+    public XMPPConnection getConnection() {
         return connection;
     }
 
     /**
-     * Set the Connection use to send or receive this candidate
+     * Set the XMPPConnection use to send or receive this candidate
      *
      * @param connection
      */
-    public void setConnection(Connection connection) {
+    public void setConnection(XMPPConnection connection) {
         this.connection = connection;
     }
 
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Agent.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Agent.java
index febbfdf77..0198e66bf 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Agent.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Agent.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.workgroup.agent;
 
 import org.jivesoftware.smackx.workgroup.packet.AgentInfo;
 import org.jivesoftware.smackx.workgroup.packet.AgentWorkgroups;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 
@@ -31,10 +31,10 @@ import java.util.Collection;
  * @author Derek DeMoro
  */
 public class Agent {
-    private Connection connection;
+    private XMPPConnection connection;
     private String workgroupJID;
 
-    public static Collection getWorkgroups(String serviceJID, String agentJID, Connection connection) throws XMPPException {
+    public static Collection getWorkgroups(String serviceJID, String agentJID, XMPPConnection connection) throws XMPPException {
         AgentWorkgroups request = new AgentWorkgroups(agentJID);
         request.setTo(serviceJID);
         AgentWorkgroups response = (AgentWorkgroups) connection.createPacketCollectorAndSend(request).nextResultOrThrow();
@@ -44,7 +44,7 @@ public class Agent {
     /**
      * Constructs an Agent.
      */
-    Agent(Connection connection, String workgroupJID) {
+    Agent(XMPPConnection connection, String workgroupJID) {
         this.connection = connection;
         this.workgroupJID = workgroupJID;
     }
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java
index 08623e2aa..034da0a43 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java
@@ -20,7 +20,7 @@ package org.jivesoftware.smackx.workgroup.agent;
 import org.jivesoftware.smackx.workgroup.packet.AgentStatus;
 import org.jivesoftware.smackx.workgroup.packet.AgentStatusRequest;
 import org.jivesoftware.smack.PacketListener;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.filter.PacketTypeFilter;
 import org.jivesoftware.smack.packet.Packet;
@@ -49,7 +49,7 @@ public class AgentRoster {
     private static final int EVENT_AGENT_REMOVED = 1;
     private static final int EVENT_PRESENCE_CHANGED = 2;
 
-    private Connection connection;
+    private XMPPConnection connection;
     private String workgroupJID;
     private List entries;
     private List listeners;
@@ -63,7 +63,7 @@ public class AgentRoster {
      *
      * @param connection an XMPP connection.
      */
-    AgentRoster(Connection connection, String workgroupJID) {
+    AgentRoster(XMPPConnection connection, String workgroupJID) {
         this.connection = connection;
         this.workgroupJID = workgroupJID;
         entries = new ArrayList();
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java
index 13c41c3f7..3c768f72e 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java
@@ -55,7 +55,7 @@ import java.util.logging.Logger;
 public class AgentSession {
     private static final Logger LOGGER = Logger.getLogger(AgentSession.class.getName());
     
-    private Connection connection;
+    private XMPPConnection connection;
 
     private String workgroupJID;
 
@@ -85,7 +85,7 @@ public class AgentSession {
      *                     authentication.
      * @param workgroupJID the fully qualified JID of the workgroup.
      */
-    public AgentSession(String workgroupJID, Connection connection) {
+    public AgentSession(String workgroupJID, XMPPConnection connection) {
         // Login must have been done before passing in connection.
         if (!connection.isAuthenticated()) {
             throw new IllegalStateException("Must login to server before creating workgroup.");
@@ -966,12 +966,12 @@ public class AgentSession {
     /**
      * Returns the generic metadata of the workgroup the agent belongs to.
      *
-     * @param con   the Connection to use.
+     * @param con   the XMPPConnection to use.
      * @param query an optional query object used to tell the server what metadata to retrieve. This can be null.
      * @throws XMPPException if an error occurs while sending the request to the server.
      * @return the settings for the workgroup.
      */
-    public GenericSettings getGenericSettings(Connection con, String query) throws XMPPException {
+    public GenericSettings getGenericSettings(XMPPConnection con, String query) throws XMPPException {
         GenericSettings setting = new GenericSettings();
         setting.setType(IQ.Type.GET);
         setting.setTo(workgroupJID);
@@ -981,7 +981,7 @@ public class AgentSession {
         return response;
     }
 
-    public boolean hasMonitorPrivileges(Connection con) throws XMPPException {
+    public boolean hasMonitorPrivileges(XMPPConnection con) throws XMPPException {
         MonitorPacket request = new MonitorPacket();
         request.setType(IQ.Type.GET);
         request.setTo(workgroupJID);
@@ -990,7 +990,7 @@ public class AgentSession {
         return response.isMonitor();
     }
 
-    public void makeRoomOwner(Connection con, String sessionID) throws XMPPException {
+    public void makeRoomOwner(XMPPConnection con, String sessionID) throws XMPPException {
         MonitorPacket request = new MonitorPacket();
         request.setType(IQ.Type.SET);
         request.setTo(workgroupJID);
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java
index 422b79ab6..4d87373f0 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java
@@ -17,7 +17,7 @@
 
 package org.jivesoftware.smackx.workgroup.agent;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Packet;
 
@@ -35,7 +35,7 @@ import java.util.Map;
  */
 public class Offer {
 
-    private Connection connection;
+    private XMPPConnection connection;
     private AgentSession session;
 
     private String sessionID;
@@ -62,7 +62,7 @@ public class Offer {
      * @param content content of the offer. The content explains the reason for the offer
      *        (e.g. user request, transfer)
      */
-    Offer(Connection conn, AgentSession agentSession, String userID,
+    Offer(XMPPConnection conn, AgentSession agentSession, String userID,
             String userJID, String workgroupName, Date expiresDate,
             String sessionID, Map> metaData, OfferContent content)
     {
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java
index 54d379731..44f7a8bed 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java
@@ -17,7 +17,7 @@
 
 package org.jivesoftware.smackx.workgroup.agent;
 
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.xmlpull.v1.XmlPullParser;
@@ -44,7 +44,7 @@ public class OfferConfirmation extends IQ {
     }
 
 
-    public void notifyService(Connection con, String workgroup, String createdRoomName) {
+    public void notifyService(XMPPConnection con, String workgroup, String createdRoomName) {
         NotifyServicePacket packet = new NotifyServicePacket(workgroup, createdRoomName);
         con.sendPacket(packet);
     }
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java
index d5a1b3ccd..f07764ca4 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.workgroup.agent;
 
 import org.jivesoftware.smackx.workgroup.packet.Transcript;
 import org.jivesoftware.smackx.workgroup.packet.Transcripts;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 
 /**
@@ -30,9 +30,9 @@ import org.jivesoftware.smack.XMPPException;
  * @author Gaston Dombiak
  */
 public class TranscriptManager {
-    private Connection connection;
+    private XMPPConnection connection;
 
-    public TranscriptManager(Connection connection) {
+    public TranscriptManager(XMPPConnection connection) {
         this.connection = connection;
     }
 
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java
index 8d9eebc60..05750f294 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java
@@ -20,7 +20,7 @@ package org.jivesoftware.smackx.workgroup.agent;
 import org.jivesoftware.smackx.search.ReportedData;
 import org.jivesoftware.smackx.workgroup.packet.TranscriptSearch;
 import org.jivesoftware.smackx.xdata.Form;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 
@@ -32,9 +32,9 @@ import org.jivesoftware.smack.packet.IQ;
  * @author Gaston Dombiak
  */
 public class TranscriptSearchManager {
-    private Connection connection;
+    private XMPPConnection connection;
 
-    public TranscriptSearchManager(Connection connection) {
+    public TranscriptSearchManager(XMPPConnection connection) {
         this.connection = connection;
     }
 
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
index 5a74c264a..869383865 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
@@ -56,7 +56,7 @@ import java.util.Map;
 public class Workgroup {
 
     private String workgroupJID;
-    private Connection connection;
+    private XMPPConnection connection;
     private boolean inQueue;
     private List invitationListeners;
     private List queueListeners;
@@ -74,7 +74,7 @@ public class Workgroup {
      * @param connection   an XMPP connection which must have already undergone a
      *                     successful login.
      */
-    public Workgroup(String workgroupJID, Connection connection) {
+    public Workgroup(String workgroupJID, XMPPConnection connection) {
         // Login must have been done before passing in connection.
         if (!connection.isAuthenticated()) {
             throw new IllegalStateException("Must login to server before creating workgroup.");
@@ -112,7 +112,7 @@ public class Workgroup {
          */
         MultiUserChat.addInvitationListener(connection,
                 new org.jivesoftware.smackx.muc.InvitationListener() {
-                    public void invitationReceived(Connection conn, String room, String inviter,
+                    public void invitationReceived(XMPPConnection conn, String room, String inviter,
                                                    String reason, String password, Message message) {
                         inQueue = false;
                         queuePosition = -1;
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java b/legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java
index 01997e75b..863000507 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java
@@ -28,7 +28,7 @@ import org.jivesoftware.smack.PacketListener;
 import org.jivesoftware.smack.Roster;
 import org.jivesoftware.smack.RosterEntry;
 import org.jivesoftware.smack.RosterGroup;
-import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.filter.PacketExtensionFilter;
 import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.packet.Message;
@@ -49,17 +49,17 @@ public class RosterExchangeManager {
     public final static String NAMESPACE = "jabber:x:roster";
     public final static String ELEMENT = "x";
 
-    private final static Map INSTANCES =
-                    Collections.synchronizedMap(new WeakHashMap());
+    private final static Map INSTANCES =
+                    Collections.synchronizedMap(new WeakHashMap());
 
     private final static PacketFilter PACKET_FILTER = new PacketExtensionFilter(ELEMENT, NAMESPACE);
 
     private final Set rosterExchangeListeners = Collections.synchronizedSet(new HashSet());
 
-    private final WeakReference weakRefConnection;
+    private final WeakReference weakRefConnection;
     private final PacketListener packetListener;
 
-    public synchronized static RosterExchangeManager getInstanceFor(Connection connection) {
+    public synchronized static RosterExchangeManager getInstanceFor(XMPPConnection connection) {
         RosterExchangeManager rosterExchangeManager = INSTANCES.get(connection);
         if (rosterExchangeManager == null) {
             rosterExchangeManager = new RosterExchangeManager(connection);
@@ -70,10 +70,10 @@ public class RosterExchangeManager {
     /**
      * Creates a new roster exchange manager.
      *
-     * @param con a Connection which is used to send and receive messages.
+     * @param con a XMPPConnection which is used to send and receive messages.
      */
-    public RosterExchangeManager(Connection connection) {
-        weakRefConnection = new WeakReference(connection);
+    public RosterExchangeManager(XMPPConnection connection) {
+        weakRefConnection = new WeakReference(connection);
         // Listens for all roster exchange packets and fire the roster exchange listeners.
         packetListener = new PacketListener() {
             public void processPacket(Packet packet) {
@@ -122,7 +122,7 @@ public class RosterExchangeManager {
         RosterExchange rosterExchange = new RosterExchange(roster);
         msg.addExtension(rosterExchange);
 
-        Connection connection = weakRefConnection.get();
+        XMPPConnection connection = weakRefConnection.get();
         // Send the message that contains the roster
         connection.sendPacket(msg);
     }
@@ -141,7 +141,7 @@ public class RosterExchangeManager {
         rosterExchange.addRosterEntry(rosterEntry);
         msg.addExtension(rosterExchange);
 
-        Connection connection = weakRefConnection.get();
+        XMPPConnection connection = weakRefConnection.get();
         // Send the message that contains the roster
         connection.sendPacket(msg);
     }
@@ -163,7 +163,7 @@ public class RosterExchangeManager {
         }
         msg.addExtension(rosterExchange);
 
-        Connection connection = weakRefConnection.get();
+        XMPPConnection connection = weakRefConnection.get();
         // Send the message that contains the roster
         connection.sendPacket(msg);
     }
diff --git a/resources/releasedocs/changelog.html b/resources/releasedocs/changelog.html
index 9e857550c..309e3a9c9 100644
--- a/resources/releasedocs/changelog.html
+++ b/resources/releasedocs/changelog.html
@@ -182,10 +182,10 @@ hr {
 	
  • [SMACK-457] - Remove unnecessary printStackTrace() in XMPPConnection
    • 
 	
  • [SMACK-460] - ServiceDiscoveryManager should not use the constructor in connectionCreated()
    • 
 	
  • [SMACK-461] - Remove incorrect deprecated marker for DiscoverInfo.Identity.setType()
    • 
-	
  • [SMACK-464] - Make it clear that PacketListener's added with Connection.addPacketListener() are only for received packets
    • 
+	
  • [SMACK-464] - Make it clear that PacketListener's added with XMPPConnection.addPacketListener() are only for received packets
    • 
 	
  • [SMACK-534] - Convert all System.out and printStackTrace calls to use Java util logging.
    • 
-	
  • [SMACK-339] - Allow ConnectionListeners to be added before Connection is connected.  Currently throws exception
    • 
-	
  • [SMACK-373] - Don't remove listeners after a disconnect() , keep state of Connection between disconnect() and connect()/login()
    • 
+	
  • [SMACK-339] - Allow ConnectionListeners to be added before XMPPConnection is connected.  Currently throws exception
    • 
+	
  • [SMACK-373] - Don't remove listeners after a disconnect() , keep state of XMPPConnection between disconnect() and connect()/login()
    • 
 	
  • [SMACK-434] - Create a project to contain non production ready implementations of specifications
    • 
 	
  • [SMACK-526] - Deprecate all PEP related classes.
    • 
 
@@ -346,7 +346,7 @@ hr {
 	
  • [SMACK-269] - Smack 3.1.0 creates a new chat for every incoming message
    • 
 	
  • [SMACK-271] - Deadlock in XMPPConnection while login and parsing stream features
    • 
 	
  • [SMACK-275] - Patch: Fix for broken SASL DIGEST-MD5 implementation
    • 
-	
  • [SMACK-280] - The authentification should use the Connection#sendPacket method and work transparent with packets and packet listeners.
    • 
+	
  • [SMACK-280] - The authentification should use the XMPPConnection#sendPacket method and work transparent with packets and packet listeners.
    • 
 	
  • [SMACK-288] - The parsing of the result for a LeafNode.getItems() call is incorrect.  It creates a DefaultPacketExtension instead of an Item for every other item in the result.
    • 
 	
  • [SMACK-290] - Deadlock while getting Roster before it's initialized
    • 
 	
  • [SMACK-291] - RosterGroup modifications should depend on roster push
    • 
diff --git a/sample/web/login.jsp b/sample/web/login.jsp
index 9730758f9..f4cd4f8fd 100644
--- a/sample/web/login.jsp
+++ b/sample/web/login.jsp
@@ -150,7 +150,7 @@
                          
                       
                        
-                        Debug Connection:
+                        Debug XMPPConnection: