http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Concepts-Virtualhost-Nodes.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Concepts-Virtualhost-Nodes.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Concepts-Virtualhost-Nodes.html
index 1c83955..9bf0c0b 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Concepts-Virtualhost-Nodes.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Concepts-Virtualhost-Nodes.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Concepts-Virtualhosts.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Concepts-Virtualhosts.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Concepts-Virtualhosts.html
index 5e8a5df..01b6836 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Concepts-Virtualhosts.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Concepts-Virtualhosts.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Concepts.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Concepts.html 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Concepts.html
index ac9bfb8..acbd6c8 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Concepts.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Concepts.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started-CommandLine.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started-CommandLine.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started-CommandLine.html
index e062bd5..66520c3 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started-CommandLine.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started-CommandLine.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started-Logging.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started-Logging.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started-Logging.html
index 9dd0fc4..7af174d 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started-Logging.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started-Logging.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
index b0d5814..7bbad18 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
index 9aa62c6..875f828 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started.html
index ef1d88b..2180808 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Getting-Started.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Backup.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Backup.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Backup.html
index 4b8b778..6489e3f 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Backup.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Backup.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Behaviour.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Behaviour.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Behaviour.html
index 44b96c5..e2b9fef 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Behaviour.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Behaviour.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-ClientFailover.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-ClientFailover.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-ClientFailover.html
index 9eca332..001c2a5 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-ClientFailover.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-ClientFailover.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-CreatingGroup.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-CreatingGroup.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-CreatingGroup.html
index 8e73100..5092dd4 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-CreatingGroup.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-CreatingGroup.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-DiskSpace.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-DiskSpace.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-DiskSpace.html
index e6b1b50..3a70fe3 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-DiskSpace.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-DiskSpace.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Network-Requirements.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Network-Requirements.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Network-Requirements.html
index 21303c4..f4383e0 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Network-Requirements.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Network-Requirements.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-NodeOperations.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-NodeOperations.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-NodeOperations.html
index 804f8b4..09174d1 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-NodeOperations.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-NodeOperations.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-OverviewOfHA.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-OverviewOfHA.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-OverviewOfHA.html
index 32d479c..07f3d4c 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-OverviewOfHA.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-OverviewOfHA.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
index 4f8027b..5c5ff6b 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Security.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Security.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Security.html
index ac28520..42e1377 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Security.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability-Security.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability.html
index b66a8ec..eea10d8 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-High-Availability.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
index cd707a0..8fb6351 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
index 87b0160..13cb4cc 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Example.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Example.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Example.html
index de83ca8..07a4cde 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Example.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Example.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
index 3ed18b6..3b90f81 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Location.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Location.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Location.html
index eb9f482..b7df1af 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Location.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Location.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Overwrite-Config-Store.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Overwrite-Config-Store.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Overwrite-Config-Store.html
index 6585fa2..ad2df57 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Overwrite-Config-Store.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Overwrite-Config-Store.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Type.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Type.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Type.html
index 17ef95a..377394a 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Type.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration-Type.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration.html
index 4899a30..25d0fa6 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Initial-Configuration.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-Download.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-Download.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-Download.html
index 58959f8..408142d 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-Download.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-Download.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-InstallationUnix.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-InstallationUnix.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-InstallationUnix.html
index 0550a81..bd58b8c 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-InstallationUnix.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-InstallationUnix.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-InstallationWindows.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-InstallationWindows.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-InstallationWindows.html
index 259d542..a966c22 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-InstallationWindows.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-InstallationWindows.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-OptionalDependencies.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-OptionalDependencies.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-OptionalDependencies.html
index 568094d..a74af25 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-OptionalDependencies.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-OptionalDependencies.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-Prerequistes.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-Prerequistes.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-Prerequistes.html
index 58c7777..013786a 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-Prerequistes.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation-Prerequistes.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation.html
index 7692e04..d55d81f 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Installation.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Introduction.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Introduction.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Introduction.html
index 2216d51..397336c 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Introduction.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Introduction.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
index 126c881..63ea5af 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel-QMF.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel-QMF.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel-QMF.html
index 455945d..01be082 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel-QMF.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel-QMF.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel-REST-API.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel-REST-API.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel-REST-API.html
index d54c8d8..6d6108d 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel-REST-API.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel-REST-API.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel-Web-Console.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel-Web-Console.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel-Web-Console.html
index e63b42a..4f079f8 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel-Web-Console.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel-Web-Console.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel.html
index 32a4bc7..4115528 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Channel.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Access-Control-Providers.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Access-Control-Providers.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Access-Control-Providers.html
index 9912421..8302e00 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Access-Control-Providers.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Access-Control-Providers.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Authentication-Providers.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Authentication-Providers.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Authentication-Providers.html
index 48895d2..2cdbb5c 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Authentication-Providers.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Authentication-Providers.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Broker.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Broker.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Broker.html
index 9f0fbdf..17dfbc8 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Broker.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Broker.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Consumers.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Consumers.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Consumers.html
index 2786ac3..0bbca59 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Consumers.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Consumers.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Entities-Matrix.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Entities-Matrix.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Entities-Matrix.html
index b8f3030..5e3962f 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Entities-Matrix.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Entities-Matrix.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Entities.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Entities.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Entities.html
index 5b2b53b..498b6a6 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Entities.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Entities.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Exchanges.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Exchanges.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Exchanges.html
index c453c6a..515a089 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Exchanges.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Exchanges.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Group-Providers.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Group-Providers.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Group-Providers.html
index dab2f45..ec19ca5 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Group-Providers.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Group-Providers.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Keystores.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Keystores.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Keystores.html
index f04cc30..c0cddbf 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Keystores.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Keystores.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Plugin-HTTP.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Plugin-HTTP.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Plugin-HTTP.html
index f84af4d..3bc84ec 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Plugin-HTTP.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Plugin-HTTP.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Ports.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Ports.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Ports.html
index 107070c..cf44358 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Ports.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Ports.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Queues.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Queues.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Queues.html
index c33d53b..c34e3d3 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Queues.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Queues.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
index 17e6545..0e0a82d 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Truststores.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Truststores.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Truststores.html
index c2a05b8..beb593d 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Truststores.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Truststores.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
index 302d066..ca5a235 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Virtualhosts.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Virtualhosts.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Virtualhosts.html
index cd8aac2..c4f5389 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Virtualhosts.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Management-Managing-Virtualhosts.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
index 0fe34d7..460ddd9 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html
index 9ac67b2..1406987 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Miscellaneous.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Miscellaneous.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Miscellaneous.html
index 8aba741..dccf42a 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Miscellaneous.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Miscellaneous.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Background-Recovery.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Background-Recovery.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Background-Recovery.html
index a81ccce..bbc339c 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Background-Recovery.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Background-Recovery.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
index 0fd865c..71db12d 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Connection-Limit.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Connection-Limit.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Connection-Limit.html
index a8b0650..6759f84 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Connection-Limit.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Connection-Limit.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Disk-Space-Management.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Disk-Space-Management.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Disk-Space-Management.html
index 43ba3dd..5fb6212 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Disk-Space-Management.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Disk-Space-Management.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Flow-To-Disk.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Flow-To-Disk.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Flow-To-Disk.html
index adb5e7c..ae6bf7c 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Flow-To-Disk.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Flow-To-Disk.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
index 4743617..baa117d 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Memory.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Memory.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Memory.html
index d02d4d2..2be4bd4 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Memory.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Memory.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Message-Compression.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Message-Compression.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Message-Compression.html
index 33f23ed..2973831 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Message-Compression.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Message-Compression.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Producer-Transaction-Timeout.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Producer-Transaction-Timeout.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Producer-Transaction-Timeout.html
index c2d06e1..eb596e7 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Producer-Transaction-Timeout.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime-Producer-Transaction-Timeout.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime.html 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime.html
index 2369fa1..bc305c7 100644
--- a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime.html
+++ b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Runtime.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Security-ACLs.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Security-ACLs.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Security-ACLs.html
index 4f3ecca..f2279be 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Security-ACLs.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Security-ACLs.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Security-Configuration-Encryption.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Security-Configuration-Encryption.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Security-Configuration-Encryption.html
index 47e4f8b..f4dafea 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Security-Configuration-Encryption.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Security-Configuration-Encryption.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Security-Group-Providers.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Security-Group-Providers.html
 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Security-Group-Providers.html
