diff --git a/categories/index.html b/categories/index.html
index 5ce7a9c..ce249af 100644
--- a/categories/index.html
+++ b/categories/index.html
@@ -16,7 +16,7 @@
 
     <base href="https://ozone.apache.org/">
 
-    <link rel="canonical" href="https://hadoop.apache.org/ozone">
+    <link rel="canonical" href="https://ozone.apache.org">
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
           integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
@@ -65,7 +65,7 @@
                     <li><a href="downloads">Download</a></li>
                     <li><a href="docs">Documentation</a></li>
                     <li><a href="community">Community</a></li>
-                    <li><a href="https://github.com/apache/hadoop-ozone">Source</a></li>
+                    <li><a href="https://github.com/apache/ozone">Source</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/OZONE">Wiki</a></li>
                 </ul>
             </div>
diff --git a/community/index.html b/community/index.html
index 215f139..8b9c4f5 100644
--- a/community/index.html
+++ b/community/index.html
@@ -16,7 +16,7 @@
 
     <base href="https://ozone.apache.org/">
 
-    <link rel="canonical" href="https://hadoop.apache.org/ozone">
+    <link rel="canonical" href="https://ozone.apache.org">
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
           integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
@@ -65,7 +65,7 @@
                     <li><a href="downloads">Download</a></li>
                     <li><a href="docs">Documentation</a></li>
                     <li><a href="community">Community</a></li>
-                    <li><a href="https://github.com/apache/hadoop-ozone">Source</a></li>
+                    <li><a href="https://github.com/apache/ozone">Source</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/OZONE">Wiki</a></li>
                 </ul>
             </div>
diff --git a/docs/index.html b/docs/index.html
index c3132b6..c45df2d 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -16,7 +16,7 @@
 
     <base href="https://ozone.apache.org/">
 
-    <link rel="canonical" href="https://hadoop.apache.org/ozone">
+    <link rel="canonical" href="https://ozone.apache.org">
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
           integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
@@ -65,7 +65,7 @@
                     <li><a href="downloads">Download</a></li>
                     <li><a href="docs">Documentation</a></li>
                     <li><a href="community">Community</a></li>
-                    <li><a href="https://github.com/apache/hadoop-ozone">Source</a></li>
+                    <li><a href="https://github.com/apache/ozone">Source</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/OZONE">Wiki</a></li>
                 </ul>
             </div>
@@ -107,7 +107,7 @@
   </table>
 </p>
 
-  <p>Documentation is also part the binary release packages and available online from the running Storage Container Manager or Ozone Manager webui.</p>
+  <p>Documentation is also part of the binary release packages and available online from the running Storage Container Manager or Ozone Manager webui.</p>
 
 </div>
 
diff --git a/downloads/index.html b/downloads/index.html
index cfca032..59201c9 100644
--- a/downloads/index.html
+++ b/downloads/index.html
@@ -16,7 +16,7 @@
 
     <base href="https://ozone.apache.org/">
 
-    <link rel="canonical" href="https://hadoop.apache.org/ozone">
+    <link rel="canonical" href="https://ozone.apache.org">
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
           integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
@@ -65,7 +65,7 @@
                     <li><a href="downloads">Download</a></li>
                     <li><a href="docs">Documentation</a></li>
                     <li><a href="community">Community</a></li>
-                    <li><a href="https://github.com/apache/hadoop-ozone">Source</a></li>
+                    <li><a href="https://github.com/apache/ozone">Source</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/OZONE">Wiki</a></li>
                 </ul>
             </div>
diff --git a/faq/index.html b/faq/index.html
index c0f29cb..8c341e8 100644
--- a/faq/index.html
+++ b/faq/index.html
@@ -16,7 +16,7 @@
 
     <base href="https://ozone.apache.org/">
 
-    <link rel="canonical" href="https://hadoop.apache.org/ozone">
+    <link rel="canonical" href="https://ozone.apache.org">
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
           integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
@@ -65,7 +65,7 @@
                     <li><a href="downloads">Download</a></li>
                     <li><a href="docs">Documentation</a></li>
                     <li><a href="community">Community</a></li>
-                    <li><a href="https://github.com/apache/hadoop-ozone">Source</a></li>
+                    <li><a href="https://github.com/apache/ozone">Source</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/OZONE">Wiki</a></li>
                 </ul>
             </div>
diff --git a/index.html b/index.html
index d30e0c3..c08d55e 100644
--- a/index.html
+++ b/index.html
@@ -17,7 +17,7 @@
 
     <base href="https://ozone.apache.org/">
 
