APEXCORE-442 Removed incubating
diff --git a/README.md b/README.md
index 1dccc54..3cbadd2 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Apache Apex Incubator Website
+Apache Apex Website
 =============================
 
 This is the source code for the Apache Apex website, hosted at [apex.apache.org](http://apex.apache.org/). The following tools are used to build the html pages:
@@ -59,7 +59,7 @@
 ------------
 If you would like to make a change to the site:
 
-1. Fork the [github mirror](https://github.com/apache/incubator-apex-site)
+1. Fork the [github mirror](https://github.com/apache/apex-site)
 2. Create a new branch from `master`
 3. Add commit(s) to your branch
 4. Test your changes locally (see Development section below)
@@ -69,7 +69,7 @@
 If you are a committer, do the following:
 
 1. Update the master branch with your (or a Pull Request's) change.
-2. Push updated master to the asf remote master (https://git-wip-us.apache.org/repos/asf/incubator-apex-site.git)
+2. Push updated master to the asf remote master (https://git-wip-us.apache.org/repos/asf/apex-site.git)
 2. Run `build.sh` from the master branch directory (requires nodejs and npm). This will:
   - ensure the necessary npm and bower dependencies are installed
   - checks out and updates the `asf-site` branch with a new commit of the build from the current branch
diff --git a/bower.json b/bower.json
index 14994b8..b5c5ef4 100644
--- a/bower.json
+++ b/bower.json
@@ -1,20 +1,19 @@
 {
-  "name": "apex-incubator-site",
+  "name": "apex-site",
   "version": "1.0.0",
   "authors": [
     "Andy Perlitch <andyperlitch@gmail.com>"
   ],
-  "description": "The public incubator website for the Apache Apex Project",
+  "description": "The public website for the Apache Apex Project",
   "keywords": [
     "apache",
     "software",
     "foundation",
     "apex",
-    "incubator",
     "website"
   ],
   "license": "Apache-2.0",
-  "homepage": "http://apex.incubator.apache.org/",
+  "homepage": "http://apex.apache.org/",
   "ignore": [
     "**/.*",
     "node_modules",
diff --git a/gulpfile.js b/gulpfile.js
index 6e90a37..233e4f0 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -298,8 +298,8 @@
   // The release "targets", in this case meaning apex-core and apex-malhar
   var targets = [
     // NOTE: Once apex leaves incubation, this object should be changed to exclude "incubator"
-    { key: 'core.src',   path: 'release/incubator/apex',        repo: 'incubator-apex-core' },
-    { key: 'malhar.src', path: 'release/incubator/apex/malhar', repo: 'incubator-apex-malhar' }
+    { key: 'core.src',   path: 'release/incubator/apex',        repo: 'apex-core' },
+    { key: 'malhar.src', path: 'release/incubator/apex/malhar', repo: 'apex-malhar' }
   ];
 
   // For each target, get the releases
diff --git a/navigation.json b/navigation.json
index 96f8d58..8255001 100644
--- a/navigation.json
+++ b/navigation.json
@@ -4,17 +4,16 @@
   { "id": "community", "label": "Community", "href": "/community.html" },
   { "id": "docs", "label": "Docs", "href": "/docs.html" },
   { "id": "source", "label": "Source", "items": [
-    { "label": "Apex Core (ASF)", "href": "https://git-wip-us.apache.org/repos/asf?p=incubator-apex-core.git" },
-    { "label": "Apex Core (Github Mirror)", "href": "https://github.com/apache/incubator-apex-core" },
-    { "label": "Apex Malhar (ASF)", "href": "https://git-wip-us.apache.org/repos/asf?p=incubator-apex-malhar.git" },
-    { "label": "Apex Malhar (Github Mirror)", "href": "https://github.com/apache/incubator-apex-malhar" }
+    { "label": "Apex Core (ASF)", "href": "https://git-wip-us.apache.org/repos/asf?p=apex-core.git" },
+    { "label": "Apex Core (Github Mirror)", "href": "https://github.com/apache/apex-core" },
+    { "label": "Apex Malhar (ASF)", "href": "https://git-wip-us.apache.org/repos/asf?p=apex-malhar.git" },
+    { "label": "Apex Malhar (Github Mirror)", "href": "https://github.com/apache/apex-malhar" }
   ] },
   { "id": "apache", "label": "Apache", "items": [
-    { "label": "Status Page", "href": "http://incubator.apache.org/projects/apex.html" },
     { "label": "Apache Foundation", "href": "http://www.apache.org/foundation/how-it-works.html" },
     { "label": "Apache License", "href": "http://www.apache.org/licenses/" },
     { "label": "Sponsorship", "href": "http://www.apache.org/foundation/sponsorship.html" },
     { "label": "Thanks", "href": "http://www.apache.org/foundation/thanks.html" }
   ]},
   { "id": "download", "label": "Download", "href": "/downloads.html", "classes": "btn btn-success" }
-]
\ No newline at end of file
+]
diff --git a/package.json b/package.json
index deb79b7..d1f46e2 100644
--- a/package.json
+++ b/package.json
@@ -1,21 +1,20 @@
 {
-  "name": "apex-incubator-site",
+  "name": "apex-site",
   "version": "1.0.0",
-  "description": "The public incubator website for the Apache Apex Project",
+  "description": "The public website for the Apache Apex Project",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
     "type": "git",
-    "url": "https://git-wip-us.apache.org/repos/asf/incubator-apex-site.git"
+    "url": "https://git-wip-us.apache.org/repos/asf/apex-site.git"
   },
   "keywords": [
     "apache",
     "software",
     "foundation",
     "apex",
-    "incubator",
     "website"
   ],
   "author": "Andy Perlitch <andy@datatorrent.com>",
diff --git a/src/md/community.md b/src/md/community.md
index 6cb67c5..ffd869a 100644
--- a/src/md/community.md
+++ b/src/md/community.md
@@ -20,8 +20,8 @@
 
 The Apex Project is made up of two repositories:
 
-- [Apex Core](https://github.com/apache/incubator-apex-core) - The core of the Apex platform.
-- [Apex Malhar](https://github.com/apache/incubator-apex-malhar) - Community-driven set of open-source "operators" and utilities for use in your Apex applications.
+- [Apex Core](https://github.com/apache/apex-core) - The core of the Apex platform.
+- [Apex Malhar](https://github.com/apache/apex-malhar) - Community-driven set of open-source "operators" and utilities for use in your Apex applications.
 
 ## Release Process
 
diff --git a/src/md/contributing.md b/src/md/contributing.md
index 211c708..d0ae543 100644
--- a/src/md/contributing.md
+++ b/src/md/contributing.md
@@ -16,23 +16,23 @@
 
 ## Becoming a committer
 
-Community members that make sustained, welcome contributions to the project may be invited to become a committer. Committers are voted in by the PPMC. A committer has a signed Contributor License Agreement ([CLA](http://www.apache.org/licenses/icla.txt)) on file and an apache.org address.
+Community members that make sustained, welcome contributions to the project may be invited to become a committer. Committers are voted in by the PMC. A committer has a signed Contributor License Agreement ([CLA](http://www.apache.org/licenses/icla.txt)) on file and an apache.org address.
 
 We expect committers to subscribe to the [project mailing lists](community.html#mailing-lists).  
 
-A committer will be considered “emeritus/inactive” by not contributing in any form to the project for over 1 year. An emeritus committer may request reinstatement of commit access from the PPMC. Such reinstatement is subject to lazy consensus of active PPMC members.
+A committer will be considered “emeritus/inactive” by not contributing in any form to the project for over 1 year. An emeritus committer may request reinstatement of commit access from the PMC. Such reinstatement is subject to lazy consensus of active PMC members.
 
-The Podling Project Management Committee ([PPMC](http://incubator.apache.org/guides/ppmc.html)) is responsible for the oversight of the project and it also decides who to add as a PPMC member. Existing committers may be invited to become a PPMC member after consistent contribution and activity over a period of time and participation in directional and community building discussions.
+The Project Management Committee ([PMC](http://www.apache.org/dev/pmc.html)) is responsible for the oversight of the project and it also decides who to add as a PMC member. Existing committers may be invited to become a PMC member after consistent contribution and activity over a period of time and participation in directional and community building discussions.
 
 ## Code Style
 Apache Apex follows coding style that is closest to K & R style and uses [Checkstyle](http://checkstyle.sourceforge.net/) tool to enforce these standards. Travis CI will fail for any pull request that introduces any style violations.
 
-The checkstyle configuration that Apache Apex projects use is present here : https://github.com/apache/incubator-apex-core/blob/master/apex_checks.xml
+The checkstyle configuration that Apache Apex projects use is present here : https://github.com/apache/apex-core/blob/master/apex_checks.xml
 
 To make it easier for the users to set up their development environment, settings for the following common IDEs are provided in the Apache Apex Core repository with instructions.
- - [IntelliJ](https://github.com/apache/incubator-apex-core/tree/master/misc/ide-templates/intellij)
- - [Eclipse](https://github.com/apache/incubator-apex-core/tree/master/misc/ide-templates/eclipse)
- - [NetBeans](https://github.com/apache/incubator-apex-core/tree/master/misc/ide-templates/netbeans)
+ - [IntelliJ](https://github.com/apache/apex-core/tree/master/misc/ide-templates/intellij)
+ - [Eclipse](https://github.com/apache/apex-core/tree/master/misc/ide-templates/eclipse)
+ - [NetBeans](https://github.com/apache/apex-core/tree/master/misc/ide-templates/netbeans)
 
 ## Opening Pull Requests (contributors)
 
@@ -40,12 +40,12 @@
 
 1. Create a JIRA ([-core](https://issues.apache.org/jira/browse/APEXCORE/),[-malhar](https://issues.apache.org/jira/browse/APEXMALHAR/)) for the work you plan to do (or assign yourself to an existing JIRA ticket)
 1. Fork the ASF github mirror (one time step):
-   https://github.com/apache/incubator-apex-core/  
+   https://github.com/apache/apex-core/  
 1. Clone the **fork** on your local workspace (one time step):  
-  `git clone https://github.com/{github_username}/incubator-apex-core.git`
-1. Add [incubator apex core](https://github.com/apache/incubator-apex-core) as a remote repository (one time step):  
-`git remote add upstream https://github.com/apache/incubator-apex-core`
-1. Create a new branch from the [master](https://github.com/apache/incubator-apex-core/tree/master) branch. **Name your branch with the JIRA number in it, e.g. `APEXCORE-123.my-feature`.**  
+  `git clone https://github.com/{github_username}/apex-core.git`
+1. Add [apex core](https://github.com/apache/apex-core) as a remote repository (one time step):  
+`git remote add upstream https://github.com/apache/apex-core`
+1. Create a new branch from the [master](https://github.com/apache/apex-core/tree/master) branch. **Name your branch with the JIRA number in it, e.g. `APEXCORE-123.my-feature`.**  
 `git checkout -b APEXCORE-123.my-feature -t upstream/master`  
 Creating a local branch that tracks a remote makes pull easier (no need to specify the remote branch while pulling). A branch can be made to track a remote branch anytime, not necessarily at its creation by:  
 `git branch -u upstream/master`
@@ -113,8 +113,8 @@
   - Travis CI pull request build needs to pass
   - Ensure tests are added/modified for new features or fixes
   - Ensure appropriate JavaDoc comments have been added
-1. To set up access to the ASF source repository, [follow these steps](https://git-wip-us.apache.org/#committers-getting-started). The ASF master repository is: `https://git-wip-us.apache.org/repos/asf/incubator-apex-core.git`
-1. Use the git command line to pull in the changes from the pull requests. You can refer to the corresponding email that will be automatically sent to the `dev@apex.incubator.apache.org` mailing list to see the exact commands to merge the given pull request.
+1. To set up access to the ASF source repository, [follow these steps](https://git-wip-us.apache.org/#committers-getting-started). The ASF master repository is: `https://git-wip-us.apache.org/repos/asf/apex-core.git`
+1. Use the git command line to pull in the changes from the pull requests. You can refer to the corresponding email that will be automatically sent to the `dev@apex.apache.org` mailing list to see the exact commands to merge the given pull request.
 1. Once done with verification, push the changes to the ASF repository's `master` branch. Within a few
 seconds, the changes will propagate back to the github mirror and the pull requests be closed and marked merged automatically.
 1. The `Fix version` field on the corresponding JIRA ticket needs to be set and the ticket resolved after pushing the changes.
diff --git a/src/md/docs.md b/src/md/docs.md
index 5bed9c7..7fa774c 100644
--- a/src/md/docs.md
+++ b/src/md/docs.md
@@ -14,7 +14,7 @@
 - <a href="http://docs.datatorrent.com/tutorials/salesdimensions/" rel="nofollow">Sales Dimensions Application Tutorial</a> Similar to the Top N Words application but covers
 dimensional computations on a simulated sales data stream.
 - <a href="https://github.com/DataTorrent/examples" rel="nofollow">Example Applications</a> Sample code for specialized tutorials covering a variety of topics such as large key-value state management (HDHT), custom partitioning using stream codecs, etc.
-- [Malhar Demos](https://github.com/apache/incubator-apex-malhar/tree/master/demos) This is part of the source repository for Apache Apex Malhar and contains a number of more substantial sample applications that developers will find especially useful.  They include an application that computes some statistics (such as moving averages) from a live stream of stock transactions from *Yahoo! Finance*; one that analyzes a synthetic stream of eruption event data for the *Old Faithful* geyser; a Twitter stream analyzer; and a simulated fraud detector.
+- [Malhar Demos](https://github.com/apache/apex-malhar/tree/master/demos) This is part of the source repository for Apache Apex Malhar and contains a number of more substantial sample applications that developers will find especially useful.  They include an application that computes some statistics (such as moving averages) from a live stream of stock transactions from *Yahoo! Finance*; one that analyzes a synthetic stream of eruption event data for the *Old Faithful* geyser; a Twitter stream analyzer; and a simulated fraud detector.
 
 ### Presentations
 
diff --git a/src/md/people.md b/src/md/people.md
index 8a44aea..b81f6e2 100644
--- a/src/md/people.md
+++ b/src/md/people.md
@@ -4,17 +4,17 @@
 
 ## Becoming a committer
 
-Community members that make sustained, welcome contributions to the project may be invited to become a committer. Committers are voted in by the PPMC. A committer has a signed Contributor License Agreement (CLA) on file and an apache.org address.
+Community members that make sustained, welcome contributions to the project may be invited to become a committer. Committers are voted in by the PMC. A committer has a signed Contributor License Agreement (CLA) on file and an apache.org address.
 
 We expect committers to subscribe to the project mailing lists.
 
-A committer will be considered “emeritus/inactive” by not contributing in any form to the project for over 1 year. An emeritus committer may request reinstatement of commit access from the PPMC. Such reinstatement is subject to lazy consensus of active PPMC members.
+A committer will be considered “emeritus/inactive” by not contributing in any form to the project for over 1 year. An emeritus committer may request reinstatement of commit access from the PMC. Such reinstatement is subject to lazy consensus of active PMC members.
 
-The Podling Project Management Committee (PPMC) is responsible for the oversight of the project and it also decides who to add as a PPMC member. Existing committers may be invited to become a PPMC member after consistent contribution and activity over a period of time and participation in directional and community building discussions.
+The Project Management Committee (PMC) is responsible for the oversight of the project and it also decides who to add as a PMC member. Existing committers may be invited to become a PMC member after consistent contribution and activity over a period of time and participation in directional and community building discussions.
 
 ## Committers
 
-Following is the list of all Apache Apex committers, PPMC members and mentors. A good place to see all contributors and other project stats is [Open Hub](https://www.openhub.net/p/apache_apex)
+Following is the list of all Apache Apex committers, PMC members and mentors. A good place to see all contributors and other project stats is [Open Hub](https://www.openhub.net/p/apache_apex)
 
 | Name | Apache ID | Role |
 | --- | --- | --- |
@@ -28,36 +28,36 @@
 | Yogi Devendra | yogidevendra | Committer |
 | Ted Dunning | tdunning | Mentor |
 | Timothy Farkas | timothyfarkas | Committer |
-| Ilya Ganelin | ilganeli | PPMC |
+| Ilya Ganelin | ilganeli | PMC |
 | Alan Gates | gates | Mentor |
 | P. Taylor Goetz | ptgoetz | Mentor |
 | Tushar Gosavi | tushar | Committer |
 | Priyanka Gugale | priyag | Committer |
-| Gaurav Gupta | gauravgopi123 | PPMC |
+| Gaurav Gupta | gauravgopi123 | PMC |
 | Sandesh Hegde | sandesh | Committer |
 | Siyuan Hua | hsy541 | Committer |
-| Pramod Immaneni | pramod | PPMC |
-| Amol Kekre | akekre | PPMC | 
+| Pramod Immaneni | pramod | PMC |
+| Amol Kekre | akekre | PMC | 
 | Chinmay Kolhatkar | chinmay | Committer |
 | Anuj Lal | anujlal | Committer |
 | Dongming Liang | d9liang | Committer |
 | Justin Mclean | jmclean | Mentor |
 | Adi Mishra | apmishra | Committer |
-| Chetan Narsude | chetan | PPMC |
+| Chetan Narsude | chetan | PMC |
 | Chris Nauroth | cnauroth | Mentor |
 | Sasha Parfenov | sashap | Committer |
 | Andy Perlitch | andyp | Committer |
 | Shubham Pathak | shubham | Committer |
 | Ashwin Putta | ashwinchandrap | Committer |
 | Munagala Ramanath | ramapex | Committer |
-| Vlad Rozov | vrozov | PPMC |
+| Vlad Rozov | vrozov | PMC |
 | Hitesh Shah | hitesh | Mentor |
 | Atri Sharma | atri | Committer |
 | Chandni Singh | csingh | Committer |
 | Ashish Tadose | ashishtadose | Committer |
 | Aniruddha Thombare | aniruddha | Committer |
 | Jessica Wang | jessicawang | Committer |
-| Thomas Weise | thw | PPMC |
-| David Yan | davidyan | PPMC |
-| Brennon York | boyork | PPMC |
+| Thomas Weise | thw | PMC |
+| David Yan | davidyan | PMC |
+| Brennon York | boyork | PMC |
 
diff --git a/src/md/release.md b/src/md/release.md
index e43996f..1788148 100644
--- a/src/md/release.md
+++ b/src/md/release.md
@@ -4,16 +4,16 @@
 
 ## Creating Release Branch
 
-If this is a minor release (X.Y.0), start with creating a new branch. Example for 3.2.0:
+If this is a minor release (X.Y.0), start with creating a new branch. Example for 3.4.0:
 
 ```bash
 git checkout master && git pull
-git checkout -b release-3.2 master
+git checkout -b release-3.4 master
 ```
 Replace version in master branch:
 ```
 git checkout master
-git grep -l "3.2.0-SNAPSHOT"
+git grep -l "3.4.0-SNAPSHOT"
 ```
 For informational purpose, this should yield the list of files that needs the version number replaced to X.(Y+1).0 next version. Note that the replacement step is different between the repositories due to an open issue. See:
 
@@ -21,8 +21,8 @@
 
 For -core:
 ```bash
-dv=3.2.0-SNAPSHOT
-rv=3.3.0-SNAPSHOT
+dv=3.4.0-SNAPSHOT
+rv=3.5.0-SNAPSHOT
 for a in `git grep -l "${dv}"`; do echo $a; sed -i 's/'"${dv}"'/'"${rv}"'/g' $a; done
 ```
 For -malhar:
@@ -31,7 +31,7 @@
 ```
 Commit and push the change:
 ```
-git commit -am "Preparing for 3.3.0 development"
+git commit -am "Preparing for 3.5.0 development"
 git push apache master
 ```
 
@@ -72,8 +72,8 @@
 ### Update version number for RC
 
 ```
-dv=3.2.0-SNAPSHOT
-rv=3.2.0
+dv=3.4.0-SNAPSHOT
+rv=3.4.0
 ```
 As mentioned earlier, use the following for -core releases:
 ```
@@ -166,7 +166,7 @@
 
 Move source release from dist staging to release folder:
 ```
-rv=3.2.0
+rv=3.4.0
 RNAME=apache-apex-core-${rv}
 svn mv https://dist.apache.org/repos/dist/dev/incubator/apex/${RNAME}-RC1 https://dist.apache.org/repos/dist/release/incubator/apex/${RNAME} -m "Release ${RNAME}"
 ```
@@ -180,15 +180,15 @@
 
 Create final release tag:
 ```bash
-rv=3.2.0
+rv=3.4.0
 git tag -a "v${rv}" -m "Release ${rv}" "v${rv}-RC2"
 git push apache "v${rv}"
 ```
 Bump patch version number in release branch (X.Y.Z+1 - otherwise same as when creating new release branch):
 ```bash
-git checkout release-3.2
-dv=3.2.0-SNAPSHOT
-rv=3.2.1-SNAPSHOT
+git checkout release-3.4
+dv=3.4.0-SNAPSHOT
+rv=3.4.1-SNAPSHOT
 for a in `git grep -l "${dv}"`; do echo $a; sed -i 's/'"${dv}"'/'"${rv}"'/g' $a; done
 ```
 If there are new artifacts published to Maven repositories consider enabling semantic versioning check for the newly
@@ -203,9 +203,9 @@
 
 ## Announce Release
 
-For minor or major release, publish the documentation to the web site prior to updating download page (which will automatically link the documentation). See https://github.com/apache/incubator-apex-core/tree/master/docs#deployment
+For minor or major release, publish the documentation to the web site prior to updating download page (which will automatically link the documentation). See https://github.com/apache/apex-core/tree/master/docs#deployment
 
-Update the download page to reflect the new release: https://github.com/apache/incubator-apex-site#updating-downloads-page
+Update the download page to reflect the new release: https://github.com/apache/apex-site#updating-downloads-page
 
 Send the announcement email, example:
 http://mail-archives.apache.org/mod_mbox/www-announce/201605.mbox/%3CCA%2B5xAo1ZYso6azUBJOkpVtJqM%3DAnJFr_RtjKk9_VusBwgYNS8A%40mail.gmail.com%3E
diff --git a/src/md/third-party-downloads.md b/src/md/third-party-downloads.md
index 71dae46..39a098c 100644
--- a/src/md/third-party-downloads.md
+++ b/src/md/third-party-downloads.md
@@ -23,4 +23,4 @@
     - RPM: [CentOS 6](https://ci.bigtop.apache.org/job/Bigtop-trunk-packages/BUILD_ENVIRONMENTS=centos-6,COMPONENTS=apex,label=docker-slave/lastSuccessfulBuild/artifact/output/apex/noarch/apex-3.3.0-1.el6.noarch.rpm), [CentOS 7](https://ci.bigtop.apache.org/job/Bigtop-trunk-packages/BUILD_ENVIRONMENTS=centos-7,COMPONENTS=apex,label=docker-slave/lastSuccessfulBuild/artifact/output/apex/noarch/apex-3.3.0-1.el7.centos.noarch.rpm), [Fedora 20](https://ci.bigtop.apache.org/job/Bigtop-trunk-packages/BUILD_ENVIRONMENTS=fedora-20,COMPONENTS=apex,label=docker-slave/lastSuccessfulBuild/artifact/output/apex/noarch/apex-3.3.0-1.fc20.noarch.rpm), [OpenSUSE 13.2](https://ci.bigtop.apache.org/job/Bigtop-trunk-packages/BUILD_ENVIRONMENTS=opensuse-13.2,COMPONENTS=apex,label=docker-slave/lastSuccessfulBuild/artifact/output/apex/noarch/apex-3.3.0-1.noarch.rpm) 
     - DEB: [Ubuntu 14.04](https://ci.bigtop.apache.org/job/Bigtop-trunk-packages/BUILD_ENVIRONMENTS=ubuntu-14.04,COMPONENTS=apex,label=docker-slave/lastSuccessfulBuild/artifact/output/apex/apex_3.3.0-1_all.deb), [Debian 8](https://ci.bigtop.apache.org/job/Bigtop-trunk-packages/BUILD_ENVIRONMENTS=debian-8,COMPONENTS=apex,label=docker-slave/lastSuccessfulBuild/artifact/output/apex/apex_3.3.0-1_all.)
 
-If you would like to provide your own edition of Apache Apex here, please send email to [dev@apex.incubator.apache.org](mailto:dev@apex.incubator.apache.org).
\ No newline at end of file
+If you would like to provide your own edition of Apache Apex here, please send email to [dev@apex.apache.org](mailto:dev@apex.apache.org).
\ No newline at end of file
diff --git a/src/md/verification.md b/src/md/verification.md
index 7636ba3..6e20a29 100644
--- a/src/md/verification.md
+++ b/src/md/verification.md
@@ -108,7 +108,7 @@
 ```bash
 apex> launch <demo-apa-file>
 ```
-Demo apa files are typically in malhar/demos directory.
+Demo apa files are typically in apex-malhar/demos directory.
 
 
 ## Miscellaneous checks: Part II (Post compilation)
diff --git a/src/pages/index.html b/src/pages/index.html
index b5930e7..ab64530 100644
--- a/src/pages/index.html
+++ b/src/pages/index.html
@@ -11,7 +11,7 @@
         <h1>Apache Apex<span class="banner-trademark">&trade;</span></h1>
         <p>Enterprise-grade unified stream and batch processing engine.</p>
         <p>
-          <a class="btn btn-info btn-lg" href="https://github.com/apache/incubator-apex-core" role="button">Github</a>
+          <a class="btn btn-info btn-lg" href="https://github.com/apache/apex-core" role="button">Github</a>
         </p>
       </div>
     </div>