diff --git a/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundQueueBridge.java b/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundQueueBridge.java
index 8ef03434ce..88f152ac67 100755
--- a/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundQueueBridge.java
+++ b/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundQueueBridge.java
@@ -28,12 +28,14 @@ package org.apache.activemq.network.jms;
 public class InboundQueueBridge extends QueueBridge{
        
     String inboundQueueName;
+    String localQueueName;
     /**
      * Constructor that takes a foriegn destination as an argument
      * @param inboundQueueName
      */
     public  InboundQueueBridge(String inboundQueueName){
        this.inboundQueueName = inboundQueueName;
+       this.localQueueName = inboundQueueName;
     }
     
     /**
@@ -54,6 +56,23 @@ public class InboundQueueBridge extends QueueBridge{
      */
     public void setInboundQueueName(String inboundQueueName){
         this.inboundQueueName=inboundQueueName;
+        if (this.localQueueName == null){
+            this.localQueueName = inboundQueueName;
+        }
+    }
+
+    /**
+     * @return the localQueueName
+     */
+    public String getLocalQueueName(){
+        return localQueueName;
+    }
+
+    /**
+     * @param localQueueName the localQueueName to set
+     */
+    public void setLocalQueueName(String localQueueName){
+        this.localQueueName=localQueueName;
     }
     
 }
\ No newline at end of file
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundTopicBridge.java b/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundTopicBridge.java
index c43fc8c2d0..a9250147b5 100755
--- a/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundTopicBridge.java
+++ b/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundTopicBridge.java
@@ -28,12 +28,14 @@ package org.apache.activemq.network.jms;
 public class InboundTopicBridge extends TopicBridge{
        
     String inboundTopicName;
+    String localTopicName;
     /**
      * Constructor that takes a foriegn destination as an argument
      * @param inboundTopicName
      */
     public  InboundTopicBridge(String  inboundTopicName){
         this.inboundTopicName = inboundTopicName;
+        this.localTopicName = inboundTopicName;
     }
     
     /**
@@ -50,10 +52,27 @@ public class InboundTopicBridge extends TopicBridge{
     }
 
     /**
-     * @param outboundTopicName The outboundTopicName to set.
+     * @param inboundTopicName 
      */
     public void setInboundTopicName(String inboundTopicName){
         this.inboundTopicName=inboundTopicName;
+        if(this.localTopicName==null){
+            this.localTopicName = inboundTopicName;
+        }
+    }
+
+    /**
+     * @return the localTopicName
+     */
+    public String getLocalTopicName(){
+        return localTopicName;
+    }
+
+    /**
+     * @param localTopicName the localTopicName to set
+     */
+    public void setLocalTopicName(String localTopicName){
+        this.localTopicName=localTopicName;
     }
     
 }
