You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by dg...@apache.org on 2019/08/23 20:08:25 UTC

[openwhisk-release] branch master updated: remove incubator references (#296)

This is an automated email from the ASF dual-hosted git repository.

dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-release.git


The following commit(s) were added to refs/heads/master by this push:
     new 878716a  remove incubator references (#296)
878716a is described below

commit 878716a1bdf62ea18ce5fc2296d36368775e7c13
Author: David Grove <dg...@users.noreply.github.com>
AuthorDate: Fri Aug 23 16:08:19 2019 -0400

    remove incubator references (#296)
    
    Mechanical removal of incubator- in docs and scripts.
---
 README.md                       | 149 ++++++++++++++++++++--------------------
 docs/general_spec.md            |  52 +++++++-------
 docs/license_compliance.md      |  48 ++++++-------
 docs/license_exclusions.md      | 132 +++++++++++++++++------------------
 docs/pick_up_source_code.md     |  20 +++---
 docs/prerequisites.md           |   6 +-
 docs/release_instructions.md    |  57 ++++++++-------
 docs/tag_release.md             |  12 ++--
 docs/work_items.md              |  20 +++---
 tools/gen-release-vote.py       |   6 +-
 tools/generate_release_notes.sh |   2 +-
 tools/lib/pom.xml               |   2 +-
 tools/rcverify.sh               |   4 +-
 tools/travis/setup.sh           |   8 +--
 14 files changed, 261 insertions(+), 257 deletions(-)

diff --git a/README.md b/README.md
index 726202a..a6ea564 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@
 # Apache OpenWhisk Project Release Management
 
 [![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
-[![Build Status](https://travis-ci.org/apache/incubator-openwhisk-release.svg?branch=master)](https://travis-ci.org/apache/incubator-openwhisk-release)
+[![Build Status](https://travis-ci.org/apache/openwhisk-release.svg?branch=master)](https://travis-ci.org/apache/openwhisk-release)
 
 The primary goal of this project is to provide the Apache OpenWhisk project's Release Managers the instructions and automation needed to guarantee a release complies with both the Apache Software Foundation's (ASF) [Release Creation Process](http://www.apache.org/dev/release-publishing.html) and [Release Policy](http://www.apache.org/legal/release-policy.html).
 
@@ -66,119 +66,119 @@ The following table can be used by Release Managers to get quickly check the sta
 <th width="110">ASF LICENSE</th>
 <th width="120">ASF NOTICE</th>
 <th width="120">Slack Channel</th>
-<th><a href="https://github.com/apache/incubator-openwhisk-utilities/tree/master/scancode">ScanCode</a></th>
+<th><a href="https://github.com/apache/openwhisk-utilities/tree/master/scancode">ScanCode</a></th>
 </tr>
 <tr align="left">
-<td><a href="https://github.com/apache/incubator-openwhisk">incubator-openwhisk</a></td>
-<td><a href="https://travis-ci.org/apache/incubator-openwhisk/branches"><img src="https://travis-ci.org/apache/incubator-openwhisk.svg?branch=master" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk/blob/master/LICENSE.txt"><img src="https://img.shields.io/badge/license-Apache--2.0-blue.svg" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk/blob/master/NOTICE.txt">NOTICE</a></td>
+<td><a href="https://github.com/apache/openwhisk">openwhisk</a></td>
+<td><a href="https://travis-ci.org/apache/openwhisk/branches"><img src="https://travis-ci.org/apache/openwhisk.svg?branch=master" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk/blob/master/LICENSE.txt"><img src="https://img.shields.io/badge/license-Apache--2.0-blue.svg" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk/blob/master/NOTICE.txt">NOTICE</a></td>
 <td><a href="https://openwhisk-team.slack.com/messages/C3TPCAQG1/"><img src="https://img.shields.io/badge/channel-Slack-800080.svg" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk/blob/master/tools/travis/scan.sh">scan.sh</a></td>
+<td><a href="https://github.com/apache/openwhisk/blob/master/tools/travis/scan.sh">scan.sh</a></td>
 </tr>
 <tr align="left">
-<td><a href="https://github.com/apache/incubator-openwhisk-catalog">incubator-openwhisk-catalog</a></td>
-<td><a href="https://travis-ci.org/apache/incubator-openwhisk-catalog/branches"><img src="https://travis-ci.org/apache/incubator-openwhisk-catalog.svg?branch=master" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-catalog/blob/master/LICENSE.txt"><img src="https://img.shields.io/badge/license-Apache--2.0-blue.svg" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-catalog/blob/master/NOTICE.txt">NOTICE</a></td>
+<td><a href="https://github.com/apache/openwhisk-catalog">openwhisk-catalog</a></td>
+<td><a href="https://travis-ci.org/apache/openwhisk-catalog/branches"><img src="https://travis-ci.org/apache/openwhisk-catalog.svg?branch=master" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-catalog/blob/master/LICENSE.txt"><img src="https://img.shields.io/badge/license-Apache--2.0-blue.svg" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-catalog/blob/master/NOTICE.txt">NOTICE</a></td>
 <td>&nbsp;</td>
-<td><a href="https://github.com/apache/incubator-openwhisk-catalog/blob/master/tools/travis/build.sh">build.sh</a></td>
+<td><a href="https://github.com/apache/openwhisk-catalog/blob/master/tools/travis/build.sh">build.sh</a></td>
 </tr>
 <tr align="left">
-<td><a href="https://github.com/apache/incubator-openwhisk-apigateway">incubator-openwhisk-apigateway</a></td>
-<td><a href="https://travis-ci.org/apache/incubator-openwhisk-apigateway/branches"><img src="https://travis-ci.org/apache/incubator-openwhisk-apigateway.svg?branch=master" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-apigateway/blob/master/LICENSE.txt"><img src="https://img.shields.io/badge/license-Apache--2.0-blue.svg" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-apigateway/blob/master/NOTICE.txt">NOTICE</a></td>
+<td><a href="https://github.com/apache/openwhisk-apigateway">openwhisk-apigateway</a></td>
+<td><a href="https://travis-ci.org/apache/openwhisk-apigateway/branches"><img src="https://travis-ci.org/apache/openwhisk-apigateway.svg?branch=master" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-apigateway/blob/master/LICENSE.txt"><img src="https://img.shields.io/badge/license-Apache--2.0-blue.svg" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-apigateway/blob/master/NOTICE.txt">NOTICE</a></td>
 <td><a href="https://openwhisk-team.slack.com/messages/C3TP33Y2U/"><img src="https://img.shields.io/badge/channel-Slack-800080.svg" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-apigateway/blob/master/tools/travis/build.sh">build.sh</a></td>
+<td><a href="https://github.com/apache/openwhisk-apigateway/blob/master/tools/travis/build.sh">build.sh</a></td>
 </tr>
 <tr align="left">
-<td><a href="https://github.com/apache/incubator-openwhisk-cli">incubator-openwhisk-cli</a></td>
-<td><a href="https://travis-ci.org/apache/incubator-openwhisk-cli/branches"><img src="https://travis-ci.org/apache/incubator-openwhisk-cli.svg?branch=master" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-cli/blob/master/LICENSE.txt"><img src="https://img.shields.io/badge/license-Apache--2.0-blue.svg" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-cli/blob/master/NOTICE.txt">NOTICE</a></td>
+<td><a href="https://github.com/apache/openwhisk-cli">openwhisk-cli</a></td>
+<td><a href="https://travis-ci.org/apache/openwhisk-cli/branches"><img src="https://travis-ci.org/apache/openwhisk-cli.svg?branch=master" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-cli/blob/master/LICENSE.txt"><img src="https://img.shields.io/badge/license-Apache--2.0-blue.svg" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-cli/blob/master/NOTICE.txt">NOTICE</a></td>
 <td>&nbsp;</td>
-<td><a href="https://github.com/apache/incubator-openwhisk-cli/blob/master/tools/travis/test_openwhisk.sh">test_openwhisk.sh</a></td>
+<td><a href="https://github.com/apache/openwhisk-cli/blob/master/tools/travis/test_openwhisk.sh">test_openwhisk.sh</a></td>
 </tr>
 <tr align="left">
-<td><a href="https://github.com/apache/incubator-openwhisk-client-go">incubator-openwhisk-client-go</a></td>
-<td><a href="https://travis-ci.org/apache/incubator-openwhisk-client-go/branches"><img src="https://travis-ci.org/apache/incubator-openwhisk-client-go.svg?branch=master" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-client-go/blob/master/LICENSE.txt"><img src="https://img.shields.io/badge/license-Apache--2.0-blue.svg" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-client-go/blob/master/NOTICE.txt">NOTICE</a></td>
+<td><a href="https://github.com/apache/openwhisk-client-go">openwhisk-client-go</a></td>
+<td><a href="https://travis-ci.org/apache/openwhisk-client-go/branches"><img src="https://travis-ci.org/apache/openwhisk-client-go.svg?branch=master" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-client-go/blob/master/LICENSE.txt"><img src="https://img.shields.io/badge/license-Apache--2.0-blue.svg" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-client-go/blob/master/NOTICE.txt">NOTICE</a></td>
 <td>&nbsp;</td>
-<td><a href="https://github.com/apache/incubator-openwhisk-client-go/blob/master/tools/travis/build.sh">build.sh</a></td>
+<td><a href="https://github.com/apache/openwhisk-client-go/blob/master/tools/travis/build.sh">build.sh</a></td>
 </tr>
 <tr align="left">
-<td><a href="https://github.com/apache/incubator-openwhisk-composer">incubator-openwhisk-composer</a></td>
-<td><a href="https://travis-ci.org/apache/incubator-openwhisk-composer/branches"><img src="https://travis-ci.org/apache/incubator-openwhisk-composer.svg?branch=master" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-composer/blob/master/LICENSE.txt"><img src="https://img.shields.io/badge/license-Apache--2.0-blue.svg" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-composer/blob/master/NOTICE.txt">NOTICE</a></td>
+<td><a href="https://github.com/apache/openwhisk-composer">openwhisk-composer</a></td>
+<td><a href="https://travis-ci.org/apache/openwhisk-composer/branches"><img src="https://travis-ci.org/apache/openwhisk-composer.svg?branch=master" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-composer/blob/master/LICENSE.txt"><img src="https://img.shields.io/badge/license-Apache--2.0-blue.svg" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-composer/blob/master/NOTICE.txt">NOTICE</a></td>
 <td><a href="https://openwhisk-team.slack.com/messages/C7DJNS37W/"><img src="https://img.shields.io/badge/channel-Slack-800080.svg" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-composer/blob/master/travis/scancode.sh">scancode.sh</a></td>
+<td><a href="https://github.com/apache/openwhisk-composer/blob/master/travis/scancode.sh">scancode.sh</a></td>
 </tr>
 <tr align="left">
-<td><a href="https://github.com/apache/incubator-openwhisk-wskdeploy">incubator-openwhisk-wskdeploy</a></td>
-<td><a href="https://travis-ci.org/apache/incubator-openwhisk-wskdeploy/branches"><img src="https://travis-ci.org/apache/incubator-openwhisk-wskdeploy.svg?branch=master" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/LICENSE.txt"><img src="https://img.shields.io/badge/license-Apache--2.0-blue.svg" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/NOTICE.txt">NOTICE</a></td>
+<td><a href="https://github.com/apache/openwhisk-wskdeploy">openwhisk-wskdeploy</a></td>
+<td><a href="https://travis-ci.org/apache/openwhisk-wskdeploy/branches"><img src="https://travis-ci.org/apache/openwhisk-wskdeploy.svg?branch=master" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-wskdeploy/blob/master/LICENSE.txt"><img src="https://img.shields.io/badge/license-Apache--2.0-blue.svg" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-wskdeploy/blob/master/NOTICE.txt">NOTICE</a></td>
 <td><a href="https://openwhisk-team.slack.com/messages/C3TP33Y2U/"><img src="https://img.shields.io/badge/channel-Slack-800080.svg" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/tools/travis/scancode.sh">scancode.sh</a></td>
+<td><a href="https://github.com/apache/openwhisk-wskdeploy/blob/master/tools/travis/scancode.sh">scancode.sh</a></td>
 </tr>
 <tr align="left">
-<td><a href="https://github.com/apache/incubator-openwhisk-deploy-kube">incubator-openwhisk-deploy-kube</a></td>
-<td><a href="https://travis-ci.org/apache/incubator-openwhisk-deploy-kube/branches"><img src="https://travis-ci.org/apache/incubator-openwhisk-deploy-kube.svg?branch=master" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-deploy-kube/blob/master/LICENSE.txt"><img src="https://img.shields.io/badge/license-Apache--2.0-blue.svg" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-deploy-kube/blob/master/NOTICE.txt">NOTICE</a></td>
+<td><a href="https://github.com/apache/openwhisk-deploy-kube">openwhisk-deploy-kube</a></td>
+<td><a href="https://travis-ci.org/apache/openwhisk-deploy-kube/branches"><img src="https://travis-ci.org/apache/openwhisk-deploy-kube.svg?branch=master" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-deploy-kube/blob/master/LICENSE.txt"><img src="https://img.shields.io/badge/license-Apache--2.0-blue.svg" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-deploy-kube/blob/master/NOTICE.txt">NOTICE</a></td>
 <td><a href="https://openwhisk-team.slack.com/messages/C4J3R7JFL/"><img src="https://img.shields.io/badge/channel-Slack-800080.svg" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-deploy-kube/blob/master/tools/travis/scancode.sh">scancode.sh</a></td>
+<td><a href="https://github.com/apache/openwhisk-deploy-kube/blob/master/tools/travis/scancode.sh">scancode.sh</a></td>
 </tr>
 <tr align="left">
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-nodejs">incubator-openwhisk-runtime-nodejs</a></td>
-<td><a href="https://travis-ci.org/apache/incubator-openwhisk-runtime-nodejs/branches"><img src="https://travis-ci.org/apache/incubator-openwhisk-runtime-nodejs.svg?branch=master" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-nodejs/blob/master/LICENSE.txt"><img src="https://camo.githubusercontent.com/3a4d3bc039085cffdfecbe3077ffe49c5fe23286/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6c6963656e73652d4170616368652d2d322e302d626c75652e737667" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-nodejs/blob/master/NOTICE.txt">NOTICE</a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-nodejs">openwhisk-runtime-nodejs</a></td>
+<td><a href="https://travis-ci.org/apache/openwhisk-runtime-nodejs/branches"><img src="https://travis-ci.org/apache/openwhisk-runtime-nodejs.svg?branch=master" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-nodejs/blob/master/LICENSE.txt"><img src="https://camo.githubusercontent.com/3a4d3bc039085cffdfecbe3077ffe49c5fe23286/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6c6963656e73652d4170616368652d2d322e302d626c75652e737667" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-nodejs/blob/master/NOTICE.txt">NOTICE</a></td>
 <td>&nbsp;</td>
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-nodejs/blob/master/tools/travis/build.sh">build.sh</a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-nodejs/blob/master/tools/travis/build.sh">build.sh</a></td>
 </tr>
 <tr align="left">
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-swift"> incubator-openwhisk-runtime-swift</a></td>
-<td align="left"><a href="https://travis-ci.org/apache/incubator-openwhisk-runtime-swift/branches"><img src="https://travis-ci.org/apache/incubator-openwhisk-runtime-swift.svg?branch=master" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-swift/blob/master/LICENSE.txt"><img src="https://camo.githubusercontent.com/3a4d3bc039085cffdfecbe3077ffe49c5fe23286/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6c6963656e73652d4170616368652d2d322e302d626c75652e737667" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-swift/blob/master/NOTICE.txt">NOTICE</a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-swift"> openwhisk-runtime-swift</a></td>
+<td align="left"><a href="https://travis-ci.org/apache/openwhisk-runtime-swift/branches"><img src="https://travis-ci.org/apache/openwhisk-runtime-swift.svg?branch=master" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-swift/blob/master/LICENSE.txt"><img src="https://camo.githubusercontent.com/3a4d3bc039085cffdfecbe3077ffe49c5fe23286/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6c6963656e73652d4170616368652d2d322e302d626c75652e737667" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-swift/blob/master/NOTICE.txt">NOTICE</a></td>
 <td>&nbsp;</td>
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-swift/blob/master/tools/travis/build.sh">build.sh</a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-swift/blob/master/tools/travis/build.sh">build.sh</a></td>
 </tr>
 <tr align="left">
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-docker">incubator-openwhisk-runtime-docker</a></td>
-<td><a href="https://travis-ci.org/apache/incubator-openwhisk-runtime-docker/branches"><img src="https://travis-ci.org/apache/incubator-openwhisk-runtime-docker.svg?branch=master" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-docker/blob/master/LICENSE.txt"><img src="https://camo.githubusercontent.com/3a4d3bc039085cffdfecbe3077ffe49c5fe23286/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6c6963656e73652d4170616368652d2d322e302d626c75652e737667" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-docker/blob/master/NOTICE.txt">NOTICE</a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-docker">openwhisk-runtime-docker</a></td>
+<td><a href="https://travis-ci.org/apache/openwhisk-runtime-docker/branches"><img src="https://travis-ci.org/apache/openwhisk-runtime-docker.svg?branch=master" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-docker/blob/master/LICENSE.txt"><img src="https://camo.githubusercontent.com/3a4d3bc039085cffdfecbe3077ffe49c5fe23286/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6c6963656e73652d4170616368652d2d322e302d626c75652e737667" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-docker/blob/master/NOTICE.txt">NOTICE</a></td>
 <td>&nbsp;</td>
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-docker/blob/master/tools/travis/build.sh">build.sh</a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-docker/blob/master/tools/travis/build.sh">build.sh</a></td>
 </tr>
 <tr align="left">
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-java">incubator-openwhisk-runtime-java</a></td>
-<td><a href="https://travis-ci.org/apache/incubator-openwhisk-runtime-java/branches"><img src="https://travis-ci.org/apache/incubator-openwhisk-runtime-java.svg?branch=master" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-java/blob/master/LICENSE.txt"><img src="https://camo.githubusercontent.com/3a4d3bc039085cffdfecbe3077ffe49c5fe23286/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6c6963656e73652d4170616368652d2d322e302d626c75652e737667" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-java/blob/master/NOTICE.txt">NOTICE</a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-java">openwhisk-runtime-java</a></td>
+<td><a href="https://travis-ci.org/apache/openwhisk-runtime-java/branches"><img src="https://travis-ci.org/apache/openwhisk-runtime-java.svg?branch=master" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-java/blob/master/LICENSE.txt"><img src="https://camo.githubusercontent.com/3a4d3bc039085cffdfecbe3077ffe49c5fe23286/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6c6963656e73652d4170616368652d2d322e302d626c75652e737667" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-java/blob/master/NOTICE.txt">NOTICE</a></td>
 <td>&nbsp;</td>
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-java/blob/master/tools/travis/build.sh">build.sh</a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-java/blob/master/tools/travis/build.sh">build.sh</a></td>
 </tr>
 <tr align="left">
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-php">incubator-openwhisk-runtime-php</a></td>
-<td><a href="https://travis-ci.org/apache/incubator-openwhisk-runtime-php/branches"><img src="https://travis-ci.org/apache/incubator-openwhisk-runtime-php.svg?branch=master" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-php/blob/master/LICENSE.txt"><img src="https://camo.githubusercontent.com/3a4d3bc039085cffdfecbe3077ffe49c5fe23286/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6c6963656e73652d4170616368652d2d322e302d626c75652e737667" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-php/blob/master/NOTICE.txt">NOTICE</a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-php">openwhisk-runtime-php</a></td>
+<td><a href="https://travis-ci.org/apache/openwhisk-runtime-php/branches"><img src="https://travis-ci.org/apache/openwhisk-runtime-php.svg?branch=master" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-php/blob/master/LICENSE.txt"><img src="https://camo.githubusercontent.com/3a4d3bc039085cffdfecbe3077ffe49c5fe23286/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6c6963656e73652d4170616368652d2d322e302d626c75652e737667" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-php/blob/master/NOTICE.txt">NOTICE</a></td>
 <td>&nbsp;</td>
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-php/blob/master/tools/travis/build.sh">build.sh</a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-php/blob/master/tools/travis/build.sh">build.sh</a></td>
 </tr>
 <tr align="left">
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-python">incubator-openwhisk-runtime-python</a></td>
-<td><a href="https://travis-ci.org/apache/incubator-openwhisk-runtime-python/branches"><img src="https://travis-ci.org/apache/incubator-openwhisk-runtime-python.svg?branch=master" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-python/blob/master/LICENSE.txt"><img src="https://camo.githubusercontent.com/3a4d3bc039085cffdfecbe3077ffe49c5fe23286/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6c6963656e73652d4170616368652d2d322e302d626c75652e737667" alt="" /></a></td>
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-python/blob/master/NOTICE.txt">NOTICE</a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-python">openwhisk-runtime-python</a></td>
+<td><a href="https://travis-ci.org/apache/openwhisk-runtime-python/branches"><img src="https://travis-ci.org/apache/openwhisk-runtime-python.svg?branch=master" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-python/blob/master/LICENSE.txt"><img src="https://camo.githubusercontent.com/3a4d3bc039085cffdfecbe3077ffe49c5fe23286/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6c6963656e73652d4170616368652d2d322e302d626c75652e737667" alt="" /></a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-python/blob/master/NOTICE.txt">NOTICE</a></td>
 <td>&nbsp;</td>
-<td><a href="https://github.com/apache/incubator-openwhisk-runtime-python/blob/master/tools/travis/build.sh">build.sh</a></td>
+<td><a href="https://github.com/apache/openwhisk-runtime-python/blob/master/tools/travis/build.sh">build.sh</a></td>
 </tr>
 </tbody>
 </table>
@@ -188,13 +188,10 @@ The following table can be used by Release Managers to get quickly check the sta
 - The ASF License badge is hyperlinked to the corresponding repository's LICENSE file.
 - The ASF NOTICE column text links to the corresponding repository's NOTICE file.
 - The ScanCode column text is hyperlinked to the corresponding repository's build file that executes the scancode utility.
-  - The ASF scan configuration for all repos. can be found here: [ASF-Release.cfg](https://github.com/apache/incubator-openwhisk-utilities/blob/master/scancode/ASF-Release.cfg).
+  - The ASF scan configuration for all repos. can be found here: [ASF-Release.cfg](https://github.com/apache/openwhisk-utilities/blob/master/scancode/ASF-Release.cfg).
 - The Slack badge is hyperlinked to the corresponding repository's public Slack channel (if one exists).
 - LICENSE and NOTICE file process and compliance tracking can be found here: [license_compliance.md](docs/license_compliance.md)
 
 # References
 - [Apache Release Creation Process](http://www.apache.org/dev/release-publishing.html)
 - [Apache Release Policy](http://www.apache.org/legal/release-policy.html)
-
-# Disclaimer
-This project is still "in development" with many steps still in the process of being automated and brought into compliance. We welcome any reviews, comments or contributions to help us complete and improve any part of the process.
diff --git a/docs/general_spec.md b/docs/general_spec.md
index dd9e711..75b33fe 100644
--- a/docs/general_spec.md
+++ b/docs/general_spec.md
@@ -30,17 +30,17 @@ Long story short, Apache generally needs two type of packages to be publicly ava
 ## Release of OpenWhisk artifacts
 
 Please click on the work items listed as belows to access the detailed information:
-- [1. Download the source code](work_items.md#1-download-the-source-code-open-issue) ([open issue](https://github.com/apache/incubator-openwhisk-release/issues/16))
-- [2. Verify the compliance of the source code](work_items.md#2-verify-the-compliance-of-the-source-code-open-issue) ([open issue](https://github.com/apache/incubator-openwhisk-release/issues/17))
-- [3. Deploy OpenWhisk based on the source code](work_items.md#3-deploy-openwhisk-based-on-the-source-code-open-issue) ([open issue](https://github.com/apache/incubator-openwhisk-release/issues/18))
-- [4. Test each OpenWhisk component](work_items.md#4-test-each-openwhisk-component-open-issue) ([open issue](https://github.com/apache/incubator-openwhisk-release/issues/19))
-- [5. Add NOTICE, LICENSE, and CHANGELOG to each OpenWhisk project](work_items.md#5-add-notice-license-and-changelog-to-each-openwhisk-project-open-issue) ([open issue](https://github.com/apache/incubator-openwhisk-release/issues/13))
-- [6. Package the artifacts](work_items.md#6-package-the-artifacts-open-issue) ([open issue](https://github.com/apache/incubator-openwhisk-release/issues/20))
-- [7. Upload the artifacts to staging repository](work_items.md#7-upload-the-artifacts-into-staging-repository-for-release-vote-open-issue) ([open issue](https://github.com/apache/incubator-openwhisk-release/issues/21))
+- [1. Download the source code](work_items.md#1-download-the-source-code-open-issue) ([open issue](https://github.com/apache/openwhisk-release/issues/16))
+- [2. Verify the compliance of the source code](work_items.md#2-verify-the-compliance-of-the-source-code-open-issue) ([open issue](https://github.com/apache/openwhisk-release/issues/17))
+- [3. Deploy OpenWhisk based on the source code](work_items.md#3-deploy-openwhisk-based-on-the-source-code-open-issue) ([open issue](https://github.com/apache/openwhisk-release/issues/18))
+- [4. Test each OpenWhisk component](work_items.md#4-test-each-openwhisk-component-open-issue) ([open issue](https://github.com/apache/openwhisk-release/issues/19))
+- [5. Add NOTICE, LICENSE, and CHANGELOG to each OpenWhisk project](work_items.md#5-add-notice-license-and-changelog-to-each-openwhisk-project-open-issue) ([open issue](https://github.com/apache/openwhisk-release/issues/13))
+- [6. Package the artifacts](work_items.md#6-package-the-artifacts-open-issue) ([open issue](https://github.com/apache/openwhisk-release/issues/20))
+- [7. Upload the artifacts to staging repository](work_items.md#7-upload-the-artifacts-into-staging-repository-for-release-vote-open-issue) ([open issue](https://github.com/apache/openwhisk-release/issues/21))
     - After the above 7 steps, note will be sent out to the community for vote. Before we reach enough votes, Step 1 to 7
     can be re-iterated to update the artifacts in staging repository.
 
-- [8. Release the artifacts](work_items.md#8-release-the-artifacts-open-issue) ([open issue](https://github.com/apache/incubator-openwhisk-release/issues/22))
+- [8. Release the artifacts](work_items.md#8-release-the-artifacts-open-issue) ([open issue](https://github.com/apache/openwhisk-release/issues/22))
 
 ## Different phases of implementations
 
@@ -53,22 +53,22 @@ file, and uploaded into the staging repository. This is the phase we are current
 ## List of OpenWhisk repositories to be released
 
 We plan to release the following OpenWhisk repositories:
-- OpenWhisk core: [incubator-openwhisk](https://github.com/apache/incubator-openwhisk)
+- OpenWhisk core: [openwhisk](https://github.com/apache/openwhisk)
 - OpenWhisk runtimes:
-    - [incubator-openwhisk-runtime-nodejs](https://github.com/apache/incubator-openwhisk-runtime-nodejs)
-    - [incubator-openwhisk-runtime-swift](https://github.com/apache/incubator-openwhisk-runtime-swift)
-    - [incubator-openwhisk-runtime-php](https://github.com/apache/incubator-openwhisk-runtime-php)
-    - [incubator-openwhisk-runtime-python](https://github.com/apache/incubator-openwhisk-runtime-python)
-    - [incubator-openwhisk-runtime-java](https://github.com/apache/incubator-openwhisk-runtime-java)
-    - [incubator-openwhisk-runtime-docker](https://github.com/apache/incubator-openwhisk-runtime-docker)
-- OpenWhisk catalog: [incubator-openwhisk-catalog](https://github.com/apache/incubator-openwhisk-catalog)
-- OpenWhisk API gateway: [incubator-openwhisk-apigateway](https://github.com/apache/incubator-openwhisk-apigateway)
+    - [openwhisk-runtime-nodejs](https://github.com/apache/openwhisk-runtime-nodejs)
+    - [openwhisk-runtime-swift](https://github.com/apache/openwhisk-runtime-swift)
+    - [openwhisk-runtime-php](https://github.com/apache/openwhisk-runtime-php)
+    - [openwhisk-runtime-python](https://github.com/apache/openwhisk-runtime-python)
+    - [openwhisk-runtime-java](https://github.com/apache/openwhisk-runtime-java)
+    - [openwhisk-runtime-docker](https://github.com/apache/openwhisk-runtime-docker)
+- OpenWhisk catalog: [openwhisk-catalog](https://github.com/apache/openwhisk-catalog)
+- OpenWhisk API gateway: [openwhisk-apigateway](https://github.com/apache/openwhisk-apigateway)
 - OpenWhisk deployment support:
-    - [incubator-openwhisk-deploy-kube](https://github.com/apache/incubator-openwhisk-deploy-kube)
+    - [openwhisk-deploy-kube](https://github.com/apache/openwhisk-deploy-kube)
 - OpenWhisk clients:
-    - [incubator-openwhisk-client-go](https://github.com/apache/incubator-openwhisk-client-go)
-    - [incubator-openwhisk-cli](https://github.com/apache/incubator-openwhisk-cli)
-    - [incubator-openwhisk-wskdeploy](https://github.com/apache/incubator-openwhisk-wskdeploy)
+    - [openwhisk-client-go](https://github.com/apache/openwhisk-client-go)
+    - [openwhisk-cli](https://github.com/apache/openwhisk-cli)
+    - [openwhisk-wskdeploy](https://github.com/apache/openwhisk-wskdeploy)
 
 # Proposed implementation
 ## How to automate the release process for OpenWhisk?
@@ -88,7 +88,7 @@ saved for each repository.
 
 The following diagram shows the structure of the repository:
 ```
-|--incubator-openwhisk-release--|
+|--openwhisk-release--|
     |--releases--|
         |--current--|   # the only directory to work with before proposing any release or sub-release
             |--config.json--|
@@ -96,7 +96,7 @@ The following diagram shows the structure of the repository:
             |--LICENSE--|
             |--CHANGELOG--|
             |--...--|
-        |--incubator--| # example with no sub-release
+        |--version--| # example with no sub-release
             |--config.json--|
             |--NOTICE--|
             |--LICENSE--|
@@ -142,9 +142,9 @@ branch, Travis build will be triggered to verify that combination of hash values
 projects. If the Travis build passes, the aggregation of OpenWhisk projects works.
 
 Once the release manager feels confident in a certain the project set, a release can be proposed. For example, the next release
-name of OpenWhisk is _incubator_, and there is no sub-release name. We can copy all the files under _releases/current_ into
-the directory _releases/incubator_(create one if it is missing), and submit this change as a PR to this master branch. When
-this PR is merged into master and becomes a valid commit, the release manager can tag it with the name _incubator_, in order
+name of OpenWhisk is _version_, and there is no sub-release name. We can copy all the files under _releases/current_ into
+the directory _releases/version_(create one if it is missing), and submit this change as a PR to this master branch. When
+this PR is merged into master and becomes a valid commit, the release manager can tag it with the name _version_, in order
 to kick off a Travis build to publish the packages into Apache/staging repository.
 
 ## TBD:
diff --git a/docs/license_compliance.md b/docs/license_compliance.md
index f6388fc..12f6e44 100644
--- a/docs/license_compliance.md
+++ b/docs/license_compliance.md
@@ -57,7 +57,7 @@ In addition, the recommended type of approved ASF license header (i.e., "full" o
 | Groovy code (`*.groovy`) | Full | Source code. |
 | Makefile | Full | May contain functional (script) code. |
 | Scala Configurations (`*.conf`) | Full | Scala (Java)  configuration files may contain code or interfaces. |
-| Scala Properties (`*.properties`) | Full | Project convention.</br>Example: [incubator-openwhisk/blob/master/tools/eclipse/scala.properties](https://github.com/apache/incubator-openwhisk/blob/master/tools/eclipse/scala.properties) |
+| Scala Properties (`*.properties`) | Full | Project convention.</br>Example: [openwhisk/blob/master/tools/eclipse/scala.properties](https://github.com/apache/openwhisk/blob/master/tools/eclipse/scala.properties) |
 | Script files (`*.sh`) | Full | May contain functional (script) code. |
 | Vagrantfile configuration file (`Vagrantfile`)| Full | Project convention. |
 | Web Content (e.g., `*.html`, `.css`) | Full | Source code. |
@@ -75,32 +75,32 @@ In accordance with Apache LICENSE policies, the table below lists general exclus
 
 | TAG | File type | Rationale |
 |:---|:---|:---|
-| ANS.CFG| Ansible Configuration Files (`*.cfg`) | Configuration files. Not much creativity.<br/>Example: [incubator-openwhisk/ansible/ansible.cfg](https://github.com/apache/incubator-openwhisk/blob/master/ansible/ansible.cfg) |
-| ANS.ENV | Ansible environment files (`*.env`) | Configuration files. Not much creativity.</br>Example: [ansible/environments/distributed/files/openstack/openstack.env](https://github.com/apache/incubator-openwhisk/blob/master/ansible/environments/distributed/files/openstack/openstack.env) |
-| ANS.HOSTS | Ansible hosts files (`hosts`) | Configuration files. Not much creativity.</br>Example: [incubator-openwhisk/ansible/environments/distributed/hosts](https://github.com/apache/incubator-openwhisk/blob/master/ansible/environments/distributed/hosts) |
-| ANS.INI | Ansible (host) Inventory Files (`*.ini`) | Configuration files. Not much creativity.<br/>Example: [incubator-openwhisk/ansible/environments/local/hosts.j2.ini](https://github.com/apache/incubator-openwhisk/blob/master/ansible/environments/local/hosts.j2.ini) |
-| API.ENC | Encrypted API Credentials used in Travis | Configuration data.</br>Example: [incubator-openwhisk-catalog/credentials.json.enc](https://github.com/apache/incubator-openwhisk-catalog/blob/master/credentials.json.enc) |
-| DATA.AUTH | API Auth. key | Configuration data.</br>Example: [ansible/files/auth.guest](https://github.com/apache/incubator-openwhisk/blob/master/ansible/files/auth.guest) |
-| DATA.TEST | Empty (zero-length) test files | Empty test data file.</br>Example: [incubator-openwhisk/tests/dat/actions/empty.js](https://github.com/apache/incubator-openwhisk/blob/master/tests/dat/actions/empty.js) |
+| ANS.CFG| Ansible Configuration Files (`*.cfg`) | Configuration files. Not much creativity.<br/>Example: [openwhisk/ansible/ansible.cfg](https://github.com/apache/openwhisk/blob/master/ansible/ansible.cfg) |
+| ANS.ENV | Ansible environment files (`*.env`) | Configuration files. Not much creativity.</br>Example: [ansible/environments/distributed/files/openstack/openstack.env](https://github.com/apache/openwhisk/blob/master/ansible/environments/distributed/files/openstack/openstack.env) |
+| ANS.HOSTS | Ansible hosts files (`hosts`) | Configuration files. Not much creativity.</br>Example: [openwhisk/ansible/environments/distributed/hosts](https://github.com/apache/openwhisk/blob/master/ansible/environments/distributed/hosts) |
+| ANS.INI | Ansible (host) Inventory Files (`*.ini`) | Configuration files. Not much creativity.<br/>Example: [openwhisk/ansible/environments/local/hosts.j2.ini](https://github.com/apache/openwhisk/blob/master/ansible/environments/local/hosts.j2.ini) |
+| API.ENC | Encrypted API Credentials used in Travis | Configuration data.</br>Example: [openwhisk-catalog/credentials.json.enc](https://github.com/apache/openwhisk-catalog/blob/master/credentials.json.enc) |
+| DATA.AUTH | API Auth. key | Configuration data.</br>Example: [ansible/files/auth.guest](https://github.com/apache/openwhisk/blob/master/ansible/files/auth.guest) |
+| DATA.TEST | Empty (zero-length) test files | Empty test data file.</br>Example: [openwhisk/tests/dat/actions/empty.js](https://github.com/apache/openwhisk/blob/master/tests/dat/actions/empty.js) |
 | GIT.1 | Git configuration (`.gitattributes`, `.gitignore`) | Configuration file. Not much creativity.  |
 | GIT.2 | Git tracking (`.git` subdirectory) | Git file tracking. Not part of project source. |
-| GODEPS.JSON | GoDeps dependencies data (`Godeps.json`) |  | JSON data generated by the GoDeps utility.</br>Example: [incubator-openwhisk-wskdeploy/blob/master/Godeps/Godeps.json](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/Godeps/Godeps.json) |
+| GODEPS.JSON | GoDeps dependencies data (`Godeps.json`) |  | JSON data generated by the GoDeps utility.</br>Example: [openwhisk-wskdeploy/blob/master/Godeps/Godeps.json](https://github.com/apache/openwhisk-wskdeploy/blob/master/Godeps/Godeps.json) |
 | GODEPS.README | GoDeps Readme file (`Readme`) | Plain text Readme generated by the GoDeps utility; states the directory and JSON file within it were autogenerated. |
-| GRDL.PROP | Gradle Wrapper properties (`gradle-wrapper.properties`) | Generated by Gradle.</br>Example: [incubator-openwhisk-cli/gradle/wrapper/gradle-wrapper.properties](https://github.com/apache/incubator-openwhisk-cli/blob/master/gradle/wrapper/gradle-wrapper.properties)|
-| I18N.1 | Golang Internationalization resource files (`i18n_resources.go`) | Not much creativity. The file is auto-generated; not able to add header.</br>Example: [incubator-openwhisk-client-go/wski18n/i18n_resources.go](https://github.com/apache/incubator-openwhisk-client-go/blob/master/wski18n/i18n_resources.go) |
+| GRDL.PROP | Gradle Wrapper properties (`gradle-wrapper.properties`) | Generated by Gradle.</br>Example: [openwhisk-cli/gradle/wrapper/gradle-wrapper.properties](https://github.com/apache/openwhisk-cli/blob/master/gradle/wrapper/gradle-wrapper.properties)|
+| I18N.1 | Golang Internationalization resource files (`i18n_resources.go`) | Not much creativity. The file is auto-generated; not able to add header.</br>Example: [openwhisk-client-go/wski18n/i18n_resources.go](https://github.com/apache/openwhisk-client-go/blob/master/wski18n/i18n_resources.go) |
 | IDE | IDE configuration files (e.g., `.project`) | Not much creativity. |
 | IGNORE | Tooling "ignore" files (e.g., `.gitignore`, `.dockerignore`) | Not included in source release. |
-| IMAGE | Binary Image files (e.g., `.png`, `.jpg`, `.ico`) | Binary files.</br>Example: [incubator-openwhisk/docs/images/OpenWhisk.png](https://github.com/apache/incubator-openwhisk/blob/master/docs/images/OpenWhisk.png) |
-| J2 | Jinja2 Template files (`*.j2`) | **REVIEW** Not much creativity.</br>Example: [incubator-openwhisk/ansible/templates/whisk.properties.j2](https://github.com/apache/incubator-openwhisk/blob/master/ansible/templates/whisk.properties.j2) |
-| JSON | JSON files (`*.json`) | Configuration and test data files.</br> - Note: _JSON files don't support comments_</br>Example: [incubator-openwhisk/tests/dat/actions/echo.json](https://github.com/apache/incubator-openwhisk/blob/master/tests/dat/actions/echo.json) |
-| KUBE.1 | Kubernetes Configurations (e.g., `*.env`) | Configuration file. Not much creativity.<br/>Example: [incubator-openwhisk//ansible/environments/distributed/files/openstack/openstack.env](https://github.com/apache/incubator-openwhisk/blob/master/ansible/environments/distributed/files/openstack/openstack.env) |
-| OAPI | Open API (Swagger) documents | JSON files describing API input data.</br>Example: [incubator-openwhisk/blob/master/tests/dat/apigw/testswaggerdoc2](https://github.com/apache/incubator-openwhisk/blob/master/tests/dat/apigw/testswaggerdoc2) for test input data |
-| PEM | Privacy Enhanced Mail (PEM) files (`*.pem`) | Contains generated, base64-encoded x509 keys.</br>Example: [incubator-openwhisk/ansible/roles/nginx/files/openwhisk-server-key.pem](https://github.com/apache/incubator-openwhisk/blob/master/ansible/roles/nginx/files/openwhisk-server-key.pem)|
+| IMAGE | Binary Image files (e.g., `.png`, `.jpg`, `.ico`) | Binary files.</br>Example: [openwhisk/docs/images/OpenWhisk.png](https://github.com/apache/openwhisk/blob/master/docs/images/OpenWhisk.png) |
+| J2 | Jinja2 Template files (`*.j2`) | **REVIEW** Not much creativity.</br>Example: [openwhisk/ansible/templates/whisk.properties.j2](https://github.com/apache/openwhisk/blob/master/ansible/templates/whisk.properties.j2) |
+| JSON | JSON files (`*.json`) | Configuration and test data files.</br> - Note: _JSON files don't support comments_</br>Example: [openwhisk/tests/dat/actions/echo.json](https://github.com/apache/openwhisk/blob/master/tests/dat/actions/echo.json) |
+| KUBE.1 | Kubernetes Configurations (e.g., `*.env`) | Configuration file. Not much creativity.<br/>Example: [openwhisk//ansible/environments/distributed/files/openstack/openstack.env](https://github.com/apache/openwhisk/blob/master/ansible/environments/distributed/files/openstack/openstack.env) |
+| OAPI | Open API (Swagger) documents | JSON files describing API input data.</br>Example: [openwhisk/blob/master/tests/dat/apigw/testswaggerdoc2](https://github.com/apache/openwhisk/blob/master/tests/dat/apigw/testswaggerdoc2) for test input data |
+| PEM | Privacy Enhanced Mail (PEM) files (`*.pem`) | Contains generated, base64-encoded x509 keys.</br>Example: [openwhisk/ansible/roles/nginx/files/openwhisk-server-key.pem](https://github.com/apache/openwhisk/blob/master/ansible/roles/nginx/files/openwhisk-server-key.pem)|
 | PROFILE | Profiling configuration scripts (`.profiling.*`) | Configure Docker container for profiling (build). |
 | PYDEV | PyDev configuration files (`.pydevproject`) | Not included in source release. |
 | TEST.JAR | Java Application Resource (JAR) files (`*.jar`) | Binary JAR files used for testing (Actions). |
 | TEST.ZIP | ZIP compressed archive files (`*.zip`) | Binary ZIP files used for testing (Actions). |
-| XML | XML files (`*.xml`) | Configuration and test data files.</br>Example: [incubator-openwhisk/tools/eclipse/java.xml](https://github.com/apache/incubator-openwhisk/blob/master/tools/eclipse/java.xml) |
+| XML | XML files (`*.xml`) | Configuration and test data files.</br>Example: [openwhisk/tools/eclipse/java.xml](https://github.com/apache/openwhisk/blob/master/tools/eclipse/java.xml) |
 
 # Known exclusions
 
@@ -109,8 +109,8 @@ In accordance with Apache LICENSE policies, the table below lists general exclus
 The Apache OpenWhisk project enforces and verifies ASF License header conformance on all source files using the project's own scanCode utility (on all Travis CI builds) and Apache RAT tool (on all automated releases).
 
 In accordance with Apache policy, these utilities exclude specific files from the ASF license header requirement which are configured in the following files:
-- scanCode: [ASF-Release.cfg](https://github.com/apache/incubator-openwhisk-utilities/blob/master/scancode/ASF-Release.cfg)
-- Apache RAT: [pom.xml](https://github.com/apache/incubator-openwhisk-release/blob/master/tools/lib/pom.xml) (Apache Rat)
+- scanCode: [ASF-Release.cfg](https://github.com/apache/openwhisk-utilities/blob/master/scancode/ASF-Release.cfg)
+- Apache RAT: [pom.xml](https://github.com/apache/openwhisk-release/blob/master/tools/lib/pom.xml) (Apache Rat)
 
 ### ASF License header exclusions
 The following page contains a non-comprehensive listing of all project files, by repository that are known to not have ASF license headers along with the policy tag indicating the justification against the table above: [license_exclusions.md](license_exclusions.md)
@@ -123,12 +123,12 @@ This section describes how the Apache OpenWhisk project enforces and verifies LI
 
 This utility is used to enforce LICENSE compliance on all contributions as they are submitted to GitHub.
 
-The scancode utility code and documentation are under the [OpenWhisk Utilities](https://github.com/apache/incubator-openwhisk-utilities) repository.  The community has agreed that all repositories MUST include ASF LICENSE scanning as part of the Travis Continuous Integration (CI) process enabled to run on every contribution via a GitHub Pull Request (PR).  This means no new or updated files can be merged unless they have a valid ASF LICENSE header where required by policy.
+The scancode utility code and documentation are under the [OpenWhisk Utilities](https://github.com/apache/openwhisk-utilities) repository.  The community has agreed that all repositories MUST include ASF LICENSE scanning as part of the Travis Continuous Integration (CI) process enabled to run on every contribution via a GitHub Pull Request (PR).  This means no new or updated files can be merged unless they have a valid ASF LICENSE header where required by policy.
 
-- The Utility itself is here: [scancode](https://github.com/apache/incubator-openwhisk-utilities/tree/master/scancode)
-- The ASF Compliance configuration is here: [ASF-Release.cfg](https://github.com/apache/incubator-openwhisk-utilities/blob/master/scancode/ASF-Release.cfg)
+- The Utility itself is here: [scancode](https://github.com/apache/openwhisk-utilities/tree/master/scancode)
+- The ASF Compliance configuration is here: [ASF-Release.cfg](https://github.com/apache/openwhisk-utilities/blob/master/scancode/ASF-Release.cfg)
 
-The [README](https://github.com/apache/incubator-openwhisk-release/blob/master/README.md) for this repository includes a table that indicates where the scancode utility is invoked, as part of the GitHub Travis CI process, per project repository.
+The [README](https://github.com/apache/openwhisk-release/blob/master/README.md) for this repository includes a table that indicates where the scancode utility is invoked, as part of the GitHub Travis CI process, per project repository.
 
 ### Apache Rat
 
diff --git a/docs/license_exclusions.md b/docs/license_exclusions.md
index 879e7e6..56c4db2 100644
--- a/docs/license_exclusions.md
+++ b/docs/license_exclusions.md
@@ -27,16 +27,16 @@ In additon, the specific rationale for the exclusion, in accordance with Apache
 
 ## Exclusions part of Apache source code release
 
-### [incubator-openwhisk](https://github.com/apache/incubator-openwhisk)
+### [openwhisk](https://github.com/apache/openwhisk)
 
 | Exclusion | Rationale [TAG] |
 |:---|:---|
 | [ansible/ansible.cfg]() | ANS.CFG |
-| [ansible/environments/distributed/files/openstack/openstack.env](https://github.com/apache/incubator-openwhisk/blob/master/ansible/environments/distributed/files/openstack/openstack.env) | ANS.ENV |
-| [ansible/environments/distributed/hosts](https://github.com/apache/incubator-openwhisk/blob/master/ansible/environments/distributed/hosts) | ANS.HOSTS |
-| [ansible/environments/docker-machine/hosts.j2.ini](https://github.com/apache/incubator-openwhisk/blob/master/ansible/environments/docker-machine/hosts.j2.ini) | ANS.INI |
-| [ansible/environments/local/hosts.j2.ini](https://github.com/apache/incubator-openwhisk/blob/master/ansible/environments/local/hosts.j2.ini) | ANS.INI |
-| [ansible/environments/vagrant/hosts](https://github.com/apache/incubator-openwhisk/blob/master/ansible/environments/vagrant/hosts) | ANS.HOSTS |
+| [ansible/environments/distributed/files/openstack/openstack.env](https://github.com/apache/openwhisk/blob/master/ansible/environments/distributed/files/openstack/openstack.env) | ANS.ENV |
+| [ansible/environments/distributed/hosts](https://github.com/apache/openwhisk/blob/master/ansible/environments/distributed/hosts) | ANS.HOSTS |
+| [ansible/environments/docker-machine/hosts.j2.ini](https://github.com/apache/openwhisk/blob/master/ansible/environments/docker-machine/hosts.j2.ini) | ANS.INI |
+| [ansible/environments/local/hosts.j2.ini](https://github.com/apache/openwhisk/blob/master/ansible/environments/local/hosts.j2.ini) | ANS.INI |
+| [ansible/environments/vagrant/hosts](https://github.com/apache/openwhisk/blob/master/ansible/environments/vagrant/hosts) | ANS.HOSTS |
 | [ansible/files/activations_design_document_for_activations_db.json]() | JSON |
 | [ansible/files/auth.guest]() | DATA.AUTH |
 | [ansible/files/auth.whisk.system]() |  DATA.AUTH |
@@ -57,79 +57,79 @@ In additon, the specific rationale for the exclusion, in accordance with Apache
 | [ansible/templates/jmxremote.access.j2]() | J2 |
 | [ansible/templates/jmxremote.password.j2]() | J2 |
 | [ansible/templates/whisk.properties.j2]() | J2 |
-| [bin/wskadmin](https://github.com/apache/incubator-openwhisk/blob/master/bin/wskadmin) | Generated, symbolic link |
-| [bin/wskdev](https://github.com/apache/incubator-openwhisk/blob/master/bin/wskdev) | Generated, symbolic link |
-| [common/scala/src/main/resources/logback.xml](https://github.com/apache/incubator-openwhisk/blob/master/common/scala/src/main/resources/logback.xml) | XML |
-| [docs/images/OpenWhisk_flow_of_processing.draw.io.xml](https://github.com/apache/incubator-openwhisk/blob/master/docs/images/OpenWhisk_flow_of_processing.draw.io.xml) | XML |
-| [tools/eclipse/java.xml](https://github.com/apache/incubator-openwhisk/blob/master/tools/eclipse/java.xml) | XML |
+| [bin/wskadmin](https://github.com/apache/openwhisk/blob/master/bin/wskadmin) | Generated, symbolic link |
+| [bin/wskdev](https://github.com/apache/openwhisk/blob/master/bin/wskdev) | Generated, symbolic link |
+| [common/scala/src/main/resources/logback.xml](https://github.com/apache/openwhisk/blob/master/common/scala/src/main/resources/logback.xml) | XML |
+| [docs/images/OpenWhisk_flow_of_processing.draw.io.xml](https://github.com/apache/openwhisk/blob/master/docs/images/OpenWhisk_flow_of_processing.draw.io.xml) | XML |
+| [tools/eclipse/java.xml](https://github.com/apache/openwhisk/blob/master/tools/eclipse/java.xml) | XML |
 
-### [incubator-openwhisk-apigateway](https://github.com/apache/incubator-openwhisk-apigateway)
+### [openwhisk-apigateway](https://github.com/apache/openwhisk-apigateway)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
-| [.profiling.after](https://github.com/apache/incubator-openwhisk-apigateway/blob/master/.profiling.after) | PROFILE |
-| [.profiling.before](https://github.com/apache/incubator-openwhisk-apigateway/blob/master/.profiling.before) | PROFILE |
+| [.profiling.after](https://github.com/apache/openwhisk-apigateway/blob/master/.profiling.after) | PROFILE |
+| [.profiling.before](https://github.com/apache/openwhisk-apigateway/blob/master/.profiling.before) | PROFILE |
 
-### [incubator-openwhisk-catalog](https://github.com/apache/incubator-openwhisk-catalog)
+### [openwhisk-catalog](https://github.com/apache/openwhisk-catalog)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
-| [credentials.json.enc](https://github.com/apache/incubator-openwhisk-catalog/blob/master/credentials.json.enc) | API.ENC |
+| [credentials.json.enc](https://github.com/apache/openwhisk-catalog/blob/master/credentials.json.enc) | API.ENC |
 
-### [incubator-openwhisk-client-go](https://github.com/apache/incubator-openwhisk-client-go)
+### [openwhisk-client-go](https://github.com/apache/openwhisk-client-go)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
-| [Godeps/Godeps.json](https://github.com/apache/incubator-openwhisk-client-go/blob/master/Godeps/Godeps.json) | GODEPS.JSON |
-| [Godeps/Readme](https://github.com/apache/incubator-openwhisk-client-go/blob/master/Godeps/Readme) | GODEPS.README |
-| [wski18n/i18n_resources.go](https://github.com/apache/incubator-openwhisk-client-go/blob/master/wski18n/i18n_resources.go) | I18N.1, NOTE: ASF Header manually added after autogen. recently |
-| [wski18n/resources](https://github.com/apache/incubator-openwhisk-client-go/tree/master/wski18n/resources) | JSON, Empty files (i.e., no translations yet) |
+| [Godeps/Godeps.json](https://github.com/apache/openwhisk-client-go/blob/master/Godeps/Godeps.json) | GODEPS.JSON |
+| [Godeps/Readme](https://github.com/apache/openwhisk-client-go/blob/master/Godeps/Readme) | GODEPS.README |
+| [wski18n/i18n_resources.go](https://github.com/apache/openwhisk-client-go/blob/master/wski18n/i18n_resources.go) | I18N.1, NOTE: ASF Header manually added after autogen. recently |
+| [wski18n/resources](https://github.com/apache/openwhisk-client-go/tree/master/wski18n/resources) | JSON, Empty files (i.e., no translations yet) |
 
-### [incubator-openwhisk-deploy-kube](https://github.com/apache/incubator-openwhisk-deploy-kube)
+### [openwhisk-deploy-kube](https://github.com/apache/openwhisk-deploy-kube)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
-| [helm/runtimes.json](https://github.com/apache/incubator-openwhisk-deploy-kube/blob/master/helm/runtimes.json) | JSON |
-| [runtimes-minimal-travis.json](https://github.com/apache/incubator-openwhisk-deploy-kube/blob/master/helm/runtimes-minimal-travis.json) | JSON |
-| [kubernetes/controller/controller.env](https://github.com/apache/incubator-openwhisk-deploy-kube/blob/master/kubernetes/controller/controller.env) | KUBE.1 |
-| [kubernetes/invoker/invoker-dcf.env](https://github.com/apache/incubator-openwhisk-deploy-kube/blob/master/kubernetes/invoker/invoker-dcf.env) | KUBE.1 |
-| [kubernetes/invoker/invoker-k8scf.env](https://github.com/apache/incubator-openwhisk-deploy-kube/blob/master/kubernetes/invoker/invoker-k8scf.env) | KUBE.1 |
+| [helm/runtimes.json](https://github.com/apache/openwhisk-deploy-kube/blob/master/helm/runtimes.json) | JSON |
+| [runtimes-minimal-travis.json](https://github.com/apache/openwhisk-deploy-kube/blob/master/helm/runtimes-minimal-travis.json) | JSON |
+| [kubernetes/controller/controller.env](https://github.com/apache/openwhisk-deploy-kube/blob/master/kubernetes/controller/controller.env) | KUBE.1 |
+| [kubernetes/invoker/invoker-dcf.env](https://github.com/apache/openwhisk-deploy-kube/blob/master/kubernetes/invoker/invoker-dcf.env) | KUBE.1 |
+| [kubernetes/invoker/invoker-k8scf.env](https://github.com/apache/openwhisk-deploy-kube/blob/master/kubernetes/invoker/invoker-k8scf.env) | KUBE.1 |
 
-### [incubator-openwhisk-runtime-docker](https://github.com/apache/incubator-openwhisk-runtime-docker)
+### [openwhisk-runtime-docker](https://github.com/apache/openwhisk-runtime-docker)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
-| [ansible/environments/local/hosts](https://github.com/apache/incubator-openwhisk-runtime-docker/blob/master/ansible/environments/local/hosts) | ANS.HOSTS |
+| [ansible/environments/local/hosts](https://github.com/apache/openwhisk-runtime-docker/blob/master/ansible/environments/local/hosts) | ANS.HOSTS |
 
-### [incubator-openwhisk-runtime-java](https://github.com/apache/incubator-openwhisk-runtime-java)
+### [openwhisk-runtime-java](https://github.com/apache/openwhisk-runtime-java)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
-| [ansible/environments/local/hosts](https://github.com/apache/incubator-openwhisk-runtime-java/blob/master/ansible/environments/local/hosts) | ANS.HOSTS |
+| [ansible/environments/local/hosts](https://github.com/apache/openwhisk-runtime-java/blob/master/ansible/environments/local/hosts) | ANS.HOSTS |
 
-### [incubator-openwhisk-runtime-nodejs](https://github.com/apache/incubator-openwhisk-runtime-nodejs)
+### [openwhisk-runtime-nodejs](https://github.com/apache/openwhisk-runtime-nodejs)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
-| [ansible/environments/local/hosts](https://github.com/apache/incubator-openwhisk-runtime-nodejs/blob/master/ansible/environments/local/hosts) | ANS.HOSTS |
+| [ansible/environments/local/hosts](https://github.com/apache/openwhisk-runtime-nodejs/blob/master/ansible/environments/local/hosts) | ANS.HOSTS |
 | [core/nodejs8Action/package.json]() | JSON |
 | [core/nodejsActionBase/package.json]() | JSON |
 
-### [incubator-openwhisk-runtime-php](https://github.com/apache/incubator-openwhisk-runtime-php)
+### [openwhisk-runtime-php](https://github.com/apache/openwhisk-runtime-php)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
-| [ansible/environments/local/hosts](https://github.com/apache/incubator-openwhisk-runtime-php/blob/master/ansible/environments/local/hosts) | ANS.HOSTS |
+| [ansible/environments/local/hosts](https://github.com/apache/openwhisk-runtime-php/blob/master/ansible/environments/local/hosts) | ANS.HOSTS |
 | [core/php7.1Action/composer.json]() | JSON |
 
-### [incubator-openwhisk-runtime-python](https://github.com/apache/incubator-openwhisk-runtime-python)
+### [openwhisk-runtime-python](https://github.com/apache/openwhisk-runtime-python)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
-| [ansible/environments/local/hosts](https://github.com/apache/incubator-openwhisk-runtime-python/blob/master/ansible/environments/local/hosts) | ANS.HOSTS |
+| [ansible/environments/local/hosts](https://github.com/apache/openwhisk-runtime-python/blob/master/ansible/environments/local/hosts) | ANS.HOSTS |
 | [core/php7.1Action/composer.json]() | JSON |
 
-### [incubator-openwhisk-runtime-swift](https://github.com/apache/incubator-openwhisk-runtime-swift)
+### [openwhisk-runtime-swift](https://github.com/apache/openwhisk-runtime-swift)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
-| [ansible/environments/local/hosts](https://github.com/apache/incubator-openwhisk-runtime-swift/blob/master/ansible/environments/local/hosts) | ANS.HOSTS |
+| [ansible/environments/local/hosts](https://github.com/apache/openwhisk-runtime-swift/blob/master/ansible/environments/local/hosts) | ANS.HOSTS |
 
-### [incubator-openwhisk-wskdeploy](https://github.com/apache/incubator-openwhisk-wskdeploy)
+### [openwhisk-wskdeploy](https://github.com/apache/openwhisk-wskdeploy)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
-| [wski18n/i18n_resources.go](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/wski18n/i18n_resources.go) | I18N.1 |
-| [wski18n/resources](https://github.com/apache/incubator-openwhisk-wskdeploy/tree/master/wski18n/resources) | JSON, Empty files (i.e., no translations yet) |
+| [wski18n/i18n_resources.go](https://github.com/apache/openwhisk-wskdeploy/blob/master/wski18n/i18n_resources.go) | I18N.1 |
+| [wski18n/resources](https://github.com/apache/openwhisk-wskdeploy/tree/master/wski18n/resources) | JSON, Empty files (i.e., no translations yet) |
 | [Godeps/Godeps.json]() | GODEPS.JSON |
 | [Godeps/Readme]() | GODEPS.README |
 | [ansible/environments/local/hosts]() | ANS.HOSTS |
@@ -140,12 +140,12 @@ In additon, the specific rationale for the exclusion, in accordance with Apache
 -->
 The following "tests" files are excluded from having ASF License headers, but alse are NOT part of the project source code release archive when created.
 
-### [incubator-openwhisk](https://github.com/apache/incubator-openwhisk)
+### [openwhisk](https://github.com/apache/openwhisk)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
-| [tests/credentials.json.enc](https://github.com/apache/incubator-openwhisk-catalog/blob/master/tests/credentials.json.enc) | API.ENC |
+| [tests/credentials.json.enc](https://github.com/apache/openwhisk-catalog/blob/master/tests/credentials.json.enc) | API.ENC |
 | [tests/dat/actions/blackbox.zip]() | TEST.ZIP |
-| [tests/dat/actions/empty.js](https://github.com/apache/incubator-openwhisk/blob/master/tests/dat/actions/empty.js) | DATA.TEST, Empty (zero-length) test data file. |
+| [tests/dat/actions/empty.js](https://github.com/apache/openwhisk/blob/master/tests/dat/actions/empty.js) | DATA.TEST, Empty (zero-length) test data file. |
 | [tests/dat/actions/helloJava.jar]() | TEST.JAR |
 | [tests/dat/actions/helloJavaDefaultPackage.jar]() | TEST.JAR |
 | [tests/dat/actions/helloSwift311.zip]() | TEST.ZIP |
@@ -174,26 +174,26 @@ The following "tests" files are excluded from having ASF License headers, but al
 | [tests/dat/apigw/testswaggerdoc2]() | OAPI. Test data. |
 | [tests/dat/apigw/testswaggerdocinvalid]() | OAPI. Test data. |
 | [tests/performance/gatling_tests/src/gatling/resources/conf/logback.xml]() | XML |
-| [tests/performance/gatling_tests/src/gatling/resources/data/javaAction.jar](https://github.com/apache/incubator-openwhisk/blob/master/tests/performance/gatling_tests/src/gatling/resources/data/javaAction.jar) | TEST.JAR |
-| [tests/performance/gatling_tests/src/gatling/resources/conf/logback.xml](https://github.com/apache/incubator-openwhisk/blob/master/tests/performance/gatling_tests/src/gatling/resources/conf/logback.xml) | XML |
-| [tests/performance/wrk_tests/post.lua](https://github.com/apache/incubator-openwhisk/blob/master/tests/performance/wrk_tests/post.lua) | DATA.TEXT, Empy (HTTP POST) Performance test data file. |
+| [tests/performance/gatling_tests/src/gatling/resources/data/javaAction.jar](https://github.com/apache/openwhisk/blob/master/tests/performance/gatling_tests/src/gatling/resources/data/javaAction.jar) | TEST.JAR |
+| [tests/performance/gatling_tests/src/gatling/resources/conf/logback.xml](https://github.com/apache/openwhisk/blob/master/tests/performance/gatling_tests/src/gatling/resources/conf/logback.xml) | XML |
+| [tests/performance/wrk_tests/post.lua](https://github.com/apache/openwhisk/blob/master/tests/performance/wrk_tests/post.lua) | DATA.TEXT, Empy (HTTP POST) Performance test data file. |
 | [tests/src/test/resources/logback-test.xml]() | XML |
 
-### [incubator-openwhisk-apigateway](https://github.com/apache/incubator-openwhisk-apigateway)
+### [openwhisk-apigateway](https://github.com/apache/openwhisk-apigateway)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
-| [tests/scripts/lua/management/examples/example1.json](https://github.com/apache/incubator-openwhisk-apigateway/blob/master/tests/scripts/lua/management/examples/example1.json) | JSON |
-| [tests/scripts/lua/management/examples/example2.json](https://github.com/apache/incubator-openwhisk-apigateway/blob/master/tests/scripts/lua/management/examples/example2.json) | JSON |
-| [tests/scripts/lua/management/examples/example3.json](https://github.com/apache/incubator-openwhisk-apigateway/blob/master/tests/scripts/lua/management/examples/example3.json) | JSON |
+| [tests/scripts/lua/management/examples/example1.json](https://github.com/apache/openwhisk-apigateway/blob/master/tests/scripts/lua/management/examples/example1.json) | JSON |
+| [tests/scripts/lua/management/examples/example2.json](https://github.com/apache/openwhisk-apigateway/blob/master/tests/scripts/lua/management/examples/example2.json) | JSON |
+| [tests/scripts/lua/management/examples/example3.json](https://github.com/apache/openwhisk-apigateway/blob/master/tests/scripts/lua/management/examples/example3.json) | JSON |
 | [tests/lua_modules]() | Travis installed test modules scripts. Not part of source code release. |
 | [lua_install]() | Travis installed test packages. Not part of source code release. |
 
-### [incubator-openwhisk-catalog](https://github.com/apache/incubator-openwhisk-catalog)
+### [openwhisk-catalog](https://github.com/apache/openwhisk-catalog)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
-| [tests/credentials.json.enc](https://github.com/apache/incubator-openwhisk/blob/master/tests/credentials.json.enc) | API.ENC |
+| [tests/credentials.json.enc](https://github.com/apache/openwhisk/blob/master/tests/credentials.json.enc) | API.ENC |
 
-### [incubator-openwhisk-cli](https://github.com/apache/incubator-openwhisk-cli)
+### [openwhisk-cli](https://github.com/apache/openwhisk-cli)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
 | [tests/src/dat/invalidInput1.json]() | JSON |
@@ -201,41 +201,41 @@ The following "tests" files are excluded from having ASF License headers, but al
 | [tests/src/dat/invalidInput3.json]() | JSON |
 | [tests/src/dat/invalidInput4.json]() | JSON |
 
-### [incubator-openwhisk-runtime-docker](https://github.com/apache/incubator-openwhisk-runtime-docker)
+### [openwhisk-runtime-docker](https://github.com/apache/openwhisk-runtime-docker)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
 | _None_ | _N/A_ |
 
-### [incubator-openwhisk-runtime-java](https://github.com/apache/incubator-openwhisk-runtime-java)
+### [openwhisk-runtime-java](https://github.com/apache/openwhisk-runtime-java)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
 | _None_ | _N/A_ |
 
-### [incubator-openwhisk-runtime-nodejs](https://github.com/apache/incubator-openwhisk-runtime-nodejs)
+### [openwhisk-runtime-nodejs](https://github.com/apache/openwhisk-runtime-nodejs)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
 | _None_ | _N/A_ |
 
-### [incubator-openwhisk-runtime-php](https://github.com/apache/incubator-openwhisk-runtime-php)
+### [openwhisk-runtime-php](https://github.com/apache/openwhisk-runtime-php)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
 | _None_ | _N/A_ |
 
-### [incubator-openwhisk-runtime-python](https://github.com/apache/incubator-openwhisk-runtime-python)
+### [openwhisk-runtime-python](https://github.com/apache/openwhisk-runtime-python)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
 | _None_ | _N/A_ |
 
-### [incubator-openwhisk-runtime-swift](https://github.com/apache/incubator-openwhisk-runtime-swift)
+### [openwhisk-runtime-swift](https://github.com/apache/openwhisk-runtime-swift)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
-| [tests/dat/SwiftyRequest/Package.resolved](https://github.com/apache/incubator-openwhisk-runtime-swift/blob/master/tests/dat/actions/SwiftyRequest/Package.resolved) | OAPI |
+| [tests/dat/SwiftyRequest/Package.resolved](https://github.com/apache/openwhisk-runtime-swift/blob/master/tests/dat/actions/SwiftyRequest/Package.resolved) | OAPI |
 
-### [incubator-openwhisk-wskdeploy](https://github.com/apache/incubator-openwhisk-wskdeploy)
+### [openwhisk-wskdeploy](https://github.com/apache/openwhisk-wskdeploy)
 | Exclusion | Rationale [TAG] |
 |:---|:---|
-| [specification/archive/*](https://github.com/apache/incubator-openwhisk-wskdeploy/tree/master/specification/archive) | Archive of specification versions in PDF format. |
-| [specification/diagrams/*](https://github.com/apache/incubator-openwhisk-wskdeploy/tree/master/specification/diagrams) | IMAGE, Ninary images (e.g., ```.jpg```, ```.png```, etc.) used in specification HTML. |
+| [specification/archive/*](https://github.com/apache/openwhisk-wskdeploy/tree/master/specification/archive) | Archive of specification versions in PDF format. |
+| [specification/diagrams/*](https://github.com/apache/openwhisk-wskdeploy/tree/master/specification/diagrams) | IMAGE, Ninary images (e.g., ```.jpg```, ```.png```, etc.) used in specification HTML. |
 | [tests/apps/owbp-cloudant-trigger/manifest-bp.json]() | JSON |
 | [tests/dat/wskprops]() | API Client configuration data. |
 | [tests/dat/wskpropsnokeycert]() | API Client configuration data. |
@@ -254,4 +254,4 @@ The following "tests" files are excluded from having ASF License headers, but al
 | [tests/apps/owbp-cloudant-trigger/manifest-bp.json]() | JSON |
 
 ### Notes
-- logback (logger) failed in PG when adding XML comments that included the ASF license header. See PR[#3702](https://github.com/apache/incubator-openwhisk/pull/3702/files) which had to be reverted (although it passed Travis).  This needs to be investigated as to why it failed in PG and if we need additional Travis tests.
+- logback (logger) failed in PG when adding XML comments that included the ASF license header. See PR[#3702](https://github.com/apache/openwhisk/pull/3702/files) which had to be reverted (although it passed Travis).  This needs to be investigated as to why it failed in PG and if we need additional Travis tests.
diff --git a/docs/pick_up_source_code.md b/docs/pick_up_source_code.md
index 7ae0250..fa0e800 100644
--- a/docs/pick_up_source_code.md
+++ b/docs/pick_up_source_code.md
@@ -33,27 +33,27 @@ Template of [_config.json_](../tools/config.json):
   "stage_url": "https://dist.apache.org/repos/dist/dev/openwhisk",
   "release_url": "https://dist.apache.org/repos/dist/release/openwhisk",
   "versioning": {
-    "version": "incubator",
+    "version": "",
     "pre_release_version": "rc1"
   },
   "RepoList": [
-    "incubator-openwhisk",
-    "incubator-openwhisk-wskdeploy",
-    "incubator-openwhisk-cli"
+    "openwhisk",
+    "openwhisk-wskdeploy",
+    "openwhisk-cli"
   ],
-  "incubator_openwhisk": {
+  "openwhisk": {
     "hash": "a891e06",
-    "repository": "https://github.com/apache/incubator-openwhisk.git",
+    "repository": "https://github.com/apache/openwhisk.git",
     "branch": "master"
   },
-  "incubator_openwhisk_wskdeploy": {
+  "openwhisk_wskdeploy": {
     "hash": "1425456",
-    "repository": "https://github.com/apache/incubator-openwhisk-wskdeploy.git",
+    "repository": "https://github.com/apache/openwhisk-wskdeploy.git",
     "branch": "master"
   },
-  "incubator_openwhisk_cli": {
+  "openwhisk_cli": {
     "hash": "1448d31",
-    "repository": "https://github.com/apache/incubator-openwhisk-cli.git",
+    "repository": "https://github.com/apache/openwhisk-cli.git",
     "branch": "master"
   }
 }
diff --git a/docs/prerequisites.md b/docs/prerequisites.md
index 37a7f91..4dd6638 100644
--- a/docs/prerequisites.md
+++ b/docs/prerequisites.md
@@ -28,10 +28,10 @@ This project is only supported under Mac or Ununtu operating system.
 Open a terminal, go to the directory where you save the source code of this release tool, and run
 
 ```
-$ git clone https://github.com/apache/incubator-openwhisk-release.git
+$ git clone https://github.com/apache/openwhisk-release.git
 ```
 
-The directory _incubator-openwhisk-release_ becomes the home directory of openwhisk release tool, which will be referred to
+The directory _openwhisk-release_ becomes the home directory of openwhisk release tool, which will be referred to
 in the following context.
 
 ## Install the dependencies
@@ -40,7 +40,7 @@ After running the "git clone" command to download the source code this release r
 command to install all the dependencies:
 
 ```
-$ cd incubator-openwhisk-release/tools
+$ cd openwhisk-release/tools
 $ ./install_dependencies.sh
 ```
 
diff --git a/docs/release_instructions.md b/docs/release_instructions.md
index 3179f55..0461973 100644
--- a/docs/release_instructions.md
+++ b/docs/release_instructions.md
@@ -102,7 +102,7 @@ built from the Git repositories and commit IDs listed below.
 This release comprises of source code distribution only.
 
 You can use this UNIX script to download the release and verify the signatures:
-https://gitbox.apache.org/repos/asf?p=incubator-openwhisk-release.git;a=blob_plain;f=tools/rcverify.sh;hb=HEAD
+https://gitbox.apache.org/repos/asf?p=openwhisk-release.git;a=blob_plain;f=tools/rcverify.sh;hb=HEAD
 
 Usage:
 sh rcverify.sh {repository} {component} {version}
@@ -166,41 +166,48 @@ The script will download the release candidate, verify signatures, discalaimer,
 
 Example of how to use `rcverify.sh`:
 ```
-rcverify.sh openwhisk-client-js 'OpenWhisk JavaScript Client Library' 3.19.0-incubating
+rcverify.sh openwhisk-client-js 'OpenWhisk Client Js' 3.20.0 rc2
 ```
 
 Example output from `rcverify.sh`:
 ```
 working in the following directory:
-/tmp/tmp.6t9xcMV8
-fetching openwhisk-client-js-3.19.0-incubating-sources.tar.gz
-fetching openwhisk-client-js-3.19.0-incubating-sources.tar.gz.asc
-fetching openwhisk-client-js-3.19.0-incubating-sources.tar.gz.sha512
+/var/folders/8c/zvj0nsxx2rgc_km8nvf8k0c00000gn/T/tmp.S8okDNye
+fetching tarball and signatures from https://dist.apache.org/repos/dist/dev/openwhisk/apache-openwhisk-3.20.0-rc2
+fetching openwhisk-client-js-3.20.0-sources.tar.gz
+fetching openwhisk-client-js-3.20.0-sources.tar.gz.asc
+fetching openwhisk-client-js-3.20.0-sources.tar.gz.sha512
 fetching release keys
-import keys
-gpg: key ABCXYZ: "Some Name <so...@email>" ...
-gpg: key FOOBAR: "Another Name <an...@email>" ...
-gpg: Total number processed: 2
-gpg:              unchanged: 2
+importing keys
+gpg: key 72AF0CC22C4CF320: "Vincent Hou (Release manager of OpenWhisk) <ho...@apache.org>" not changed
+gpg: key 22907064147F886E: "Dave Grove <dg...@apache.org>" not changed
+gpg: key 44667BC927C86D51: "Rodric Rabbah <ra...@apache.org>" not changed
+gpg: key B1457C3D7101CC78: "James Thomas <ja...@apache.org>" not changed
+gpg: Total number processed: 4
+gpg:              unchanged: 4
 unpacking tar ball
 cloning scancode
 Cloning into 'incubator-openwhisk-utilities'...
-remote: Enumerating objects: 52, done.
-remote: Counting objects: 100% (52/52), done.
-remote: Compressing objects: 100% (35/35), done.
-remote: Total 52 (delta 23), reused 34 (delta 15), pack-reused 0
-Unpacking objects: 100% (52/52), done.
-computing sha512 and validating... passed
-verifying asc... passed (signed-by: Some Name <so...@email>)
-verifying disclaimer... passed
+remote: Enumerating objects: 55, done.
+remote: Counting objects: 100% (55/55), done.
+remote: Compressing objects: 100% (41/41), done.
+remote: Total 55 (delta 21), reused 29 (delta 11), pack-reused 0
+Unpacking objects: 100% (55/55), done.
+computing sha512 for openwhisk-client-js-3.20.0-sources.tar.gz
+SHA512: openwhisk-client-js-3.20.0-sources.tar.gz:
+5FEF999E 532BD0C1 6C8BC0A1 F5232C93 964A30CF F14B2D82 1C8A2E1D 1106339C E2457918
+ C9873B3B 26FB4711 4FBA6F1C 8C8A62A8 3D50592C F9617EA5 54827EBA
+validating sha512... passed
+verifying asc... passed (signed-by: James Thomas <ja...@apache.org>)
 verifing notice... passed
-verifying license... failed (diff '/tmp/tmp.6t9xcMV8/incubator-openwhisk-client-js-3.19.0-incubating/LICENSE.txt' '/tmp/tmp.6t9xcMV8/LICENSE-2.0')
+verifying absence of DISCLAIMER.txt passed
+verifying license... passed
 verifying sources have proper headers... passed
-scanning for binaries... passed
-
-run the following command to remove the scratch space:
-  rm -rf '/tmp/tmp.6t9xcMV8'
-
+scanning for executable files... passed
+scanning for non-text files... passed
+scanning for archives... passed
+scanning for packages... passed
+```
 
 ### Create Release notes
 
diff --git a/docs/tag_release.md b/docs/tag_release.md
index 12deca2..3334b7d 100644
--- a/docs/tag_release.md
+++ b/docs/tag_release.md
@@ -55,8 +55,8 @@ To change an existing variable, you can run the following command as an example:
 git remote set-url <remote_url_var> <full_remote_url>
 ```
 
-If you are releasing OpenWhisk, the \<full_remote_url\> will be "git@github.com:apache/incubator-openwhisk.git" or
-"https://github.com/apache/incubator-openwhisk.git".
+If you are releasing OpenWhisk, the \<full_remote_url\> will be "git@github.com:apache/openwhisk.git" or
+"https://github.com/apache/openwhisk.git".
 
 In case of making mistakes, you may need to remove tags. You can run the following command to remove a local tag:
 ```
@@ -78,15 +78,15 @@ each OpenWhisk project, don't forget to verify whether the Travis build succeed
 If the Travis job succeeds, you are all set for this step; if the Travis job fails, you need to find out the reason,
 why it has failed. Empirically, it fails due to that you pushed a tag, not compliant with naming convention for that project.
 Let's take the Go runtime as an example, if you name the tag after "1.11@1.13.0-incubating", the Travis build will fail,
-like the error result [here](https://travis-ci.org/apache/incubator-openwhisk-runtime-go/builds/532326848). The correct tag for Go runtime in this case is like "golang1.11@1.13.0-incubating", and the successful
-build is located [here](https://travis-ci.org/apache/incubator-openwhisk-runtime-go/builds/533325334).
+like the error result [here](https://travis-ci.org/apache/openwhisk-runtime-go/builds/532326848). The correct tag for Go runtime in this case is like "golang1.11@1.13.0-incubating", and the successful
+build is located [here](https://travis-ci.org/apache/openwhisk-runtime-go/builds/533325334).
 
 Another reason that the Travis build fails can be there is really a bug with the Travis build. In this case, you can keep
 the tag you have pushed in the Github repository, but log this issue as well. One way to compensate is to run the "docker push"
 manually on your local machine to upload the image into Docker Hub. Here are the steps you need to follow for this situation:
 
 1. Visit the private SVN repository to access the credentials for Docker Hub
-If you are a PMC member, your credentials with Apache should give you the access to the [private SVN repository](https://svn.apache.org/repos/private/pmc/incubator/openwhisk/accounts).
+If you are a PMC member, your credentials with Apache should give you the access to the [private SVN repository](https://svn.apache.org/repos/private/pmc/openwhisk/accounts).
 After you login with your credentials, open the file called dockerhub.txt, and you will see the username and password to
 push your local docker images. DON'T misuse it.
 
@@ -108,6 +108,6 @@ go to the home directory of the specific OpenWhisk project, and run the followin
 
 The argument \<runtime_kind\> is the folder name for each version of the runtime. You can find the name by checking what
 are under the folder core. For example, your want to find the runtime kind for the runtime Ruby, there are ruby2.5Action
-and ruby2.6ActionLoop under the [core folder](https://github.com/apache/incubator-openwhisk-runtime-ruby/tree/master/core). The candidates
+and ruby2.6ActionLoop under the [core folder](https://github.com/apache/openwhisk-runtime-ruby/tree/master/core). The candidates
 for \<runtime_kind\> will be ruby2.5Action or ruby2.6ActionLoop. The argument \<tag\> is usually \<version\>-\<pre_release_version\>,
 the real full version we specify for each release.
diff --git a/docs/work_items.md b/docs/work_items.md
index 5fd593a..bc6f4b3 100644
--- a/docs/work_items.md
+++ b/docs/work_items.md
@@ -29,7 +29,7 @@ the test cases to check whether the services are up and running, whether the cli
 
 This release of the source code packages need to have the following features implemented.
 
-## 1. Download the source code ([open issue](https://github.com/apache/incubator-openwhisk-release/issues/16))
+## 1. Download the source code ([open issue](https://github.com/apache/openwhisk-release/issues/16))
 
 All the source code OpenWhisk project is located at the Github website. If a configuration file is in place, we should
 be able to download the source code, based on the hash values or tags, defined for each specified repository. This
@@ -44,7 +44,7 @@ download the source code. It is better to support both Ubuntu and Mac systems.
 - Download the source code into a local workspace, based on predefined project hashes or tags
 - By default, clone the source code with all the git history into a default directory
 
-## 2. Verify the compliance of the source code ([open issue](https://github.com/apache/incubator-openwhisk-release/issues/17))
+## 2. Verify the compliance of the source code ([open issue](https://github.com/apache/openwhisk-release/issues/17))
 
 Each source code file needs to have Apache licensing header at the top. We need to implement the verification in the
 script able to run both locally and in Travis build.
@@ -55,7 +55,7 @@ script able to run both locally and in Travis build.
     - Implement in the script to check the headers
 - Other verifications to be determined
 
-## 3. Deploy OpenWhisk based on the source code ([open issue](https://github.com/apache/incubator-openwhisk-release/issues/18))
+## 3. Deploy OpenWhisk based on the source code ([open issue](https://github.com/apache/openwhisk-release/issues/18))
 
 Build the source code and deploy the OpenWhisk environment. We need to implement the following bulletins in the script.
 
@@ -68,7 +68,7 @@ Build the source code and deploy the OpenWhisk environment. We need to implement
 - Install catalog
 
 
-## 4. Test each OpenWhisk component ([open issue](https://github.com/apache/incubator-openwhisk-release/issues/19))
+## 4. Test each OpenWhisk component ([open issue](https://github.com/apache/openwhisk-release/issues/19))
 
 This step is optional for the release process, but the release manager needs to make sure the code we deliver is in
 good shape in terms of functionality.
@@ -80,7 +80,7 @@ good shape in terms of functionality.
 - Test api gateway by running the test cases under OpenWhisk api gateway
 - ...
 
-## 5. Add NOTICE, LICENSE, and CHANGELOG to each OpenWhisk project ([open issue](https://github.com/apache/incubator-openwhisk-release/issues/13))
+## 5. Add NOTICE, LICENSE, and CHANGELOG to each OpenWhisk project ([open issue](https://github.com/apache/openwhisk-release/issues/13))
 
 We need to prepare these files when release managers are developing the release repository. As we investigated, Apache
 Tentacles can create the LICENSE and NOTICE report. The current question is: can we run this tools locally, to generate
@@ -91,7 +91,7 @@ the NOTICE and LICENSE, before we upload artifacts to any repository, like the s
     - For files with static content, we can add them into the existing project.
     - For files with dynamic content for different releases, we can either manually edit them or use tools to generate them.
 
-## 6. Package the artifacts ([open issue](https://github.com/apache/incubator-openwhisk-release/issues/20))
+## 6. Package the artifacts ([open issue](https://github.com/apache/openwhisk-release/issues/20))
 
 Each OpenWhisk project needs to have one compiled package, and one source code package. This is probably where the Maven
 release plugin can play out. As we have already downloaded the source code of each OpenWhisk repository, Maven command
@@ -111,10 +111,10 @@ how to do it, either in Travis CI, Jenkins pipeline, or any other building tools
 - Implement the script to package the artifacts
 - Sign the artifacts cryptographically for the staging and release
 
-## 7. Upload the artifacts into staging repository for release vote ([open issue](https://github.com/apache/incubator-openwhisk-release/issues/21))
+## 7. Upload the artifacts into staging repository for release vote ([open issue](https://github.com/apache/openwhisk-release/issues/21))
 
 Upload the artifacts including source code, compiled packages, etc into the staging repository for vote.
-This is the [staging directory of Apache projects](https://dist.apache.org/repos/dist/dev/incubator/openwhisk/) for OpenWhisk.
+This is the [staging directory of Apache projects](https://dist.apache.org/repos/dist/dev/openwhisk/) for OpenWhisk.
 
 **Work bulletins**:
 - Investigate how to upload the artifacts to a staging repository with existing tools, like Gradle, Maven, any other
@@ -122,10 +122,10 @@ building plugins, etc
 - Implement the script to upload the artifacts to the staging repository
 - Validate the artifacts in the staging repository
 
-## 8. Release the artifacts ([open issue](https://github.com/apache/incubator-openwhisk-release/issues/22))
+## 8. Release the artifacts ([open issue](https://github.com/apache/openwhisk-release/issues/22))
 
 When we reach an agreement on the candidate located in the staging repository, the artifacts need to be move to the Apache\
-directory for release. This is the [release directory of Apache](https://dist.apache.org/repos/dist/release/incubator/openwhisk/) for OpenWhisk.
+directory for release. This is the [release directory of Apache](https://dist.apache.org/repos/dist/release/openwhisk/) for OpenWhisk.
 
 **Work bulletins**:
 - Migrate artifacts from the staging repository to Apache directory
diff --git a/tools/gen-release-vote.py b/tools/gen-release-vote.py
index 359c2a0..c0ab40a 100755
--- a/tools/gen-release-vote.py
+++ b/tools/gen-release-vote.py
@@ -119,10 +119,10 @@ This is a call to vote on releasing version {version} release candidate {rc} of
 This release is comprised of source code distribution only.
 
 You can use this UNIX script to download the release and verify the checklist below:
-https://gitbox.apache.org/repos/asf?p=incubator-openwhisk-release.git;a=blob_plain;f=tools/rcverify.sh;hb={HEAD}
+https://gitbox.apache.org/repos/asf?p=openwhisk-release.git;a=blob_plain;f=tools/rcverify.sh;hb={HEAD}
 
 Usage:
-curl -s "https://gitbox.apache.org/repos/asf?p=incubator-openwhisk-release.git;a=blob_plain;f=tools/rcverify.sh;hb={HEAD}" -o rcverify.sh
+curl -s "https://gitbox.apache.org/repos/asf?p=openwhisk-release.git;a=blob_plain;f=tools/rcverify.sh;hb={HEAD}" -o rcverify.sh
 chmod +x rcverify.sh
 {rcverifies}
 
@@ -144,7 +144,7 @@ Release verification checklist for reference:
 This majority vote is open for at least 72 hours.
 {signature}
 
-[1] https://github.com/apache/incubator-openwhisk-release/blob/master/docs/license_compliance.md""".format(
+[1] https://github.com/apache/openwhisk-release/blob/master/docs/license_compliance.md""".format(
         version = version.v,
         rc = version.rc,
         N = ("%s project modules" % componentCount) if componentCount > 1 else "project module",
diff --git a/tools/generate_release_notes.sh b/tools/generate_release_notes.sh
index 17e19f0..cad5e93 100755
--- a/tools/generate_release_notes.sh
+++ b/tools/generate_release_notes.sh
@@ -47,7 +47,7 @@ do
     do
       PRNUMBER=$(echo $line | egrep -o '\(#[[:digit:]]+\)') # format like (#1234)
       PRN=$(echo $PRNUMBER | egrep -o '[[:digit:]]+') # format like 1234
-      PRLINK="([#$PRN](https://github.com/apache/incubator-$repo_name/pull/$PRN))"
+      PRLINK="([#$PRN](https://github.com/apache/$repo_name/pull/$PRN))"
       line=${line/$PRNUMBER/$PRLINK}
       printf "%s\n" "$line" >> $FILE
     done
diff --git a/tools/lib/pom.xml b/tools/lib/pom.xml
index 5420b2a..214fd0e 100644
--- a/tools/lib/pom.xml
+++ b/tools/lib/pom.xml
@@ -20,7 +20,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.incubator.openwhisk.release</groupId>
+  <groupId>org.apache.openwhisk.release</groupId>
   <artifactId>header-check</artifactId>
   <version>1.0</version>
   <build>
diff --git a/tools/rcverify.sh b/tools/rcverify.sh
index 4caf6e6..3c4a5f2 100755
--- a/tools/rcverify.sh
+++ b/tools/rcverify.sh
@@ -111,7 +111,7 @@ echo "unpacking tar ball"
 tar zxf "$DIR/$TGZ" -C "$DIR"
 
 echo "cloning scancode"
-cd "$DIR" && git clone https://github.com/apache/incubator-openwhisk-utilities.git --depth 1
+cd "$DIR" && git clone https://github.com/apache/openwhisk-utilities.git --depth 1
 
 echo "computing sha512 for $TGZ"
 EXPECTED=$(cat "$DIR/$TGZ.sha512")
@@ -158,7 +158,7 @@ if [ -f '$DIR/$BASE/tools/travis/scancodeExlusions' ]; then
 else
     SCANCODE_EXTRA_ARGS=""
 fi
-CMD="'$DIR/incubator-openwhisk-utilities/scancode/scanCode.py' --config '$DIR/incubator-openwhisk-utilities/scancode/ASF-Release.cfg' $SCANCODE_EXTRA_ARGS '$DIR/$BASE'"
+CMD="'$DIR/openwhisk-utilities/scancode/scanCode.py' --config '$DIR/openwhisk-utilities/scancode/ASF-Release.cfg' $SCANCODE_EXTRA_ARGS '$DIR/$BASE'"
 SC=$(eval $CMD >& /dev/null)
 validate $? 0 "$CMD"
 
diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh
index 1fb97c4..7b6531b 100755
--- a/tools/travis/setup.sh
+++ b/tools/travis/setup.sh
@@ -32,7 +32,7 @@ SUFFIX="$TRAVIS_BUILD_NUMBER"
 PR_NUM="$TRAVIS_PULL_REQUEST"
 PREFIX="build_testing"
 
-export OPENWHISK_HOME="$OPENWHISK_SOURCE_DIR/incubator-openwhisk";
+export OPENWHISK_HOME="$OPENWHISK_SOURCE_DIR/openwhisk";
 
 mkdir -p $OPENWHISK_SOURCE_DIR
 cd $OPENWHISK_SOURCE_DIR
@@ -42,7 +42,7 @@ docker images
 
 "$PARENTDIR/download_source_code.sh"
 
-cd $OPENWHISK_SOURCE_DIR/incubator-openwhisk
+cd $OPENWHISK_SOURCE_DIR/openwhisk
 ./tools/travis/setup.sh
 TERM=dumb ./gradlew core:controller:distDocker core:invoker:distDocker -PdockerImagePrefix=$PREFIX
 
@@ -57,9 +57,9 @@ $ANSIBLE_CMD wipe.yml
 $ANSIBLE_CMD openwhisk.yml
 
 # Build the binaries for CLI
-cd $OPENWHISK_SOURCE_DIR/incubator-openwhisk-cli
+cd $OPENWHISK_SOURCE_DIR/openwhisk-cli
 #./gradlew buildBinaries -PcrossCompileCLI=true
 
 # Build the binaries for wskdeploy
-cd $OPENWHISK_SOURCE_DIR/incubator-openwhisk-wskdeploy
+cd $OPENWHISK_SOURCE_DIR/openwhisk-wskdeploy
 #./gradlew distDocker -PcrossCompileWSKDEPLOY=true