-    <link rel="canonical" href="https://hadoop.apache.org/ozone">
+    <link rel="canonical" href="https://ozone.apache.org">
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
           integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
@@ -66,7 +66,7 @@
                     <li><a href="downloads">Download</a></li>
                     <li><a href="docs">Documentation</a></li>
                     <li><a href="community">Community</a></li>
-                    <li><a href="https://github.com/apache/hadoop-ozone">Source</a></li>
+                    <li><a href="https://github.com/apache/ozone">Source</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/OZONE">Wiki</a></li>
                 </ul>
             </div>
diff --git a/index.xml b/index.xml
index 89c7359..5bf0c44 100644
--- a/index.xml
+++ b/index.xml
@@ -94,7 +94,7 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://ozone.apache.org/docs/</guid>
-      <description>Documentation is also part the binary release packages and available online from the running Storage Container Manager or Ozone Manager webui.</description>
+      <description>Documentation is also part of the binary release packages and available online from the running Storage Container Manager or Ozone Manager webui.</description>
     </item>
     
     <item>
diff --git a/release/0.2.1-alpha/index.html b/release/0.2.1-alpha/index.html
index 7027d5c..976c6d3 100644
--- a/release/0.2.1-alpha/index.html
+++ b/release/0.2.1-alpha/index.html
@@ -16,7 +16,7 @@
 
     <base href="https://ozone.apache.org/">
 
-    <link rel="canonical" href="https://hadoop.apache.org/ozone">
+    <link rel="canonical" href="https://ozone.apache.org">
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
           integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
@@ -65,7 +65,7 @@
                     <li><a href="downloads">Download</a></li>
                     <li><a href="docs">Documentation</a></li>
                     <li><a href="community">Community</a></li>
-                    <li><a href="https://github.com/apache/hadoop-ozone">Source</a></li>
+                    <li><a href="https://github.com/apache/ozone">Source</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/OZONE">Wiki</a></li>
                 </ul>
             </div>
diff --git a/release/0.3.0-alpha/index.html b/release/0.3.0-alpha/index.html
index 07b8ef7..e6dbe88 100644
--- a/release/0.3.0-alpha/index.html
+++ b/release/0.3.0-alpha/index.html
@@ -16,7 +16,7 @@
 
     <base href="https://ozone.apache.org/">
 
-    <link rel="canonical" href="https://hadoop.apache.org/ozone">
+    <link rel="canonical" href="https://ozone.apache.org">
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
           integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
@@ -65,7 +65,7 @@
                     <li><a href="downloads">Download</a></li>
                     <li><a href="docs">Documentation</a></li>
                     <li><a href="community">Community</a></li>
-                    <li><a href="https://github.com/apache/hadoop-ozone">Source</a></li>
+                    <li><a href="https://github.com/apache/ozone">Source</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/OZONE">Wiki</a></li>
                 </ul>
             </div>
diff --git a/release/0.4.0-alpha/index.html b/release/0.4.0-alpha/index.html
index 34ce4c2..9a0efc4 100644
--- a/release/0.4.0-alpha/index.html
+++ b/release/0.4.0-alpha/index.html
@@ -16,7 +16,7 @@
 
     <base href="https://ozone.apache.org/">
 
-    <link rel="canonical" href="https://hadoop.apache.org/ozone">
+    <link rel="canonical" href="https://ozone.apache.org">
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
           integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
@@ -65,7 +65,7 @@
                     <li><a href="downloads">Download</a></li>
                     <li><a href="docs">Documentation</a></li>
                     <li><a href="community">Community</a></li>
-                    <li><a href="https://github.com/apache/hadoop-ozone">Source</a></li>
+                    <li><a href="https://github.com/apache/ozone">Source</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/OZONE">Wiki</a></li>
                 </ul>
             </div>
diff --git a/release/0.4.1-alpha/index.html b/release/0.4.1-alpha/index.html
index 6e930cf..cc14dfa 100644
--- a/release/0.4.1-alpha/index.html
+++ b/release/0.4.1-alpha/index.html
@@ -16,7 +16,7 @@
 
     <base href="https://ozone.apache.org/">
 
-    <link rel="canonical" href="https://hadoop.apache.org/ozone">
+    <link rel="canonical" href="https://ozone.apache.org">
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
           integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
@@ -65,7 +65,7 @@
                     <li><a href="downloads">Download</a></li>
                     <li><a href="docs">Documentation</a></li>
                     <li><a href="community">Community</a></li>
