diff --git a/about.md b/about.md
index 157a88c..0e423cf 100644
--- a/about.md
+++ b/about.md
@@ -16,7 +16,7 @@
   database concepts.
 * An expressive and declarative query language (AQL) for querying
   semi-structured data.
-* A runtime query execution engine, Hyracks, for partitioned-parallel
+* A runtime query execution engine, Apache Hyracks, for partitioned-parallel
   execution of query plans.
 * Partitioned LSM-based data storage and indexing for efficient
   ingestion of newly arriving data.
@@ -30,6 +30,7 @@
   those of a NoSQL store.
 
 ### History
+
 Prior to being developed at the Apache Software Foundation AsterixDB was co-developed by a team of faculty, staff, and
 students at UC Irvine and UC Riverside. The project was initiated as a large NSF-sponsored project in 2009, the goal of
 which was to combine the best ideas from the parallel database world, the then new Apache Hadoop world, and the
@@ -37,3 +38,8 @@
 release was made four years later, in June of 2013, under the Apache Software License 2.0. AsterixDB was accepted into
 the Apache Incubator in Febuary of 2015 and was established as a TLP in April of 2016.
 
+### More information
+
+More information about AsterixDB (and its underlying frameworks Hyracks and Algebricks) can be found on the site of the
+[ASTERIX project at UC Irvine](http://asterix.ics.uci.edu/) - especially in the
+[Publications section](http://asterix.ics.uci.edu/publications.html).
diff --git a/content/about.html b/content/about.html
index fec3560..fcd55ef 100644
--- a/content/about.html
+++ b/content/about.html
@@ -119,7 +119,7 @@
 database concepts.</li>
   <li>An expressive and declarative query language (AQL) for querying
 semi-structured data.</li>
-  <li>A runtime query execution engine, Hyracks, for partitioned-parallel
+  <li>A runtime query execution engine, Apache Hyracks, for partitioned-parallel
 execution of query plans.</li>
   <li>Partitioned LSM-based data storage and indexing for efficient
 ingestion of newly arriving data.</li>
@@ -134,6 +134,7 @@
 </ul>
 
 <h3 id="history">History</h3>
+
 <p>Prior to being developed at the Apache Software Foundation AsterixDB was co-developed by a team of faculty, staff, and
 students at UC Irvine and UC Riverside. The project was initiated as a large NSF-sponsored project in 2009, the goal of
 which was to combine the best ideas from the parallel database world, the then new Apache Hadoop world, and the
@@ -141,6 +142,11 @@
 release was made four years later, in June of 2013, under the Apache Software License 2.0. AsterixDB was accepted into
 the Apache Incubator in Febuary of 2015 and was established as a TLP in April of 2016.</p>
 
+<h3 id="more-information">More information</h3>
+
+<p>More information about AsterixDB (and its underlying frameworks Hyracks and Algebricks) can be found on the site of the
+<a href="http://asterix.ics.uci.edu/">ASTERIX project at UC Irvine</a> - especially in the
+<a href="http://asterix.ics.uci.edu/publications.html">Publications section</a>.</p>
 
 </div>
 </div>
diff --git a/content/download.html b/content/download.html
index 25221e8..0f871c4 100644
--- a/content/download.html
+++ b/content/download.html
@@ -114,14 +114,13 @@
 
     <p>Apache AsterixDB™ source releases as a tarball/zip are available on the ASF mirror of your choice.</p>
 
-    <p>Feel free to browse and download the source tree of AsterixDB (and Hyracks) from our GitHub mirror.</p>
+    <p>Feel free to browse and download the source tree of AsterixDB from our GitHub mirror.</p>
 
   </div>
 <div class="col-md-6">
 
     <p><a class="btn btn-md btn-info" href="https://www.apache.org/dyn/closer.cgi/incubator/asterixdb" role="button">Source Tarballs <i class="fa fa-download fa-lg"></i></a></p>
-    <p><a class="btn btn-md btn-info" href="https://github.com/apache/incubator-asterixdb/" role="button">AsterixDB on GitHub <i class="fa fa-github fa-lg"></i></a></p>
-    <p><a class="btn btn-md btn-info" href="https://github.com/apache/incubator-asterixdb-hyracks/" role="button">Hyracks on GitHub <i class="fa fa-github fa-lg"></i></a></p>
+    <p><a class="btn btn-md btn-info" href="https://github.com/apache/asterixdb" role="button">AsterixDB on GitHub <i class="fa fa-github fa-lg"></i></a></p>
 
   </div>
 </div>
diff --git a/content/site.html b/content/site.html
index df6b5d4..73e11bf 100644
--- a/content/site.html
+++ b/content/site.html
@@ -135,12 +135,12 @@
 
 <p>The website is managed using <code>git</code>. Clone the site as usual</p>
 
-<pre><code>➤ git clone -b asf-site https://git-wip-us.apache.org/repos/asf/incubator-asterixdb-site.git
+<pre><code>➤ git clone -b asf-site https://git-wip-us.apache.org/repos/asf/asterixdb-site.git
 </code></pre>
 
 <p>and <code>cd</code> into the clone</p>
 
-<pre><code>➤ cd incubator-asterixdb-site
+<pre><code>➤ cd asterixdb-site
 </code></pre>
 
 <p>You will notice lots of Markdown files and HTML templates in the repository root. The compiled content of the website itself is served from the <code>content/</code> folder in this repository. That is to say, that the actual content of the website itself, as well as its sources are stored in the same repository. Additionally, the main branch on this repository is <code>asf-site</code> and not <code>master</code></p>
@@ -205,7 +205,7 @@
 <p>If jekyll produces an error message like this one:</p>
 
 <pre><code>➤ jekyll serve --watch
-Configuration file: /.../incubator-asterixdb-site/_config.yml
+Configuration file: /.../asterixdb-site/_config.yml
 You are missing a library required for syntax highlighting. Please run:
 $ [sudo] gem install pygments
 jekyll 3.1.2 | Error:  uninitialized constant Kramdown::Converter::PygmentsHtml::FatalException
diff --git a/download.md b/download.md
index d72407c..7165e3a 100644
--- a/download.md
+++ b/download.md
@@ -12,14 +12,13 @@
 
 Apache AsterixDB&trade; source releases as a tarball/zip are available on the ASF mirror of your choice.
 
-Feel free to browse and download the source tree of AsterixDB (and Hyracks) from our GitHub mirror.
+Feel free to browse and download the source tree of AsterixDB from our GitHub mirror.
 
 </div>
 <div class="col-md-6" markdown="1">
 
 <p><a class="btn btn-md btn-info" href="https://www.apache.org/dyn/closer.cgi/incubator/asterixdb" role="button">Source Tarballs <i class="fa fa-download fa-lg"></i></a></p>
-<p><a class="btn btn-md btn-info" href="https://github.com/apache/incubator-asterixdb/" role="button">AsterixDB on GitHub <i class="fa fa-github fa-lg"></i></a></p>
-<p><a class="btn btn-md btn-info" href="https://github.com/apache/incubator-asterixdb-hyracks/" role="button">Hyracks on GitHub <i class="fa fa-github fa-lg"></i></a></p>
+<p><a class="btn btn-md btn-info" href="https://github.com/apache/asterixdb" role="button">AsterixDB on GitHub <i class="fa fa-github fa-lg"></i></a></p>
 
 </div>
 </div>
diff --git a/site.md b/site.md
index 213aef1..f6af732 100644
--- a/site.md
+++ b/site.md
@@ -22,11 +22,11 @@
 
 The website is managed using `git`. Clone the site as usual
 
-    ➤ git clone -b asf-site https://git-wip-us.apache.org/repos/asf/incubator-asterixdb-site.git
+    ➤ git clone -b asf-site https://git-wip-us.apache.org/repos/asf/asterixdb-site.git
 
 and `cd` into the clone
 
-    ➤ cd incubator-asterixdb-site
+    ➤ cd asterixdb-site
 
 You will notice lots of Markdown files and HTML templates in the repository root. The compiled content of the website itself is served from the `content/` folder in this repository. That is to say, that the actual content of the website itself, as well as its sources are stored in the same repository. Additionally, the main branch on this repository is `asf-site` and not `master`
 
@@ -82,7 +82,7 @@
 If jekyll produces an error message like this one:
 
     ➤ jekyll serve --watch
-    Configuration file: /.../incubator-asterixdb-site/_config.yml
+    Configuration file: /.../asterixdb-site/_config.yml
     You are missing a library required for syntax highlighting. Please run:
     $ [sudo] gem install pygments
     jekyll 3.1.2 | Error:  uninitialized constant Kramdown::Converter::PygmentsHtml::FatalException