diff --git a/documentation/connections.md b/documentation/connections.md
index c53ba16b7..c205da563 100644
--- a/documentation/connections.md
+++ b/documentation/connections.md
@@ -32,7 +32,7 @@ Connect and Disconnect
 XMPPTCPConnectionConfiguration.Builder configBuilder = XMPPTCPConnectionConfiguration.builder();
 configBuilder.setUsernameAndPassword("username", "password");
 configBuilder.setResource("SomeResource");
-configBuilder.setServiceName("jabber.org");
+configBuilder.setXmppDomain("jabber.org");
 
 AbstractXMPPConnection connection = new XMPPTCPConnection(configBuilder.build());
 // Connect to the server
diff --git a/documentation/gettingstarted.md b/documentation/gettingstarted.md
index 588c5298b..98879bdaf 100644
--- a/documentation/gettingstarted.md
+++ b/documentation/gettingstarted.md
@@ -53,7 +53,7 @@ conn1.connect();
 // Create a connection to the jabber.org server on a specific port.
 XMPPTCPConnectionConfiguration config = XMPPTCPConnectionConfiguration.builder()
   .setUsernameAndPassword("username", "password")
-  .setServiceName("jabber.org")
+  .setXmppDomain("jabber.org")
   .setHost("earl.jabber.org")
   .setPort("8222")
   .build();
diff --git a/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java b/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java
index 9594b5692..a3023abde 100644
--- a/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java
+++ b/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java
@@ -118,7 +118,7 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection {
      */
     public XMPPBOSHConnection(String username, String password, boolean https, String host, int port, String filePath, DomainBareJid xmppServiceDomain) {
         this(BOSHConfiguration.builder().setUseHttps(https).setHost(host)
-                .setPort(port).setFile(filePath).setServiceName(xmppServiceDomain)
+                .setPort(port).setFile(filePath).setXmppDomain(xmppServiceDomain)
                 .setUsernameAndPassword(username, password).build());
     }
 
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
index ba594f940..d9360efa2 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
@@ -464,9 +464,21 @@ public abstract class ConnectionConfiguration {
          *
          * @param serviceName the service name
          * @return a reference to this builder.
+         * @deprecated use {@link #setXmppDomain(DomainBareJid)} instead.
          */
+        @Deprecated
         public B setServiceName(DomainBareJid serviceName) {
-            this.xmppServiceDomain = serviceName;
+            return setXmppDomain(serviceName);
+        }
+
+        /**
+         * Set the service name of this XMPP service (i.e., the XMPP domain).
+         *
+         * @param xmppServiceDomain the service name
+         * @return a reference to this builder.
+         */
+        public B setXmppDomain(DomainBareJid xmppServiceDomain) {
+            this.xmppServiceDomain = xmppServiceDomain;
             return getThis();
         }
 
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java b/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java
index 33b17b65a..dc367d007 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java
@@ -57,7 +57,7 @@ public class DummyConnection extends AbstractXMPPConnection {
     private final BlockingQueue<TopLevelStreamElement> queue = new LinkedBlockingQueue<TopLevelStreamElement>();
 
     public static ConnectionConfiguration.Builder<?,?> getDummyConfigurationBuilder() {
-        return DummyConnectionConfiguration.builder().setServiceName(JidTestUtil.EXAMPLE_ORG).setUsernameAndPassword("dummy",
+        return DummyConnectionConfiguration.builder().setXmppDomain(JidTestUtil.EXAMPLE_ORG).setUsernameAndPassword("dummy",
                         "dummypass");
     }
 
diff --git a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackLowLevelIntegrationTest.java b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackLowLevelIntegrationTest.java
index c5ce1673d..cd55e824c 100644
--- a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackLowLevelIntegrationTest.java
+++ b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackLowLevelIntegrationTest.java
@@ -51,7 +51,7 @@ public abstract class AbstractSmackLowLevelIntegrationTest extends AbstractSmack
             builder.setCustomSSLContext(sc);
         }
         builder.setSecurityMode(configuration.securityMode);
-        builder.setServiceName(service);
+        builder.setXmppDomain(service);
         return builder;
     }
 
diff --git a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/SmackIntegrationTestFramework.java b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/SmackIntegrationTestFramework.java
index be9eef6b7..3157419c9 100644
--- a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/SmackIntegrationTestFramework.java
+++ b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/SmackIntegrationTestFramework.java
@@ -516,7 +516,7 @@ public class SmackIntegrationTestFramework {
         }
         // @formatter:off
         Builder builder = XMPPTCPConnectionConfiguration.builder()
-                        .setServiceName(config.service)
+                        .setXmppDomain(config.service)
                         .setUsernameAndPassword(accountUsername, accountPassword)
                         .setResource(middlefix + '-' + testRunResult.testRunId)
                         .setSecurityMode(config.securityMode);
@@ -551,7 +551,7 @@ public class SmackIntegrationTestFramework {
             builder.setCustomSSLContext(sc);
         }
         builder.setSecurityMode(config.securityMode);
-        builder.setServiceName(config.service);
+        builder.setXmppDomain(config.service);
         XMPPTCPConnection connection = new XMPPTCPConnection(builder.build());
         connection.connect();
         UsernameAndPassword uap = IntTestUtil.registerAccount(connection);
diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
index f2dca387e..28d91d77c 100644
--- a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
+++ b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
@@ -337,7 +337,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
      * @throws XmppStringprepException 
      */
     public XMPPTCPConnection(CharSequence username, String password, String serviceName) throws XmppStringprepException {
-        this(XMPPTCPConnectionConfiguration.builder().setUsernameAndPassword(username, password).setServiceName(
+        this(XMPPTCPConnectionConfiguration.builder().setUsernameAndPassword(username, password).setXmppDomain(
                                         JidCreate.domainBareFrom(serviceName)).build());
     }
 
diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnectionConfiguration.java b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnectionConfiguration.java
index 844830a0d..425c67ffc 100644
--- a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnectionConfiguration.java
+++ b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnectionConfiguration.java
@@ -27,7 +27,7 @@ import org.jivesoftware.smack.ConnectionConfiguration;
  * <pre>
  * {@code
  * XMPPTCPConnectionConfiguration conf = XMPPConnectionConfiguration.builder()
- *     .setServiceName("example.org").setUsernameAndPassword("user", "password")
+ *     .setXmppDomain("example.org").setUsernameAndPassword("user", "password")
  *     .setCompressionEnabled(false).build();
  * XMPPTCPConnection connection = new XMPPTCPConnection(conf);
  * }