-                    <li><a href="https://github.com/apache/hadoop-ozone">Source</a></li>
+                    <li><a href="https://github.com/apache/ozone">Source</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/OZONE">Wiki</a></li>
                 </ul>
             </div>
diff --git a/release/0.5.0-beta/index.html b/release/0.5.0-beta/index.html
index 39c7a29..3abc9eb 100644
--- a/release/0.5.0-beta/index.html
+++ b/release/0.5.0-beta/index.html
@@ -16,7 +16,7 @@
 
     <base href="https://ozone.apache.org/">
 
-    <link rel="canonical" href="https://hadoop.apache.org/ozone">
+    <link rel="canonical" href="https://ozone.apache.org">
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
           integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
@@ -65,7 +65,7 @@
                     <li><a href="downloads">Download</a></li>
                     <li><a href="docs">Documentation</a></li>
                     <li><a href="community">Community</a></li>
-                    <li><a href="https://github.com/apache/hadoop-ozone">Source</a></li>
+                    <li><a href="https://github.com/apache/ozone">Source</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/OZONE">Wiki</a></li>
                 </ul>
             </div>
diff --git a/release/1.0.0/index.html b/release/1.0.0/index.html
index b0ca51a..3d9f34e 100644
--- a/release/1.0.0/index.html
+++ b/release/1.0.0/index.html
@@ -16,7 +16,7 @@
 
     <base href="https://ozone.apache.org/">
 
-    <link rel="canonical" href="https://hadoop.apache.org/ozone">
+    <link rel="canonical" href="https://ozone.apache.org">
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
           integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
@@ -65,7 +65,7 @@
                     <li><a href="downloads">Download</a></li>
                     <li><a href="docs">Documentation</a></li>
                     <li><a href="community">Community</a></li>
-                    <li><a href="https://github.com/apache/hadoop-ozone">Source</a></li>
+                    <li><a href="https://github.com/apache/ozone">Source</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/OZONE">Wiki</a></li>
                 </ul>
             </div>
diff --git a/release/1.1.0/index.html b/release/1.1.0/index.html
index c6248f1..fc6a5ff 100644
--- a/release/1.1.0/index.html
+++ b/release/1.1.0/index.html
@@ -16,7 +16,7 @@
 
     <base href="https://ozone.apache.org/">
 
-    <link rel="canonical" href="https://hadoop.apache.org/ozone">
+    <link rel="canonical" href="https://ozone.apache.org">
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
           integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
@@ -65,7 +65,7 @@
                     <li><a href="downloads">Download</a></li>
                     <li><a href="docs">Documentation</a></li>
                     <li><a href="community">Community</a></li>
-                    <li><a href="https://github.com/apache/hadoop-ozone">Source</a></li>
+                    <li><a href="https://github.com/apache/ozone">Source</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/OZONE">Wiki</a></li>
                 </ul>
             </div>
diff --git a/release/index.html b/release/index.html
index a781156..61792e0 100644
--- a/release/index.html
+++ b/release/index.html
@@ -16,7 +16,7 @@
 
     <base href="https://ozone.apache.org/">
 
-    <link rel="canonical" href="https://hadoop.apache.org/ozone">
+    <link rel="canonical" href="https://ozone.apache.org">
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
           integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
@@ -65,7 +65,7 @@
                     <li><a href="downloads">Download</a></li>
                     <li><a href="docs">Documentation</a></li>
                     <li><a href="community">Community</a></li>
-                    <li><a href="https://github.com/apache/hadoop-ozone">Source</a></li>
+                    <li><a href="https://github.com/apache/ozone">Source</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/OZONE">Wiki</a></li>
                 </ul>
             </div>
diff --git a/tags/index.html b/tags/index.html
index c3f2fd1..935a92f 100644
--- a/tags/index.html
+++ b/tags/index.html
@@ -16,7 +16,7 @@
 
     <base href="https://ozone.apache.org/">
 
-    <link rel="canonical" href="https://hadoop.apache.org/ozone">
+    <link rel="canonical" href="https://ozone.apache.org">
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
           integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
@@ -65,7 +65,7 @@
                     <li><a href="downloads">Download</a></li>
                     <li><a href="docs">Documentation</a></li>
                     <li><a href="community">Community</a></li>
-                    <li><a href="https://github.com/apache/hadoop-ozone">Source</a></li>
+                    <li><a href="https://github.com/apache/ozone">Source</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/OZONE">Wiki</a></li>
                 </ul>
             </div>