\ No newline at end of file
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java b/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java
index 0aadb03187..f7a7f19b99 100755
--- a/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java
+++ b/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java
@@ -263,8 +263,9 @@ public class JmsQueueConnector extends JmsConnector{
             QueueSession localSession = localQueueConnection.createQueueSession(false,Session.AUTO_ACKNOWLEDGE);
             for(int i=0;i<inboundQueueBridges.length;i++){
                 InboundQueueBridge bridge=inboundQueueBridges[i];
-                String queueName=bridge.getInboundQueueName();
-                Queue activemqQueue=createActiveMQQueue(localSession,queueName);
+                String localQueueName=bridge.getLocalQueueName();
+                Queue activemqQueue=createActiveMQQueue(localSession,localQueueName);
+                String queueName = bridge.getInboundQueueName();
                 Queue foreignQueue=createForeignQueue(outboundSession,queueName);
                 bridge.setConsumerQueue(foreignQueue);
                 bridge.setProducerQueue(activemqQueue);
@@ -287,8 +288,9 @@ public class JmsQueueConnector extends JmsConnector{
             QueueSession localSession = localQueueConnection.createQueueSession(false,Session.AUTO_ACKNOWLEDGE);
             for(int i=0;i<outboundQueueBridges.length;i++){
                 OutboundQueueBridge bridge=outboundQueueBridges[i];
+                String localQueueName=bridge.getLocalQueueName();              
+                Queue activemqQueue=createActiveMQQueue(localSession,localQueueName);
                 String queueName=bridge.getOutboundQueueName();
-                Queue activemqQueue=createActiveMQQueue(localSession,queueName);
                 Queue foreignQueue=createForeignQueue(outboundSession,queueName);
                 bridge.setConsumerQueue(activemqQueue);
                 bridge.setProducerQueue(foreignQueue);
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java b/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java
index 56027b5f6e..1be1686076 100755
--- a/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java
+++ b/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java
@@ -265,8 +265,9 @@ public class JmsTopicConnector extends JmsConnector{
             TopicSession localSession = localTopicConnection.createTopicSession(false,Session.AUTO_ACKNOWLEDGE);
             for(int i=0;i<inboundTopicBridges.length;i++){
                 InboundTopicBridge bridge=inboundTopicBridges[i];
+                String localTopicName=bridge.getLocalTopicName();          
+                Topic activemqTopic=createActiveMQTopic(localSession,localTopicName);
                 String topicName=bridge.getInboundTopicName();
-                Topic activemqTopic=createActiveMQTopic(localSession,topicName);
                 Topic foreignTopic=createForeignTopic(outboundSession,topicName);
                 bridge.setConsumerTopic(foreignTopic);
                 bridge.setProducerTopic(activemqTopic);
@@ -289,8 +290,9 @@ public class JmsTopicConnector extends JmsConnector{
             TopicSession localSession = localTopicConnection.createTopicSession(false,Session.AUTO_ACKNOWLEDGE);
             for(int i=0;i<outboundTopicBridges.length;i++){
                 OutboundTopicBridge bridge=outboundTopicBridges[i];
+                String localTopicName=bridge.getLocalTopicName();
+                Topic activemqTopic=createActiveMQTopic(localSession,localTopicName);
                 String topicName=bridge.getOutboundTopicName();
-                Topic activemqTopic=createActiveMQTopic(localSession,topicName);
                 Topic foreignTopic=createForeignTopic(outboundSession,topicName);
                 bridge.setConsumerTopic(activemqTopic);
                 bridge.setProducerTopic(foreignTopic);
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundQueueBridge.java b/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundQueueBridge.java
index 908670cb13..1a6ec0037f 100755
--- a/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundQueueBridge.java
+++ b/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundQueueBridge.java
@@ -28,12 +28,14 @@ package org.apache.activemq.network.jms;
 public class OutboundQueueBridge extends QueueBridge{
        
     String outboundQueueName;
+    String localQueueName;
     /**
      * Constructor that takes a foreign destination as an argument
      * @param outboundQueueName
      */
     public  OutboundQueueBridge(String  outboundQueueName){
         this.outboundQueueName = outboundQueueName;
+        this.localQueueName = outboundQueueName;
     }
     
     /**
@@ -54,6 +56,23 @@ public class OutboundQueueBridge extends QueueBridge{
      */
     public void setOutboundQueueName(String outboundQueueName){
         this.outboundQueueName=outboundQueueName;
+        if (this.localQueueName==null){
+            this.localQueueName=outboundQueueName;
+        }
+    }
+
+    /**
+     * @return the localQueueName
+     */
+    public String getLocalQueueName(){
+        return localQueueName;
+    }
+
+    /**
+     * @param localQueueName the localQueueName to set
+     */
+    public void setLocalQueueName(String localQueueName){
+        this.localQueueName=localQueueName;
     }
     
 }
\ No newline at end of file
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundTopicBridge.java b/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundTopicBridge.java
index fc3cbc2591..ab45304204 100755
--- a/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundTopicBridge.java
+++ b/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundTopicBridge.java
@@ -28,12 +28,14 @@ package org.apache.activemq.network.jms;
 public class OutboundTopicBridge extends TopicBridge{
        
     String outboundTopicName;
+    String localTopicName;
     /**
      * Constructor that takes a foreign destination as an argument
      * @param outboundTopicName
      */
     public  OutboundTopicBridge(String  outboundTopicName){
         this.outboundTopicName = outboundTopicName;
+        this.localTopicName = outboundTopicName;
     }
     
     /**
@@ -54,6 +56,23 @@ public class OutboundTopicBridge extends TopicBridge{
      */
     public void setOutboundTopicName(String outboundTopicName){
         this.outboundTopicName=outboundTopicName;
+        if(this.localTopicName==null){
+            this.localTopicName=outboundTopicName;
+        }
+    }
+
+    /**
+     * @return the localTopicName
+     */
+    public String getLocalTopicName(){
+        return localTopicName;
+    }
+
+    /**
+     * @param localTopicName the localTopicName to set
+     */
+    public void setLocalTopicName(String localTopicName){
+        this.localTopicName=localTopicName;
     }
     
 }
\ No newline at end of file