diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java
index b95bc4ff12..caab70e767 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java
@@ -33,10 +33,12 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * An implementation of {@link org.springframework.messaging.simp.SimpMessageSendingOperations}.
+ * An implementation of
+ * {@link org.springframework.messaging.simp.SimpMessageSendingOperations}.
  *
  * <p>Also provides methods for sending messages to a user. See
- * {@link org.springframework.messaging.simp.user.UserDestinationResolver UserDestinationResolver}
+ * {@link org.springframework.messaging.simp.user.UserDestinationResolver
+ * UserDestinationResolver}
  * for more on user destinations.
  *
  * @author Rossen Stoyanchev
@@ -47,19 +49,19 @@ public class SimpMessagingTemplate extends AbstractMessageSendingTemplate<String
 
 	private final MessageChannel messageChannel;
 
-	private String userDestinationPrefix = "/user/";
-
-	private MessageHeaderInitializer headerInitializer;
+	private String destinationPrefix = "/user/";
 
 	private volatile long sendTimeout = -1;
 
+	private MessageHeaderInitializer headerInitializer;
+
 
 	/**
 	 * Create a new {@link SimpMessagingTemplate} instance.
 	 * @param messageChannel the message channel (must not be {@code null})
 	 */
 	public SimpMessagingTemplate(MessageChannel messageChannel) {
-		Assert.notNull(messageChannel, "MessageChannel must not be null");
+		Assert.notNull(messageChannel, "'messageChannel' must not be null");
 		this.messageChannel = messageChannel;
 	}
 
@@ -77,8 +79,8 @@ public class SimpMessagingTemplate extends AbstractMessageSendingTemplate<String
 	 * @see org.springframework.messaging.simp.user.UserDestinationMessageHandler
 	 */
 	public void setUserDestinationPrefix(String prefix) {
-		Assert.hasText(prefix, "'userDestinationPrefix' must not be empty");
-		this.userDestinationPrefix = prefix.endsWith("/") ? prefix : prefix + "/";
+		Assert.hasText(prefix, "'destinationPrefix' must not be empty");
+		this.destinationPrefix = prefix.endsWith("/") ? prefix : prefix + "/";
 
 	}
 
@@ -86,7 +88,21 @@ public class SimpMessagingTemplate extends AbstractMessageSendingTemplate<String
 	 * Return the configured user destination prefix.
 	 */
 	public String getUserDestinationPrefix() {
-		return this.userDestinationPrefix;
+		return this.destinationPrefix;
+	}
+
+	/**
+	 * Specify the timeout value to use for send operations (in milliseconds).
+	 */
+	public void setSendTimeout(long sendTimeout) {
+		this.sendTimeout = sendTimeout;
+	}
+
+	/**
+	 * Return the configured send timeout (in milliseconds).
+	 */
+	public long getSendTimeout() {
+		return this.sendTimeout;
 	}
 
 	/**
@@ -105,20 +121,6 @@ public class SimpMessagingTemplate extends AbstractMessageSendingTemplate<String
 		return this.headerInitializer;
 	}
 
-	/**
-	 * Specify the timeout value to use for send operations (in milliseconds).
-	 */
-	public void setSendTimeout(long sendTimeout) {
-		this.sendTimeout = sendTimeout;
-	}
-
-	/**
-	 * Return the configured send timeout (in milliseconds).
-	 */
-	public long getSendTimeout() {
-		return this.sendTimeout;
-	}
-
 
 	/**
 	 * If the headers of the given message already contain a
@@ -220,7 +222,7 @@ public class SimpMessagingTemplate extends AbstractMessageSendingTemplate<String
 
 		Assert.notNull(user, "User must not be null");
 		user = StringUtils.replace(user, "/", "%2F");
-		super.convertAndSend(this.userDestinationPrefix + user + destination, payload, headers, postProcessor);
+		super.convertAndSend(this.destinationPrefix + user + destination, payload, headers, postProcessor);
 	}