diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ab2f597..10fc92a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -53,7 +53,7 @@
 ### Discussion
 
 Please use the project's developer email list to engage our community:
-[dev@openwhisk.incubator.apache.org](dev@openwhisk.incubator.apache.org)
+[dev@openwhisk.apache.org](dev@openwhisk.apache.org)
 
 In addition, we provide a "dev" Slack team channel for conversations at:
 https://openwhisk-team.slack.com/messages/dev/
diff --git a/README.md b/README.md
index 9d024b6..9f2591e 100644
--- a/README.md
+++ b/README.md
@@ -20,9 +20,9 @@
 # Developer tools for OpenWhisk
 
 [![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-devtools.svg?branch=master)](https://travis-ci.org/apache/incubator-openwhisk-devtools)
+[![Build Status](https://travis-ci.org/apache/openwhisk-devtools.svg?branch=master)](https://travis-ci.org/apache/openwhisk-devtools)
 
-This repository is part of [Apache OpenWhisk](http://openwhisk.incubator.apache.org/) and provides developer tools that help with local development, testing and operation of OpenWhisk.
+This repository is part of [Apache OpenWhisk](http://openwhisk.apache.org/) and provides developer tools that help with local development, testing and operation of OpenWhisk.
 
 ## Subprojects
 
diff --git a/actionloop-starter-kit/.travis.yml b/actionloop-starter-kit/.travis.yml
index 5b32fc6..c475d21 100644
--- a/actionloop-starter-kit/.travis.yml
+++ b/actionloop-starter-kit/.travis.yml
@@ -38,12 +38,12 @@
     on:
       tags: true
       all_branches: true
-      repo: apache/incubator-openwhisk-runtime-python
+      repo: apache/openwhisk-runtime-python
   - provider: script
     script: "./tools/travis/publish.sh openwhisk 3 latest && ./tools/travis/publish.sh openwhisk 3-ai latest && ./tools/travis/publish.sh openwhisk 3-loop latest"
     on:
       branch: master
-      repo: apache/incubator-openwhisk-runtime-python
+      repo: apache/openwhisk-runtime-python
 env:
   global:
   - secure: Ac7MlWUpsLwmbcjCigDf+vftiXAEJbf78FVm2QCd4IeFqlRiNbQm3bWRXOOW3Zqh4R4o/wSFpFq0qKPrI9WJjOcxD0GxFboq2iGWTegddfDbENV/IBmjurl6NzYY6dUB7GUSmHYy6tdKnxMhjHzZCn2m4OVWltcMtnOV0G+uYvbnre7vXfb67duzJF+mYpJJ7rC0wGh+N50bYvm0BTtPcQMYJibq6sDTY8Lr1b74QGdM/sODre69CbuiwAA7Ed0hajEcMkv8YnwY0De/PL7hthUyCWSD+i1AhtD+3odA64yX/pAbBzfCcqPoI0Nt5ZmAAUKLJ9pAHCc74dlmYzj9wj1z5TS0nLOE2l++vNvgsA3/c+lqrBv6hc9FmSKx4yfNdFCakVLEfdRJw/45ibIRN5dCW5tDdIx8aciBV8c0CyYgSLRvtVuvw5IX7fbwhHOZ8ftTRzCHS0Nd9zs4x3za+1aucWFQEyrkPtXZIiqeuV7yI4S7yYhGeJy/3KmuN7ljDiTElZb/W9W22ryw/UwCyyZBGnvhomAwInS3E51Jv8GuOU9FVliGzGs2yLuVQ1FjIZ25Au5W4TLTor/jE+dxOlH4u25neqsKBxzG4iyJs3AfJnycD8op7JbTG64OqpVvaB8A4N3P416IxGALSFVv2BWSLY4qWBRVKHbZAHn2tTg=
diff --git a/actionloop-starter-kit/tools/travis/build.sh b/actionloop-starter-kit/tools/travis/build.sh
index e3aa931..8ee3c2b 100755
--- a/actionloop-starter-kit/tools/travis/build.sh
+++ b/actionloop-starter-kit/tools/travis/build.sh
@@ -23,7 +23,7 @@
 SCRIPTDIR=$(cd $(dirname "$0") && pwd)
 ROOTDIR="$SCRIPTDIR/../.."
 WHISKDIR="$ROOTDIR/../openwhisk"
-UTILDIR="$ROOTDIR/../incubator-openwhisk-utilities"
+UTILDIR="$ROOTDIR/../openwhisk-utilities"
 
 export OPENWHISK_HOME=$WHISKDIR
 
diff --git a/actionloop-starter-kit/tools/travis/setup.sh b/actionloop-starter-kit/tools/travis/setup.sh
index 3424cdb..6315f1a 100755
--- a/actionloop-starter-kit/tools/travis/setup.sh
+++ b/actionloop-starter-kit/tools/travis/setup.sh
@@ -26,9 +26,9 @@
 
 # clone OpenWhisk utilities repo. in order to run scanCode
 cd $HOMEDIR
-git clone https://github.com/apache/incubator-openwhisk-utilities.git
+git clone https://github.com/apache/openwhisk-utilities.git
 
 # clone main openwhisk repo. for testing purposes
-git clone --depth=1 https://github.com/apache/incubator-openwhisk.git openwhisk
+git clone --depth=1 https://github.com/apache/openwhisk.git openwhisk
 cd openwhisk
 ./tools/travis/setup.sh
diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index 7577eb1..98d5e34 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -58,7 +58,7 @@
 		echo "Skipping downloading the code as OPENWHISK_PROJECT_HOME is set to " $(OPENWHISK_PROJECT_HOME); \
 	else \
 		rm -rf $(CURDIR)/openwhisk-src; \
-		curl -s -o ./openwhisk-src.tar.gz -L https://github.com/apache/incubator-openwhisk/archive/$(OPENWHISK_VERSION).tar.gz; \
+		curl -s -o ./openwhisk-src.tar.gz -L https://github.com/apache/openwhisk/archive/$(OPENWHISK_VERSION).tar.gz; \
 		echo "Unpacking tarball."; \
 	    mkdir -p $(OPENWHISK_PROJECT_HOME); \
 	    tar -xf ./openwhisk-src.tar.gz --strip 1 -C $(OPENWHISK_PROJECT_HOME); \
@@ -69,7 +69,7 @@
 download-catalog:
 	if [ "$(OPENWHISK_CATALOG_HOME)" = "$(CURDIR)/openwhisk-catalog" ]; then \
 	    rm -rf $(CURDIR)/openwhisk-catalog*; \
-	    curl -s -O ./openwhisk-catalog.tar.gz -L https://api.github.com/repos/apache/incubator-openwhisk-catalog/tarball/master > ./openwhisk-catalog.tar.gz; \
+	    curl -s -O ./openwhisk-catalog.tar.gz -L https://api.github.com/repos/apache/openwhisk-catalog/tarball/master > ./openwhisk-catalog.tar.gz; \
 	    mkdir openwhisk-catalog; \
 	    tar -xf ./openwhisk-catalog.tar.gz --strip 1 -C openwhisk-catalog; \
 	else \
@@ -146,12 +146,12 @@
 	if [ ! -e "$(WSK_CLI)" ]; then \
         if [ "$(UNAME_STR)" = "Darwin" ]; then \
           echo "downloading cli for mac" ; \
-          curl -s -o $(OPENWHISK_PROJECT_HOME)/bin/wsk.zip -L https://github.com/apache/incubator-openwhisk-cli/releases/download/latest/OpenWhisk_CLI-latest-mac-amd64.zip ; \
+          curl -s -o $(OPENWHISK_PROJECT_HOME)/bin/wsk.zip -L https://github.com/apache/openwhisk-cli/releases/download/latest/OpenWhisk_CLI-latest-mac-amd64.zip ; \
             cd $(OPENWHISK_PROJECT_HOME)/bin ; \
         unzip -o wsk.zip; \
         elif [ "$(UNAME_STR)" = "Linux" ]; then \
           echo "downloading cli for linux" ; \
-          curl -s -o $(OPENWHISK_PROJECT_HOME)/bin/wsk.tgz -L https://github.com/apache/incubator-openwhisk-cli/releases/download/latest/OpenWhisk_CLI-latest-linux-amd64.tgz ; \
+          curl -s -o $(OPENWHISK_PROJECT_HOME)/bin/wsk.tgz -L https://github.com/apache/openwhisk-cli/releases/download/latest/OpenWhisk_CLI-latest-linux-amd64.tgz ; \
             cd $(OPENWHISK_PROJECT_HOME)/bin ; \
             tar -xf wsk.tgz ; \
         fi; \
@@ -342,7 +342,7 @@
 .PHONY: init-whisk-cli
 init-whisk-cli:
 	echo "waiting for the Whisk controller to come up ... "
-	# removed --head from this curl because of an upstream change https://github.com/apache/incubator-openwhisk/pull/4494
+	# removed --head from this curl because of an upstream change https://github.com/apache/openwhisk/pull/4494
 	until $$(curl --output /dev/null --silent --fail http://$(DOCKER_HOST_IP):8888/ping); do printf '.'; sleep 5; done
 	echo "initializing CLI properties into $(WSK_CONFIG_FILE)"
 	WSK_CONFIG_FILE=$(WSK_CONFIG_FILE) $(WSK_CLI) property set --auth `cat $(OPENWHISK_PROJECT_HOME)/ansible/files/auth.guest` --apihost https://$(DOCKER_HOST_IP) -i
@@ -460,7 +460,7 @@
 	echo "Downloading package" $(PACKAGE_NAME) "into" $(PACKAGE_HOME)
 	rm -rf ./openwhisk-package-$(PACKAGE_NAME)*
 	if [ "$(PACKAGE_HOME)" = "./openwhisk-package-$(PACKAGE_NAME)" ]; then \
-	    curl -s -O ./openwhisk-package-$(PACKAGE_NAME).tar.gz -L https://api.github.com/repos/apache/incubator-openwhisk-package-$(PACKAGE_NAME)/tarball/master > ./openwhisk-package-$(PACKAGE_NAME).tar.gz; \
+	    curl -s -O ./openwhisk-package-$(PACKAGE_NAME).tar.gz -L https://api.github.com/repos/apache/openwhisk-package-$(PACKAGE_NAME)/tarball/master > ./openwhisk-package-$(PACKAGE_NAME).tar.gz; \
 	    mkdir openwhisk-package-$(PACKAGE_NAME); \
 	    tar -xf ./openwhisk-package-$(PACKAGE_NAME).tar.gz --strip 1 -C openwhisk-package-$(PACKAGE_NAME); \
 	else \
diff --git a/docker-compose/README.md b/docker-compose/README.md
index f2ac189..33d9795 100644
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -19,7 +19,7 @@
 
 # How to setup OpenWhisk with Docker Compose
 
-[![Build Status](https://travis-ci.org/apache/incubator-openwhisk-devtools.svg?branch=master)](https://travis-ci.org/apache/incubator-openwhisk-devtools)
+[![Build Status](https://travis-ci.org/apache/openwhisk-devtools.svg?branch=master)](https://travis-ci.org/apache/openwhisk-devtools)
 
 An easy way to try OpenWhisk locally is to use Docker Compose.
 
@@ -66,10 +66,10 @@
 
 This is the set of environment variables that can be set:
 
-* `OPENWHISK_PROJECT_HOME` - a checkout of [openwhisk](https://github.com/apache/incubator-openwhisk)
-* `OPENWHISK_VERSION` - defaults to `master` but can be set to [releases](https://github.com/apache/incubator-openwhisk/releases) such as `0.9.0-incubating`
-* `OPENWHISK_CATALOG_HOME` - a checkout of [openwhisk-catalog](https://github.com/apache/incubator-openwhisk-catalog)
-* `WSK_CLI` - the directory where the [`wsk` command line tool](https://github.com/apache/incubator-openwhisk-cli) can be found
+* `OPENWHISK_PROJECT_HOME` - a checkout of [openwhisk](https://github.com/apache/openwhisk)
+* `OPENWHISK_VERSION` - defaults to `master` but can be set to [releases](https://github.com/apache/openwhisk/releases) such as `0.9.0-incubating`
+* `OPENWHISK_CATALOG_HOME` - a checkout of [openwhisk-catalog](https://github.com/apache/openwhisk-catalog)
+* `WSK_CLI` - the directory where the [`wsk` command line tool](https://github.com/apache/openwhisk-cli) can be found
 * `DOCKER_IMAGE_PREFIX` - the prefix of the docker images used for actions. If you are building and testing checkouts of runtimes locally, then consider setting this to `whisk`.
 
 Note that these are all optional and only need to be set if you have a local checkout that you want to use.
@@ -100,7 +100,7 @@
 
   Look at the logs in `~/tmp/openwhisk` especially `~/tmp/openwhisk/controller/logs/controller-local_logs.log` that might give more information. This can be an indication that the docker environment doesn't work properly (and on Mac you might need to switch to use [Docker for Mac](https://www.docker.com/docker-mac).
 
-* Check the [issue tracker](https://github.com/apache/incubator-openwhisk-devtools/issues) for more.
+* Check the [issue tracker](https://github.com/apache/openwhisk-devtools/issues) for more.
 
 # Pull and build local OpenWhisk core images
 
@@ -170,7 +170,7 @@
 
 ## Install Catalog Packages
 
-OpenWhisk has [numerous extra packages](https://github.com/apache/incubator-openwhisk-catalog) that are often installed into the `/whisk.system` namespace.
+OpenWhisk has [numerous extra packages](https://github.com/apache/openwhisk-catalog) that are often installed into the `/whisk.system` namespace.
 
 ***These are not included by default with the devtools  `make quick-start` command.***
 
@@ -191,11 +191,11 @@
 
 ## Install Feed Providers
 
-OpenWhisk supports [feed providers](https://github.com/apache/incubator-openwhisk/blob/master/docs/feeds.md) for invoking triggers from external event sources.
+OpenWhisk supports [feed providers](https://github.com/apache/openwhisk/blob/master/docs/feeds.md) for invoking triggers from external event sources.
 
 ***Feed provider packages are not included by default with the devtools  `make quick-start` command.***
 
-Providers for the [`alarms`](https://github.com/apache/incubator-openwhisk-package-alarms), [`kafka`](https://github.com/apache/incubator-openwhisk-package-kafka) and [`cloudant`](https://github.com/apache/incubator-openwhisk-package-cloudant) feeds can be installed individually using the `make` command.
+Providers for the [`alarms`](https://github.com/apache/openwhisk-package-alarms), [`kafka`](https://github.com/apache/openwhisk-package-kafka) and [`cloudant`](https://github.com/apache/openwhisk-package-cloudant) feeds can be installed individually using the `make` command.
 
 ```bash
 make create-provider-alarms
diff --git a/docker-compose/apigateway/generated-conf.d/whisk-docker-compose.conf b/docker-compose/apigateway/generated-conf.d/whisk-docker-compose.conf
index 7f26798..a20adc9 100644
--- a/docker-compose/apigateway/generated-conf.d/whisk-docker-compose.conf
+++ b/docker-compose/apigateway/generated-conf.d/whisk-docker-compose.conf
@@ -56,7 +56,7 @@
   }
 
   location /blackbox.tar.gz {
-    return 301 https://github.com/apache/incubator-openwhisk-runtime-docker/releases/download/sdk%400.1.0/blackbox-0.1.0.tar.gz;
+    return 301 https://github.com/apache/openwhisk-runtime-docker/releases/download/sdk%400.1.0/blackbox-0.1.0.tar.gz;
   }
 
 }
diff --git a/java-action-archetype/README.md b/java-action-archetype/README.md
index 8dea9da..112ca03 100644
--- a/java-action-archetype/README.md
+++ b/java-action-archetype/README.md
@@ -28,7 +28,7 @@
 * (Maven v3.3.x)[https://maven.apache.org] or above
 * Java 8 or above
 
-[WSK CLI](https://github.com/apache/incubator-openwhisk/blob/master/docs/cli.md) is configured
+[WSK CLI](https://github.com/apache/openwhisk/blob/master/docs/cli.md) is configured
 
 ## Install the archetype
 ```sh
diff --git a/java-local/src/main/java/openwhisk/java/local/JarLoader.java b/java-local/src/main/java/openwhisk/java/local/JarLoader.java
index a89c181..e3630ff 100644
--- a/java-local/src/main/java/openwhisk/java/local/JarLoader.java
+++ b/java-local/src/main/java/openwhisk/java/local/JarLoader.java
@@ -28,7 +28,7 @@
 import java.nio.file.Path;
 
 /**
- * Parts copied from https://github.com/apache/incubator-openwhisk-runtime-java/blob/master/core/javaAction/proxy/src/main/java/openwhisk/java/action/JarLoader.java
+ * Parts copied from https://github.com/apache/openwhisk-runtime-java/blob/master/core/javaAction/proxy/src/main/java/openwhisk/java/action/JarLoader.java
  *
  */
 public class JarLoader extends URLClassLoader implements Invoker{
diff --git a/knative-build/README.md b/knative-build/README.md
index 22739fd..c576fe9 100644
--- a/knative-build/README.md
+++ b/knative-build/README.md
@@ -161,8 +161,8 @@
 ## Clone this repository
 
 ```bash
-$ git clone https://github.com/apache/incubator-openwhisk-devtools.git
-$ cd incubator-openwhisk-devtools/knative-build
+$ git clone https://github.com/apache/openwhisk-devtools.git
+$ cd openwhisk-devtools/knative-build
 ```
 
 ## Register Secrets for Docker Hub
diff --git a/knative-build/runtimes/java/core/java8/CHANGELOG.md b/knative-build/runtimes/java/core/java8/CHANGELOG.md
index 62cd6e0..4bbd41e 100644
--- a/knative-build/runtimes/java/core/java8/CHANGELOG.md
+++ b/knative-build/runtimes/java/core/java8/CHANGELOG.md
@@ -21,11 +21,11 @@
 
 ## 1.1.3
 Changes:
-- Update jdk x86_64-ubuntu-jdk8u181-b13_openj9-0.9.0 and push latest hash [jdk8u181-b13_openj9-0.9.0](https://hub.docker.com/r/adoptopenjdk/openjdk8-openj9/tags/) [#77](https://github.com/apache/incubator-openwhisk-runtime-java/pull/77/files)
+- Update jdk x86_64-ubuntu-jdk8u181-b13_openj9-0.9.0 and push latest hash [jdk8u181-b13_openj9-0.9.0](https://hub.docker.com/r/adoptopenjdk/openjdk8-openj9/tags/) [#77](https://github.com/apache/openwhisk-runtime-java/pull/77/files)
 
 ## 1.1.2
 Changes:
--  Update run handler to accept more environment variables [#67](https://github.com/apache/incubator-openwhisk-runtime-java/pull/67)
+-  Update run handler to accept more environment variables [#67](https://github.com/apache/openwhisk-runtime-java/pull/67)
 
 ## 1.1.1
 Changes:
diff --git a/knative-build/runtimes/java/tests/knative/helloworld/build-without-code.yaml.tmpl b/knative-build/runtimes/java/tests/knative/helloworld/build-without-code.yaml.tmpl
index 475d142..e09d2f9 100644
--- a/knative-build/runtimes/java/tests/knative/helloworld/build-without-code.yaml.tmpl
+++ b/knative-build/runtimes/java/tests/knative/helloworld/build-without-code.yaml.tmpl
@@ -6,7 +6,7 @@
   serviceAccountName: openwhisk-runtime-builder
   source:
     git:
-      url: "https://github.com/apache/incubator-openwhisk-devtools.git"
+      url: "https://github.com/apache/openwhisk-devtools.git"
       revision: "master"
   template:
     name: openwhisk-java-runtime
diff --git a/knative-build/runtimes/java/tests/knative/helloworld/build.yaml.tmpl b/knative-build/runtimes/java/tests/knative/helloworld/build.yaml.tmpl
index 9e3a933..d3a0eaf 100644
--- a/knative-build/runtimes/java/tests/knative/helloworld/build.yaml.tmpl
+++ b/knative-build/runtimes/java/tests/knative/helloworld/build.yaml.tmpl
@@ -6,7 +6,7 @@
   serviceAccountName: openwhisk-runtime-builder
   source:
     git:
-      url: "https://github.com/apache/incubator-openwhisk-devtools.git"
+      url: "https://github.com/apache/openwhisk-devtools.git"
       revision: "master"
   template:
     name: openwhisk-java-runtime
diff --git a/knative-build/runtimes/java/tests/knative/helloworldwithparams/build-without-code.yaml.tmpl b/knative-build/runtimes/java/tests/knative/helloworldwithparams/build-without-code.yaml.tmpl
index dbde022..276cd23 100644
--- a/knative-build/runtimes/java/tests/knative/helloworldwithparams/build-without-code.yaml.tmpl
+++ b/knative-build/runtimes/java/tests/knative/helloworldwithparams/build-without-code.yaml.tmpl
@@ -6,7 +6,7 @@
   serviceAccountName: openwhisk-runtime-builder
   source:
     git:
-      url: "https://github.com/apache/incubator-openwhisk-devtools.git"
+      url: "https://github.com/apache/openwhisk-devtools.git"
       revision: "master"
   template:
     name: openwhisk-java-runtime
diff --git a/knative-build/runtimes/java/tests/knative/helloworldwithparams/build.yaml.tmpl b/knative-build/runtimes/java/tests/knative/helloworldwithparams/build.yaml.tmpl
index 19fbc66..a80903e 100644
--- a/knative-build/runtimes/java/tests/knative/helloworldwithparams/build.yaml.tmpl
+++ b/knative-build/runtimes/java/tests/knative/helloworldwithparams/build.yaml.tmpl
@@ -6,7 +6,7 @@
   serviceAccountName: openwhisk-runtime-builder
   source:
     git:
-      url: "https://github.com/apache/incubator-openwhisk-devtools.git"
+      url: "https://github.com/apache/openwhisk-devtools.git"
       revision: "master"
   template:
     name: openwhisk-java-runtime
diff --git a/knative-build/runtimes/java/tests/knative/helloworldwithparamsfromenv/build-without-code.yaml.tmpl b/knative-build/runtimes/java/tests/knative/helloworldwithparamsfromenv/build-without-code.yaml.tmpl
index fc5f7b7..e0f1bf2 100644
--- a/knative-build/runtimes/java/tests/knative/helloworldwithparamsfromenv/build-without-code.yaml.tmpl
+++ b/knative-build/runtimes/java/tests/knative/helloworldwithparamsfromenv/build-without-code.yaml.tmpl
@@ -6,7 +6,7 @@
   serviceAccountName: openwhisk-runtime-builder
   source:
     git:
-      url: "https://github.com/apache/incubator-openwhisk-devtools.git"
+      url: "https://github.com/apache/openwhisk-devtools.git"
       revision: "master"
   template:
     name: openwhisk-java-runtime
diff --git a/knative-build/runtimes/java/tests/knative/helloworldwithparamsfromenv/build.yaml.tmpl b/knative-build/runtimes/java/tests/knative/helloworldwithparamsfromenv/build.yaml.tmpl
index bb1ce72..b53a97c 100644
--- a/knative-build/runtimes/java/tests/knative/helloworldwithparamsfromenv/build.yaml.tmpl
+++ b/knative-build/runtimes/java/tests/knative/helloworldwithparamsfromenv/build.yaml.tmpl
@@ -6,7 +6,7 @@
   serviceAccountName: openwhisk-runtime-builder
   source:
     git:
-      url: "https://github.com/apache/incubator-openwhisk-devtools.git"
+      url: "https://github.com/apache/openwhisk-devtools.git"
       revision: "master"
   template:
     name: openwhisk-java-runtime
diff --git a/knative-build/runtimes/javascript/README.md b/knative-build/runtimes/javascript/README.md
index 2592646..b2a7bd3 100644
--- a/knative-build/runtimes/javascript/README.md
+++ b/knative-build/runtimes/javascript/README.md
@@ -204,7 +204,7 @@
   serviceAccountName: openwhisk-runtime-builder
   source:
     git:
-      url: "https://github.com/apache/incubator-openwhisk-devtools.git"
+      url: "https://github.com/apache/openwhisk-devtools.git"
       revision: "master"
   template:
     name: openwhisk-nodejs-runtime
diff --git a/knative-build/runtimes/javascript/package.json b/knative-build/runtimes/javascript/package.json
index bce34b9..f093797 100644
--- a/knative-build/runtimes/javascript/package.json
+++ b/knative-build/runtimes/javascript/package.json
@@ -4,7 +4,7 @@
     "description": "Apache OpenWhisk NodeJS Runtime",
     "repository": {
         "type": "git",
-        "url": "git@github.com:apache/incubator-openwhisk-runtime-nodejs.git"
+        "url": "git@github.com:apache/openwhisk-runtime-nodejs.git"
     },
     "license": "Apache-2.0",
     "dependencies": {
diff --git a/knative-build/runtimes/javascript/platform/knative.js b/knative-build/runtimes/javascript/platform/knative.js
index eb741fe..42dcd37 100644
--- a/knative-build/runtimes/javascript/platform/knative.js
+++ b/knative-build/runtimes/javascript/platform/knative.js
@@ -167,7 +167,7 @@
  * Pre-process HTTP request information and make it available as parameter data to the action function
  * by moving it to where the route handlers expect it to be (i.e., in the JSON value data map).
  *
- * See: https://github.com/apache/incubator-openwhisk/blob/master/docs/webactions.md#http-context
+ * See: https://github.com/apache/openwhisk/blob/master/docs/webactions.md#http-context
  *
  * HTTP Context
  * ============
diff --git a/knative-build/runtimes/javascript/tests/helloworld/build-without-code.yaml.tmpl b/knative-build/runtimes/javascript/tests/helloworld/build-without-code.yaml.tmpl
index a88d683..1caff59 100644
--- a/knative-build/runtimes/javascript/tests/helloworld/build-without-code.yaml.tmpl
+++ b/knative-build/runtimes/javascript/tests/helloworld/build-without-code.yaml.tmpl
@@ -6,7 +6,7 @@
   serviceAccountName: openwhisk-runtime-builder
   source:
     git:
-      url: "https://github.com/apache/incubator-openwhisk-devtools.git"
+      url: "https://github.com/apache/openwhisk-devtools.git"
       revision: "master"
   template:
     name: openwhisk-nodejs-runtime
diff --git a/knative-build/runtimes/javascript/tests/helloworld/build.yaml.tmpl b/knative-build/runtimes/javascript/tests/helloworld/build.yaml.tmpl
index 43489ec..a28e068 100644
--- a/knative-build/runtimes/javascript/tests/helloworld/build.yaml.tmpl
+++ b/knative-build/runtimes/javascript/tests/helloworld/build.yaml.tmpl
@@ -6,7 +6,7 @@
   serviceAccountName: openwhisk-runtime-builder
   source:
     git:
-      url: "https://github.com/apache/incubator-openwhisk-devtools.git"
+      url: "https://github.com/apache/openwhisk-devtools.git"
       revision: "master"
   template:
     name: openwhisk-nodejs-runtime
diff --git a/knative-build/runtimes/javascript/tests/helloworldwithparams/build-without-code.yaml.tmpl b/knative-build/runtimes/javascript/tests/helloworldwithparams/build-without-code.yaml.tmpl
index 6789198..ad764ff 100644
--- a/knative-build/runtimes/javascript/tests/helloworldwithparams/build-without-code.yaml.tmpl
+++ b/knative-build/runtimes/javascript/tests/helloworldwithparams/build-without-code.yaml.tmpl
@@ -6,7 +6,7 @@
   serviceAccountName: openwhisk-runtime-builder
   source:
     git:
-      url: "https://github.com/apache/incubator-openwhisk-devtools.git"
+      url: "https://github.com/apache/openwhisk-devtools.git"
       revision: "master"
   template:
     name: openwhisk-nodejs-runtime
diff --git a/knative-build/runtimes/javascript/tests/helloworldwithparams/build.yaml.tmpl b/knative-build/runtimes/javascript/tests/helloworldwithparams/build.yaml.tmpl
index 97e8e3e..98bdf92 100644
--- a/knative-build/runtimes/javascript/tests/helloworldwithparams/build.yaml.tmpl
+++ b/knative-build/runtimes/javascript/tests/helloworldwithparams/build.yaml.tmpl
@@ -6,7 +6,7 @@
   serviceAccountName: openwhisk-runtime-builder
   source:
     git:
-      url: "https://github.com/apache/incubator-openwhisk-devtools.git"
+      url: "https://github.com/apache/openwhisk-devtools.git"
       revision: "master"
   template:
     name: openwhisk-nodejs-runtime
diff --git a/knative-build/runtimes/javascript/tests/helloworldwithparamsfromenv/build-without-code.yaml.tmpl b/knative-build/runtimes/javascript/tests/helloworldwithparamsfromenv/build-without-code.yaml.tmpl
index 528160b..f370b6b 100644
--- a/knative-build/runtimes/javascript/tests/helloworldwithparamsfromenv/build-without-code.yaml.tmpl
+++ b/knative-build/runtimes/javascript/tests/helloworldwithparamsfromenv/build-without-code.yaml.tmpl
@@ -6,7 +6,7 @@
   serviceAccountName: openwhisk-runtime-builder
   source:
     git:
-      url: "https://github.com/apache/incubator-openwhisk-devtools.git"
+      url: "https://github.com/apache/openwhisk-devtools.git"
       revision: "master"
   template:
     name: openwhisk-nodejs-runtime
diff --git a/knative-build/runtimes/javascript/tests/helloworldwithparamsfromenv/build.yaml.tmpl b/knative-build/runtimes/javascript/tests/helloworldwithparamsfromenv/build.yaml.tmpl
index b4beb64..c1fe1b0 100644
--- a/knative-build/runtimes/javascript/tests/helloworldwithparamsfromenv/build.yaml.tmpl
+++ b/knative-build/runtimes/javascript/tests/helloworldwithparamsfromenv/build.yaml.tmpl
@@ -6,7 +6,7 @@
   serviceAccountName: openwhisk-runtime-builder
   source:
     git:
-      url: "https://github.com/apache/incubator-openwhisk-devtools.git"
+      url: "https://github.com/apache/openwhisk-devtools.git"
       revision: "master"
   template:
     name: openwhisk-nodejs-runtime
diff --git a/knative-build/runtimes/javascript/tests/packageaction/build.yaml.tmpl b/knative-build/runtimes/javascript/tests/packageaction/build.yaml.tmpl
index 1cbe955..db12224 100644
--- a/knative-build/runtimes/javascript/tests/packageaction/build.yaml.tmpl
+++ b/knative-build/runtimes/javascript/tests/packageaction/build.yaml.tmpl
@@ -7,12 +7,12 @@
   sources:
     - name: runtime
       git:
-        url: "https://github.com/apache/incubator-openwhisk-devtools.git"
+        url: "https://github.com/apache/openwhisk-devtools.git"
         revision: "master"
     - name: application
       targetPath: app
       git:
-        url: "https://github.com/apache/incubator-openwhisk-test.git"
+        url: "https://github.com/apache/openwhisk-test.git"
         revision: "master"
   template:
     name: openwhisk-nodejs-runtime
diff --git a/knative-build/runtimes/javascript/tests/webactionhelloworld/build.yaml.tmpl b/knative-build/runtimes/javascript/tests/webactionhelloworld/build.yaml.tmpl
index 8c7a384..e78c81f 100644
--- a/knative-build/runtimes/javascript/tests/webactionhelloworld/build.yaml.tmpl
+++ b/knative-build/runtimes/javascript/tests/webactionhelloworld/build.yaml.tmpl
@@ -6,7 +6,7 @@
   serviceAccountName: openwhisk-runtime-builder
   source:
     git:
-      url: "https://github.com/apache/incubator-openwhisk-devtools.git"
+      url: "https://github.com/apache/openwhisk-devtools.git"
   revision: "master"
   template:
     name: openwhisk-nodejs-runtime
diff --git a/knative-build/runtimes/javascript/tests/webactionraw/build.yaml.tmpl b/knative-build/runtimes/javascript/tests/webactionraw/build.yaml.tmpl
index b850d96..6f132b1 100644
--- a/knative-build/runtimes/javascript/tests/webactionraw/build.yaml.tmpl
+++ b/knative-build/runtimes/javascript/tests/webactionraw/build.yaml.tmpl
@@ -6,7 +6,7 @@
   serviceAccountName: openwhisk-runtime-builder
   source:
     git:
-      url: "https://github.com/apache/incubator-openwhisk-devtools.git"
+      url: "https://github.com/apache/openwhisk-devtools.git"
   revision: "master"
   template:
     name: openwhisk-nodejs-runtime
diff --git a/terraform-wskdeploy-plugin/README.md b/terraform-wskdeploy-plugin/README.md
index a846951..964a365 100644
--- a/terraform-wskdeploy-plugin/README.md
+++ b/terraform-wskdeploy-plugin/README.md
@@ -19,7 +19,7 @@
 
 # (Experimental)Terraform Wskdeploy Plugin
 A sample app to demo how to implement Terraform Plugin. The purpose
-is to try to integrate Terraform with [wskdeploy](https://github.com/apache/incubator-openwhisk-wskdeploy)
+is to try to integrate Terraform with [wskdeploy](https://github.com/apache/openwhisk-wskdeploy)
 so in the sample main.tf, we added a sample yaml path. Change the path to your
 local wskdeploy yaml file instead.
 
@@ -40,7 +40,7 @@
 ## Clone wskdeploy repo
 Clone wskdeploy repo under your $GOPATH
 
-`git clone https://github.com/apache/incubator-openwhisk-wskdeploy.git $GOPATH/src/github.com/apache/incubator-openwhisk-wskdeploy`
+`git clone https://github.com/apache/openwhisk-wskdeploy.git $GOPATH/src/github.com/apache/openwhisk-wskdeploy`
 
 The wskdeloy yaml file property is defined in sample main.tf, you can change $USER and $GOPATH in the file as your
 environments, so terraform could find your local wskdeploy yaml file.
diff --git a/terraform-wskdeploy-plugin/main.tf b/terraform-wskdeploy-plugin/main.tf
index 9046c07..9801a8e 100644
--- a/terraform-wskdeploy-plugin/main.tf
+++ b/terraform-wskdeploy-plugin/main.tf
@@ -1,4 +1,4 @@
 resource "example_server" "my-server" {
   address = "1.2.3.4"
-  wskdeploy_yaml = "/Users/$USER/$GOPATH/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/triggerrule/manifest.yml"
+  wskdeploy_yaml = "/Users/$USER/$GOPATH/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/triggerrule/manifest.yml"
 }
diff --git a/terraform-wskdeploy-plugin/resource_server.go b/terraform-wskdeploy-plugin/resource_server.go
index b0d9679..c369b63 100644
--- a/terraform-wskdeploy-plugin/resource_server.go
+++ b/terraform-wskdeploy-plugin/resource_server.go
@@ -18,8 +18,8 @@
 package main
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/cmd"
-    "github.com/apache/incubator-openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/cmd"
+    "github.com/apache/openwhisk-wskdeploy/utils"
 	"github.com/hashicorp/terraform/helper/schema"
 	"log"
 )
diff --git a/tools/travis/scancode.sh b/tools/travis/scancode.sh
index 5a2a84e..2ab2943 100755
--- a/tools/travis/scancode.sh
+++ b/tools/travis/scancode.sh
@@ -20,7 +20,7 @@
 # Build script for Travis-CI.
 SCRIPTDIR=$(cd $(dirname "$0") && pwd)
 ROOTDIR="$SCRIPTDIR/../.."
-UTIL_DIR="$ROOTDIR/../incubator-openwhisk-utilities"
+UTIL_DIR="$ROOTDIR/../openwhisk-utilities"
 
 # run scancode
 cd $UTIL_DIR
diff --git a/tools/travis/setupscan.sh b/tools/travis/setupscan.sh
index c7fb18e..1f369a5 100755
--- a/tools/travis/setupscan.sh
+++ b/tools/travis/setupscan.sh
@@ -20,4 +20,4 @@
 
 # clone OpenWhisk utilities repo. in order to run scanCode.py
 cd $HOMEDIR
-git clone https://github.com/apache/incubator-openwhisk-utilities.git
+git clone https://github.com/apache/openwhisk-utilities.git