diff --git a/examples/features/standard/rest/dup-send/src/main/resources/broker.xml b/examples/features/standard/rest/dup-send/src/main/resources/broker.xml
index 7e5527a8d2..577f5b05fa 100644
--- a/examples/features/standard/rest/dup-send/src/main/resources/broker.xml
+++ b/examples/features/standard/rest/dup-send/src/main/resources/broker.xml
@@ -27,10 +27,10 @@ under the License.
       <acceptors>
          <acceptor name="in-vm">vm://0</acceptor>
       </acceptors>
-   <addresses>
+      <addresses>
          <address name="orders">
             <anycast>
-               <queue name="jms.queue.orders"/>
+               <queue name="orders"/>
             </anycast>
          </address>
       </addresses>
diff --git a/examples/features/standard/rest/javascript-chat/src/main/resources/broker.xml b/examples/features/standard/rest/javascript-chat/src/main/resources/broker.xml
index d41cd6d4b3..30a5ff323f 100644
--- a/examples/features/standard/rest/javascript-chat/src/main/resources/broker.xml
+++ b/examples/features/standard/rest/javascript-chat/src/main/resources/broker.xml
@@ -27,7 +27,7 @@ under the License.
       <acceptors>
          <acceptor name="in-vm">vm://0</acceptor>
       </acceptors>
-   <addresses>
+      <addresses>
          <address name="chat">
             <multicast/>
          </address>
diff --git a/examples/features/standard/rest/javascript-chat/src/main/webapp/index.html b/examples/features/standard/rest/javascript-chat/src/main/webapp/index.html
index 87c62f299d..22c9fbf08e 100644
--- a/examples/features/standard/rest/javascript-chat/src/main/webapp/index.html
+++ b/examples/features/standard/rest/javascript-chat/src/main/webapp/index.html
@@ -148,7 +148,7 @@ under the License.
             }
         }
 
-        initializeSenderAndTop('jms.topic.chat');
+        initializeSenderAndTop('chat');
 
 
         setTimeout("receiveMessage()", 800);
diff --git a/examples/features/standard/rest/jms-to-rest/postOrder.py b/examples/features/standard/rest/jms-to-rest/postOrder.py
index e0440f0e2a..a9b96d248b 100644
--- a/examples/features/standard/rest/jms-to-rest/postOrder.py
+++ b/examples/features/standard/rest/jms-to-rest/postOrder.py
@@ -17,7 +17,7 @@
 import httplib, urlparse
 
 conn = httplib.HTTPConnection("localhost:8080")
-conn.request("HEAD", "/queues/jms.queue.orders")
+conn.request("HEAD", "/queues/orders")
 res = conn.getresponse()
 createLink = res.getheader("msg-create")
 print createLink
diff --git a/examples/features/standard/rest/jms-to-rest/receiveOrder.py b/examples/features/standard/rest/jms-to-rest/receiveOrder.py
index 076978ba6b..2e86515a80 100644
--- a/examples/features/standard/rest/jms-to-rest/receiveOrder.py
+++ b/examples/features/standard/rest/jms-to-rest/receiveOrder.py
@@ -17,7 +17,7 @@
 import httplib, urlparse
 
 conn = httplib.HTTPConnection("localhost:8080")
-conn.request("HEAD", "/queues/jms.queue.orders")
+conn.request("HEAD", "/queues/orders")
 res = conn.getresponse()
 consumersLink = res.getheader("msg-pull-consumers")
 consumersParsed = urlparse.urlparse(consumersLink)
diff --git a/examples/features/standard/rest/jms-to-rest/src/main/resources/broker.xml b/examples/features/standard/rest/jms-to-rest/src/main/resources/broker.xml
index d481507a9c..1628bdbcef 100644
--- a/examples/features/standard/rest/jms-to-rest/src/main/resources/broker.xml
+++ b/examples/features/standard/rest/jms-to-rest/src/main/resources/broker.xml
@@ -28,10 +28,10 @@ under the License.
          <acceptor name="in-vm">vm://0</acceptor>
          <acceptor name="netty">tcp://localhost:61616</acceptor>
       </acceptors>
-   <addresses>
+      <addresses>
          <address name="orders">
             <anycast>
-               <queue name="jms.queue.orders"/>
+               <queue name="orders"/>
             </anycast>
          </address>
       </addresses>
diff --git a/examples/features/standard/rest/push/src/main/resources/broker.xml b/examples/features/standard/rest/push/src/main/resources/broker.xml
index 9e91b5ab27..d58574ebc7 100644
--- a/examples/features/standard/rest/push/src/main/resources/broker.xml
+++ b/examples/features/standard/rest/push/src/main/resources/broker.xml
@@ -31,12 +31,12 @@ under the License.
    <addresses>
          <address name="shipping">
             <anycast>
-               <queue name="jms.queue.shipping"/>
+               <queue name="shipping"/>
             </anycast>
          </address>
          <address name="orders">
             <anycast>
-               <queue name="jms.queue.orders"/>
+               <queue name="orders"/>
             </anycast>
          </address>
       </addresses>