diff --git a/distribution/activemq/src/main/resources/bin/activemq b/distribution/activemq/src/main/resources/bin/activemq
index 141f11019d..74ca5da6f6 100755
--- a/distribution/activemq/src/main/resources/bin/activemq
+++ b/distribution/activemq/src/main/resources/bin/activemq
@@ -95,7 +95,14 @@ for i in `ls $ACTIVEMQ_HOME/lib/*.jar`; do
 	CLASSPATH=$i:$CLASSPATH
 done
 
-source $ACTIVEMQ_HOME/bin/activemq.conf
+# Set Defaults Properties
+ACTIVEMQ_LOGGING_CONF="file:$ACTIVEMQ_HOME/config/logging.properties"
+ACTIVEMQ_DATA_DIR=$ACTIVEMQ_HOME/data
+ACTIVEMQ_LOG_MANAGER=org.jboss.logmanager.LogManager
+JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M"
+
+# Load Runtime Config
+. $ACTIVEMQ_HOME/bin/activemq.conf
 
 JAVA_ARGS="$JAVA_ARGS $ACTIVEMQ_CLUSTER_PROPS -Dactivemq.home=$ACTIVEMQ_HOME -Djava.library.path=$ACTIVEMQ_HOME/bin/lib/linux-i686:$ACTIVEMQ_HOME/bin/lib/linux-x86_64 -Ddata.dir=$ACTIVEMQ_DATA_DIR -Djava.util.logging.manager=$ACTIVEMQ_LOG_MANAGER -Dlogging.configuration=$ACTIVEMQ_LOGGING_CONF $DEBUG_ARGS"
 
diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
index b9cba87120..82c25577ee 100644
--- a/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
@@ -38,21 +38,21 @@ under the License.
 
       <connectors>
          <!-- Default Connector.  Returned to clients during broadcast and distributed around cluster.  See broadcast and discovery-groups -->
-         <connector name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</connector>
+         <connector name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</connector>
       </connectors>
 
       <acceptors>
-         <!-- Default ActiveMQ Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP  -->
-         <acceptor name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</acceptor>
+         <!-- Default ActiveMQ Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP. -->
+         <acceptor name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</acceptor>
 
-         <!-- AMQP Connector.  Listens on default AMQP port for AMQP traffic.  -->
-         <acceptor name="amqp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5672}?protocols=AMQP</acceptor>
+         <!-- AMQP Acceptor.  Listens on default AMQP port for AMQP traffic.-->
+         <acceptor name="amqp">tcp://${activemq.remoting.amqp.host:localhost}:${activemq.remoting.amqp.port:5672}?protocols=AMQP</acceptor>
 
-         <!-- STOMP Acceptor.  Enables ActiveMQ Core protocol, OpenWire and STOMP.  -->
-         <acceptor name="stomp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61613}?protocols=STOMP</acceptor>
+         <!-- STOMP Acceptor. -->
+         <acceptor name="stomp">tcp://${activemq.remoting.stomp.host:localhost}:${activemq.remoting.stomp.port:61613}?protocols=STOMP</acceptor>
 
-         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Core and STOMP for legacy HornetQ clients  -->
-         <acceptor name="hornetq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}?protocols=CORE,STOMP</acceptor>
+         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Core and STOMP for legacy HornetQ clients. -->
+         <acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:localhost}:${activemq.remoting.hornetq.port:5445}?protocols=CORE,STOMP</acceptor>
       </acceptors>
 
       <broadcast-groups>
diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
index 047028e503..219c0b2752 100644
--- a/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
@@ -36,21 +36,21 @@ under the License.
 
       <connectors>
          <!-- Default Connector.  Returned to clients during broadcast and distributed around cluster.  See broadcast and discovery-groups -->
-         <connector name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</connector>
+         <connector name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</connector>
       </connectors>
 
       <acceptors>
-         <!-- Default ActiveMQ Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP  -->
-         <acceptor name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</acceptor>
+         <!-- Default ActiveMQ Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP. -->
+         <acceptor name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</acceptor>
 
-         <!-- AMQP Connector.  Listens on default AMQP port for AMQP traffic.  -->
-         <acceptor name="amqp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5672}?protocols=AMQP</acceptor>
+         <!-- AMQP Acceptor.  Listens on default AMQP port for AMQP traffic.-->
+         <acceptor name="amqp">tcp://${activemq.remoting.amqp.host:localhost}:${activemq.remoting.amqp.port:5672}?protocols=AMQP</acceptor>
 