index 9b149c9..6e84178 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Security-Group-Providers.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Security-Group-Providers.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Security.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Security.html 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Security.html
index d40c18b..c2a0278 100644
--- 
a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Security.html
+++ 
b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Security.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/java-broker/book/index.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-6.0.4/java-broker/book/index.html 
b/content/releases/qpid-java-6.0.4/java-broker/book/index.html
index 044ade7..9b6f61c 100644
--- a/content/releases/qpid-java-6.0.4/java-broker/book/index.html
+++ b/content/releases/qpid-java-6.0.4/java-broker/book/index.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/jms-client-0-10/book/JMS-Client-0-10-Book.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/jms-client-0-10/book/JMS-Client-0-10-Book.html
 
b/content/releases/qpid-java-6.0.4/jms-client-0-10/book/JMS-Client-0-10-Book.html
index df789ff..c7f9448 100644
--- 
a/content/releases/qpid-java-6.0.4/jms-client-0-10/book/JMS-Client-0-10-Book.html
+++ 
b/content/releases/qpid-java-6.0.4/jms-client-0-10/book/JMS-Client-0-10-Book.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/jms-client-0-10/book/JMS-Client-0-10-Configuring-Addresses.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/jms-client-0-10/book/JMS-Client-0-10-Configuring-Addresses.html
 
b/content/releases/qpid-java-6.0.4/jms-client-0-10/book/JMS-Client-0-10-Configuring-Addresses.html
index cd8884c..6a6a53f 100644
--- 
a/content/releases/qpid-java-6.0.4/jms-client-0-10/book/JMS-Client-0-10-Configuring-Addresses.html
+++ 
b/content/releases/qpid-java-6.0.4/jms-client-0-10/book/JMS-Client-0-10-Configuring-Addresses.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.4/jms-client-0-10/book/JMS-Client-0-10-Configuring-JNDI.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.4/jms-client-0-10/book/JMS-Client-0-10-Configuring-JNDI.html
 
b/content/releases/qpid-java-6.0.4/jms-client-0-10/book/JMS-Client-0-10-Configuring-JNDI.html
index 8c1c4c1..c27295d 100644
--- 
a/content/releases/qpid-java-6.0.4/jms-client-0-10/book/JMS-Client-0-10-Configuring-JNDI.html
+++ 
b/content/releases/qpid-java-6.0.4/jms-client-0-10/book/JMS-Client-0-10-Configuring-JNDI.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

Reply via email to