You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by mr...@apache.org on 2019/08/09 16:04:55 UTC
[openwhisk-wskdeploy] branch master updated: Remove 'incubat(ing, ion, or)' designation and disclaimer from all files (#1065)

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

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


The following commit(s) were added to refs/heads/master by this push:
     new cbe7c52  Remove 'incubat(ing, ion, or)' designation and disclaimer from all files (#1065)
cbe7c52 is described below

commit cbe7c52d99c1ead5172946d3aeb33adb5d5c40b2
Author: Matt Rutkowski <mr...@us.ibm.com>
AuthorDate: Fri Aug 9 11:04:47 2019 -0500

    Remove 'incubat(ing, ion, or)' designation and disclaimer from all files (#1065)
    
    * Remove 'incubat(ing, ion, or)' designation and disclaimer
    
    * update i18n resource file
    
    * Update GoDeps to refernce the commit hash post repo. rename
    
    * Put back incubator-openwhisk-test references
---
 .gitignore                                         |  1 -
 .travis.yml                                        |  8 ++---
 CONTRIBUTING.md                                    |  2 +-
 DISCLAIMER.txt                                     |  1 -
 Dockerfile                                         | 12 +++----
 Godeps/Godeps.json                                 | 10 +++---
 README.md                                          | 42 ++++++++++------------
 build.gradle                                       |  6 ++--
 build.sh                                           |  2 +-
 cmd/export.go                                      | 14 ++++----
 cmd/report.go                                      |  4 +--
 cmd/root.go                                        | 16 ++++-----
 cmd/root_test.go                                   |  4 +--
 cmd/sync.go                                        |  4 +--
 cmd/undeploy.go                                    |  2 +-
 cmd/utils.go                                       |  4 +--
 cmd/version.go                                     |  6 ++--
 conductor/conductor.go                             |  2 +-
 conductor/conductor_test.go                        |  2 +-
 dependencies/dependencies.go                       |  2 +-
 deployers/deploymentreader.go                      | 12 +++----
 deployers/deploymentreader_test.go                 |  6 ++--
 deployers/manifestreader.go                        | 12 +++----
 deployers/manifestreader_test.go                   | 12 +++----
 deployers/projectreader.go                         | 14 ++++----
 deployers/servicedeployer.go                       | 14 ++++----
 deployers/whiskclient.go                           | 12 +++----
 deployers/whiskclient_test.go                      |  8 ++---
 docs/creating_tagged_releases.md                   |  4 +--
 docs/export.md                                     |  8 ++---
 docs/programming_guide.md                          |  2 +-
 docs/sync_projects_between_client_and_server.md    |  8 ++---
 docs/wskdeploy_action_helloworld.md                |  2 +-
 docs/wskdeploy_apigateway_helloworld.md            |  2 +-
 docs/wskdeploy_apigateway_http.md                  |  2 +-
 docs/wskdeploy_apigateway_http_sequence.md         |  2 +-
 docs/wskdeploy_apigateway_sequence.md              |  2 +-
 docs/wskdeploy_debugging.md                        |  4 +--
 docs/wskdeploy_package_minimal.md                  |  6 ++--
 docs/wskdeploy_triggerrule_basic.md                |  2 +-
 docs/wskdeploy_triggerrule_trigger_bindings.md     |  2 +-
 main.go                                            |  4 +--
 parsers/deploy_parser.go                           |  4 +--
 parsers/manifest_parser.go                         | 20 +++++------
 parsers/manifest_parser_test.go                    | 12 +++----
 parsers/parameters.go                              |  6 ++--
 parsers/yamlparser.go                              |  6 ++--
 runtimes/runtimes.go                               | 12 +++----
 specification/html/images/images.md                |  4 +--
 specification/html/spec_actions.md                 |  2 +-
 specification/html/spec_apis.md                    |  4 +--
 specification/html/spec_rule.md                    |  2 +-
 specification/html/spec_trigger.md                 |  2 +-
 tests/README.md                                    | 28 +++++++--------
 tests/apps/openwhisk-githubslackbot/README.md      | 10 +++---
 tests/apps/openwhisk-githubslackbot/manifest.yaml  |  2 +-
 tests/apps/owbp-cloudant-trigger/manifest-bp.json  |  2 +-
 .../owbp-cloudant-trigger_test.go                  |  4 +--
 ...manifest_data_compose_actions_for_function.yaml |  2 +-
 ...mpose_actions_for_function_with_remote_dir.yaml |  2 +-
 tests/dat/manifest_validate_dependencies.yaml      |  3 --
 .../integration/alarmtrigger/alarmtrigger_test.go  |  6 ++--
 .../src/integration/apigateway/apigateway_test.go  |  4 +--
 tests/src/integration/cloudant/README.md           |  8 ++---
 tests/src/integration/cloudant/cloudant_test.go    |  4 +--
 tests/src/integration/common/wskdeploy.go          | 14 ++++----
 tests/src/integration/conductor/conductor_test.go  |  4 +--
 .../defaultpackage/defaultpackage_test.go          |  4 +--
 .../src/integration/dependency/dependency_test.go  |  4 +--
 tests/src/integration/docker/docker_test.go        |  4 +--
 tests/src/integration/export/export_test.go        | 18 +++++-----
 tests/src/integration/flagstests/flags_test.go     | 18 +++++-----
 tests/src/integration/helloworld/README.md         |  2 +-
 .../src/integration/helloworld/helloworld_test.go  |  6 ++--
 tests/src/integration/jaraction/jaraction_test.go  |  4 +--
 .../managed-deployment/managed-deployment_test.go  |  4 +--
 .../integration/message-hub/message-hub_test.go    |  6 ++--
 .../src/integration/runtimetests/runtimes_test.go  |  4 +--
 .../integration/triggerrule/triggerrule_test.go    |  6 ++--
 .../validate-action-annotations_test.go            |  4 +--
 .../validate-bind-inputs-anno_test.go              |  4 +--
 .../validate-file-extensions_test.go               |  4 +--
 .../validate-packages-in-manifest_test.go          |  6 ++--
 .../validate-application-and-project_test.go       |  4 +--
 .../validatePackagesInDeployment_test.go           |  6 ++--
 .../validateSequencesCreation_test.go              |  2 +-
 tests/src/integration/webaction/webaction_test.go  |  4 +--
 .../integration/websequence/websequence_test.go    |  4 +--
 tests/src/integration/zipaction/zipaction_test.go  |  6 ++--
 .../zipactionwithexclude_test.go                   |  4 +--
 .../zipactionwithinclude_test.go                   |  6 ++--
 tests/usecases/github/README.md                    | 12 +++----
 tests/usecases/github/deployment.yaml              |  2 +-
 tests/usecases/slack/README.md                     | 12 +++----
 tools/travis/cloneutils.sh                         |  2 +-
 tools/travis/scancode.sh                           |  2 +-
 tools/travis/script.sh                             |  4 +--
 utils/file.go                                      |  2 +-
 utils/managedannotations.go                        |  2 +-
 utils/misc.go                                      |  2 +-
 utils/misc_test.go                                 |  2 +-
 utils/validation.go                                |  6 ++--
 utils/zip.go                                       |  4 +--
 webaction/webaction.go                             |  4 +--
 wskenv/environment.go                              |  4 +--
 wski18n/i18n_resources.go                          | 20 +++++------
 wskprint/console.go                                |  4 +--
 107 files changed, 330 insertions(+), 339 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9fd9de2..50384bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,6 @@ _testmain.go
 
 #binaries
 openwhisk-wskdeploy
-incubator-openwhisk-wskdeploy
 wskdeploy
 
 # Go IDE
diff --git a/.travis.yml b/.travis.yml
index 9167d2c..3ee1845 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,9 +74,9 @@ before_deploy:
       git config --global user.email "builds@travis-ci.com";
       git config --global user.name "Travis CI";
       git tag -d $GIT_TAG;
-      git push -q https://$API_KEY@github.com/apache/incubator-openwhisk-wskdeploy :refs/tags/$GIT_TAG;
+      git push -q https://$API_KEY@github.com/apache/openwhisk-wskdeploy :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-wskdeploy $GIT_TAG;
+      git push -f -q https://$API_KEY@github.com/apache/openwhisk-wskdeploy $GIT_TAG;
   fi
 - echo "TRAVIS_EVENT_TYPE is "
 - echo $TRAVIS_EVENT_TYPE
@@ -96,14 +96,14 @@ deploy:
   target_commitish: $TRAVIS_COMMIT
   tag_name: $GIT_TAG
   on:
-    repo: apache/incubator-openwhisk-wskdeploy
+    repo: apache/openwhisk-wskdeploy
     tags: $TAG
     condition: "$DEPLOY_BUILD_READY = true"
 - provider: script
   skip_cleanup: true
   script: "./tools/travis/docker/publish.sh openwhisk wskdeploy ${TRAVIS_TAG}"
   on:
-    repo: apache/incubator-openwhisk-wskdeploy
+    repo: apache/openwhisk-wskdeploy
     tags: true
     condition: "$DEPLOY_BUILD_READY = true"
 env:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ab2f597..10fc92a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -53,7 +53,7 @@ Provide as much context as possible so we can try to recreate the issue.
 ### 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/DISCLAIMER.txt b/DISCLAIMER.txt
deleted file mode 100644
index dcf0237..0000000
--- a/DISCLAIMER.txt
+++ /dev/null
@@ -1 +0,0 @@
-Apache OpenWhisk Whisk Deploy(wskdeploy) 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 [...]
diff --git a/Dockerfile b/Dockerfile
index 66ab8b2..34fe6e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,19 +27,19 @@ ENV GOPATH=/
 RUN echo "Installing the godep tool"
 RUN go get github.com/tools/godep
 
-ADD . /src/github.com/apache/incubator-openwhisk-wskdeploy
+ADD . /src/github.com/apache/openwhisk-wskdeploy
 
 # Load all of the dependencies from the previously generated/saved godep generated godeps.json file
 RUN echo "Restoring Go dependencies"
-RUN cd /src/github.com/apache/incubator-openwhisk-wskdeploy && /bin/godep restore -v
+RUN cd /src/github.com/apache/openwhisk-wskdeploy && /bin/godep restore -v
 
 # All of the Go CLI binaries will be placed under a build folder
-RUN rm -rf /src/github.com/apache/incubator-openwhisk-wskdeploy/build
-RUN mkdir /src/github.com/apache/incubator-openwhisk-wskdeploy/build
+RUN rm -rf /src/github.com/apache/openwhisk-wskdeploy/build
+RUN mkdir /src/github.com/apache/openwhisk-wskdeploy/build
 
 ARG WSKDEPLOY_OS
 ARG WSKDEPLOY_ARCH
 
 # Build the Go wsk CLI binaries and compress resultant binaries
-RUN chmod +x /src/github.com/apache/incubator-openwhisk-wskdeploy/build.sh
-RUN cd /src/github.com/apache/incubator-openwhisk-wskdeploy/ && ./build.sh
+RUN chmod +x /src/github.com/apache/openwhisk-wskdeploy/build.sh
+RUN cd /src/github.com/apache/openwhisk-wskdeploy/ && ./build.sh
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 01a3e63..debe7a2 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,5 +1,5 @@
 {
-	"ImportPath": "github.com/apache/incubator-openwhisk-wskdeploy",
+	"ImportPath": "github.com/apache/openwhisk-wskdeploy",
 	"GoVersion": "go1.9",
 	"GodepVersion": "v62",
 	"Deps": [
@@ -104,12 +104,12 @@
 			"Rev": "991e81cc94f6c54209edb3192cb98e3995ad71c1"
 		},
 		{
-			"ImportPath": "github.com/apache/incubator-openwhisk-client-go/whisk",
-			"Rev": "7862108c109b7f1bbb47d66edb0a35d4a3c080a7"
+			"ImportPath": "github.com/apache/openwhisk-client-go/whisk",
+			"Rev": "d8ccb1442651beee6a9245913e3ca0cb182888b1"
 		},
 		{
-			"ImportPath": "github.com/apache/incubator-openwhisk-client-go/wski18n",
-			"Rev": "7862108c109b7f1bbb47d66edb0a35d4a3c080a7"
+			"ImportPath": "github.com/apache/openwhisk-client-go/wski18n",
+			"Rev": "d8ccb1442651beee6a9245913e3ca0cb182888b1"
 		},
 		{
 			"ImportPath": "github.com/pelletier/go-buffruneio",
diff --git a/README.md b/README.md
index 728ff56..6c391d2 100644
--- a/README.md
+++ b/README.md
@@ -20,13 +20,13 @@
 # Whisk Deploy `wskdeploy`
 
 [![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-wskdeploy.svg?branch=master)](https://travis-ci.org/apache/incubator-openwhisk-wskdeploy)
+[![Build Status](https://travis-ci.org/apache/openwhisk-wskdeploy.svg?branch=master)](https://travis-ci.org/apache/openwhisk-wskdeploy)
 
-`wskdeploy` is a utility to help you describe and deploy any part of the OpenWhisk programming model using a Manifest file written in YAML. Use it to deploy all your OpenWhisk [Packages](https://github.com/apache/incubator-openwhisk/blob/master/docs/packages.md), [Actions](https://github.com/apache/incubator-openwhisk/blob/master/docs/actions.md), [Triggers, and Rules](https://github.com/apache/incubator-openwhisk/blob/master/docs/triggers_rules.md) using a single command!
+`wskdeploy` is a utility to help you describe and deploy any part of the OpenWhisk programming model using a Manifest file written in YAML. Use it to deploy all your OpenWhisk [Packages](https://github.com/apache/openwhisk/blob/master/docs/packages.md), [Actions](https://github.com/apache/openwhisk/blob/master/docs/actions.md), [Triggers, and Rules](https://github.com/apache/openwhisk/blob/master/docs/triggers_rules.md) using a single command!
 
 `wskdeploy export --projectname managed_project_name` allows to "export" a specified managed project into a local file system. Namely, a `managed_project_name.yml` Manifest file will be created automatically. This Manifest file can be used with `wskdeploy` to redeploy the managed project at a different OpenWhisk instance. If the managed project contains dependencies on other managed projects, then these projects will be exported automatically into their respective manifests.
 
-You can use this in addition to the OpenWhisk CLI.  In fact, this utility uses the [OpenWhisk "Go" Client](https://github.com/apache/incubator-openwhisk-client-go) to create its HTTP REST calls for deploying and undeploying your packages.
+You can use this in addition to the OpenWhisk CLI.  In fact, this utility uses the [OpenWhisk "Go" Client](https://github.com/apache/openwhisk-client-go) to create its HTTP REST calls for deploying and undeploying your packages.
 
 ## Here are some quick links for:
 
@@ -56,7 +56,7 @@ Once your environment is setup, download `wskdeploy` and its dependencies:
 
 ```sh
 $ cd $GOPATH
-$ go get github.com/apache/incubator-openwhisk-wskdeploy  # see known issues below if you get an error
+$ go get github.com/apache/openwhisk-wskdeploy  # see known issues below if you get an error
 $ go get github.com/tools/godep # get the dependency manager
 ```
 
@@ -64,7 +64,7 @@ $ go get github.com/tools/godep # get the dependency manager
 
 Use the Go utility to build the ```wskdeploy``` binary as follows:
 ```sh
-$ cd src/github.com/apache/incubator-openwhisk-wskdeploy/
+$ cd src/github.com/apache/openwhisk-wskdeploy/
 $ godep restore
 $ go build -o wskdeploy
 ```
@@ -125,7 +125,7 @@ $ go run main.go -m tests/usecases/triggerrule/manifest.yml -d tests/usecases/tr
 ## Downloading released binaries
 
 Binaries of `wskdeploy` are available for download on the project's GitHub release page:
-- [https://github.com/apache/incubator-openwhisk-wskdeploy/releases](https://github.com/apache/incubator-openwhisk-wskdeploy/releases).
+- [https://github.com/apache/openwhisk-wskdeploy/releases](https://github.com/apache/openwhisk-wskdeploy/releases).
 
 For each release, we typically provide binaries built for Linux, Mac OS (Darwin) and Windows on the AMD64 architecture. However, we provide instructions on how to build your own binaries as well from source code with the Go tool.  See [Building the project](#building-the-project).
 
@@ -135,12 +135,12 @@ _If you are a Developer or Contributor, **we recommend building from the latest
 
 ## Contributing to the project
 
-Start by creating a fork of `incubator-openwhisk-wskdeploy` and then change the git `origin` to point to your forked repository, as follows:
+Start by creating a fork of `openwhisk-wskdeploy` and then change the git `origin` to point to your forked repository, as follows:
 
 ```sh
-$ cd $GOPATH/src/github.com/apache/incubator-openwhisk-wskdeploy
+$ cd $GOPATH/src/github.com/apache/openwhisk-wskdeploy
 $ git remote rename origin upstream
-$ git remote add origin https://github.com/<your fork>/incubator-openwhisk-wskdeploy
+$ git remote add origin https://github.com/<your fork>/openwhisk-wskdeploy
 $ git fetch --all
 $ git branch --set-upstream-to origin/master  # track master from origin now
 ```
@@ -156,13 +156,13 @@ The Whisk deploy project is setup for development purposes and uses "go deps" fo
 Specifically, for development please use ```go build```:
 
 ```
-$ git clone git@github.com:<your fork>/incubator-openwhisk-wskdeploy
-$ cd incubator-openwhisk-wskdeploy
+$ git clone git@github.com:<your fork>/openwhisk-wskdeploy
+$ cd openwhisk-wskdeploy
 $ go build
 ```
 
 for end-users, please use versioned releases of binaries.
-- [https://github.com/apache/incubator-openwhisk-wskdeploy/releases](https://github.com/apache/incubator-openwhisk-wskdeploy/releases)
+- [https://github.com/apache/openwhisk-wskdeploy/releases](https://github.com/apache/openwhisk-wskdeploy/releases)
 
 ### How to Cross Compile Binary with Gradle/Docker
 
@@ -174,7 +174,7 @@ After compiling, a suitable wskdeploy binary that works for your OS platform wil
 
 2. Make sure you have Java 1.7 or above installed.
 
-3. Clone the wskdeploy repo with command ```git clone https://github.com/apache/incubator-openwhisk-wskdeploy.git```
+3. Clone the wskdeploy repo with command ```git clone https://github.com/apache/openwhisk-wskdeploy.git```
 
 4. If you use Windows OS, type ```gradlew.bat -version ```. For Unix/Linux/Mac, please type ```./gradlew -version```.
 
@@ -197,7 +197,7 @@ Then, you will find the binaries and their compressed packages generated under t
 ### Building for Internationalization
 
 Please follow this process for building any changes to translatable strings:
-- [How to generate the file i18n_resources.go for internationalization](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/wski18n/README.md)
+- [How to generate the file i18n_resources.go for internationalization](https://github.com/apache/openwhisk-wskdeploy/blob/master/wski18n/README.md)
 
 <!-- ----------------------------------------------------------------------------- -->
 
@@ -210,19 +210,19 @@ Please follow this process for building any changes to translatable strings:
 The "go get" command uses HTTPS with GitHub and when you attempt to "commit" code you might be prompted with your GitHub credentials.  If you wish to use your SSH credentials, you may need to issue the following command to set the appropriate URL for your "origin" fork:
 
 ```
-git remote set-url origin git@github.com:<username>/incubator-openwhisk-wskdeploy.git
+git remote set-url origin git@github.com:<username>/openwhisk-wskdeploy.git
 ```
 
 <or> you can manually change the remote (origin) url within your .git/config file:
 ```
 [remote "origin"]
-    url = git@github.com:<username>/incubator-openwhisk-wskdeploy
+    url = git@github.com:<username>/openwhisk-wskdeploy
 ```
 
 while there, you can verify that your upstream repository is set correctly:
 ```
 [remote "upstream"]
-    url = git@github.com:apache/incubator-openwhisk-wskdeploy
+    url = git@github.com:apache/openwhisk-wskdeploy
 ```
 
 #### Git clone RPC failed: HTTP 301
@@ -231,7 +231,7 @@ This sometimes occurs using "go get" the wskdeploy code (which indirectly invoke
 
 <b>Note: Using "go get" for development is unsupported; instead, please use "go deps" for dependency management.</b>
 
-You might get this error when downloading `incubator-openwhisk-wskdeploy`:
+You might get this error when downloading `openwhisk-wskdeploy`:
 
      Cloning into ''$GOAPTH/src/gopkg.in/yaml.v2'...
      error: RPC failed; HTTP 301 curl 22 The requested URL returned error: 301
@@ -246,8 +246,4 @@ $ git config --global http.https://gopkg.in.followRedirects true
 ## Creating Tagged Releases
 
 Committers can find instructions on how to create tagged releases here:
-- [creating_tagged_releases.md](https://github.com/apache/incubator-openwhisk-wskdeploy/tree/master/docs/creating_tagged_releases.md)
-
-# Disclaimer
-
-Apache OpenWhisk Whisk Deploy(wskdeploy) 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 [...]
+- [creating_tagged_releases.md](https://github.com/apache/openwhisk-wskdeploy/tree/master/docs/creating_tagged_releases.md)
diff --git a/build.gradle b/build.gradle
index adc71ca..0a60d48 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ plugins {
 apply plugin: "org.nosphere.apache.rat"
 
 golang {
-    packagePath = 'github.com/apache/incubator-openwhisk-wskdeploy' as String
+    packagePath = 'github.com/apache/openwhisk-wskdeploy' as String
     buildTags = (rootProject.findProperty('goTags')?:'').split(',')
 }
 
@@ -62,8 +62,8 @@ dependencies {
         build(['name':'github.com/nicksnyder/go-i18n/i18n/bundle', 'version':'991e81cc94f6c54209edb3192cb98e3995ad71c1', 'transitive':false])
         build(['name':'github.com/nicksnyder/go-i18n/i18n/language', 'version':'991e81cc94f6c54209edb3192cb98e3995ad71c1', 'transitive':false])
         build(['name':'github.com/nicksnyder/go-i18n/i18n/translation', 'version':'991e81cc94f6c54209edb3192cb98e3995ad71c1', 'transitive':false])
-        build(['name':'github.com/apache/incubator-openwhisk-client-go/whisk', 'version':'7862108c109b7f1bbb47d66edb0a35d4a3c080a7', 'transitive':false])
-        build(['name':'github.com/apache/incubator-openwhisk-client-go/wski18n', 'version':'7862108c109b7f1bbb47d66edb0a35d4a3c080a7', 'transitive':false])
+        build(['name':'github.com/apache/openwhisk-client-go/whisk', 'version':'7862108c109b7f1bbb47d66edb0a35d4a3c080a7', 'transitive':false])
+        build(['name':'github.com/apache/openwhisk-client-go/wski18n', 'version':'7862108c109b7f1bbb47d66edb0a35d4a3c080a7', 'transitive':false])
         build(['name':'github.com/pelletier/go-buffruneio', 'version':'df1e16fde7fc330a0ca68167c23bf7ed6ac31d6d', 'transitive':false])
         build(['name':'github.com/pelletier/go-toml', 'version':'45932ad32dfdd20826f5671da37a5f3ce9f26a8d', 'transitive':false])
         build(['name':'github.com/spf13/afero', 'version':'06b7e5f50606ecd49148a01a6008942d9b669217', 'transitive':false])
diff --git a/build.sh b/build.sh
index 2b535a2..fb9a3e1 100644
--- a/build.sh
+++ b/build.sh
@@ -45,7 +45,7 @@ build_wskdeploy () {
 
   export GOARCH=$arch
 
-  cd /src/github.com/apache/incubator-openwhisk-wskdeploy
+  cd /src/github.com/apache/openwhisk-wskdeploy
   go build -ldflags "-X main.Version=`date -u '+%Y-%m-%dT%H:%M:%S'`" -v -o build/$os/$arch/$bin main.go;
 };
 
diff --git a/cmd/export.go b/cmd/export.go
index a91d77d..4020075 100644
--- a/cmd/export.go
+++ b/cmd/export.go
@@ -24,13 +24,13 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
-	"github.com/apache/incubator-openwhisk-wskdeploy/deployers"
-	"github.com/apache/incubator-openwhisk-wskdeploy/parsers"
-	"github.com/apache/incubator-openwhisk-wskdeploy/runtimes"
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wski18n"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskprint"
+	"github.com/apache/openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-wskdeploy/deployers"
+	"github.com/apache/openwhisk-wskdeploy/parsers"
+	"github.com/apache/openwhisk-wskdeploy/runtimes"
+	"github.com/apache/openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/wski18n"
+	"github.com/apache/openwhisk-wskdeploy/wskprint"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/report.go b/cmd/report.go
index 52289a2..9757f19 100644
--- a/cmd/report.go
+++ b/cmd/report.go
@@ -18,8 +18,8 @@
 package cmd
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wski18n"
+	"github.com/apache/openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/wski18n"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/root.go b/cmd/root.go
index d468bc4..57c8966 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -23,14 +23,14 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
-	"github.com/apache/incubator-openwhisk-wskdeploy/dependencies"
-	"github.com/apache/incubator-openwhisk-wskdeploy/deployers"
-	"github.com/apache/incubator-openwhisk-wskdeploy/runtimes"
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskderrors"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wski18n"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskprint"
+	"github.com/apache/openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-wskdeploy/dependencies"
+	"github.com/apache/openwhisk-wskdeploy/deployers"
+	"github.com/apache/openwhisk-wskdeploy/runtimes"
+	"github.com/apache/openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/wskderrors"
+	"github.com/apache/openwhisk-wskdeploy/wski18n"
+	"github.com/apache/openwhisk-wskdeploy/wskprint"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/root_test.go b/cmd/root_test.go
index 72f6396..7e4a72b 100644
--- a/cmd/root_test.go
+++ b/cmd/root_test.go
@@ -21,7 +21,7 @@ package cmd
 
 import (
 	"bytes"
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/utils"
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/assert"
 	"os"
@@ -86,7 +86,7 @@ func initializeParameters() {
 	expected_auth_flags.Auth = "fake_auth"
 	expected_auth_flags.ApiVersion = "fake_api_version"
 
-	expected_input.CfgFile = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/dat/wskprops"
+	expected_input.CfgFile = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/dat/wskprops"
 	expected_input.Verbose = true
 	expected_input.Preview = false
 	expected_input.ProjectPath = "fake_project_path"
diff --git a/cmd/sync.go b/cmd/sync.go
index f95458e..20c7ed8 100644
--- a/cmd/sync.go
+++ b/cmd/sync.go
@@ -18,8 +18,8 @@
 package cmd
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wski18n"
+	"github.com/apache/openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/wski18n"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/undeploy.go b/cmd/undeploy.go
index 569fc74..2444508 100644
--- a/cmd/undeploy.go
+++ b/cmd/undeploy.go
@@ -18,7 +18,7 @@
 package cmd
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/wski18n"
+	"github.com/apache/openwhisk-wskdeploy/wski18n"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/utils.go b/cmd/utils.go
index 21431fc..877d151 100644
--- a/cmd/utils.go
+++ b/cmd/utils.go
@@ -23,8 +23,8 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskderrors"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wski18n"
+	"github.com/apache/openwhisk-wskdeploy/wskderrors"
+	"github.com/apache/openwhisk-wskdeploy/wski18n"
 )
 
 const (
diff --git a/cmd/version.go b/cmd/version.go
index f8775ac..214be50 100755
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -19,9 +19,9 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wski18n"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskprint"
+	"github.com/apache/openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/wski18n"
+	"github.com/apache/openwhisk-wskdeploy/wskprint"
 	"github.com/spf13/cobra"
 )
 
diff --git a/conductor/conductor.go b/conductor/conductor.go
index 8f833d1..b96aabf 100644
--- a/conductor/conductor.go
+++ b/conductor/conductor.go
@@ -17,7 +17,7 @@
 
 package conductor
 
-import "github.com/apache/incubator-openwhisk-client-go/whisk"
+import "github.com/apache/openwhisk-client-go/whisk"
 
 const CONDUCTOR_ANNOTATION = "conductor"
 
diff --git a/conductor/conductor_test.go b/conductor/conductor_test.go
index 0a007fb..66e5931 100644
--- a/conductor/conductor_test.go
+++ b/conductor/conductor_test.go
@@ -22,7 +22,7 @@ package conductor
 import (
 	"testing"
 
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-client-go/whisk"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/dependencies/dependencies.go b/dependencies/dependencies.go
index 062b2d6..2a492bf 100644
--- a/dependencies/dependencies.go
+++ b/dependencies/dependencies.go
@@ -20,7 +20,7 @@ package dependencies
 import (
 	"strings"
 
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-client-go/whisk"
 )
 
 const (
diff --git a/deployers/deploymentreader.go b/deployers/deploymentreader.go
index 0c02e40..0e5a184 100644
--- a/deployers/deploymentreader.go
+++ b/deployers/deploymentreader.go
@@ -18,12 +18,12 @@
 package deployers
 
 import (
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
-	"github.com/apache/incubator-openwhisk-wskdeploy/parsers"
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskenv"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wski18n"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskprint"
+	"github.com/apache/openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-wskdeploy/parsers"
+	"github.com/apache/openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/wskenv"
+	"github.com/apache/openwhisk-wskdeploy/wski18n"
+	"github.com/apache/openwhisk-wskdeploy/wskprint"
 )
 
 type DeploymentReader struct {
diff --git a/deployers/deploymentreader_test.go b/deployers/deploymentreader_test.go
index 27bfb56..b2c1f2a 100644
--- a/deployers/deploymentreader_test.go
+++ b/deployers/deploymentreader_test.go
@@ -21,9 +21,9 @@ package deployers
 
 import (
 	"fmt"
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskprint"
+	"github.com/apache/openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/wskprint"
 	"github.com/stretchr/testify/assert"
 	"reflect"
 	"testing"
diff --git a/deployers/manifestreader.go b/deployers/manifestreader.go
index efe9a92..4fa3308 100644
--- a/deployers/manifestreader.go
+++ b/deployers/manifestreader.go
@@ -21,12 +21,12 @@ import (
 	"strings"
 
 	"fmt"
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
-	"github.com/apache/incubator-openwhisk-wskdeploy/dependencies"
-	"github.com/apache/incubator-openwhisk-wskdeploy/parsers"
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskderrors"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wski18n"
+	"github.com/apache/openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-wskdeploy/dependencies"
+	"github.com/apache/openwhisk-wskdeploy/parsers"
+	"github.com/apache/openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/wskderrors"
+	"github.com/apache/openwhisk-wskdeploy/wski18n"
 )
 
 var clientConfig *whisk.Config
diff --git a/deployers/manifestreader_test.go b/deployers/manifestreader_test.go
index e90f874..978243e 100644
--- a/deployers/manifestreader_test.go
+++ b/deployers/manifestreader_test.go
@@ -23,12 +23,12 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
-	"github.com/apache/incubator-openwhisk-wskdeploy/dependencies"
-	"github.com/apache/incubator-openwhisk-wskdeploy/parsers"
-	"github.com/apache/incubator-openwhisk-wskdeploy/runtimes"
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskprint"
+	"github.com/apache/openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-wskdeploy/dependencies"
+	"github.com/apache/openwhisk-wskdeploy/parsers"
+	"github.com/apache/openwhisk-wskdeploy/runtimes"
+	"github.com/apache/openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/wskprint"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/deployers/projectreader.go b/deployers/projectreader.go
index ad7fa1a..bb0f063 100644
--- a/deployers/projectreader.go
+++ b/deployers/projectreader.go
@@ -21,13 +21,13 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
-	"github.com/apache/incubator-openwhisk-wskdeploy/parsers"
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskderrors"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskenv"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wski18n"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskprint"
+	"github.com/apache/openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-wskdeploy/parsers"
+	"github.com/apache/openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/wskderrors"
+	"github.com/apache/openwhisk-wskdeploy/wskenv"
+	"github.com/apache/openwhisk-wskdeploy/wski18n"
+	"github.com/apache/openwhisk-wskdeploy/wskprint"
 )
 
 func (deployer *ServiceDeployer) UpdatePackageInputs() error {
diff --git a/deployers/servicedeployer.go b/deployers/servicedeployer.go
index c7b848c..ef40e07 100644
--- a/deployers/servicedeployer.go
+++ b/deployers/servicedeployer.go
@@ -28,13 +28,13 @@ import (
 	"sync"
 	"time"
 
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
-	"github.com/apache/incubator-openwhisk-wskdeploy/dependencies"
-	"github.com/apache/incubator-openwhisk-wskdeploy/parsers"
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskderrors"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wski18n"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskprint"
+	"github.com/apache/openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-wskdeploy/dependencies"
+	"github.com/apache/openwhisk-wskdeploy/parsers"
+	"github.com/apache/openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/wskderrors"
+	"github.com/apache/openwhisk-wskdeploy/wski18n"
+	"github.com/apache/openwhisk-wskdeploy/wskprint"
 )
 
 const (
diff --git a/deployers/whiskclient.go b/deployers/whiskclient.go
index 93da0ef..74cff36 100644
--- a/deployers/whiskclient.go
+++ b/deployers/whiskclient.go
@@ -24,12 +24,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
-	"github.com/apache/incubator-openwhisk-wskdeploy/parsers"
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskderrors"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wski18n"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskprint"
+	"github.com/apache/openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-wskdeploy/parsers"
+	"github.com/apache/openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/wskderrors"
+	"github.com/apache/openwhisk-wskdeploy/wski18n"
+	"github.com/apache/openwhisk-wskdeploy/wskprint"
 )
 
 // Possible sources for config info (e.g., API Host, Auth Key, Namespace)
diff --git a/deployers/whiskclient_test.go b/deployers/whiskclient_test.go
index 4e7477f..3c636c5 100644
--- a/deployers/whiskclient_test.go
+++ b/deployers/whiskclient_test.go
@@ -20,10 +20,10 @@
 package deployers
 
 import (
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wski18n"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskprint"
+	"github.com/apache/openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/wski18n"
+	"github.com/apache/openwhisk-wskdeploy/wskprint"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
diff --git a/docs/creating_tagged_releases.md b/docs/creating_tagged_releases.md
index 02d8649..82675ac 100644
--- a/docs/creating_tagged_releases.md
+++ b/docs/creating_tagged_releases.md
@@ -48,12 +48,12 @@ You can download the binaries, and delete them from the releases page in GitHub
 
 [Homebrew](https://brew.sh) is used to install `wskdeploy` locally. Once we release a new version of `wskdeploy` 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-wskdeploy/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-wskdeploy/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-wskdeploy/archive/X.Y.Z.tar.gz' \
+  --url='https://github.com/apache/openwhisk-wskdeploy/archive/X.Y.Z.tar.gz' \
   --sha256='PASTE THE SHA256 CHECKSUM HERE' \
   --version='X.Y.Z' \
   wskdeploy
diff --git a/docs/export.md b/docs/export.md
index aaeb3af..dd17c6e 100644
--- a/docs/export.md
+++ b/docs/export.md
@@ -68,7 +68,7 @@ ok: got package lib1_package
         {
             "key": "whisk-managed",
             "value": {
-                "file": "/root/go_projects/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/export/manifest_lib1.yaml",
+                "file": "/root/go_projects/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/export/manifest_lib1.yaml",
                 "projectDeps": [],
                 "projectHash": "80eec5f8e3ee874e22bdacb76aa4cc69aad459c1",
                 "projectName": "lib1"
@@ -84,7 +84,7 @@ ok: got package lib1_package
                 {
                     "key": "whisk-managed",
                     "value": {
-                        "file": "/root/go_projects/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/export/manifest_lib1.yaml",
+                        "file": "/root/go_projects/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/export/manifest_lib1.yaml",
                         "projectDeps": [],
                         "projectHash": "80eec5f8e3ee874e22bdacb76aa4cc69aad459c1",
                         "projectName": "lib1"
@@ -103,7 +103,7 @@ ok: got package lib1_package
                 {
                     "key": "whisk-managed",
                     "value": {
-                        "file": "/root/go_projects/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/export/manifest_lib1.yaml",
+                        "file": "/root/go_projects/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/export/manifest_lib1.yaml",
                         "projectDeps": [],
                         "projectHash": "80eec5f8e3ee874e22bdacb76aa4cc69aad459c1",
                         "projectName": "lib1"
@@ -122,7 +122,7 @@ ok: got package lib1_package
                 {
                     "key": "whisk-managed",
                     "value": {
-                        "file": "/root/go_projects/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/export/manifest_lib1.yaml",
+                        "file": "/root/go_projects/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/export/manifest_lib1.yaml",
                         "projectDeps": [],
                         "projectHash": "80eec5f8e3ee874e22bdacb76aa4cc69aad459c1",
                         "projectName": "lib1"
diff --git a/docs/programming_guide.md b/docs/programming_guide.md
index 35bf0ee..d5d6031 100644
--- a/docs/programming_guide.md
+++ b/docs/programming_guide.md
@@ -20,7 +20,7 @@
 # ```wskdeploy``` utility by example
 _A step-by-step guide for deploying Apache OpenWhisk applications using Package Manifest files._
 
-This guide will walk you through how to describe OpenWhisk applications and packages using the [OpenWhisk Packaging Specification](https://github.com/apache/incubator-openwhisk-wskdeploy/tree/master/specification#openwhisk-packaging-specification) and deploy them through the Whisk Deploy (```wskdeploy```) utility. Please use the specification as the ultimate reference for all Manifest file grammar and syntax.
+This guide will walk you through how to describe OpenWhisk applications and packages using the [OpenWhisk Packaging Specification](https://github.com/apache/openwhisk-wskdeploy/tree/master/specification#openwhisk-packaging-specification) and deploy them through the Whisk Deploy (```wskdeploy```) utility. Please use the specification as the ultimate reference for all Manifest file grammar and syntax.
 
 ## Getting started
 
diff --git a/docs/sync_projects_between_client_and_server.md b/docs/sync_projects_between_client_and_server.md
index e02e483..d5fe584 100644
--- a/docs/sync_projects_between_client_and_server.md
+++ b/docs/sync_projects_between_client_and_server.md
@@ -230,7 +230,7 @@ ok: got package Extension1
                     {
                         "key": "/guest/helloworlds",
                         "value": {
-                            "file": ".../src/github.com/apache/incubator-openwhisk-wskdeploy/Packages/helloworlds-master/packages/helloworlds/manifest.yaml",
+                            "file": ".../src/github.com/apache/openwhisk-wskdeploy/Packages/helloworlds-master/packages/helloworlds/manifest.yaml",
                             "projectDeps": [],
                             "projectHash": "0ae33344f7885df01aefd053e94a4eb3675ef72d",
                             "projectName": "HelloWorlds"
@@ -255,7 +255,7 @@ bx wsk package get helloworlds
         {
             "key": "whisk-managed",
             "value": {
-                "file": ".../src/github.com/apache/incubator-openwhisk-wskdeploy/Packages/helloworlds-master/packages/helloworlds/manifest.yaml",
+                "file": ".../src/github.com/apache/openwhisk-wskdeploy/Packages/helloworlds-master/packages/helloworlds/manifest.yaml",
                 "projectDeps": [],
                 "projectHash": "0ae33344f7885df01aefd053e94a4eb3675ef72d",
                 "projectName": "HelloWorlds"
@@ -302,7 +302,7 @@ ok: got package Extension2
                     {
                         "key": "/guest/helloworlds",
                         "value": {
-                            "file": ".../src/github.com/apache/incubator-openwhisk-wskdeploy/Packages/helloworlds-master/packages/helloworlds/manifest.yaml",
+                            "file": ".../src/github.com/apache/openwhisk-wskdeploy/Packages/helloworlds-master/packages/helloworlds/manifest.yaml",
                             "projectDeps": [],
                             "projectHash": "0ae33344f7885df01aefd053e94a4eb3675ef72d",
                             "projectName": "HelloWorlds"
@@ -311,7 +311,7 @@ ok: got package Extension2
                     {
                         "key": "/guest/hellowhisk",
                         "value": {
-                            "file": "../src/github.com/apache/incubator-openwhisk-wskdeploy/Packages/custom-hellowhisk-master/packages/hellowhisk/manifest.yaml",
+                            "file": "../src/github.com/apache/openwhisk-wskdeploy/Packages/custom-hellowhisk-master/packages/hellowhisk/manifest.yaml",
                             "projectDeps": [],
                             "projectHash": "8970b2e820631322ae630e9366b2342ab3b67a57",
                             "projectName": "HelloWhisk"
diff --git a/docs/wskdeploy_action_helloworld.md b/docs/wskdeploy_action_helloworld.md
index 4ddaba9..6117917 100644
--- a/docs/wskdeploy_action_helloworld.md
+++ b/docs/wskdeploy_action_helloworld.md
@@ -50,7 +50,7 @@ function main(params) {
 
 ### Deploying
 
-You can actually deploy the "hello world" manifest from the incubator-openwhisk-wskdeploy project directory if you have downloaded it from GitHub:
+You can actually deploy the "hello world" manifest from the openwhisk-wskdeploy project directory if you have downloaded it from GitHub:
 
 ```sh
 $ wskdeploy -m docs/examples/manifest_hello_world.yaml
diff --git a/docs/wskdeploy_apigateway_helloworld.md b/docs/wskdeploy_apigateway_helloworld.md
index 29dbab3..4bcefe9 100644
--- a/docs/wskdeploy_apigateway_helloworld.md
+++ b/docs/wskdeploy_apigateway_helloworld.md
@@ -54,7 +54,7 @@ The `apis` block contains a number of groups of API endpoint. Each endpoint is t
 
 ### Deploying
 
-You can actually deploy the "hello world API gateway" manifest from the incubator-openwhisk-wskdeploy project directory if you have downloaded it from GitHub:
+You can actually deploy the "hello world API gateway" manifest from the openwhisk-wskdeploy project directory if you have downloaded it from GitHub:
 
 ```sh
 $ wskdeploy -m docs/examples/manifest_hello_world_apigateway.yaml
diff --git a/docs/wskdeploy_apigateway_http.md b/docs/wskdeploy_apigateway_http.md
index 63f7e7c..1a7c3e0 100644
--- a/docs/wskdeploy_apigateway_http.md
+++ b/docs/wskdeploy_apigateway_http.md
@@ -119,7 +119,7 @@ function main(params) {
 
 ### Deploying
 
-You can actually deploy the "API Gateway HTTP" manifest from the incubator-openwhisk-wskdeploy project directory if you have downloaded it from GitHub:
+You can actually deploy the "API Gateway HTTP" manifest from the *openwhisk-wskdeploy* project directory if you have downloaded it from GitHub:
 
 ```sh
 $ wskdeploy -m docs/examples/manifest_hello_world_apigateway_http.yaml
diff --git a/docs/wskdeploy_apigateway_http_sequence.md b/docs/wskdeploy_apigateway_http_sequence.md
index 26bb689..ae8ea1c 100644
--- a/docs/wskdeploy_apigateway_http_sequence.md
+++ b/docs/wskdeploy_apigateway_http_sequence.md
@@ -99,7 +99,7 @@ The last action in the chain simply wraps the result from the previous action in
 
 ### Deploying
 
-You can actually deploy the "API Gateway HTTP" manifest from the incubator-openwhisk-wskdeploy project directory if you have downloaded it from GitHub:
+You can actually deploy the "API Gateway HTTP" manifest from the openwhisk-wskdeploy project directory if you have downloaded it from GitHub:
 
 ```sh
 $ wskdeploy -m docs/examples/manifest_hello_world_apigateway_http_sequence.yaml
diff --git a/docs/wskdeploy_apigateway_sequence.md b/docs/wskdeploy_apigateway_sequence.md
index b8a935e..67f6a1b 100644
--- a/docs/wskdeploy_apigateway_sequence.md
+++ b/docs/wskdeploy_apigateway_sequence.md
@@ -58,7 +58,7 @@ There are two key changes to this file:
 
 ### Deploying
 
-You can actually deploy the "API Gateway sequence" manifest from the incubator-openwhisk-wskdeploy project directory if you have downloaded it from GitHub:
+You can actually deploy the "API Gateway sequence" manifest from the openwhisk-wskdeploy project directory if you have downloaded it from GitHub:
 
 ```sh
 $ wskdeploy -m docs/examples/manifest_hello_world_apigateway_sequence.yaml
diff --git a/docs/wskdeploy_debugging.md b/docs/wskdeploy_debugging.md
index db9b3cd..655d7d1 100644
--- a/docs/wskdeploy_debugging.md
+++ b/docs/wskdeploy_debugging.md
@@ -57,7 +57,7 @@ Wskpdeloy uses named errors that describe the type of any error found along with
 
 For example, if you have an error in your Manifest's YAML, you may see an error such as:
 ```
-[50]: Invalid input of Yaml file =====> incubator-openwhisk-wskdeploy/parsers/manifest_parser.go
+[50]: Invalid input of Yaml file =====> openwhisk-wskdeploy/parsers/manifest_parser.go
 [98]: Failed to parse the yaml file manifest_bad_yaml.yaml
  =====> yaml: line 13: could not find expected ':'
 ```
@@ -66,4 +66,4 @@ The named error **NewInputYamlFormatError** provides direct indication of both w
 
 
 All current named errors supported by the utility can be found in the latest ```wskdeployerror.go``` source file:
-[wskdeployerror.go](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/wskderrors/wskdeployerror.go)
+[wskdeployerror.go](https://github.com/apache/openwhisk-wskdeploy/blob/master/wskderrors/wskdeployerror.go)
diff --git a/docs/wskdeploy_package_minimal.md b/docs/wskdeploy_package_minimal.md
index 1428210..242a974 100644
--- a/docs/wskdeploy_package_minimal.md
+++ b/docs/wskdeploy_package_minimal.md
@@ -19,7 +19,7 @@
 
 # Packages
 
-The wskdeploy utility works primarily with the OpenWhisk **Package** resource as described in the [OpenWhisk Packaging Specification](https://github.com/apache/incubator-openwhisk-wskdeploy/tree/master/specification#openwhisk-packaging-specification).
+The wskdeploy utility works primarily with the OpenWhisk **Package** resource as described in the [OpenWhisk Packaging Specification](https://github.com/apache/openwhisk-wskdeploy/tree/master/specification#openwhisk-packaging-specification).
 
 ## Creating a minimal OpenWhisk Package
 
@@ -90,11 +90,11 @@ packages
 
 #### Source code
 The source code for the manifest and JavaScript files can be found here:
-- [manifest_package_minimal.yaml](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/docs/examples/manifest_package_minimal.yaml)
+- [manifest_package_minimal.yaml](https://github.com/apache/openwhisk-wskdeploy/blob/master/docs/examples/manifest_package_minimal.yaml)
 
 ### Specification
 For convenience, the Packages grammar can be found here:
-- **[Packages](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/specification/html/spec_packages.md#packages)**
+- **[Packages](https://github.com/apache/openwhisk-wskdeploy/blob/master/specification/html/spec_packages.md#packages)**
 
 ---
 
diff --git a/docs/wskdeploy_triggerrule_basic.md b/docs/wskdeploy_triggerrule_basic.md
index db79fba..8281c86 100644
--- a/docs/wskdeploy_triggerrule_basic.md
+++ b/docs/wskdeploy_triggerrule_basic.md
@@ -122,7 +122,7 @@ which verifies that the parameter bindings of the values (i.e, _"Sam"_ (name), _
 
 ### Specification
 For convenience, the Actions and Parameters grammar can be found here:
-- **[Triggers and Rules](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/specification/html/spec_trigger_rule.md#triggers-and-rules)**
+- **[Triggers and Rules](https://github.com/apache/openwhisk-wskdeploy/blob/master/specification/html/spec_trigger_rule.md#triggers-and-rules)**
 
 ---
 <!--
diff --git a/docs/wskdeploy_triggerrule_trigger_bindings.md b/docs/wskdeploy_triggerrule_trigger_bindings.md
index 5b9c3b2..8b71df9 100644
--- a/docs/wskdeploy_triggerrule_trigger_bindings.md
+++ b/docs/wskdeploy_triggerrule_trigger_bindings.md
@@ -119,7 +119,7 @@ $ wsk activation get 3a7c92468b4e4170bc92468b4eb170f1
 
 ### Specification
 For convenience, the Actions and Parameters grammar can be found here:
-- **[Triggers and Rules](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/specification/html/spec_trigger_rule.md#triggers-and-rules)**
+- **[Triggers and Rules](https://github.com/apache/openwhisk-wskdeploy/blob/master/specification/html/spec_trigger_rule.md#triggers-and-rules)**
 
 ---
 <!--
diff --git a/main.go b/main.go
index 156ce5f..5a4fe1c 100644
--- a/main.go
+++ b/main.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"
 )
 
 func main() {
diff --git a/parsers/deploy_parser.go b/parsers/deploy_parser.go
index 8f985fe..4797034 100644
--- a/parsers/deploy_parser.go
+++ b/parsers/deploy_parser.go
@@ -18,8 +18,8 @@
 package parsers
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskderrors"
+	"github.com/apache/openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/wskderrors"
 	"gopkg.in/yaml.v2"
 )
 
diff --git a/parsers/manifest_parser.go b/parsers/manifest_parser.go
index fd9b121..7b77334 100644
--- a/parsers/manifest_parser.go
+++ b/parsers/manifest_parser.go
@@ -28,16 +28,16 @@ import (
 
 	"gopkg.in/yaml.v2"
 
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
-	"github.com/apache/incubator-openwhisk-wskdeploy/conductor"
-	"github.com/apache/incubator-openwhisk-wskdeploy/dependencies"
-	"github.com/apache/incubator-openwhisk-wskdeploy/runtimes"
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
-	"github.com/apache/incubator-openwhisk-wskdeploy/webaction"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskderrors"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskenv"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wski18n"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskprint"
+	"github.com/apache/openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-wskdeploy/conductor"
+	"github.com/apache/openwhisk-wskdeploy/dependencies"
+	"github.com/apache/openwhisk-wskdeploy/runtimes"
+	"github.com/apache/openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/webaction"
+	"github.com/apache/openwhisk-wskdeploy/wskderrors"
+	"github.com/apache/openwhisk-wskdeploy/wskenv"
+	"github.com/apache/openwhisk-wskdeploy/wski18n"
+	"github.com/apache/openwhisk-wskdeploy/wskprint"
 	"net/url"
 )
 
diff --git a/parsers/manifest_parser_test.go b/parsers/manifest_parser_test.go
index bc89472..c43421a 100644
--- a/parsers/manifest_parser_test.go
+++ b/parsers/manifest_parser_test.go
@@ -29,11 +29,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
-	"github.com/apache/incubator-openwhisk-wskdeploy/runtimes"
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskderrors"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskprint"
+	"github.com/apache/openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-wskdeploy/runtimes"
+	"github.com/apache/openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/wskderrors"
+	"github.com/apache/openwhisk-wskdeploy/wskprint"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -967,7 +967,7 @@ func TestComposeActionsForDocker(t *testing.T) {
 func TestComposeActionsForEnvVariableInFunction(t *testing.T) {
 	os.Setenv("OPENWHISK_FUNCTION_FILE", "../src/integration/helloworld/actions/hello.js")
 	os.Setenv("OPENWHISK_FUNCTION_PYTHON", "../src/integration/helloworld/actions/hello")
-	os.Setenv("OPENWHISK_FUNCTION_GITHUB", "raw.githubusercontent.com/apache/incubator-openwhisk-wskdeploy/master/tests/src/integration/helloworld/actions/hello")
+	os.Setenv("OPENWHISK_FUNCTION_GITHUB", "raw.githubusercontent.com/apache/openwhisk-wskdeploy/master/tests/src/integration/helloworld/actions/hello")
 
 	file := "../tests/dat/manifest_data_compose_actions_for_function_with_env_variable.yaml"
 	p, m, _ := testLoadParseManifest(t, file)
diff --git a/parsers/parameters.go b/parsers/parameters.go
index 25dff91..cc889cb 100644
--- a/parsers/parameters.go
+++ b/parsers/parameters.go
@@ -19,9 +19,9 @@ package parsers
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskderrors"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskenv"
+	"github.com/apache/openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/wskderrors"
+	"github.com/apache/openwhisk-wskdeploy/wskenv"
 	"reflect"
 )
 
diff --git a/parsers/yamlparser.go b/parsers/yamlparser.go
index 4776e6e..85864b8 100644
--- a/parsers/yamlparser.go
+++ b/parsers/yamlparser.go
@@ -20,9 +20,9 @@ package parsers
 import (
 	"strings"
 
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskenv"
+	"github.com/apache/openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/wskenv"
 )
 
 // YAML schema key names
diff --git a/runtimes/runtimes.go b/runtimes/runtimes.go
index 24236ee..adda1c8 100644
--- a/runtimes/runtimes.go
+++ b/runtimes/runtimes.go
@@ -26,11 +26,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskderrors"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wski18n"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskprint"
+	"github.com/apache/openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/wskderrors"
+	"github.com/apache/openwhisk-wskdeploy/wski18n"
+	"github.com/apache/openwhisk-wskdeploy/wskprint"
 )
 
 const (
@@ -276,7 +276,7 @@ func ListOfSupportedRuntimes(runtimes map[string][]string) (rt []string) {
 
 var RUNTIME_DETAILS = []byte(`{
     "support": {
-        "github": "https://github.com/apache/incubator-openwhisk/issues",
+        "github": "https://github.com/apache/openwhisk/issues",
         "slack": "http://slack.openwhisk.org"
     },
     "description": "OpenWhisk",
diff --git a/specification/html/images/images.md b/specification/html/images/images.md
index 8ac6251..c5157a4 100644
--- a/specification/html/images/images.md
+++ b/specification/html/images/images.md
@@ -20,5 +20,5 @@
 This directory contains supporting images and graphics for the specification.
 
 Including:
-- [OpenWhisk - Conceptual Manifest File Creation.png](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/specification/images/OpenWhisk%20-%20Conceptual%20Manifest%20File%20Creation.png)
-- [OpenWhisk - Conceptual Manifest File Deployment.png](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/specification/images/OpenWhisk%20-%20Conceptual%20Manifest%20File%20Deployment.png)
+- [OpenWhisk - Conceptual Manifest File Creation.png](https://github.com/apache/openwhisk-wskdeploy/blob/master/specification/images/OpenWhisk%20-%20Conceptual%20Manifest%20File%20Creation.png)
+- [OpenWhisk - Conceptual Manifest File Deployment.png](https://github.com/apache/openwhisk-wskdeploy/blob/master/specification/images/OpenWhisk%20-%20Conceptual%20Manifest%20File%20Deployment.png)
diff --git a/specification/html/spec_actions.md b/specification/html/spec_actions.md
index d35bc40..9614f4f 100644
--- a/specification/html/spec_actions.md
+++ b/specification/html/spec_actions.md
@@ -42,7 +42,7 @@ The Action entity schema contains the necessary information to deploy an OpenWhi
 | outputs | no | list of [parameter](spec_parameters.md) | N/A | The optional outputs from the Action. |
 | limits | no | map of [limit keys and values](#valid-limit-keys) | N/A | Optional map of limit keys and their values.</br>See section "[Valid limit keys](#valid-limit-keys)" (below) for a listing of recognized keys and values. |
 | feed | no | boolen | false | Optional indicator that the Action supports the required parameters (and operations) to be run as a Feed Action. |
-| web \| web-export | no | boolean | yes \| no \| raw \| false | The optional flag (annotation) that makes the action accessible to REST calls without authentication.<p>For details on all types of Web Actions, see: [Web Actions](https://github.com/apache/incubator-openwhisk/blob/master/docs/webactions.md).</p>|
+| web \| web-export | no | boolean | yes \| no \| raw \| false | The optional flag (annotation) that makes the action accessible to REST calls without authentication.<p>For details on all types of Web Actions, see: [Web Actions](https://github.com/apache/openwhisk/blob/master/docs/webactions.md).</p>|
 | raw-http | no | boolean | false | The optional flag (annotation) to indicate if a Web Action is able to consume the raw contents within the body of an HTTP request.<p><b>Note</b>: this option is ONLY valid if <em>"web"</em> or <em>"web-export"</em> is set to <em>‘true’</em>.<p> |
 | docker | no | string | N/A | The optional key that references a Docker image (e.g., openwhisk/skeleton). |
 | native | no | boolean | false | The optional key (flag) that indicates the Action is should use the Docker skeleton image for OpenWhisk (i.e., short-form for docker: openwhisk/skeleton). |
diff --git a/specification/html/spec_apis.md b/specification/html/spec_apis.md
index 5f2e865..2873d56 100644
--- a/specification/html/spec_apis.md
+++ b/specification/html/spec_apis.md
@@ -53,7 +53,7 @@ The API entity schema is used to define an OpenWhisk API within a manifest.
   <td>no</td>
   <td>string</td>
   <td>http</td>
-  <td>The response type or <i>content extension</i> used when the API Gateway invokes the web action. See <a href="https://github.com/apache/incubator-openwhisk/blob/master/docs/webactions.md#content-extensions">https://github.com/apache/incubator-openwhisk/blob/master/docs/webactions.md#content-extensions</a>.</p></td>
+  <td>The response type or <i>content extension</i> used when the API Gateway invokes the web action. See <a href="https://github.com/apache/openwhisk/blob/master/docs/webactions.md#content-extensions">https://github.com/apache/openwhisk/blob/master/docs/webactions.md#content-extensions</a>.</p></td>
  </tr>
 </table>
 </html>
@@ -109,7 +109,7 @@ packages:
 ### Notes
 
 - When an API endpoint is being added to an existing API, the `apiName` in the manifest is ignored.
-- See <a href="https://github.com/apache/incubator-openwhisk/blob/master/docs/webactions.md">https://github.com/apache/incubator-openwhisk/blob/master/docs/webactions.md</a> for the complete set of supported `response` values, also known as <i>content extensions</i>.
+- See <a href="https://github.com/apache/openwhisk/blob/master/docs/webactions.md">https://github.com/apache/openwhisk/blob/master/docs/webactions.md</a> for the complete set of supported `response` values, also known as <i>content extensions</i>.
 - Using a `response` value of `http` will give you the most control over the API request and response handling.
 
 <!--
diff --git a/specification/html/spec_rule.md b/specification/html/spec_rule.md
index 263389e..0b6b80d 100644
--- a/specification/html/spec_rule.md
+++ b/specification/html/spec_rule.md
@@ -19,7 +19,7 @@
 
 ## Rules
 
-The Rule entity schema contains the information necessary to associates one trigger with one action, with every firing of the trigger causing the corresponding action to be invoked with the trigger event as input. For more information, see the document "[Creating Triggers and Rules](https://github.com/apache/incubator-openwhisk/blob/master/docs/triggers_rules.md)".
+The Rule entity schema contains the information necessary to associates one trigger with one action, with every firing of the trigger causing the corresponding action to be invoked with the trigger event as input. For more information, see the document "[Creating Triggers and Rules](https://github.com/apache/openwhisk/blob/master/docs/triggers_rules.md)".
 
 #### Subsections
 - [Fields](#fields)
diff --git a/specification/html/spec_trigger.md b/specification/html/spec_trigger.md
index 7e8b111..7ac51a8 100644
--- a/specification/html/spec_trigger.md
+++ b/specification/html/spec_trigger.md
@@ -19,7 +19,7 @@
 
 ## Triggers
 
-The Trigger entity schema contains the necessary information to describe the stream of events that it represents. For more information, see the document "[Creating Triggers and Rules](https://github.com/apache/incubator-openwhisk/blob/master/docs/triggers_rules.md)".
+The Trigger entity schema contains the necessary information to describe the stream of events that it represents. For more information, see the document "[Creating Triggers and Rules](https://github.com/apache/openwhisk/blob/master/docs/triggers_rules.md)".
 
 #### Subsections
 - [Fields](#fields)
diff --git a/tests/README.md b/tests/README.md
index 889e4f5..d8c3afc 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -27,7 +27,7 @@ You can identify them by the first line of each test file `_test.go`.
 ### Unit Tests
 
 Unit tests are tagged with `+build unit` tag. For example, the test file
-[deploymentreader_test.go](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/deployers/deploymentreader_test.go)
+[deploymentreader_test.go](https://github.com/apache/openwhisk-wskdeploy/blob/master/deployers/deploymentreader_test.go)
 under `deployers/` contains unit test cases which is indicated with the unit tests
 tag on the top of the file:
 
@@ -41,20 +41,20 @@ package tests
 #### How do I run unit tests?
 
 In order to run any unit tests, you need to install the package [Testify](https://github.com/stretchr/testify/).
-After installing Testify, all the unit tests can be run from the main `incubator-openwhisk-wskdeploy`
+After installing Testify, all the unit tests can be run from the main `openwhisk-wskdeploy`
 repository folder using the following command:
 
 
 ```
 cd $GOPATH
 go get -u github.com/stretchr/testify
-cd incubator-openwhisk-wskdeploy/
+cd openwhisk-wskdeploy/
 $ go test -v ./... -tags unit
 ```
 
 #### How do I run an individual test?
 
-Above command will run all the unit tests from `incubator-openwhisk-wskdeploy`, in
+Above command will run all the unit tests from `openwhisk-wskdeploy`, in
 order to run a specific test, use:
 
 ```
@@ -83,7 +83,7 @@ Also, the manifest and deployment YAML files used by unit tests should go under
 ### Integration Tests
 
 Integration tests are tagged with `+build integration` tag. For example, the test
-file [zipaction_test.go](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/tests/src/integration/zipaction/zipaction_test.go)
+file [zipaction_test.go](https://github.com/apache/openwhisk-wskdeploy/blob/master/tests/src/integration/zipaction/zipaction_test.go)
 contains integration test which is indicated with the integration tests tag on
 the top of the file:
 
@@ -97,23 +97,23 @@ package tests
 #### How do I run integration tests?
 
 In order to run any integration tests, you need to install the package [Testify](https://github.com/stretchr/testify/).
-After installing Testify, all the integration tests can be run from the main `incubator-openwhisk-wskdeploy`
+After installing Testify, all the integration tests can be run from the main `openwhisk-wskdeploy`
 repository folder using the following command:
 
 
 ```
 cd $GOPATH
 go get -u github.com/stretchr/testify
-cd incubator-openwhisk-wskdeploy/
+cd openwhisk-wskdeploy/
 $ go test -v ./... -tags integration
 ```
 
-`wskdeploy` tests are located under [tests/](https://github.com/apache/incubator-openwhisk-wskdeploy/tree/master/tests)
+`wskdeploy` tests are located under [tests/](https://github.com/apache/openwhisk-wskdeploy/tree/master/tests)
 folder.
 
 #### How do I run an individual test?
 
-Above command will run all the integration tests from `incubator-openwhisk-wskdeploy`, in
+Above command will run all the integration tests from `openwhisk-wskdeploy`, in
 order to run a specific test, use:
 
 ```
@@ -145,16 +145,16 @@ manifest.yaml
 
 ## Real World Applications
 
-[apps](https://github.com/apache/incubator-openwhisk-wskdeploy/tree/master/tests/apps)
+[apps](https://github.com/apache/openwhisk-wskdeploy/tree/master/tests/apps)
 holds various real world applications which are being deployed using `wskdeploy`.
 This space gives an opportunity to `wskdeploy` consumers to integrate with `wskdeploy`
 and verify deployment/undeployment of their applications against a clean OpenWhisk
 instance. With this shared platform, application developer can work with `wskdeploy`
 developers to implement their requirements and usecases as they come in.
 
-As an application developer, you can follow [Contributing to Project](https://github.com/apache/incubator-openwhisk-wskdeploy#contributing-to-the-project)\
-guide to add your application under [apps](https://github.com/apache/incubator-openwhisk-wskdeploy/tree/master/tests/apps)
-or if you want to skip cloning the whole [incubator-openwhisk-wskdeploy](https://github.com/apache/incubator-openwhisk-wskdeploy)
+As an application developer, you can follow [Contributing to Project](https://github.com/apache/openwhisk-wskdeploy#contributing-to-the-project)\
+guide to add your application under [apps](https://github.com/apache/openwhisk-wskdeploy/tree/master/tests/apps)
+or if you want to skip cloning the whole [openwhisk-wskdeploy](https://github.com/apache/openwhisk-wskdeploy)
 GitHub repo. There is a one time settings possible if you just want to
 clone your own application and submit pull requests:
 
@@ -165,7 +165,7 @@ $ cd <my-wskdeploy-application>
 # initialize empty local repo
 $ git init
 # add the remote named origin using your fork
-$ git remote add origin -f https://github.com/<application-developer>/incubator-openwhisk-wskdeploy.git
+$ git remote add origin -f https://github.com/<application-developer>/openwhisk-wskdeploy.git
 # the following git command is very important where we tell git we are checking out specifics
 $ git config core.sparsecheckout true
 $ echo "apps/*" >> .git/info/sparse-checkout
diff --git a/tests/apps/openwhisk-githubslackbot/README.md b/tests/apps/openwhisk-githubslackbot/README.md
index f42b883..580f7ca 100644
--- a/tests/apps/openwhisk-githubslackbot/README.md
+++ b/tests/apps/openwhisk-githubslackbot/README.md
@@ -19,19 +19,19 @@
 
 # GitHub Slack Bot
 
-[Github Slack Bot](https://github.com/apache/incubator-openwhisk-GitHubSlackBot)
+[Github Slack Bot](https://github.com/apache/openwhisk-GitHubSlackBot)
 is an application designed to post updates to Slack when a GitHub pull request is
 ready to merge or a list of pull requests are under review for certain days and
 haven't merged.
 
 You can find detailed Architecture and Usage at
-[incubator-openwhisk-githubslackbot](https://github.com/apache/incubator-openwhisk-GitHubSlackBot).
+[openwhisk-githubslackbot](https://github.com/apache/openwhisk-GitHubSlackBot).
 
 Github Slack Bot application is dependent on three major components:
 
-1. [Cloudant Package](https://github.com/apache/incubator-openwhisk-package-cloudant)
-2. [GitHub Package](https://github.com/apache/incubator-openwhisk-catalog/tree/master/packages/github)
-3. [Slack Package](https://github.com/apache/incubator-openwhisk-catalog/tree/master/packages/slack)
+1. [Cloudant Package](https://github.com/apache/openwhisk-package-cloudant)
+2. [GitHub Package](https://github.com/apache/openwhisk-catalog/tree/master/packages/github)
+3. [Slack Package](https://github.com/apache/openwhisk-catalog/tree/master/packages/slack)
 
 
 #### `manifest.yaml` for Cloudant Package
diff --git a/tests/apps/openwhisk-githubslackbot/manifest.yaml b/tests/apps/openwhisk-githubslackbot/manifest.yaml
index 54a6631..2ca4333 100644
--- a/tests/apps/openwhisk-githubslackbot/manifest.yaml
+++ b/tests/apps/openwhisk-githubslackbot/manifest.yaml
@@ -17,7 +17,7 @@
 
 ##############################
 
-# OpenWhisk Whisk Deploy manifest for incubator-openwhisk-githubslackbot
+# OpenWhisk Whisk Deploy manifest for openwhisk-githubslackbot
 # Installing openwhisk actions, triggers, and rules for OpenWhisk building block
 #   Cloudant Package
 #   GitHub Package
diff --git a/tests/apps/owbp-cloudant-trigger/manifest-bp.json b/tests/apps/owbp-cloudant-trigger/manifest-bp.json
index 2b79e10..1078e1b 100644
--- a/tests/apps/owbp-cloudant-trigger/manifest-bp.json
+++ b/tests/apps/owbp-cloudant-trigger/manifest-bp.json
@@ -4,7 +4,7 @@
   "name": "New Cloudant Item",
   "description": "When a cloudant DB has a data item edited or added, log the change in the console.",
   "long_description": "This blueprint will create a sequence of actions, and a trigger that will kick off that sequence.  The trigger is fired when there is a change in the connected Cloudant DB, which should be a database of cats, with a name and a color.  The expected data item is a cat, with a name and a color defined.  When a new cat is added to the database, or a current cat edited, the data will be logged to the console.",
-  "url": "https://github.com/apache/incubator-openwhisk-wskdeploy/tree/master/tests/apps/owbp-cloudant-trigger",
+  "url": "https://github.com/apache/openwhisk-wskdeploy/tree/master/tests/apps/owbp-cloudant-trigger",
   "runtime": {
     "name": "Node.js 6",
     "kind": "nodejs:6",
diff --git a/tests/apps/owbp-cloudant-trigger/owbp-cloudant-trigger_test.go b/tests/apps/owbp-cloudant-trigger/owbp-cloudant-trigger_test.go
index b88062b..2f83639 100644
--- a/tests/apps/owbp-cloudant-trigger/owbp-cloudant-trigger_test.go
+++ b/tests/apps/owbp-cloudant-trigger/owbp-cloudant-trigger_test.go
@@ -21,13 +21,13 @@ package tests
 
 import (
 	"fmt"
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
 )
 
-var projectPath = "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/apps/owbp-cloudant-trigger/runtimes/"
+var projectPath = "/src/github.com/apache/openwhisk-wskdeploy/tests/apps/owbp-cloudant-trigger/runtimes/"
 
 func TestCloudantTriggerNode(t *testing.T) {
 	manifestPath := os.Getenv("GOPATH") + projectPath + "node/manifest.yaml"
diff --git a/tests/dat/manifest_data_compose_actions_for_function.yaml b/tests/dat/manifest_data_compose_actions_for_function.yaml
index d6d96d2..4b9750c 100644
--- a/tests/dat/manifest_data_compose_actions_for_function.yaml
+++ b/tests/dat/manifest_data_compose_actions_for_function.yaml
@@ -21,4 +21,4 @@ packages:
       hello1:
         function: ../src/integration/helloworld/actions/hello.js
       hello2:
-        function: https://raw.githubusercontent.com/apache/incubator-openwhisk-wskdeploy/master/tests/src/integration/helloworld/actions/hello.js
+        function: https://raw.githubusercontent.com/apache/openwhisk-wskdeploy/master/tests/src/integration/helloworld/actions/hello.js
diff --git a/tests/dat/manifest_data_compose_actions_for_function_with_remote_dir.yaml b/tests/dat/manifest_data_compose_actions_for_function_with_remote_dir.yaml
index d3206cb..65f6c1b 100644
--- a/tests/dat/manifest_data_compose_actions_for_function_with_remote_dir.yaml
+++ b/tests/dat/manifest_data_compose_actions_for_function_with_remote_dir.yaml
@@ -19,4 +19,4 @@ packages:
   helloworld:
     actions:
       hello:
-        function: https://raw.githubusercontent.com/apache/incubator-openwhisk-wskdeploy/master/tests/src/integration/helloworld/actions/
+        function: https://raw.githubusercontent.com/apache/openwhisk-wskdeploy/master/tests/src/integration/helloworld/actions/
diff --git a/tests/dat/manifest_validate_dependencies.yaml b/tests/dat/manifest_validate_dependencies.yaml
index 78e4e59..a8b9daf 100644
--- a/tests/dat/manifest_validate_dependencies.yaml
+++ b/tests/dat/manifest_validate_dependencies.yaml
@@ -38,6 +38,3 @@ packages:
                 location: github.com/apache/incubator-openwhisk-test/packages/hellowhisk
             dependency6:
                 location: /whisk.system/utils
-
-
-
diff --git a/tests/src/integration/alarmtrigger/alarmtrigger_test.go b/tests/src/integration/alarmtrigger/alarmtrigger_test.go
index 6bf080d..d4e0098 100644
--- a/tests/src/integration/alarmtrigger/alarmtrigger_test.go
+++ b/tests/src/integration/alarmtrigger/alarmtrigger_test.go
@@ -21,7 +21,7 @@ package tests
 
 import (
 	"fmt"
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
@@ -47,6 +47,6 @@ func TestAlarmTrigger(t *testing.T) {
 }
 
 var (
-	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/alarmtrigger/manifest.yaml"
-	deploymentPath = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/alarmtrigger/deployment.yaml"
+	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/alarmtrigger/manifest.yaml"
+	deploymentPath = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/alarmtrigger/deployment.yaml"
 )
diff --git a/tests/src/integration/apigateway/apigateway_test.go b/tests/src/integration/apigateway/apigateway_test.go
index a6cf3de..19ec825 100644
--- a/tests/src/integration/apigateway/apigateway_test.go
+++ b/tests/src/integration/apigateway/apigateway_test.go
@@ -20,13 +20,13 @@
 package tests
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
 )
 
-const PATH = "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/apigateway/"
+const PATH = "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/apigateway/"
 
 func TestApiGateway(t *testing.T) {
 	wskdeploy := common.NewWskdeploy()
diff --git a/tests/src/integration/cloudant/README.md b/tests/src/integration/cloudant/README.md
index 98fcf22..a72bb47 100644
--- a/tests/src/integration/cloudant/README.md
+++ b/tests/src/integration/cloudant/README.md
@@ -19,12 +19,12 @@
 
 # Using Cloudant Package with `wskdeploy`
 
-The [Cloudant usecase](https://github.com/apache/incubator-openwhisk-wskdeploy/tree/master/tests/src/integration/cloudant) demonstrates how to build an OpenWhisk app to retrieve document updates from cloudant using `wskdeploy`.
+The [Cloudant usecase](https://github.com/apache/openwhisk-wskdeploy/tree/master/tests/src/integration/cloudant) demonstrates how to build an OpenWhisk app to retrieve document updates from cloudant using `wskdeploy`.
 
-OpenWhisk supports [Cloudant package](https://github.com/apache/incubator-openwhisk-package-cloudant) which can be used to integrate with Cloudant APIs. For our simple app to display document IDs,  we need:
+OpenWhisk supports [Cloudant package](https://github.com/apache/openwhisk-package-cloudant) which can be used to integrate with Cloudant APIs. For our simple app to display document IDs,  we need:
 
-- [manifest.yaml](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/tests/usecases/cloudant/manifest.yaml)
-- [Action File](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/tests/usecases/cloudant/src/process-change.js)
+- [manifest.yaml](https://github.com/apache/openwhisk-wskdeploy/blob/master/tests/usecases/cloudant/manifest.yaml)
+- [Action File](https://github.com/apache/openwhisk-wskdeploy/blob/master/tests/usecases/cloudant/src/process-change.js)
 
 All you have to do is export following environment variables:
 
diff --git a/tests/src/integration/cloudant/cloudant_test.go b/tests/src/integration/cloudant/cloudant_test.go
index b8eeea1..329bd07 100644
--- a/tests/src/integration/cloudant/cloudant_test.go
+++ b/tests/src/integration/cloudant/cloudant_test.go
@@ -21,7 +21,7 @@ package tests
 
 import (
 	"fmt"
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
@@ -44,6 +44,6 @@ func TestCloudant(t *testing.T) {
 }
 
 var (
-	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/cloudant/manifest.yaml"
+	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/cloudant/manifest.yaml"
 	deploymentPath = ""
 )
diff --git a/tests/src/integration/common/wskdeploy.go b/tests/src/integration/common/wskdeploy.go
index b072a52..8e50f2f 100644
--- a/tests/src/integration/common/wskdeploy.go
+++ b/tests/src/integration/common/wskdeploy.go
@@ -27,12 +27,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
-	"github.com/apache/incubator-openwhisk-wskdeploy/dependencies"
-	"github.com/apache/incubator-openwhisk-wskdeploy/deployers"
-	"github.com/apache/incubator-openwhisk-wskdeploy/runtimes"
-	"github.com/apache/incubator-openwhisk-wskdeploy/utils"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskderrors"
+	"github.com/apache/openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-wskdeploy/dependencies"
+	"github.com/apache/openwhisk-wskdeploy/deployers"
+	"github.com/apache/openwhisk-wskdeploy/runtimes"
+	"github.com/apache/openwhisk-wskdeploy/utils"
+	"github.com/apache/openwhisk-wskdeploy/wskderrors"
 	"github.com/fatih/color"
 	"github.com/mattn/go-colorable"
 )
@@ -50,7 +50,7 @@ type Wskdeploy struct {
 }
 
 func NewWskdeploy() *Wskdeploy {
-	return NewWskWithPath(os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/")
+	return NewWskWithPath(os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/")
 }
 
 func GetWskpropsFromEnvVars(apiHost string, namespace string, authKey string) *whisk.Wskprops {
diff --git a/tests/src/integration/conductor/conductor_test.go b/tests/src/integration/conductor/conductor_test.go
index 162d4f9..644e256 100644
--- a/tests/src/integration/conductor/conductor_test.go
+++ b/tests/src/integration/conductor/conductor_test.go
@@ -23,11 +23,11 @@ import (
 	"os"
 	"testing"
 
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 )
 
-const PATH = "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/conductor/"
+const PATH = "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/conductor/"
 
 func TestManagedDeployment(t *testing.T) {
 	manifestPath := os.Getenv("GOPATH") + PATH + "manifest.yaml"
diff --git a/tests/src/integration/defaultpackage/defaultpackage_test.go b/tests/src/integration/defaultpackage/defaultpackage_test.go
index 12e9c64..bf97f7c 100644
--- a/tests/src/integration/defaultpackage/defaultpackage_test.go
+++ b/tests/src/integration/defaultpackage/defaultpackage_test.go
@@ -20,7 +20,7 @@
 package tests
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
@@ -28,7 +28,7 @@ import (
 )
 
 func TestDefaultPackage(t *testing.T) {
-	path := "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/defaultpackage/"
+	path := "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/defaultpackage/"
 	manifestPath := os.Getenv("GOPATH") + path + "manifest.yaml"
 	wskdeploy := common.NewWskdeploy()
 	_, err := wskdeploy.DeployManifestPathOnly(manifestPath)
diff --git a/tests/src/integration/dependency/dependency_test.go b/tests/src/integration/dependency/dependency_test.go
index b2f52c7..8498c49 100644
--- a/tests/src/integration/dependency/dependency_test.go
+++ b/tests/src/integration/dependency/dependency_test.go
@@ -20,7 +20,7 @@
 package tests
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	//"github.com/stretchr/testify/assert"
 	//"os"
 	//"testing"
@@ -38,6 +38,6 @@ var wskprops = common.GetWskprops()
 //}
 //
 //var (
-//	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/dependency/manifest.yaml"
+//	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/dependency/manifest.yaml"
 //	deploymentPath = ""
 //)
diff --git a/tests/src/integration/docker/docker_test.go b/tests/src/integration/docker/docker_test.go
index 6f50f39..cbfa7ae 100644
--- a/tests/src/integration/docker/docker_test.go
+++ b/tests/src/integration/docker/docker_test.go
@@ -20,7 +20,7 @@
 package tests
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
@@ -35,5 +35,5 @@ func TestDocker(t *testing.T) {
 }
 
 var (
-	manifestPath = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/docker/manifest.yaml"
+	manifestPath = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/docker/manifest.yaml"
 )
diff --git a/tests/src/integration/export/export_test.go b/tests/src/integration/export/export_test.go
index 73c1d0a..bdcbd43 100644
--- a/tests/src/integration/export/export_test.go
+++ b/tests/src/integration/export/export_test.go
@@ -27,11 +27,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 )
 
-const EXPORT_TEST_PATH = "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/export/"
+const EXPORT_TEST_PATH = "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/export/"
 
 func TestExport(t *testing.T) {
 	projectName := "EXT_PROJECT"
@@ -213,19 +213,19 @@ func SkipTestExportTriggerFeed(t *testing.T) {
 }
 
 var (
-	manifestLib1Path = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/export/manifest_lib1.yaml"
-	manifestLib2Path = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/export/manifest_lib2.yaml"
-	manifestExtPath  = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/export/manifest_ext.yaml"
+	manifestLib1Path = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/export/manifest_lib1.yaml"
+	manifestLib2Path = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/export/manifest_lib2.yaml"
+	manifestExtPath  = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/export/manifest_ext.yaml"
 
-	targetManifestFolder = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/export/tmp/"
+	targetManifestFolder = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/export/tmp/"
 	targetManifestPath   = targetManifestFolder + "manifest.yaml"
 
-	manifest2PackPath       = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/export/manifest_2pack.yaml"
+	manifest2PackPath       = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/export/manifest_2pack.yaml"
 	target2PackManifestPath = targetManifestFolder + "exported2packmanifest.yaml"
 
-	manifestApiExpPath       = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/export/manifest_apiexp.yaml"
+	manifestApiExpPath       = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/export/manifest_apiexp.yaml"
 	targetApiExpManifestPath = targetManifestFolder + "exportedapimanifest.yaml"
 
-	manifestFeedExpPath       = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/export/manifest_feed.yaml"
+	manifestFeedExpPath       = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/export/manifest_feed.yaml"
 	targetFeedExpManifestPath = targetManifestFolder + "exportedfeedmanifest.yaml"
 )
diff --git a/tests/src/integration/flagstests/flags_test.go b/tests/src/integration/flagstests/flags_test.go
index 3c492f0..3a479b6 100644
--- a/tests/src/integration/flagstests/flags_test.go
+++ b/tests/src/integration/flagstests/flags_test.go
@@ -20,7 +20,7 @@
 package tests
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
@@ -31,7 +31,7 @@ var wskprops = common.GetWskprops()
 // support only projectpath flag
 func TestSupportProjectPath(t *testing.T) {
 	wskdeploy := common.NewWskdeploy()
-	projectPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests"
+	projectPath := os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/flagstests"
 	_, err := wskdeploy.DeployProjectPathOnly(projectPath)
 	assert.Equal(t, nil, err, "Failed to deploy based on the projectpath")
 	_, err = wskdeploy.UndeployProjectPathOnly(projectPath)
@@ -41,7 +41,7 @@ func TestSupportProjectPath(t *testing.T) {
 // support only projectpath with trailing slash
 func TestSupportProjectPathTrailingSlash(t *testing.T) {
 	wskdeploy := common.NewWskdeploy()
-	projectPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests" + "/"
+	projectPath := os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/flagstests" + "/"
 	_, err := wskdeploy.DeployProjectPathOnly(projectPath)
 	assert.Equal(t, nil, err, "Failed to deploy based on the projectpath")
 	_, err = wskdeploy.UndeployProjectPathOnly(projectPath)
@@ -51,7 +51,7 @@ func TestSupportProjectPathTrailingSlash(t *testing.T) {
 // only a yaml manifest
 func TestSupportManifestYamlPath(t *testing.T) {
 	wskdeploy := common.NewWskdeploy()
-	manifestPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests/manifest.yaml"
+	manifestPath := os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/flagstests/manifest.yaml"
 	_, err := wskdeploy.DeployManifestPathOnly(manifestPath)
 	assert.Equal(t, nil, err, "Failed to deploy based on the manifestpath")
 	_, err = wskdeploy.UndeployManifestPathOnly(manifestPath)
@@ -61,7 +61,7 @@ func TestSupportManifestYamlPath(t *testing.T) {
 // only a yml manifest
 func TestSupportManifestYmlPath(t *testing.T) {
 	wskdeploy := common.NewWskdeploy()
-	manifestPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests/manifest.yml"
+	manifestPath := os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/flagstests/manifest.yml"
 	_, err := wskdeploy.DeployManifestPathOnly(manifestPath)
 	assert.Equal(t, nil, err, "Failed to deploy based on the manifestpath")
 	_, err = wskdeploy.UndeployManifestPathOnly(manifestPath)
@@ -71,8 +71,8 @@ func TestSupportManifestYmlPath(t *testing.T) {
 // manifest yaml and deployment yaml
 func TestSupportManifestYamlDeployment(t *testing.T) {
 	wskdeploy := common.NewWskdeploy()
-	manifestPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests/manifest.yaml"
-	deploymentPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests/deployment.yml"
+	manifestPath := os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/flagstests/manifest.yaml"
+	deploymentPath := os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/flagstests/deployment.yml"
 	_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
 	assert.Equal(t, nil, err, "Failed to deploy based on the manifestpath and deploymentpath.")
 	_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
@@ -82,8 +82,8 @@ func TestSupportManifestYamlDeployment(t *testing.T) {
 // manifest yml and deployment yaml
 func TestSupportManifestYmlDeployment(t *testing.T) {
 	wskdeploy := common.NewWskdeploy()
-	manifestPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests/manifest.yml"
-	deploymentPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests/deployment.yml"
+	manifestPath := os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/flagstests/manifest.yml"
+	deploymentPath := os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/flagstests/deployment.yml"
 	_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
 	assert.Equal(t, nil, err, "Failed to deploy based on the manifestpath and deploymentpath.")
 	_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
diff --git a/tests/src/integration/helloworld/README.md b/tests/src/integration/helloworld/README.md
index 6906782..ff4f030 100644
--- a/tests/src/integration/helloworld/README.md
+++ b/tests/src/integration/helloworld/README.md
@@ -21,7 +21,7 @@
 
 ### Package description
 
-The [manifest.yaml](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/tests/src/integration/helloworld/manifest.yaml) file defines:
+The [manifest.yaml](https://github.com/apache/openwhisk-wskdeploy/blob/master/tests/src/integration/helloworld/manifest.yaml) file defines:
 
 - a Package named `IntegrationTestHelloWorld` which contains:
 
diff --git a/tests/src/integration/helloworld/helloworld_test.go b/tests/src/integration/helloworld/helloworld_test.go
index d5d38e4..00ccf5c 100644
--- a/tests/src/integration/helloworld/helloworld_test.go
+++ b/tests/src/integration/helloworld/helloworld_test.go
@@ -20,7 +20,7 @@
 package tests
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
@@ -35,6 +35,6 @@ func TestHelloWorld(t *testing.T) {
 }
 
 var (
-	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/helloworld/manifest.yaml"
-	deploymentPath = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/helloworld/deployment.yaml"
+	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/helloworld/manifest.yaml"
+	deploymentPath = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/helloworld/deployment.yaml"
 )
diff --git a/tests/src/integration/jaraction/jaraction_test.go b/tests/src/integration/jaraction/jaraction_test.go
index 3c9f464..dfa15b4 100644
--- a/tests/src/integration/jaraction/jaraction_test.go
+++ b/tests/src/integration/jaraction/jaraction_test.go
@@ -20,7 +20,7 @@
 package tests
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
@@ -37,6 +37,6 @@ func TestJarAction(t *testing.T) {
 }
 
 var (
-	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/jaraction/manifest.yaml"
+	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/jaraction/manifest.yaml"
 	deploymentPath = ""
 )
diff --git a/tests/src/integration/managed-deployment/managed-deployment_test.go b/tests/src/integration/managed-deployment/managed-deployment_test.go
index a455e95..209b573 100644
--- a/tests/src/integration/managed-deployment/managed-deployment_test.go
+++ b/tests/src/integration/managed-deployment/managed-deployment_test.go
@@ -23,11 +23,11 @@ import (
 	"os"
 	"testing"
 
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 )
 
-const PATH = "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/managed-deployment/"
+const PATH = "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/managed-deployment/"
 
 func TestManagedDeployment(t *testing.T) {
 	manifestPath := os.Getenv("GOPATH") + PATH + "manifest.yaml"
diff --git a/tests/src/integration/message-hub/message-hub_test.go b/tests/src/integration/message-hub/message-hub_test.go
index b054419..a3a22bf 100644
--- a/tests/src/integration/message-hub/message-hub_test.go
+++ b/tests/src/integration/message-hub/message-hub_test.go
@@ -21,7 +21,7 @@ package tests
 
 import (
 	"fmt"
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
@@ -56,6 +56,6 @@ func TestMessageHub(t *testing.T) {
 }
 
 var (
-	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/message-hub/manifest.yaml"
-	deploymentPath = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/message-hub/deployment.yaml"
+	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/message-hub/manifest.yaml"
+	deploymentPath = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/message-hub/deployment.yaml"
 )
diff --git a/tests/src/integration/runtimetests/runtimes_test.go b/tests/src/integration/runtimetests/runtimes_test.go
index c488eb0..0373841 100644
--- a/tests/src/integration/runtimetests/runtimes_test.go
+++ b/tests/src/integration/runtimetests/runtimes_test.go
@@ -20,7 +20,7 @@
 package tests
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
@@ -28,7 +28,7 @@ import (
 
 func TestExplicitRuntimes(t *testing.T) {
 	wskdeploy := common.NewWskdeploy()
-	projectPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/runtimetests"
+	projectPath := os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/runtimetests"
 	_, err := wskdeploy.DeployProjectPathOnly(projectPath)
 	assert.Equal(t, nil, err, "Failed to deploy based on the project path")
 	_, err = wskdeploy.UndeployProjectPathOnly(projectPath)
diff --git a/tests/src/integration/triggerrule/triggerrule_test.go b/tests/src/integration/triggerrule/triggerrule_test.go
index 791dabc..f96f075 100644
--- a/tests/src/integration/triggerrule/triggerrule_test.go
+++ b/tests/src/integration/triggerrule/triggerrule_test.go
@@ -20,7 +20,7 @@
 package tests
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
@@ -38,6 +38,6 @@ func TestTriggerRule(t *testing.T) {
 }
 
 var (
-	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/triggerrule/manifest.yml"
-	deploymentPath = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/triggerrule/deployment.yml"
+	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/triggerrule/manifest.yml"
+	deploymentPath = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/triggerrule/deployment.yml"
 )
diff --git a/tests/src/integration/validate-action-annotations/validate-action-annotations_test.go b/tests/src/integration/validate-action-annotations/validate-action-annotations_test.go
index 842c4e8..ed448a6 100644
--- a/tests/src/integration/validate-action-annotations/validate-action-annotations_test.go
+++ b/tests/src/integration/validate-action-annotations/validate-action-annotations_test.go
@@ -20,13 +20,13 @@
 package tests
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
 )
 
-var path = "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/validate-action-annotations/"
+var path = "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/validate-action-annotations/"
 
 func TestActionAnnotations(t *testing.T) {
 	manifestPath := os.Getenv("GOPATH") + path + "manifest.yaml"
diff --git a/tests/src/integration/validate-binding-inputs-annotations/validate-bind-inputs-anno_test.go b/tests/src/integration/validate-binding-inputs-annotations/validate-bind-inputs-anno_test.go
index 09f9dd1..82052d5 100644
--- a/tests/src/integration/validate-binding-inputs-annotations/validate-bind-inputs-anno_test.go
+++ b/tests/src/integration/validate-binding-inputs-annotations/validate-bind-inputs-anno_test.go
@@ -20,13 +20,13 @@
 package tests
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
 )
 
-var PATH = "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/validate-binding-inputs-annotations/"
+var PATH = "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/validate-binding-inputs-annotations/"
 
 func TestBindingInputsAnnotations(t *testing.T) {
 
diff --git a/tests/src/integration/validate-manifest-deployment-file-extensions/validate-file-extensions_test.go b/tests/src/integration/validate-manifest-deployment-file-extensions/validate-file-extensions_test.go
index 0a1940c..87f8b70 100644
--- a/tests/src/integration/validate-manifest-deployment-file-extensions/validate-file-extensions_test.go
+++ b/tests/src/integration/validate-manifest-deployment-file-extensions/validate-file-extensions_test.go
@@ -20,13 +20,13 @@
 package tests
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
 )
 
-var projectPath = "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/validate-manifest-deployment-file-extensions/"
+var projectPath = "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/validate-manifest-deployment-file-extensions/"
 
 func TestYAMLExtension(t *testing.T) {
 	manifestPath := os.Getenv("GOPATH") + projectPath + "manifest.yaml"
diff --git a/tests/src/integration/validate-packages-in-manifest/validate-packages-in-manifest_test.go b/tests/src/integration/validate-packages-in-manifest/validate-packages-in-manifest_test.go
index 08c2e56..ca9c79f 100644
--- a/tests/src/integration/validate-packages-in-manifest/validate-packages-in-manifest_test.go
+++ b/tests/src/integration/validate-packages-in-manifest/validate-packages-in-manifest_test.go
@@ -20,7 +20,7 @@
 package tests
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
@@ -35,6 +35,6 @@ func TestPackagesInManifest(t *testing.T) {
 }
 
 var (
-	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/validate-packages-in-manifest/manifest.yaml"
-	deploymentPath = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/validate-packages-in-manifest/deployment.yaml"
+	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/validate-packages-in-manifest/manifest.yaml"
+	deploymentPath = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/validate-packages-in-manifest/deployment.yaml"
 )
diff --git a/tests/src/integration/validate-project/validate-application-and-project_test.go b/tests/src/integration/validate-project/validate-application-and-project_test.go
index dd60e10..18605c0 100644
--- a/tests/src/integration/validate-project/validate-application-and-project_test.go
+++ b/tests/src/integration/validate-project/validate-application-and-project_test.go
@@ -20,13 +20,13 @@
 package tests
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
 )
 
-var path = "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/validate-project/"
+var path = "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/validate-project/"
 
 func TestProjectInDeployment(t *testing.T) {
 	manifestPath := os.Getenv("GOPATH") + path + "manifest.yaml"
diff --git a/tests/src/integration/validatePackagesInDeployment/validatePackagesInDeployment_test.go b/tests/src/integration/validatePackagesInDeployment/validatePackagesInDeployment_test.go
index b4c5297..0131d7a 100644
--- a/tests/src/integration/validatePackagesInDeployment/validatePackagesInDeployment_test.go
+++ b/tests/src/integration/validatePackagesInDeployment/validatePackagesInDeployment_test.go
@@ -20,7 +20,7 @@
 package tests
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
@@ -37,6 +37,6 @@ func TestPackagesInDeploymentFile(t *testing.T) {
 }
 
 var (
-	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/validatePackagesInDeployment/manifest.yaml"
-	deploymentPath = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/validatePackagesInDeployment/deployment.yaml"
+	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/validatePackagesInDeployment/manifest.yaml"
+	deploymentPath = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/validatePackagesInDeployment/deployment.yaml"
 )
diff --git a/tests/src/integration/validateSequencesCreation/validateSequencesCreation_test.go b/tests/src/integration/validateSequencesCreation/validateSequencesCreation_test.go
index d1fa748..7959e6f 100644
--- a/tests/src/integration/validateSequencesCreation/validateSequencesCreation_test.go
+++ b/tests/src/integration/validateSequencesCreation/validateSequencesCreation_test.go
@@ -21,7 +21,7 @@ package tests
 
 import (
 	//	"fmt"
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	//	"github.com/stretchr/testify/assert"
 	"io/ioutil"
 	"os"
diff --git a/tests/src/integration/webaction/webaction_test.go b/tests/src/integration/webaction/webaction_test.go
index 43aba14..8def7fa 100644
--- a/tests/src/integration/webaction/webaction_test.go
+++ b/tests/src/integration/webaction/webaction_test.go
@@ -20,7 +20,7 @@
 package tests
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
@@ -38,6 +38,6 @@ func TestWebAction(t *testing.T) {
 }
 
 var (
-	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/webaction/manifest.yml"
+	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/webaction/manifest.yml"
 	deploymentPath = ""
 )
diff --git a/tests/src/integration/websequence/websequence_test.go b/tests/src/integration/websequence/websequence_test.go
index 7f6eaef..0e38209 100644
--- a/tests/src/integration/websequence/websequence_test.go
+++ b/tests/src/integration/websequence/websequence_test.go
@@ -23,7 +23,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -38,6 +38,6 @@ func TestWebSequence(t *testing.T) {
 }
 
 var (
-	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/websequence/manifest.yaml"
+	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/websequence/manifest.yaml"
 	deploymentPath = ""
 )
diff --git a/tests/src/integration/zipaction/zipaction_test.go b/tests/src/integration/zipaction/zipaction_test.go
index bf9243b..bb3edc1 100644
--- a/tests/src/integration/zipaction/zipaction_test.go
+++ b/tests/src/integration/zipaction/zipaction_test.go
@@ -20,7 +20,7 @@
 package tests
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
@@ -35,6 +35,6 @@ func TestZipAction(t *testing.T) {
 }
 
 var (
-	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/zipaction/manifest.yml"
-	deploymentPath = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/zipaction/deployment.yml"
+	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/zipaction/manifest.yml"
+	deploymentPath = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/zipaction/deployment.yml"
 )
diff --git a/tests/src/integration/zipactionwithexclude/zipactionwithexclude_test.go b/tests/src/integration/zipactionwithexclude/zipactionwithexclude_test.go
index 027285b..d782032 100644
--- a/tests/src/integration/zipactionwithexclude/zipactionwithexclude_test.go
+++ b/tests/src/integration/zipactionwithexclude/zipactionwithexclude_test.go
@@ -20,7 +20,7 @@
 package tests
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
@@ -35,6 +35,6 @@ func TestZipActionWithExclude(t *testing.T) {
 }
 
 var (
-	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/zipactionwithexclude/manifest.yml"
+	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/zipactionwithexclude/manifest.yml"
 	deploymentPath = ""
 )
diff --git a/tests/src/integration/zipactionwithinclude/zipactionwithinclude_test.go b/tests/src/integration/zipactionwithinclude/zipactionwithinclude_test.go
index 4032f53..cead1e4 100644
--- a/tests/src/integration/zipactionwithinclude/zipactionwithinclude_test.go
+++ b/tests/src/integration/zipactionwithinclude/zipactionwithinclude_test.go
@@ -20,7 +20,7 @@
 package tests
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
+	"github.com/apache/openwhisk-wskdeploy/tests/src/integration/common"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
@@ -35,6 +35,6 @@ func TestZipActionWithInclude(t *testing.T) {
 }
 
 var (
-	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/zipactionwithinclude/manifest.yml"
-	deploymentPath = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/zipactionwithinclude/deployment.yml"
+	manifestPath   = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/zipactionwithinclude/manifest.yml"
+	deploymentPath = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/zipactionwithinclude/deployment.yml"
 )
diff --git a/tests/usecases/github/README.md b/tests/usecases/github/README.md
index 48502f7..bef726e 100644
--- a/tests/usecases/github/README.md
+++ b/tests/usecases/github/README.md
@@ -19,13 +19,13 @@
 
 # Using GitHub Package with `wskdeploy`
 
-The [GitHub usecase](https://github.com/apache/incubator-openwhisk-wskdeploy/tree/master/tests/usecases/github) demonstrates how to build an OpenWhisk app to display github commit messages using `wskdeploy`.
+The [GitHub usecase](https://github.com/apache/openwhisk-wskdeploy/tree/master/tests/usecases/github) demonstrates how to build an OpenWhisk app to display github commit messages using `wskdeploy`.
 
-OpenWhisk comes with a [GitHub package](https://github.com/apache/incubator-openwhisk-catalog/blob/master/packages/github/README.md) which can be used to run GitHub APIs. For our app to display github commits, we need:
+OpenWhisk comes with a [GitHub package](https://github.com/apache/openwhisk-catalog/blob/master/packages/github/README.md) which can be used to run GitHub APIs. For our app to display github commits, we need:
 
-- [manifest.yaml](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/tests/usecases/github/manifest.yaml)
-- [deployment.yaml](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/tests/usecases/github/deployment.yaml)
-- [Action File](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/tests/usecases/github/src/print-github-commits.js)
+- [manifest.yaml](https://github.com/apache/openwhisk-wskdeploy/blob/master/tests/usecases/github/manifest.yaml)
+- [deployment.yaml](https://github.com/apache/openwhisk-wskdeploy/blob/master/tests/usecases/github/deployment.yaml)
+- [Action File](https://github.com/apache/openwhisk-wskdeploy/blob/master/tests/usecases/github/src/print-github-commits.js)
 
 All you have to do is add your own credentials in `deployment.yaml` to deploy this app.
 
@@ -33,7 +33,7 @@ All you have to do is add your own credentials in `deployment.yaml` to deploy th
 GitHubWebhookTrigger:
     inputs:
         username: <username>  # replace it with your GitHub username
-        repository: <repo>    # replace it with your repo eg. apache/incubator-openwhisk-wskdeploy
+        repository: <repo>    # replace it with your repo eg. apache/openwhisk-wskdeploy
         accessToken: <token>  # replace it with token which has access to the specified repo
         events: push          # push for commits
 ```
diff --git a/tests/usecases/github/deployment.yaml b/tests/usecases/github/deployment.yaml
index bb9057c..306c8fc 100644
--- a/tests/usecases/github/deployment.yaml
+++ b/tests/usecases/github/deployment.yaml
@@ -25,6 +25,6 @@ project:
                 GitHubWebhookTrigger:
                     inputs:
                         username: <username>  # replace it with your GitHub username
-                        repository: <repo>    # replace it with your repo eg. apache/incubator-openwhisk-wskdeploy
+                        repository: <repo>    # replace it with your repo eg. apache/openwhisk-wskdeploy
                         accessToken: <token>  # replace it with token which has access to the specified repo
                         events: push          # push for commits
diff --git a/tests/usecases/slack/README.md b/tests/usecases/slack/README.md
index 78030c6..0e42264 100644
--- a/tests/usecases/slack/README.md
+++ b/tests/usecases/slack/README.md
@@ -19,15 +19,15 @@
 
 # Using Slack Package with `wskdeploy`
 
-The [Slack usecase](https://github.com/apache/incubator-openwhisk-wskdeploy/tree/master/tests/usecases/slack) demonstrates how to build an OpenWhisk app to post a sample message to slack every hour using `wskdeploy`.
+The [Slack usecase](https://github.com/apache/openwhisk-wskdeploy/tree/master/tests/usecases/slack) demonstrates how to build an OpenWhisk app to post a sample message to slack every hour using `wskdeploy`.
 
-OpenWhisk comes with a [Slack package](https://github.com/apache/incubator-openwhisk-catalog/blob/master/packages/slack/README.md) which can be used to post messages to slack. For our app to post hourly messages, we need:
+OpenWhisk comes with a [Slack package](https://github.com/apache/openwhisk-catalog/blob/master/packages/slack/README.md) which can be used to post messages to slack. For our app to post hourly messages, we need:
 
-- [manifest.yaml](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/tests/usecases/slack/manifest.yaml)
-- [deployment.yaml](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/tests/usecases/slack/deployment.yaml)
-- [Action File](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/tests/usecases/slack/src/post-to-slack.js)
+- [manifest.yaml](https://github.com/apache/openwhisk-wskdeploy/blob/master/tests/usecases/slack/manifest.yaml)
+- [deployment.yaml](https://github.com/apache/openwhisk-wskdeploy/blob/master/tests/usecases/slack/deployment.yaml)
+- [Action File](https://github.com/apache/openwhisk-wskdeploy/blob/master/tests/usecases/slack/src/post-to-slack.js)
 
-All you have to do is export few environment variables with your slack webhook settings in `deployment.yaml` to deploy this app. You can create a new incoming webhook by following step by step instructions from [here](https://github.com/apache/incubator-openwhisk-GitHubSlackBot/blob/master/docs/add-webhook-to-slack.md).
+All you have to do is export few environment variables with your slack webhook settings in `deployment.yaml` to deploy this app. You can create a new incoming webhook by following step by step instructions from [here](https://github.com/apache/openwhisk-GitHubSlackBot/blob/master/docs/add-webhook-to-slack.md).
 
 ```yaml
     dependencies:
diff --git a/tools/travis/cloneutils.sh b/tools/travis/cloneutils.sh
index e60781e..7f6bf5e 100755
--- a/tools/travis/cloneutils.sh
+++ b/tools/travis/cloneutils.sh
@@ -22,4 +22,4 @@ HOMEDIR="$SCRIPTDIR/../../../"
 
 # 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
diff --git a/tools/travis/scancode.sh b/tools/travis/scancode.sh
index 815573b..9e41ccc 100755
--- a/tools/travis/scancode.sh
+++ b/tools/travis/scancode.sh
@@ -20,7 +20,7 @@ set -e
 # Build script for Travis-CI.
 SCRIPTDIR=$(cd $(dirname "$0") && pwd)
 ROOTDIR="$SCRIPTDIR/../.."
-UTILDIR="$ROOTDIR/../incubator-openwhisk-utilities"
+UTILDIR="$ROOTDIR/../openwhisk-utilities"
 
 # run scancode using the ASF Release configuration
 cd $UTILDIR
diff --git a/tools/travis/script.sh b/tools/travis/script.sh
index 7f2e42b..af2c353 100755
--- a/tools/travis/script.sh
+++ b/tools/travis/script.sh
@@ -36,7 +36,7 @@ HOMEDIR="$(dirname "$TRAVIS_BUILD_DIR")"
 cd $HOMEDIR
 
 # OpenWhisk clone to fixed directory location
-git clone --depth 3 https://github.com/apache/incubator-openwhisk.git openwhisk
+git clone --depth 3 https://github.com/apache/openwhisk.git openwhisk
 
 # Build script for Travis-CI.
 WHISKDIR="$HOMEDIR/openwhisk"
@@ -52,7 +52,7 @@ $ANSIBLE_CMD prereq.yml
 $ANSIBLE_CMD couchdb.yml
 $ANSIBLE_CMD initdb.yml
 $ANSIBLE_CMD wipe.yml
-$ANSIBLE_CMD openwhisk.yml -e '{"openwhisk_cli":{"installation_mode":"remote","remote":{"name":"OpenWhisk_CLI","dest_name":"OpenWhisk_CLI","location":"https://github.com/apache/incubator-openwhisk-cli/releases/download/latest"}}}'
+$ANSIBLE_CMD openwhisk.yml -e '{"openwhisk_cli":{"installation_mode":"remote","remote":{"name":"OpenWhisk_CLI","dest_name":"OpenWhisk_CLI","location":"https://github.com/apache/openwhisk-cli/releases/download/latest"}}}'
 $ANSIBLE_CMD properties.yml
 $ANSIBLE_CMD apigateway.yml
 $ANSIBLE_CMD routemgmt.yml
diff --git a/utils/file.go b/utils/file.go
index 4155358..e8470f4 100644
--- a/utils/file.go
+++ b/utils/file.go
@@ -24,7 +24,7 @@ import (
 	"path"
 	"path/filepath"
 
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskprint"
+	"github.com/apache/openwhisk-wskdeploy/wskprint"
 )
 
 // check if the path represents file path or dir path
diff --git a/utils/managedannotations.go b/utils/managedannotations.go
index 4023c10..2a28e05 100644
--- a/utils/managedannotations.go
+++ b/utils/managedannotations.go
@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-client-go/whisk"
 )
 
 /*
diff --git a/utils/misc.go b/utils/misc.go
index b32c092..81b666a 100644
--- a/utils/misc.go
+++ b/utils/misc.go
@@ -26,7 +26,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-client-go/whisk"
 	"github.com/hokaccha/go-prettyjson"
 )
 
diff --git a/utils/misc_test.go b/utils/misc_test.go
index 4f92be2..ae45bb0 100644
--- a/utils/misc_test.go
+++ b/utils/misc_test.go
@@ -20,7 +20,7 @@
 package utils
 
 import (
-	"github.com/apache/incubator-openwhisk-wskdeploy/dependencies"
+	"github.com/apache/openwhisk-wskdeploy/dependencies"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
diff --git a/utils/validation.go b/utils/validation.go
index 1b43623..45e196b 100644
--- a/utils/validation.go
+++ b/utils/validation.go
@@ -20,9 +20,9 @@ package utils
 
 import (
 	"encoding/json"
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wski18n"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskprint"
+	"github.com/apache/openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-wskdeploy/wski18n"
+	"github.com/apache/openwhisk-wskdeploy/wskprint"
 	"strings"
 )
 
diff --git a/utils/zip.go b/utils/zip.go
index a818bc0..72a1e2e 100644
--- a/utils/zip.go
+++ b/utils/zip.go
@@ -24,8 +24,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/apache/incubator-openwhisk-wskdeploy/wski18n"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskprint"
+	"github.com/apache/openwhisk-wskdeploy/wski18n"
+	"github.com/apache/openwhisk-wskdeploy/wskprint"
 )
 
 const PATH_WILDCARD = "*"
diff --git a/webaction/webaction.go b/webaction/webaction.go
index b339eae..88b6c1d 100644
--- a/webaction/webaction.go
+++ b/webaction/webaction.go
@@ -18,8 +18,8 @@
 package webaction
 
 import (
-	"github.com/apache/incubator-openwhisk-client-go/whisk"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskderrors"
+	"github.com/apache/openwhisk-client-go/whisk"
+	"github.com/apache/openwhisk-wskdeploy/wskderrors"
 	"strings"
 )
 
diff --git a/wskenv/environment.go b/wskenv/environment.go
index 0b36892..99ad198 100644
--- a/wskenv/environment.go
+++ b/wskenv/environment.go
@@ -22,8 +22,8 @@ import (
 	"reflect"
 	"strings"
 	/** Fixes #797
-	"github.com/apache/incubator-openwhisk-wskdeploy/wski18n"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wskprint"
+	"github.com/apache/openwhisk-wskdeploy/wski18n"
+	"github.com/apache/openwhisk-wskdeploy/wskprint"
 	**/)
 
 // Test if a string
diff --git a/wski18n/i18n_resources.go b/wski18n/i18n_resources.go
index f9cba2f..d0e2c37 100644
--- a/wski18n/i18n_resources.go
+++ b/wski18n/i18n_resources.go
@@ -92,7 +92,7 @@ func wski18nResourcesDe_deAllJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "wski18n/resources/de_DE.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1515697090, 0)}
+	info := bindataFileInfo{name: "wski18n/resources/de_DE.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1539631576, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -112,7 +112,7 @@ func wski18nResourcesEn_usAllJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "wski18n/resources/en_US.all.json", size: 20876, mode: os.FileMode(420), modTime: time.Unix(1554424542, 0)}
+	info := bindataFileInfo{name: "wski18n/resources/en_US.all.json", size: 20876, mode: os.FileMode(420), modTime: time.Unix(1560452590, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -132,7 +132,7 @@ func wski18nResourcesEs_esAllJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "wski18n/resources/es_ES.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1515697090, 0)}
+	info := bindataFileInfo{name: "wski18n/resources/es_ES.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1539631576, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -152,7 +152,7 @@ func wski18nResourcesFr_frAllJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "wski18n/resources/fr_FR.all.json", size: 101, mode: os.FileMode(420), modTime: time.Unix(1515697090, 0)}
+	info := bindataFileInfo{name: "wski18n/resources/fr_FR.all.json", size: 101, mode: os.FileMode(420), modTime: time.Unix(1539631576, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -172,7 +172,7 @@ func wski18nResourcesIt_itAllJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "wski18n/resources/it_IT.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1515697090, 0)}
+	info := bindataFileInfo{name: "wski18n/resources/it_IT.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1539631576, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -192,7 +192,7 @@ func wski18nResourcesJa_jaAllJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "wski18n/resources/ja_JA.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1515697090, 0)}
+	info := bindataFileInfo{name: "wski18n/resources/ja_JA.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1539631576, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -212,7 +212,7 @@ func wski18nResourcesKo_krAllJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "wski18n/resources/ko_KR.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1515697090, 0)}
+	info := bindataFileInfo{name: "wski18n/resources/ko_KR.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1539631576, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -232,7 +232,7 @@ func wski18nResourcesPt_brAllJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "wski18n/resources/pt_BR.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1515697090, 0)}
+	info := bindataFileInfo{name: "wski18n/resources/pt_BR.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1539631576, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -252,7 +252,7 @@ func wski18nResourcesZh_hansAllJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "wski18n/resources/zh_Hans.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1515697090, 0)}
+	info := bindataFileInfo{name: "wski18n/resources/zh_Hans.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1539631576, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -272,7 +272,7 @@ func wski18nResourcesZh_hantAllJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "wski18n/resources/zh_Hant.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1515697090, 0)}
+	info := bindataFileInfo{name: "wski18n/resources/zh_Hant.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1539631576, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
diff --git a/wskprint/console.go b/wskprint/console.go
index 3c2427d..145881f 100644
--- a/wskprint/console.go
+++ b/wskprint/console.go
@@ -19,7 +19,7 @@ package wskprint
 
 import (
 	"fmt"
-	"github.com/apache/incubator-openwhisk-wskdeploy/wski18n"
+	"github.com/apache/openwhisk-wskdeploy/wski18n"
 	"github.com/fatih/color"
 	"github.com/mattn/go-colorable"
 	"os"
@@ -127,7 +127,7 @@ func PrintOpenWhiskBanner(verbose bool) {
 
 // Display "trace" output if either param is true OR we are running Go test verbose (i.e., "go test -v")
 // Typical Args for "go test" looks as follows:
-// arg[0] = [/var/folders/nj/<uuid>/T/<build-id>/github.com/apache/incubator-openwhisk-wskdeploy/deployers/_test/deployers.test
+// arg[0] = [/var/folders/nj/<uuid>/T/<build-id>/github.com/apache/openwhisk-wskdeploy/deployers/_test/deployers.test
 // arg[1] = -test.v=true
 // arg[2] = -test.run=TestDeploymentReader_PackagesBindTrigger]
 func DetectGoTestVerbose() bool {