-         <!-- STOMP Acceptor.  Enables ActiveMQ Core protocol, OpenWire and STOMP.  -->
-         <acceptor name="stomp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61613}?protocols=STOMP</acceptor>
+         <!-- STOMP Acceptor. -->
+         <acceptor name="stomp">tcp://${activemq.remoting.stomp.host:localhost}:${activemq.remoting.stomp.port:61613}?protocols=STOMP</acceptor>
 
-         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Core and STOMP for legacy HornetQ clients  -->
-         <acceptor name="hornetq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}?protocols=CORE,STOMP</acceptor>
+         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Core and STOMP for legacy HornetQ clients. -->
+         <acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:localhost}:${activemq.remoting.hornetq.port:5445}?protocols=CORE,STOMP</acceptor>
       </acceptors>
 
       <security-settings>
diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
index eae0c2fa80..a8d330ddc0 100644
--- a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
@@ -42,22 +42,22 @@ under the License.
       <large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
 
       <connectors>
-         <!-- Default Connector.  Returned to clients during broadcast. -->
-         <connector name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</connector>
+         <!-- Default Connector.  Returned to clients during broadcast and distributed around cluster.  See broadcast and discovery-groups -->
+         <connector name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</connector>
       </connectors>
 
       <acceptors>
-         <!-- Default ActiveMQ Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP  -->
-         <acceptor name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</acceptor>
+         <!-- Default ActiveMQ Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP. -->
+         <acceptor name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</acceptor>
 
-         <!-- AMQP Connector.  Listens on default AMQP port for AMQP traffic.  -->
-         <acceptor name="amqp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5672}?protocols=AMQP</acceptor>
+         <!-- AMQP Acceptor.  Listens on default AMQP port for AMQP traffic.-->
+         <acceptor name="amqp">tcp://${activemq.remoting.amqp.host:localhost}:${activemq.remoting.amqp.port:5672}?protocols=AMQP</acceptor>
 
-         <!-- STOMP Acceptor.  Enables ActiveMQ Core protocol, OpenWire and STOMP.  -->
-         <acceptor name="stomp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61613}?protocols=STOMP</acceptor>
+         <!-- STOMP Acceptor. -->
+         <acceptor name="stomp">tcp://${activemq.remoting.stomp.host:localhost}:${activemq.remoting.stomp.port:61613}?protocols=STOMP</acceptor>
 
-         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Core and STOMP for legacy HornetQ clients  -->
-         <acceptor name="hornetq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}?protocols=CORE,STOMP</acceptor>
+         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Core and STOMP for legacy HornetQ clients. -->
+         <acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:localhost}:${activemq.remoting.hornetq.port:5445}?protocols=CORE,STOMP</acceptor>
       </acceptors>
 
       <broadcast-groups>
diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
index b865a3ec24..00cafb00e0 100644
--- a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
@@ -43,21 +43,21 @@ under the License.
 
       <connectors>
          <!-- Default Connector.  Returned to clients during broadcast and distributed around cluster.  See broadcast and discovery-groups -->
-         <connector name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</connector>
+         <connector name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</connector>
       </connectors>
 
       <acceptors>
-         <!-- Default ActiveMQ Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP  -->
-         <acceptor name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</acceptor>
+         <!-- Default ActiveMQ Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP. -->
+         <acceptor name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</acceptor>
 
-         <!-- AMQP Acceptor.  Listens on default STOMP port for AMQP traffic.  -->
-         <acceptor name="amqp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5672}?protocols=AMQP</acceptor>
+         <!-- AMQP Acceptor.  Listens on default AMQP port for AMQP traffic.-->
+         <acceptor name="amqp">tcp://${activemq.remoting.amqp.host:localhost}:${activemq.remoting.amqp.port:5672}?protocols=AMQP</acceptor>
 
-         <!-- STOMP Acceptor.  Enables ActiveMQ Core protocol, OpenWire and STOMP.  -->
-         <acceptor name="stomp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61613}?protocols=STOMP</acceptor>
+         <!-- STOMP Acceptor. -->
+         <acceptor name="stomp">tcp://${activemq.remoting.stomp.host:localhost}:${activemq.remoting.stomp.port:61613}?protocols=STOMP</acceptor>
 
-         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Core and STOMP for legacy HornetQ clients  -->
-         <acceptor name="hornetq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}?protocols=CORE,STOMP</acceptor>
+         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Core and STOMP for legacy HornetQ clients. -->
+         <acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:localhost}:${activemq.remoting.hornetq.port:5445}?protocols=CORE,STOMP</acceptor>
       </acceptors>
 
       <broadcast-groups>