diff --git a/.gitignore b/.gitignore
index bbc885e..1128fb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,7 @@
 build
 /release/
 /vendor/*/
-incubator-openwhisk-cli.iml
+openwhisk-cli.iml
 wski18n/i18n_resources.go
 bin/
 tests/build/
diff --git a/.travis.yml b/.travis.yml
index 7468377..cbeb9e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,13 +55,13 @@
   - GO_FILES=$(find . -iname '*.go' -type f | grep -v /vendor/)
   - test -z "$(gofmt -s -l $(echo $GO_FILES))"
   - cd $TRAVIS_BUILD_DIR/..
-  - git clone https://github.com/apache/incubator-openwhisk-utilities.git
-  - git clone https://github.com/apache/incubator-openwhisk.git
-  - cd incubator-openwhisk
+  - git clone https://github.com/apache/openwhisk-utilities.git
+  - git clone https://github.com/apache/openwhisk.git
+  - cd openwhisk
   - ./tools/travis/setup.sh
 
 script:
-  - cd $TRAVIS_BUILD_DIR/../incubator-openwhisk
+  - cd $TRAVIS_BUILD_DIR/../openwhisk
   - ./gradlew install
   - cd $TRAVIS_BUILD_DIR
   - export BUILD_VERSION="latest"
@@ -92,9 +92,9 @@
       git config --global user.name "Travis CI";
       export GIT_TAG="latest";
       git tag -d $GIT_TAG;
-      git push -q https://$API_KEY@github.com/apache/incubator-openwhisk-cli :refs/tags/$GIT_TAG;
+      git push -q https://$API_KEY@github.com/apache/openwhisk-cli :refs/tags/$GIT_TAG;
       GIT_COMMITTER_DATE="$(git show --format=%aD | head -1)" git tag $GIT_TAG -a -m "Generated tag from Travis CI build $TRAVIS_BUILD_NUMBER";
-      git push -f -q https://$API_KEY@github.com/apache/incubator-openwhisk-cli $GIT_TAG;
+      git push -f -q https://$API_KEY@github.com/apache/openwhisk-cli $GIT_TAG;
     fi
   - echo "The GIT_TAG of this Travis build is $GIT_TAG."
 
@@ -111,6 +111,6 @@
   target_commitish: $TRAVIS_COMMIT
   tag_name: $GIT_TAG
   on:
-    repo: apache/incubator-openwhisk-cli
+    repo: apache/openwhisk-cli
     tags: $TAG
     condition: "$DEPLOY_BUILD_READY = true"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6f47075..a072322 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -29,7 +29,7 @@
 
 ```
 $ cd $GOPATH/src/github.com/apache/
-$ git clone https://github.com/apache/incubator-openwhisk-cli.git
+$ git clone https://github.com/apache/openwhisk-cli.git
 ```
 
 After cloning the source code, you need to install all the dependencies by running the command under openwhisk cli folder:
@@ -44,17 +44,17 @@
 $ make deps
 ```
 
-You should be able to build the binaries with either the go command or the Gradle command, which is available in [README](https://github.com/apache/incubator-openwhisk-cli/blob/master/README.md).
+You should be able to build the binaries with either the go command or the Gradle command, which is available in [README](https://github.com/apache/openwhisk-cli/blob/master/README.md).
 
 
 ## Proposing new features
 
-If you would like to implement a new feature, please [raise an issue](https://github.com/apache/incubator-openwhisk-cli/issues) before sending a pull request so the feature can be discussed.
+If you would like to implement a new feature, please [raise an issue](https://github.com/apache/openwhisk-cli/issues) before sending a pull request so the feature can be discussed.
 This is to avoid you spending your valuable time working on a feature that the project developers are not willing to accept into the code base.
 
 ## Fixing bugs
 
-If you would like to fix a bug, please [raise an issue](https://github.com/apache/incubator-openwhisk-cli/issues) before sending a pull request so it can be discussed.
+If you would like to fix a bug, please [raise an issue](https://github.com/apache/openwhisk-cli/issues) before sending a pull request so it can be discussed.
 If the fix is trivial or non controversial then this is not usually necessary.
 
 ## Merge approval
@@ -69,7 +69,7 @@
 
 ## Setup
 
-Project was written with `Go v1.9`. It has a dependency on [incubator-openwhisk-client-go](https://github.com/apache/incubator-openwhisk-client-go).
+Project was written with `Go v1.9`. It has a dependency on [openwhisk-client-go](https://github.com/apache/openwhisk-client-go).
 
 ## Testing
 
@@ -85,12 +85,12 @@
 
  [Homebrew](https://brew.sh) is used to install `wsk` locally. Once we release a new version of `wsk` we should update its version in homebrew.
 
- Get the new release SHA256 checksum by downloading the Source Code (tar.gz) from the [releases page](https://github.com/apache/incubator-openwhisk-cli/releases) and running `shasum -a 256 X.Y.Z.tar.gz` on the tarball.
+ Get the new release SHA256 checksum by downloading the Source Code (tar.gz) from the [releases page](https://github.com/apache/openwhisk-cli/releases) and running `shasum -a 256 X.Y.Z.tar.gz` on the tarball.
 
  Update brew formula with the automation command `brew bump-formula-pr`:
  ```bash
  $ brew bump-formula-pr \
-   --url='https://github.com/apache/incubator-openwhisk-cli/archive/X.Y.Z.tar.gz' \
+   --url='https://github.com/apache/openwhisk-cli/archive/X.Y.Z.tar.gz' \
    --sha256='PASTE THE SHA256 CHECKSUM HERE' \
    wsk
  ```
diff --git a/DISCLAIMER.txt b/DISCLAIMER.txt
deleted file mode 100644
index 34311b4..0000000
--- a/DISCLAIMER.txt
+++ /dev/null
@@ -1 +0,0 @@
-Apache OpenWhisk Command-line Interface (CLI) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
diff --git a/README.md b/README.md
index 0d597dd..30fc3c7 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@
 
 # OpenWhisk Command-line Interface `wsk`
 
-[![Build Status](https://travis-ci.org/apache/incubator-openwhisk-cli.svg?branch=master)](https://travis-ci.org/apache/incubator-openwhisk-cli)
+[![Build Status](https://travis-ci.org/apache/openwhisk-cli.svg?branch=master)](https://travis-ci.org/apache/openwhisk-cli)
 [![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
 [![Join Slack](https://img.shields.io/badge/join-slack-9B69A0.svg)](http://slack.openwhisk.org/)
 [![Twitter](https://img.shields.io/twitter/follow/openwhisk.svg?style=social&logo=twitter)](https://twitter.com/intent/follow?screen_name=openwhisk)
@@ -29,7 +29,7 @@
 
 # Where to download the binary of OpenWhisk CLI
 
-The OpenWhisk CLI is available on the [releases page](https://github.com/apache/incubator-openwhisk-cli/releases). We
+The OpenWhisk CLI is available on the [releases page](https://github.com/apache/openwhisk-cli/releases). We
 currently have binaries available for Linux, Mac OS and Windows under i386 and
 amd64 architectures. Linux versions are also available under Linux on Z, Power
 and 64-bit ARM architectures. You can download the binary, which fits your
@@ -115,8 +115,8 @@
 
 ```
 $ cd $GOPATH
-$ go get github.com/apache/incubator-openwhisk-cli
-$ cd $GOPATH/src/github.com/apache/incubator-openwhisk-cli
+$ go get github.com/apache/openwhisk-cli
+$ cd $GOPATH/src/github.com/apache/openwhisk-cli
 ```
 
 The CLI internationalization should be generated dynamically using the
@@ -136,7 +136,7 @@
 ```
 
 NOTE: As a temporary workaround, you have to remove a redundant instance of `spf13/cobra`
-in the vendor folder. See this [issue](https://github.com/apache/incubator-openwhisk-cli/issues/398) for details.
+in the vendor folder. See this [issue](https://github.com/apache/openwhisk-cli/issues/398) for details.
 ```
 $ rm -rf vendor/github.com/spf13
 ```
@@ -186,7 +186,3 @@
 Currently Travis CI supports the environments of Linux and Mac,
 but it is not available for Windows. We will add support of AppVeyor CI in
 future to run test cases and build the binary for Windows.
-
-# Disclaimer
-
-Apache OpenWhisk Command-line Interface (CLI) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
diff --git a/build.gradle b/build.gradle
index be8b533..e4106ce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,7 +35,7 @@
 }
 
 golang {
-    packagePath = 'github.com/apache/incubator-openwhisk-cli' as String
+    packagePath = 'github.com/apache/openwhisk-cli' as String
     buildTags = (rootProject.findProperty('goTags')?:'').split(',')
     goVersion = '1.9.3'
 }
@@ -57,8 +57,8 @@
         build(['name':'golang.org/x/sys/unix', 'version':'7f918dd405547ecb864d14a8ecbbfe205b5f930f', 'transitive':false])
         build(['name':'gopkg.in/yaml.v2', 'version':'eb3733d160e74a9c7e442f435eb3bea458e1d19f', 'transitive':false])
         build(['name':'github.com/ghodss/yaml', 'version':'0ca9ea5df5451ffdf184b4428c902747c2c11cd7', 'transitive':false])
-        build(['name':'github.com/apache/incubator-openwhisk-client-go/whisk','version':'7862108c109b7f1bbb47d66edb0a35d4a3c080a7','transitive':false])
-        build(['name':'github.com/apache/incubator-openwhisk-wskdeploy','version':'1b972a08b66492155ee3cb9e737254952c1157cc','transitive':false])
+        build(['name':'github.com/apache/openwhisk-client-go/whisk','version':'d8ccb1442651beee6a9245913e3ca0cb182888b1','transitive':false])
+        build(['name':'github.com/apache/openwhisk-wskdeploy','version':'cbe7c52d99c1ead5172946d3aeb33adb5d5c40b2','transitive':false])
         // END - Imported from Godeps
         test name:'github.com/stretchr/testify', version:'b91bfb9ebec76498946beb6af7c0230c7cc7ba6c', transitive:false //, tag: 'v1.2.0'
         test name:'github.com/spf13/viper', version:'aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5', transitive:false
diff --git a/commands/action.go b/commands/action.go
index 5830d5d..35adb33 100644
--- a/commands/action.go
+++ b/commands/action.go
@@ -30,8 +30,8 @@
 	"strings"
 	"time"
 
-	"github.com/apache/incubator-openwhisk-cli/wski18n"
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-cli/wski18n"
+	"github.com/apache/openwhisk-client-go/whisk"
 
 	"github.com/fatih/color"
 	"github.com/mattn/go-colorable"
diff --git a/commands/activation.go b/commands/activation.go
index 028c3a5..32aec98 100644
--- a/commands/activation.go
+++ b/commands/activation.go
@@ -26,8 +26,8 @@
 	"syscall"
 	"time"
 
-	"github.com/apache/incubator-openwhisk-cli/wski18n"
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-cli/wski18n"
+	"github.com/apache/openwhisk-client-go/whisk"
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
diff --git a/commands/api.go b/commands/api.go
index 450f175..1956dad 100644
--- a/commands/api.go
+++ b/commands/api.go
@@ -26,8 +26,8 @@
 	"strconv"
 	"strings"
 
-	"github.com/apache/incubator-openwhisk-cli/wski18n"
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-cli/wski18n"
+	"github.com/apache/openwhisk-client-go/whisk"
 
 	"encoding/json"
 	"github.com/fatih/color"
diff --git a/commands/commands.go b/commands/commands.go
index 2704b48..cbc1ce5 100644
--- a/commands/commands.go
+++ b/commands/commands.go
@@ -23,8 +23,8 @@
 	"os"
 	"runtime"
 
-	"github.com/apache/incubator-openwhisk-cli/wski18n"
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-cli/wski18n"
+	"github.com/apache/openwhisk-client-go/whisk"
 
 	"github.com/spf13/cobra"
 )
diff --git a/commands/namespace.go b/commands/namespace.go
index 15786b0..7b7497a 100644
--- a/commands/namespace.go
+++ b/commands/namespace.go
@@ -24,8 +24,8 @@
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 
-	"github.com/apache/incubator-openwhisk-cli/wski18n"
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-cli/wski18n"
+	"github.com/apache/openwhisk-client-go/whisk"
 )
 
 // namespaceCmd represents the namespace command
diff --git a/commands/package.go b/commands/package.go
index 1f62c93..1bb69e2 100644
--- a/commands/package.go
+++ b/commands/package.go
@@ -22,8 +22,8 @@
 	"fmt"
 	"net/http"
 
-	"github.com/apache/incubator-openwhisk-cli/wski18n"
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-cli/wski18n"
+	"github.com/apache/openwhisk-client-go/whisk"
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
diff --git a/commands/project.go b/commands/project.go
index 407825c..c7cd688 100644
--- a/commands/project.go
+++ b/commands/project.go
@@ -18,10 +18,10 @@
 package commands
 
 import (
-	"github.com/apache/incubator-openwhisk-cli/wski18n"
-	"github.com/apache/incubator-openwhisk-wskdeploy/cmd"
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
-	wskdeploy_wski18n "github.com/apache/incubator-openwhisk-wskdeploy/wski18n"
+	"github.com/apache/openwhisk-cli/wski18n"
+	"github.com/apache/openwhisk-wskdeploy/cmd"
+	"github.com/apache/openwhisk-wskdeploy/utils"
+	wskdeploy_wski18n "github.com/apache/openwhisk-wskdeploy/wski18n"
 	"github.com/spf13/cobra"
 )
 
diff --git a/commands/property.go b/commands/property.go
index 0d955f0..b87bd46 100644
--- a/commands/property.go
+++ b/commands/property.go
@@ -26,8 +26,8 @@
 	homedir "github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
 
-	"github.com/apache/incubator-openwhisk-cli/wski18n"
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-cli/wski18n"
+	"github.com/apache/openwhisk-client-go/whisk"
 )
 
 var Properties struct {
diff --git a/commands/qualified_name.go b/commands/qualified_name.go
index bae3a3d..9603ff4 100644
--- a/commands/qualified_name.go
+++ b/commands/qualified_name.go
@@ -20,8 +20,8 @@
 import (
 	"errors"
 	"fmt"
-	"github.com/apache/incubator-openwhisk-cli/wski18n"
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-cli/wski18n"
+	"github.com/apache/openwhisk-client-go/whisk"
 	"strings"
 )
 
diff --git a/commands/rule.go b/commands/rule.go
index 6092d8c..495e721 100644
--- a/commands/rule.go
+++ b/commands/rule.go
@@ -21,8 +21,8 @@
 	"errors"
 	"fmt"
 
-	"github.com/apache/incubator-openwhisk-cli/wski18n"
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-cli/wski18n"
+	"github.com/apache/openwhisk-client-go/whisk"
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
diff --git a/commands/sdk.go b/commands/sdk.go
index 76cf84b..dc1a004 100644
--- a/commands/sdk.go
+++ b/commands/sdk.go
@@ -26,8 +26,8 @@
 
 	"github.com/spf13/cobra"
 
-	"github.com/apache/incubator-openwhisk-cli/wski18n"
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-cli/wski18n"
+	"github.com/apache/openwhisk-client-go/whisk"
 )
 
 // sdkCmd represents the sdk command
diff --git a/commands/shared.go b/commands/shared.go
index 9295d2b..86a5ca9 100644
--- a/commands/shared.go
+++ b/commands/shared.go
@@ -20,8 +20,8 @@
 import (
 	"errors"
 
-	"github.com/apache/incubator-openwhisk-cli/wski18n"
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-cli/wski18n"
+	"github.com/apache/openwhisk-client-go/whisk"
 )
 
 func entityNameError(entityName string) error {
diff --git a/commands/trigger.go b/commands/trigger.go
index 65ed46c..86b18da 100644
--- a/commands/trigger.go
+++ b/commands/trigger.go
@@ -21,8 +21,8 @@
 	"errors"
 	"fmt"
 
-	"github.com/apache/incubator-openwhisk-cli/wski18n"
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-cli/wski18n"
+	"github.com/apache/openwhisk-client-go/whisk"
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
diff --git a/commands/trigger_test.go b/commands/trigger_test.go
index d64e332..8904307 100644
--- a/commands/trigger_test.go
+++ b/commands/trigger_test.go
@@ -19,7 +19,7 @@
 
 import (
 	"errors"
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-client-go/whisk"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"net/http"
diff --git a/commands/util.go b/commands/util.go
index 49dee62..c3fd752 100644
--- a/commands/util.go
+++ b/commands/util.go
@@ -23,8 +23,8 @@
 	"fmt"
 	"strings"
 
-	"github.com/apache/incubator-openwhisk-cli/wski18n"
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-cli/wski18n"
+	"github.com/apache/openwhisk-client-go/whisk"
 
 	"github.com/fatih/color"
 	"github.com/mattn/go-colorable"
diff --git a/commands/wsk.go b/commands/wsk.go
index 28bf6d3..40e1ea7 100644
--- a/commands/wsk.go
+++ b/commands/wsk.go
@@ -18,7 +18,7 @@
 package commands
 
 import (
-	"github.com/apache/incubator-openwhisk-cli/wski18n"
+	"github.com/apache/openwhisk-cli/wski18n"
 	"github.com/spf13/cobra"
 )
 
diff --git a/main.go b/main.go
index 343f6c6..623af5d 100644
--- a/main.go
+++ b/main.go
@@ -22,9 +22,9 @@
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 	"os"
 
-	"github.com/apache/incubator-openwhisk-cli/commands"
-	"github.com/apache/incubator-openwhisk-cli/wski18n"
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-cli/commands"
+	"github.com/apache/openwhisk-cli/wski18n"
+	"github.com/apache/openwhisk-client-go/whisk"
 )
 
 // CLI_BUILD_TIME holds the time of the CLI build.  During gradle builds,
diff --git a/tests/build.gradle b/tests/build.gradle
index f41535a..a731586 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -59,7 +59,7 @@
 task createKeystore(dependsOn: deleteKeystore) {
     doLast {
         Properties props = new Properties()
-        def owPath = System.getenv("OPENWHISK_HOME") ?: '../incubator-openwhisk'
+        def owPath = System.getenv("OPENWHISK_HOME") ?: '../openwhisk'
         props.load(new FileInputStream(file(owPath + '/whisk.properties')))
         keystorePath.parentFile.mkdirs()
         def cmd = ['keytool', '-import', '-alias', 'Whisk', '-noprompt', '-trustcacerts', '-file', file(props['whisk.ssl.cert']), '-keystore', keystorePath, '-storepass', 'openwhisk']
diff --git a/tests/src/integration/command_test.go b/tests/src/integration/command_test.go
index a7df9e6..4bed4ac 100644
--- a/tests/src/integration/command_test.go
+++ b/tests/src/integration/command_test.go
@@ -23,7 +23,7 @@
 	"os"
 	"testing"
 
-	"github.com/apache/incubator-openwhisk-cli/tests/src/integration/common"
+	"github.com/apache/openwhisk-cli/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/tests/src/integration/common/utils.go b/tests/src/integration/common/utils.go
index 58aedd6..f211ff7 100644
--- a/tests/src/integration/common/utils.go
+++ b/tests/src/integration/common/utils.go
@@ -115,7 +115,7 @@
 }
 
 func GetRepoPath() string {
-	return os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-cli"
+	return os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-cli"
 }
 
 func GetBinPath() string {
diff --git a/tests/src/integration/common/wsk.go b/tests/src/integration/common/wsk.go
index d6481dc..dcaa64e 100644
--- a/tests/src/integration/common/wsk.go
+++ b/tests/src/integration/common/wsk.go
@@ -17,7 +17,7 @@
 package common
 
 import (
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-client-go/whisk"
 	"os"
 	"os/exec"
 )
diff --git a/tests/src/integration/integration_test.go b/tests/src/integration/integration_test.go
index 928d96a..2df9d87 100644
--- a/tests/src/integration/integration_test.go
+++ b/tests/src/integration/integration_test.go
@@ -24,7 +24,7 @@
 	"os"
 	"testing"
 
-	"github.com/apache/incubator-openwhisk-cli/tests/src/integration/common"
+	"github.com/apache/openwhisk-cli/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/tools/travis/test_openwhisk.sh b/tools/travis/test_openwhisk.sh
index c39a9e0..20df571 100755
--- a/tools/travis/test_openwhisk.sh
+++ b/tools/travis/test_openwhisk.sh
@@ -25,17 +25,17 @@
 #
 #    ./gradlew releaseBinaries
 #
-#  Also at this point, you should already have incubator-openwhisk pulled down
+#  Also at this point, you should already have the openwhisk main repo. pulled down
 #  from gradle in the parent directory, using a command such as:
 #
-#    git clone --depth 3 https://github.com/apache/incubator-openwhisk.git
+#    git clone --depth 3 https://github.com/apache/openwhisk.git
 #
 #  To be clear, your directory structure will look something like...
 #
 #      $HOMEDIR
-#       |- incubator-openwhisk
-#       |- incubator-openwhisk-cli (This project)
-#       |- incubator-openwhisk-utilities (For scancode)
+#       |- openwhisk
+#       |- openwhisk-cli (This project)
+#       |- openwhisk-utilities (For scancode)
 #
 #  The idea is to only build once and to be transparent about building in
 #  the Travis script.  To that end, some of the other builds that had been
@@ -54,13 +54,13 @@
 
 # For the gradle builds.
 HOMEDIR="$(dirname "$TRAVIS_BUILD_DIR")"
-OPENWHISK_HOME="$( cd "${OPENWHISK_HOME:-$HOMEDIR/incubator-openwhisk}" && pwd )"
+OPENWHISK_HOME="$( cd "${OPENWHISK_HOME:-$HOMEDIR/openwhisk}" && pwd )"
 export OPENWHISK_HOME
 
 #
 #  Run scancode using the ASF Release configuration
 #
-UTILDIR="$( cd "${UTILDIR:-$HOMEDIR/incubator-openwhisk-utilities}" && pwd )"
+UTILDIR="$( cd "${UTILDIR:-$HOMEDIR/openwhisk-utilities}" && pwd )"
 export UTILDIR
 cd $UTILDIR
 scancode/scanCode.py --config scancode/ASF-Release.cfg $TRAVIS_BUILD_DIR
diff --git a/vendor/vendor.json b/vendor/vendor.json
index b884bde..d80a786 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -3,88 +3,88 @@
 	"ignore": "test",
 	"package": [
 		{
-			"checksumSHA1": "vwG1BfskucmP9YJf8zXm6E6gITw=",
-			"path": "github.com/apache/incubator-openwhisk-client-go/whisk",
-			"revision": "7862108c109b7f1bbb47d66edb0a35d4a3c080a7",
-			"revisionTime": "2019-06-29T18:26:08Z"
+			"checksumSHA1": "upP6n3vm+l0xwq1EswdwVQSHDOg=",
+			"path": "github.com/apache/openwhisk-client-go/whisk",
+			"revision": "d8ccb1442651beee6a9245913e3ca0cb182888b1",
+			"revisionTime": "2019-08-09T21:43:19Z"
 		},
 		{
-			"checksumSHA1": "4NY5lFykxXaoN+JNMxo179L79sU=",
-			"path": "github.com/apache/incubator-openwhisk-client-go/wski18n",
-			"revision": "7862108c109b7f1bbb47d66edb0a35d4a3c080a7",
-			"revisionTime": "2019-06-29T18:26:08Z"
+			"checksumSHA1": "uN1QmjP7Z6Rlkw73uOAQrtNKQR0=",
+			"path": "github.com/apache/openwhisk-client-go/wski18n",
+			"revision": "d8ccb1442651beee6a9245913e3ca0cb182888b1",
+			"revisionTime": "2019-08-09T21:43:19Z"
 		},
 		{
-			"checksumSHA1": "9W8qCTt3LnfrN3XV0wBv+YfowHU=",
-			"path": "github.com/apache/incubator-openwhisk-wskdeploy/cmd",
-			"revision": "1b972a08b66492155ee3cb9e737254952c1157cc",
-			"revisionTime": "2019-07-02T12:38:22Z"
+			"checksumSHA1": "jgCQbGeq+qGCWmBQOcl0LF6Dy0E=",
+			"path": "github.com/apache/openwhisk-wskdeploy/cmd",
+			"revision": "cbe7c52d99c1ead5172946d3aeb33adb5d5c40b2",
+			"revisionTime": "2019-08-09T21:43:19Z"
 		},
 		{
-			"checksumSHA1": "zoY15nrCfmU+4Xsk2dzrpviEPuU=",
-			"path": "github.com/apache/incubator-openwhisk-wskdeploy/conductor",
-			"revision": "1b972a08b66492155ee3cb9e737254952c1157cc",
-			"revisionTime": "2019-07-02T12:38:22Z"
+			"checksumSHA1": "pm8VdiNPSunE7DPNZI2r7xiu61A=",
+			"path": "github.com/apache/openwhisk-wskdeploy/conductor",
+			"revision": "cbe7c52d99c1ead5172946d3aeb33adb5d5c40b2",
+			"revisionTime": "2019-08-09T21:43:19Z"
 		},
 		{
-			"checksumSHA1": "o7oqPbymhiZ4x/ajT3zHKYmizkU=",
-			"path": "github.com/apache/incubator-openwhisk-wskdeploy/dependencies",
-			"revision": "1b972a08b66492155ee3cb9e737254952c1157cc",
-			"revisionTime": "2019-07-02T12:38:22Z"
+			"checksumSHA1": "yIvnsPSPzMew+mPmYrw/E4JFFNI=",
+			"path": "github.com/apache/openwhisk-wskdeploy/dependencies",
+			"revision": "cbe7c52d99c1ead5172946d3aeb33adb5d5c40b2",
+			"revisionTime": "2019-08-09T21:43:19Z"
 		},
 		{
-			"checksumSHA1": "3M3Dd5jXZUAYrHdKjAbTGhQpx2c=",
-			"path": "github.com/apache/incubator-openwhisk-wskdeploy/deployers",
-			"revision": "1b972a08b66492155ee3cb9e737254952c1157cc",
-			"revisionTime": "2019-07-02T12:38:22Z"
+			"checksumSHA1": "4fgQb6yiH0E3tfiP24lDcV5P5kU=",
+			"path": "github.com/apache/openwhisk-wskdeploy/deployers",
+			"revision": "cbe7c52d99c1ead5172946d3aeb33adb5d5c40b2",
+			"revisionTime": "2019-08-09T21:43:19Z"
 		},
 		{
-			"checksumSHA1": "SF2iutNA9FZqcK2RKBhMWvZWyec=",
-			"path": "github.com/apache/incubator-openwhisk-wskdeploy/parsers",
-			"revision": "1b972a08b66492155ee3cb9e737254952c1157cc",
-			"revisionTime": "2019-07-02T12:38:22Z"
+			"checksumSHA1": "4Gafv3A6u35vHM/8fVUCN5P4Krs=",
+			"path": "github.com/apache/openwhisk-wskdeploy/parsers",
+			"revision": "cbe7c52d99c1ead5172946d3aeb33adb5d5c40b2",
+			"revisionTime": "2019-08-09T21:43:19Z"
 		},
 		{
-			"checksumSHA1": "0pxUt7OAYYSxhEzJAmRyUgwTW4Q=",
-			"path": "github.com/apache/incubator-openwhisk-wskdeploy/runtimes",
-			"revision": "1b972a08b66492155ee3cb9e737254952c1157cc",
-			"revisionTime": "2019-07-02T12:38:22Z"
+			"checksumSHA1": "6CrktZhh//fCW0dvuibw3VZksBk=",
+			"path": "github.com/apache/openwhisk-wskdeploy/runtimes",
+			"revision": "cbe7c52d99c1ead5172946d3aeb33adb5d5c40b2",
+			"revisionTime": "2019-08-09T21:43:19Z"
 		},
 		{
-			"checksumSHA1": "Is46iYPQpNn/El8K+wu13z+j9c8=",
-			"path": "github.com/apache/incubator-openwhisk-wskdeploy/utils",
-			"revision": "1b972a08b66492155ee3cb9e737254952c1157cc",
-			"revisionTime": "2019-07-02T12:38:22Z"
+			"checksumSHA1": "9JlneR//KAmnD2INB3UnDXxjsSc=",
+			"path": "github.com/apache/openwhisk-wskdeploy/utils",
+			"revision": "cbe7c52d99c1ead5172946d3aeb33adb5d5c40b2",
+			"revisionTime": "2019-08-09T21:43:19Z"
 		},
 		{
-			"checksumSHA1": "pPW5QDgsHH/Ckz++Li+r0Qhj8WA=",
-			"path": "github.com/apache/incubator-openwhisk-wskdeploy/webaction",
-			"revision": "1b972a08b66492155ee3cb9e737254952c1157cc",
-			"revisionTime": "2019-07-02T12:38:22Z"
+			"checksumSHA1": "8X3D/AEFXHV0PkZSoJeXyCLKi3U=",
+			"path": "github.com/apache/openwhisk-wskdeploy/webaction",
+			"revision": "cbe7c52d99c1ead5172946d3aeb33adb5d5c40b2",
+			"revisionTime": "2019-08-09T21:43:19Z"
 		},
 		{
-			"checksumSHA1": "lUDv3myF33Wcf7bQ7xctTWaS7vk=",
-			"path": "github.com/apache/incubator-openwhisk-wskdeploy/wskderrors",
-			"revision": "1b972a08b66492155ee3cb9e737254952c1157cc",
-			"revisionTime": "2019-07-02T12:38:22Z"
+			"checksumSHA1": "k7/MiIC0+Qfy5yRJ9ivBfphho+A=",
+			"path": "github.com/apache/openwhisk-wskdeploy/wskderrors",
+			"revision": "cbe7c52d99c1ead5172946d3aeb33adb5d5c40b2",
+			"revisionTime": "2019-08-09T21:43:19Z"
 		},
 		{
-			"checksumSHA1": "kEwvrkKJTrmgPx4bypQM1jUPsFs=",
-			"path": "github.com/apache/incubator-openwhisk-wskdeploy/wskenv",
-			"revision": "1b972a08b66492155ee3cb9e737254952c1157cc",
-			"revisionTime": "2019-07-02T12:38:22Z"
+			"checksumSHA1": "hzfJyO3o/11C7UXzuQlxvDODcIk=",
+			"path": "github.com/apache/openwhisk-wskdeploy/wskenv",
+			"revision": "cbe7c52d99c1ead5172946d3aeb33adb5d5c40b2",
+			"revisionTime": "2019-08-09T21:43:19Z"
 		},
 		{
-			"checksumSHA1": "49/yKwDIzgWDi7Kz+EhljIzGJdc=",
-			"path": "github.com/apache/incubator-openwhisk-wskdeploy/wski18n",
-			"revision": "1b972a08b66492155ee3cb9e737254952c1157cc",
-			"revisionTime": "2019-07-02T12:38:22Z"
+			"checksumSHA1": "2FUwVbZLu70t3okks4UarnhGK8M=",
+			"path": "github.com/apache/openwhisk-wskdeploy/wski18n",
+			"revision": "cbe7c52d99c1ead5172946d3aeb33adb5d5c40b2",
+			"revisionTime": "2019-08-09T21:43:19Z"
 		},
 		{
-			"checksumSHA1": "y8Rck9vRpJdrkxHBYZHxPTXuTs0=",
-			"path": "github.com/apache/incubator-openwhisk-wskdeploy/wskprint",
-			"revision": "1b972a08b66492155ee3cb9e737254952c1157cc",
-			"revisionTime": "2019-07-02T12:38:22Z"
+			"checksumSHA1": "M+Uh58tCycL/sg2tidyiGt8WsdQ=",
+			"path": "github.com/apache/openwhisk-wskdeploy/wskprint",
+			"revision": "cbe7c52d99c1ead5172946d3aeb33adb5d5c40b2",
+			"revisionTime": "2019-08-09T21:43:19Z"
 		},
 		{
 			"checksumSHA1": "A/DjlgGYOKIkKC8qckZB1shNTFk=",
@@ -93,6 +93,12 @@
 			"revisionTime": "2015-11-20T18:32:58Z"
 		},
 		{
+			"checksumSHA1": "CSPbwbyzqA6sfORicn4HFtIhF/c=",
+			"path": "github.com/davecgh/go-spew/spew",
+			"revision": "d8f796af33cc11cb798c1aaeb27a4ebc5099927d",
+			"revisionTime": "2018-08-30T19:11:22Z"
+		},
+		{
 			"checksumSHA1": "AANTVr9CVVyzsgviODY6Wi2thuM=",
 			"path": "github.com/fatih/color",
 			"revision": "570b54cabe6b8eb0bc2dfce68d964677d63b5260",
@@ -375,6 +381,12 @@
 			"revisionTime": "2019-01-13T21:29:17Z"
 		},
 		{
+			"checksumSHA1": "LuFv4/jlrmFNnDb/5SCSEPAM9vU=",
+			"path": "github.com/pmezard/go-difflib/difflib",
+			"revision": "5d4384ee4fb2527b0a1256a821ebfc92f91efefc",
+			"revisionTime": "2018-12-26T10:54:42Z"
+		},
+		{
 			"checksumSHA1": "FZ0r4TzEy9UxXLkFVXFygApni4M=",
 			"path": "github.com/spf13/cobra",
 			"revision": "6e91dded25d73176bf7f60b40dd7aa1f0bf9be8d",
@@ -387,6 +399,12 @@
 			"revisionTime": "2016-10-24T13:13:51Z"
 		},
 		{
+			"checksumSHA1": "/7bZ0f2fM9AAsLf3nMca6Gtlm6E=",
+			"path": "github.com/stretchr/testify/assert",
+			"revision": "221dbe5ed46703ee255b1da0dec05086f5035f62",
+			"revisionTime": "2019-05-17T17:51:56Z"
+		},
+		{
 			"checksumSHA1": "qyU58wqixJNIOwqz2CXE2eMBNTk=",
 			"path": "golang.org/x/net/html",
 			"revision": "3a22650c66bd7f4fb6d1e8072ffd7b75c8a27898",
@@ -531,5 +549,5 @@
 			"revisionTime": "2017-08-12T16:00:11Z"
 		}
 	],
-	"rootPath": "github.com/apache/incubator-openwhisk-cli"
+	"rootPath": "github.com/apache/openwhisk-cli"
 }