diff --git a/source/org/jivesoftware/smack/SSLXMPPConnection.java b/source/org/jivesoftware/smack/SSLXMPPConnection.java
index c81e5f433..bb3a72f98 100644
--- a/source/org/jivesoftware/smack/SSLXMPPConnection.java
+++ b/source/org/jivesoftware/smack/SSLXMPPConnection.java
@@ -32,7 +32,7 @@ import java.security.NoSuchAlgorithmException;
 
 /**
  * Creates an SSL connection to a XMPP server using the legacy dedicated SSL port
- * mechanism. Fully compliant XMPP 1.0 servers (e.g. Jive Messenger 2.3.0) do not
+ * mechanism. Fully compliant XMPP 1.0 servers (e.g. Wildfire 2.4.0) do not
  * require using a dedicated SSL port. Instead, TLS (a standardized version of SSL 3.0)
  * is dynamically negotiated over the standard XMPP port. Therefore, only use this
  * class to connect to an XMPP server if you know that the server does not support
diff --git a/source/org/jivesoftware/smackx/SharedGroupManager.java b/source/org/jivesoftware/smackx/SharedGroupManager.java
index ca509c6eb..928e1bdae 100644
--- a/source/org/jivesoftware/smackx/SharedGroupManager.java
+++ b/source/org/jivesoftware/smackx/SharedGroupManager.java
@@ -14,7 +14,7 @@ import java.util.List;
  * A SharedGroupManager provides services for discovering the shared groups where a user belongs.<p>
  *
  * Important note: This functionality is not part of the XMPP spec and it will only work
- * with Jive Messenger.
+ * with Wildfire.
  *
  * @author Gaston Dombiak
  */
diff --git a/source/org/jivesoftware/smackx/packet/SharedGroupsInfo.java b/source/org/jivesoftware/smackx/packet/SharedGroupsInfo.java
index eafef4400..b6e0b535a 100644
--- a/source/org/jivesoftware/smackx/packet/SharedGroupsInfo.java
+++ b/source/org/jivesoftware/smackx/packet/SharedGroupsInfo.java
@@ -13,7 +13,7 @@ import java.util.List;
  * from the server.<p>
  *
  * Important note: This functionality is not part of the XMPP spec and it will only work
- * with Jive Messenger.
+ * with Wildfire.
  *
  * @author Gaston Dombiak
  */
diff --git a/test/org/jivesoftware/smackx/ServiceDiscoveryManagerTest.java b/test/org/jivesoftware/smackx/ServiceDiscoveryManagerTest.java
index 99985af4b..3f1dfa82a 100644
--- a/test/org/jivesoftware/smackx/ServiceDiscoveryManagerTest.java
+++ b/test/org/jivesoftware/smackx/ServiceDiscoveryManagerTest.java
@@ -153,7 +153,7 @@ public class ServiceDiscoveryManagerTest extends SmackTestCase {
         try {
             boolean canPublish = ServiceDiscoveryManager.getInstanceFor(getConnection(0))
                     .canPublishItems(getServiceName());
-            assertFalse("Messenger does not support publishing...so far!!", canPublish);
+            assertFalse("Wildfire does not support publishing...so far!!", canPublish);
         }
         catch (Exception e) {
             fail(e.getMessage());
diff --git a/test/org/jivesoftware/smackx/SharedGroupsTest.java b/test/org/jivesoftware/smackx/SharedGroupsTest.java
index 623f59d26..9086cfcf9 100644
--- a/test/org/jivesoftware/smackx/SharedGroupsTest.java
+++ b/test/org/jivesoftware/smackx/SharedGroupsTest.java
@@ -9,7 +9,7 @@ import java.util.List;
  * Test cases for getting the shared groups of a user.<p>
  *
  * Important note: This functionality is not part of the XMPP spec and it will only work
- * with Jive Messenger.
+ * with Wildfire.
  *
  * @author Gaston Dombiak
  */